diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c3e99..ded1c3c 100644 --- 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 index 77aab0c..24bc431 100644 --- 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" } ] \ No newline at end of file diff --git a/bootstraptool/pom.xml b/bootstraptool/pom.xml index 076ebee..76edc39 100644 --- a/bootstraptool/pom.xml +++ b/bootstraptool/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.horizen bootstraptool - 1.4.0-RC2 + 1.4.0 2023 UTF-8 @@ -16,12 +16,12 @@ io.horizen sidechains-sdk-account_sctools - 0.12.0-RC2 + 0.12.0 io.horizen eon - 1.4.0-RC2 + 1.4.0 compile diff --git a/doc/release/1.4.0.md b/doc/release/1.4.0.md index 66dd9cd..7abe8f0 100644 --- 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 index 2f145a4..bb1be47 100644 --- a/node/pom.xml +++ b/node/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.horizen eon - 1.4.0-RC2 + 1.4.0 2023 UTF-8 @@ -11,7 +11,7 @@ 11 3.8.1 3.1.1 - 0.12.0-RC2 + 0.12.0 diff --git a/node/src/main/java/io/horizen/eon/forks/F6Fork.java b/node/src/main/java/io/horizen/eon/forks/F6Fork.java index ec2ed37..702c892 100644 --- 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 index c87db15..a7e0661 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.horizen eonproject - 1.4.0-RC2 + 1.4.0 pom 2023