Merge pull request #116 from HorizenOfficial/version_1_4_0_final

Version 1.4.0 final
HorizenOfficial · Jun 18, 2024 · 5de188e · 5de188e
2 parents 23b92d0 + f79affa
commit 5de188e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 ## 1.4.0
-* SDK dependency updated to version 0.12.0 (see [SDK changelog](https://github.com/HorizenOfficial/Sidechains-SDK/blob/0.12.0-RC2/CHANGELOG.md))
+* SDK dependency updated to version 0.12.0 (see [SDK changelog](https://github.com/HorizenOfficial/Sidechains-SDK/blob/0.12.0/CHANGELOG.md))
 * Fork configuration to enable new on-chain delegated staking reward mechanism and new handling of rewards from mainchain
 * Added support for metrics endpoint
 * Bug fix: Modify entrypoint.sh: Improve declared ip detection in MacOS environments

diff --git a/api/version.json b/api/version.json
@@ -2,15 +2,15 @@
    {
       "network":"mainnet",
       "networkName": "eon",
-      "version":"1.4.0-RC2",
-      "dockerImages":["zencash/evmapp:1.4.0-RC2","zencash/evmapp:latest"],
-      "ghReleaseLink":"github.com/HorizenOfficial/eon/releases/tag/1.4.0-RC2"
+      "version":"1.4.0",
+      "dockerImages":["zencash/evmapp:1.4.0","zencash/evmapp:latest"],
+      "ghReleaseLink":"github.com/HorizenOfficial/eon/releases/tag/1.4.0"
    },
    {
       "network":"testnet",
       "networkName": "gobi",
-      "version":"1.4.0-RC2",
-      "dockerImages":["zencash/evmapp:1.4.0-RC2","zencash/evmapp:latest"],
-      "ghReleaseLink":"github.com/HorizenOfficial/eon/releases/tag/1.4.0-RC2"
+      "version":"1.4.0",
+      "dockerImages":["zencash/evmapp:1.4.0","zencash/evmapp:latest"],
+      "ghReleaseLink":"github.com/HorizenOfficial/eon/releases/tag/1.4.0"
    }
 ]
diff --git a/bootstraptool/pom.xml b/bootstraptool/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>bootstraptool</artifactId>
-  <version>1.4.0-RC2</version>
+  <version>1.4.0</version>
   <inceptionYear>2023</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,12 +16,12 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-account_sctools</artifactId>
-      <version>0.12.0-RC2</version>
+      <version>0.12.0</version>
     </dependency>
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>eon</artifactId>
-      <version>1.4.0-RC2</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/doc/release/1.4.0.md b/doc/release/1.4.0.md
@@ -2,7 +2,7 @@
 ---
 
 ## Notes about new/updated Features
-The 1.4.0 version has been updated to the 0.12.0 SDK version, which introduces several additions: refer to [SDK release notes](https://github.com/HorizenOfficial/Sidechains-SDK/blob/0.12.0-RC2/doc/release/0.12.0.md) for a detailed explanation.
+The 1.4.0 version has been updated to the 0.12.0 SDK version, which introduces several additions: refer to [SDK release notes](https://github.com/HorizenOfficial/Sidechains-SDK/blob/0.12.0/doc/release/0.12.0.md) for a detailed explanation.
 
 
 ### Metrics endpoint

diff --git a/node/pom.xml b/node/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>eon</artifactId>
-  <version>1.4.0-RC2</version>
+  <version>1.4.0</version>
   <inceptionYear>2023</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <maven.dependency.plugin>3.1.1</maven.dependency.plugin>
-    <sidechain.sdk.version>0.12.0-RC2</sidechain.sdk.version>
+    <sidechain.sdk.version>0.12.0</sidechain.sdk.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/node/src/main/java/io/horizen/eon/forks/F6Fork.java b/node/src/main/java/io/horizen/eon/forks/F6Fork.java
@@ -34,7 +34,7 @@ protected int getActivationTestnetGobi() {
     }
     @Override
     protected int getActivationMainnet() {
-        return  10000000;  //TBD
+        return  1593;  //estimated starts at THU 27 June 2024 17:55 Milano time
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>eonproject</artifactId>
-  <version>1.4.0-RC2</version>
+  <version>1.4.0</version>
   <packaging>pom</packaging>
   <inceptionYear>2023</inceptionYear>
   <properties>