Merge pull request #1698 from rsksmart/set-activation-height

Set activation heights in testnet and update version name
rsksmart · Jan 20, 2022 · a4e57af · a4e57af
2 parents 8894827 + e20d5dc
commit a4e57af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -14,7 +14,8 @@ blockchain.config {
     consensusRules = {
         rskip97 = -1, # disable orchid difficulty drop
         rskip132 = 43550, # enable recalculted receive headers cost
-        rskip284 = -1, # TODO set activation height in testnet
+        rskip284 = 2581800,
+        rskip290 = 2581800
     }
 }
 

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