Adding activation and rollback logic

rsksmart · Oct 14, 2024 · dee9465 · dee9465
1 parent 0f5e2ed
commit dee9465
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 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
@@ -95,7 +95,9 @@ public enum ConsensusRule {
     RSKIP417("rskip417"),
     RSKIP428("rskip428"),
     RSKIP434("rskip434"),
-    RSKIP438("rskip438")
+    RSKIP438("rskip438"),
+    RSKIP453("rskip453")
+
     ;
 
     private String configKey;

diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/Program.java b/rskj-core/src/main/java/org/ethereum/vm/program/Program.java
@@ -684,12 +684,24 @@ private ProgramResult getProgramResult(RskAddress senderAddress, byte[] nonce, D
                                 this,
                                 "No gas to return just created contract",
                                 storageCost));
+
+                if (activations.isActive(ConsensusRule.RSKIP453)) {
+                    track.rollback();
+                    stackPushZero();
+                    return programResult;
+                }
             } else if (codeLength > Constants.getMaxContractSize()) {
                 programResult.setException(
                         ExceptionHelper.tooLargeContractSize(
                                 this,
                                 Constants.getMaxContractSize(),
                                 codeLength));
+
+                if (activations.isActive(ConsensusRule.RSKIP453)) {
+                    track.rollback();
+                    stackPushZero();
+                    return programResult;
+                }
             } else {
                 programResult.spendGas(storageCost);
                 track.saveCode(contractAddress, code);

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

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