Merge pull request #2055 from rsksmart/fingerroot500-modifier

Changed version modifier from rc to fingerroot; Updated activation heights for fingerroot hf
rsksmart · Jun 13, 2023 · 154e793 · 154e793
2 parents e91cbec + 6badb4c
commit 154e793
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
@@ -11,7 +11,7 @@ blockchain.config {
         iris300 = 3614800,
         hop400 = 4598500,
         hop401 = 4976300,
-        fingerroot500 = -1
+        fingerroot500 = 5468000
     }
 }
 

diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -11,7 +11,7 @@ blockchain.config {
         iris300 = 2060500,
         hop400 = 3103000,
         hop401 = 3362200,
-        fingerroot500 = -1
+        fingerroot500 = 4015800
     },
     consensusRules = {
         rskip97 = -1, # disable orchid difficulty drop

diff --git a/rskj-core/src/main/resources/version.properties b/rskj-core/src/main/resources/version.properties
@@ -1,2 +1,2 @@
 versionNumber='5.0.0'
-modifier="RC"
+modifier="FINGERROOT"