From de3cd4ce8dd3dedd631773d865597bbd79ccadb0 Mon Sep 17 00:00:00 2001 From: nathanieliov Date: Thu, 19 Dec 2024 18:12:38 -0400 Subject: [PATCH] Added RSKIP459 activation code --- .../org/ethereum/config/blockchain/upgrades/ConsensusRule.java | 1 + rskj-core/src/main/resources/expected.conf | 1 + rskj-core/src/main/resources/reference.conf | 1 + .../config/blockchain/upgrades/ActivationConfigTest.java | 1 + .../config/blockchain/upgrades/ActivationConfigsForTest.java | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) 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 fb04b65742..68420afd59 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 @@ -101,6 +101,7 @@ public enum ConsensusRule { RSKIP434("rskip434"), RSKIP438("rskip438"), RSKIP454("rskip454"), + RSKIP459("rskip459"), ; private final String configKey; diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf index 0657298867..b68edc87de 100644 --- a/rskj-core/src/main/resources/expected.conf +++ b/rskj-core/src/main/resources/expected.conf @@ -102,6 +102,7 @@ blockchain = { rskip434 = rskip438 = rskip454 = + rskip459 = } } gc = { diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf index 3f6eac0ecc..15403c9715 100644 --- a/rskj-core/src/main/resources/reference.conf +++ b/rskj-core/src/main/resources/reference.conf @@ -87,6 +87,7 @@ blockchain = { rskip434 = arrowhead631 rskip438 = lovell700 rskip454 = lovell700 + rskip459 = 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 b7f14e2cb8..25a9a29f8b 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 @@ -128,6 +128,7 @@ class ActivationConfigTest { " rskip434: arrowhead631", " rskip438: lovell700", " rskip454: lovell700", + " rskip459: 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 e0dc663f34..399bb0b54b 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 @@ -180,7 +180,8 @@ private static List getLovell700Rskips() { ConsensusRule.RSKIP427, ConsensusRule.RSKIP428, ConsensusRule.RSKIP438, - ConsensusRule.RSKIP454 + ConsensusRule.RSKIP454, + ConsensusRule.RSKIP459 )); }