fix nimbus test generation error

ethereum · Jul 13, 2023 · 0902578 · 0902578
1 parent ee3fa4c
commit 0902578
Show file tree

Hide file tree

Showing 6 changed files with 1,042 additions and 625 deletions.
diff --git a/BlockchainTests/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheEnd.json b/BlockchainTests/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheEnd.json
diff --git a/BlockchainTests/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheMiddle.json b/BlockchainTests/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheMiddle.json
diff --git a/BlockchainTests/ValidBlocks/bcValidBlockTest/reentrencySuicide.json b/BlockchainTests/ValidBlocks/bcValidBlockTest/reentrencySuicide.json
diff --git a/...inTestsFiller/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheEndFiller.json b/...inTestsFiller/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheEndFiller.json
@@ -5,7 +5,7 @@
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
             "difficulty" : "131072",
             "extraData" : "0x42",
-            "gasLimit" : "3141592",
+            "gasLimit" : "0x70ffffffffffffff",
             "gasUsed" : "0",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -112,9 +112,6 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_GasLimitReached"
-                        },
                         "data" : "",
                         "gasLimit" : "314134359",
                         "gasPrice" : "1343",
@@ -134,9 +131,6 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_NonceTooHigh"
-                        },
                         "data" : ":raw 0x342354353460",
                         "gasLimit" : "314143359",
                         "gasPrice" : "1000",
@@ -227,13 +221,10 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_NonceTooHigh"
-                        },
                         "data" : "",
                         "gasLimit" : "314159",
                         "gasPrice" : "1000",
-                        "nonce" : "3",
+                        "nonce" : "2",
                         "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
                         "to" : "795e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "value" : "1000"

diff --git a/...estsFiller/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheMiddleFiller.json b/...estsFiller/ValidBlocks/bcTotalDifficultyTest/lotsOfBranchesOverrideAtTheMiddleFiller.json
@@ -5,7 +5,7 @@
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
             "difficulty" : "131072",
             "extraData" : "0x42",
-            "gasLimit" : "3141592",
+            "gasLimit" : "0x70ffffffffffffff",
             "gasUsed" : "0",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -112,9 +112,6 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_GasLimitReached"
-                        },
                         "data" : "",
                         "gasLimit" : "314134359",
                         "gasPrice" : "1343",
@@ -134,9 +131,6 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_NonceTooHigh"
-                        },
                         "data" : ":raw 0x342354353460",
                         "gasLimit" : "314143359",
                         "gasPrice" : "1000",
@@ -232,6 +226,9 @@
             },
             {
                 "blocknumber" : "3",
+                "blockHeader" : {
+                    "extraData" : "0x133"
+                },
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -244,13 +241,10 @@
                 },
                 "transactions" : [
                     {
-                        "expectException" : {
-                            ">=Istanbul" : "TR_NonceTooHigh"
-                        },
                         "data" : "",
                         "gasLimit" : "314159",
                         "gasPrice" : "1000",
-                        "nonce" : "3",
+                        "nonce" : "2",
                         "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
                         "to" : "795e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "value" : "1000"

diff --git a/src/BlockchainTestsFiller/ValidBlocks/bcValidBlockTest/reentrencySuicideFiller.yml b/src/BlockchainTestsFiller/ValidBlocks/bcValidBlockTest/reentrencySuicideFiller.yml
@@ -0,0 +1,62 @@
+---
+reentrencySuicide:
+  genesisBlockHeader:
+    bloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
+    coinbase: '0x8888f1f195afa192cfee860698584c030f4c9db1'
+    difficulty: '231072'
+    extraData: '0x42'
+    gasLimit: '31415920000'
+    gasUsed: '0'
+    mixHash: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
+    nonce: '0x0102030405060708'
+    number: '0'
+    parentHash: '0x0000000000000000000000000000000000000000000000000000000000000000'
+    receiptTrie: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
+    stateRoot: '0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a'
+    timestamp: '0x54c98c81'
+    transactionsTrie: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
+    uncleHash: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347'
+  sealEngine: NoProof
+  expect:
+  - network:
+    - ">=Merge"
+    result:
+      '0x000000000000000000000000000000000000c0de':
+        shouldnotexist: '1'
+      '0x000000000000000000000000000000000000000a':
+        balance: '1'
+      '0x000000000000000000000000000000000000000b':
+        balance: '2'
+
+  pre:
+    '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b':
+      balance: '100000000000'
+      nonce: '0'
+      code: ''
+      storage: {}
+    '0x095e7baea6a6c7c4c2dfeb977efac326af552d87':
+      balance: '100'
+      nonce: '0'
+      code: |
+        {
+             (MSTORE 0 10) (CALL (GAS) 0xc0de 1 0 32 0 0) 
+             (MSTORE 0 0x000000000000000000000000000000000000c0de) (CALL (GAS) 0xc0de 3 0 32 0 0) 
+             (MSTORE 0 11) (CALL (GAS) 0xc0de 2 0 32 0 0) 
+        }
+      storage: {}
+    '0x000000000000000000000000000000000000c0de':
+      balance: '0'
+      nonce: '0'
+      code: "{ (SELFDESTRUCT (CALLDATALOAD 0)) }"
+      storage: {}
+  blocks:
+  - transactions:
+    - data: ''
+      gasLimit: '500000000'
+      gasPrice: '100'
+      nonce: '0'
+      secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+      to: '0x095e7baea6a6c7c4c2dfeb977efac326af552d87'
+      value: '0'
+    uncleHeaders: []
+