Merge pull request #2891 from rsksmart/add-rskip460

Add RSKIP460 activation code
rsksmart · Dec 12, 2024 · 7ee97b4 · 7ee97b4
2 parents 8184a36 + 8b6fafc
commit 7ee97b4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java
@@ -98,7 +98,8 @@ public enum ConsensusRule {
     RSKIP427("rskip427"),
     RSKIP428("rskip428"),
     RSKIP434("rskip434"),
-    RSKIP438("rskip438")
+    RSKIP438("rskip438"),
+    RSKIP460("rskip460")
     ;
 
     private final String configKey;

diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
@@ -100,6 +100,7 @@ blockchain = {
              rskip428 = <hardforkName>
              rskip434 = <hardforkName>
              rskip438 = <hardforkName>
+             rskip460 = <hardforkName>
         }
     }
     gc = {

diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf
@@ -85,6 +85,7 @@ blockchain = {
             rskip428 = lovell700
             rskip434 = arrowhead631
             rskip438 = lovell700
+            rskip460 = lovell700
         }
     }
     gc = {

diff --git a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
@@ -126,6 +126,7 @@ class ActivationConfigTest {
         "    rskip428: lovell700",
         "    rskip434: arrowhead631",
         "    rskip438: lovell700",
+        "    rskip460: lovell700",
         "}"
     ));
 

diff --git a/...-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java b/...-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java
@@ -177,7 +177,8 @@ private static List<ConsensusRule> getArrowhead631Rskips() {
     private static List<ConsensusRule> getLovell700Rskips() {
         return new ArrayList<>(Arrays.asList(
             ConsensusRule.RSKIP427,
-            ConsensusRule.RSKIP428
+            ConsensusRule.RSKIP428,
+            ConsensusRule.RSKIP460
         ));
     }