EIP-3860 tests: Change expectations to Shanghai

ethereum · Jan 6, 2023 · 8972acc · 8972acc
1 parent e148f3b
commit 8972acc
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 117 deletions.
diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json
diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json
diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json
diff --git a/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json b/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json
@@ -4,15 +4,15 @@
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-f485063a-20230102",
             "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.9190dff4.Linux.g++",
-            "generatedTestHash" : "e03b0a5061cd2b29f0558d77a2ce847216f17467d7aa534d559ab9f0d4b8c34a",
+            "generatedTestHash" : "73e3a35399dc59111e55f18896d42c59a50417d7df7dd03f6e628b8246ddfe16",
             "labels" : {
                 "0" : "valid",
                 "1" : "invalid"
             },
             "lllcversion" : "Version: 0.5.14-develop.2021.4.29+commit.14c9d5de.Linux.clang",
             "solidity" : "Version: 0.8.17-develop.2022.9.30+commit.8df45f5f.Linux.clang",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/create2InitCodeSizeLimitFiller.yml",
-            "sourceHash" : "16280ab980346bcb7a218d61003dd42e9d6d4c10b2ebccedaf3ce0164e58b882"
+            "sourceHash" : "c11e7cfccb6c735543ccdbb43de87230c208cc9df76241e20eb1a25bd3c9a6dc"
         },
         "env" : {
             "currentBaseFee" : "0x0a",
@@ -47,7 +47,7 @@
                     "txbytes" : "0xf880800a83e4e1c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000000000000000000000000000000000000000c0011ca0fa5e0f7c53cba5169bd5b239b479ba8668cf69d8c06d24b00a585b995a1c2c67a056382ddd27880d6393b3f905dc75db8a0c30eeb1c9a8443ac53723ca4feba37c"
                 }
             ],
-            "Merge+3860" : [
+            "Shanghai" : [
                 {
                     "hash" : "0x812b09db30c2a7eb6ddb5d973f5ec54790cc7368528392fb729e8468e248d051",
                     "indexes" : {

diff --git a/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json b/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json
@@ -4,15 +4,15 @@
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-f485063a-20230102",
             "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.9190dff4.Linux.g++",
-            "generatedTestHash" : "f6a1fe88b1ac8b42357e2cca65f56a5496230ccfc70af854e5e6c2a57532848c",
+            "generatedTestHash" : "1a7169d0539991e3bba18dcf080850a37c9ac7f1affb1c9398f5aedf205bdf35",
             "labels" : {
                 "0" : "valid",
                 "1" : "invalid"
             },
             "lllcversion" : "Version: 0.5.14-develop.2021.4.29+commit.14c9d5de.Linux.clang",
             "solidity" : "Version: 0.8.17-develop.2022.9.30+commit.8df45f5f.Linux.clang",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/createInitCodeSizeLimitFiller.yml",
-            "sourceHash" : "222d6b843a2b945ebaf102eaa07e959f6c6eb4501257563d62ee223653f0b908"
+            "sourceHash" : "79a85c908a13ed3bc2aaee208dc6db88e12da70fad1ecead09aada1478421378"
         },
         "env" : {
             "currentBaseFee" : "0x0a",
@@ -47,7 +47,7 @@
                     "txbytes" : "0xf880800a83e4e1c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000000000000000000000000000000000000000c0011ca0fa5e0f7c53cba5169bd5b239b479ba8668cf69d8c06d24b00a585b995a1c2c67a056382ddd27880d6393b3f905dc75db8a0c30eeb1c9a8443ac53723ca4feba37c"
                 }
             ],
-            "Merge+3860" : [
+            "Shanghai" : [
                 {
                     "hash" : "0x3f3ccd2d0daae88cd08551e0c993d6c1729b4910fbf87b74346682f5d78e34d1",
                     "indexes" : {

diff --git a/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json b/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json
diff --git a/src/GeneralStateTestsFiller/EIPTests/stEIP3860/create2InitCodeSizeLimitFiller.yml b/src/GeneralStateTestsFiller/EIPTests/stEIP3860/create2InitCodeSizeLimitFiller.yml
@@ -105,7 +105,7 @@ create2InitCodeSizeLimit:
     - indexes:
        data: ':label valid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           nonce: 1
@@ -127,7 +127,7 @@ create2InitCodeSizeLimit:
     - indexes:
        data: ':label invalid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           nonce: 1

diff --git a/src/GeneralStateTestsFiller/EIPTests/stEIP3860/createInitCodeSizeLimitFiller.yml b/src/GeneralStateTestsFiller/EIPTests/stEIP3860/createInitCodeSizeLimitFiller.yml
@@ -105,7 +105,7 @@ createInitCodeSizeLimit:
     - indexes:
        data: ':label valid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           nonce: 1
@@ -127,7 +127,7 @@ createInitCodeSizeLimit:
     - indexes:
        data: ':label invalid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           nonce: 1

diff --git a/src/GeneralStateTestsFiller/EIPTests/stEIP3860/creationTxInitCodeSizeLimitFiller.yml b/src/GeneralStateTestsFiller/EIPTests/stEIP3860/creationTxInitCodeSizeLimitFiller.yml
@@ -50,7 +50,7 @@ creationTxInitCodeSizeLimit:
     - indexes:
        data: ':label valid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           # Difference with Merge is the charge for initcode 49152 // 32 * 2 = 3072 gas
@@ -79,9 +79,9 @@ creationTxInitCodeSizeLimit:
     - indexes:
        data: ':label invalid'
       network:
-        - 'Merge+3860'
+        - 'Shanghai'
       expectException:
-        'Merge+3860' : 'TR_InitCodeLimitExceeded'
+        'Shanghai' : 'TR_InitCodeLimitExceeded'
       result:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
           nonce: 0