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 index 014229ac9f..4e37eea07a 100644 --- 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 index 6dc5b16c5c..a8cb939000 100644 --- a/rskj-core/src/main/resources/expected.conf +++ b/rskj-core/src/main/resources/expected.conf @@ -100,6 +100,7 @@ blockchain = { rskip428 = rskip434 = rskip438 = + rskip460 = } } gc = { diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf index a7d71a2b4d..4355022e72 100644 --- 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 index d94e90569c..2aef8df5b4 100644 --- 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/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java index 4aab321e76..02828c05da 100644 --- a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java +++ b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java @@ -177,7 +177,8 @@ private static List getArrowhead631Rskips() { private static List getLovell700Rskips() { return new ArrayList<>(Arrays.asList( ConsensusRule.RSKIP427, - ConsensusRule.RSKIP428 + ConsensusRule.RSKIP428, + ConsensusRule.RSKIP460 )); }