Merge pull request #2263 from rsksmart/arrowhead-activation

Set Arrowhead activation heights for testnet and mainnet. Version modifier to ARROWHEAD
rsksmart · Mar 5, 2024 · 46636a3 · 46636a3
2 parents 15f1669 + 9e16555
commit 46636a3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeMainNetConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeMainNetConstants.java
@@ -151,7 +151,7 @@ public class BridgeMainNetConstants extends BridgeConstants {
 
         numberOfBlocksBetweenPegouts = 360; // 3 hours of RSK blocks (considering 1 block every 30 seconds)
 
-        btcHeightWhenPegoutTxIndexActivates = 100; // TODO: TBD and change current mock value. This is an estimation of the btc block number once RSKIP379 is activated.
+        btcHeightWhenPegoutTxIndexActivates = 837_589; // Estimated date Wed, 03 Apr 2024 15:00:00 GMT. 832,430 was the block number at time of calculation
         pegoutTxIndexGracePeriodInBtcBlocks = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
     }
 

diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeTestNetConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeTestNetConstants.java
@@ -169,8 +169,8 @@ public class BridgeTestNetConstants extends BridgeConstants {
 
         numberOfBlocksBetweenPegouts = 360; // 3 hours of RSK blocks (considering 1 block every 30 seconds)
 
-        btcHeightWhenPegoutTxIndexActivates = 150; // TODO: TBD and change current mock value. This is an estimation of the btc block number once RSKIP379 is activated.
-        pegoutTxIndexGracePeriodInBtcBlocks = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
+        btcHeightWhenPegoutTxIndexActivates = 2_589_553; // Estimated date Wed, 20 Mar 2024 15:00:00 GMT. 2,579,823 was the block number at time of calculation
+        pegoutTxIndexGracePeriodInBtcBlocks = 1_440; // 10 days in BTC blocks (considering 1 block every 10 minutes)
     }
 
     public static BridgeTestNetConstants getInstance() {

diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
@@ -12,7 +12,7 @@ blockchain.config {
         hop400 = 4598500,
         hop401 = 4976300,
         fingerroot500 = 5468000,
-        arrowhead600 = -1
+        arrowhead600 = 6223700
     }
 }
 

diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -12,7 +12,7 @@ blockchain.config {
         hop400 = 3103000,
         hop401 = 3362200,
         fingerroot500 = 4015800,
-        arrowhead600 = -1
+        arrowhead600 = 4927100
     },
     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='6.0.0'
-modifier="RC"
+modifier="ARROWHEAD"
diff --git a/rskj-core/src/test/java/co/rsk/config/BridgeConstantsTest.java b/rskj-core/src/test/java/co/rsk/config/BridgeConstantsTest.java
@@ -124,8 +124,8 @@ void test_getMinimumPeginTxValue(BridgeConstants bridgeConstants, boolean isRSKI
 
     private static Stream<Arguments> getBtcHeightWhenPegoutTxIndexActivatesArgProvider() {
         return Stream.of(
-            Arguments.of(BridgeMainNetConstants.getInstance(), 100),
-            Arguments.of(BridgeTestNetConstants.getInstance(), 150),
+            Arguments.of(BridgeMainNetConstants.getInstance(), 837589),
+            Arguments.of(BridgeTestNetConstants.getInstance(), 2589553),
             Arguments.of(BridgeRegTestConstants.getInstance(), 250)
         );
     }
@@ -143,7 +143,7 @@ void test_getBtcHeightWhenPegoutTxIndexActivates(BridgeConstants bridgeConstants
     private static Stream<Arguments> getPegoutTxIndexGracePeriodInBtcBlocksArgProvider() {
         return Stream.of(
             Arguments.of(BridgeMainNetConstants.getInstance(), 4_320),
-            Arguments.of(BridgeTestNetConstants.getInstance(), 4_320),
+            Arguments.of(BridgeTestNetConstants.getInstance(), 1_440),
             Arguments.of(BridgeRegTestConstants.getInstance(), 100)
         );
     }