Merge pull request #2324 from rsksmart/add-lovell700-hardfork

Added lovell700 hardfork
rsksmart · May 14, 2024 · 6d8ae0e · 6d8ae0e
2 parents a61e908 + c0e537a
commit 6d8ae0e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 6 deletions.
diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java
@@ -31,7 +31,8 @@ public enum NetworkUpgrade {
     HOP400("hop400"),
     HOP401("hop401"),
     FINGERROOT500("fingerroot500"),
-    ARROWHEAD600("arrowhead600");
+    ARROWHEAD600("arrowhead600"),
+    LOVELL700("lovell700");
 
     private String name;
 

diff --git a/rskj-core/src/main/resources/config/devnet.conf b/rskj-core/src/main/resources/config/devnet.conf
@@ -12,7 +12,8 @@ blockchain.config {
         hop400 = 0,
         hop401 = 0,
         fingerroot500 = 0,
-        arrowhead600 = 0
+        arrowhead600 = 0,
+        lovell700 = 0
     },
     consensusRules = {
         rskip97 = -1 # disable orchid difficulty drop

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

diff --git a/rskj-core/src/main/resources/config/regtest.conf b/rskj-core/src/main/resources/config/regtest.conf
@@ -11,8 +11,9 @@ blockchain.config {
         iris300 = 0,
         hop400 = 0,
         hop401 = 0,
-        fingerroot500 = 0
-        arrowhead600 = 0
+        fingerroot500 = 0,
+        arrowhead600 = 0,
+        lovell700 = 0
     },
     consensusRules = {
         rskip97 = -1 # disable orchid difficulty drop

diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -12,7 +12,8 @@ blockchain.config {
         hop400 = 3103000,
         hop401 = 3362200,
         fingerroot500 = 4015800,
-        arrowhead600 = 4927100
+        arrowhead600 = 4927100,
+        lovell700 = -1
     },
     consensusRules = {
         rskip97 = -1, # disable orchid difficulty drop

diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
@@ -16,6 +16,7 @@ blockchain = {
             hop401 = <height>
             fingerroot500 = <height>
             arrowhead600 = <height>
+            lovell700 = <height>
         }
         consensusRules = {
              areBridgeTxsPaid = <hardforkName>

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
@@ -43,6 +43,7 @@ class ActivationConfigTest {
             "    hop401: 0",
             "    fingerroot500: 0",
             "    arrowhead600: 0",
+            "    lovell700: 0",
             "},",
             "consensusRules: {",
             "    areBridgeTxsPaid: afterBridgeSync,",

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
@@ -191,6 +191,11 @@ private static List<ConsensusRule> getArrowhead600Rskips() {
         return rskips;
     }
 
+    private static List<ConsensusRule> getLovell700Rskips() {
+        List<ConsensusRule> rskips = new ArrayList<>();
+        return rskips;
+    }
+
     public static ActivationConfig genesis() {
         return only();
     }
@@ -333,6 +338,30 @@ public static ActivationConfig arrowhead600(List<ConsensusRule> except) {
         return enableTheseDisableThose(rskips, except);
     }
 
+    public static ActivationConfig lovell700(List<ConsensusRule> except) {
+        List<ConsensusRule> rskips = new ArrayList<>();
+        rskips.addAll(getPaidBridgeTxsRskip());
+        rskips.addAll(getOrchidRskips());
+        rskips.addAll(getOrchid060Rskips());
+        rskips.addAll(getWasabi100Rskips());
+        rskips.addAll(getBahamasRskips());
+        rskips.addAll(getTwoToThreeRskips());
+        rskips.addAll(getPapyrus200Rskips());
+        rskips.addAll(getIris300Rskips());
+        rskips.addAll(getHop400Rskips());
+        rskips.addAll(getHop401Rskips());
+        rskips.addAll(getFingerroot500Rskips());
+        rskips.addAll(getArrowhead600Rskips());
+        rskips.addAll(getLovell700Rskips());
+
+        return enableTheseDisableThose(rskips, except);
+    }
+
+    public static ActivationConfig lovell700() {
+        return lovell700(Collections.emptyList());
+    }
+
+
     public static ActivationConfig regtest() {
         return REGTEST;
     }