Skip to content

Commit 3e2535e

Browse files
winsvegawinsvega
committed
correct bc test fillers for Prague
1 parent 05fe4aa commit 3e2535e

17 files changed

+491
-118
lines changed

‎src/BlockchainTestsFiller/InvalidBlocks/bcEIP1559/intrinsicOrFailFiller.yml ‎src/BlockchainTestsFiller/InvalidBlocks/bcEIP1559/intrinsicOrFailCancunFiller.yml

+63-63
Large diffs are not rendered by default.

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/lastblockhashExceptionCopier.json

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
],
1414
"sealEngine" : "NoProof",
1515
"network" : "Istanbul",
16+
"config" : {
17+
"network" : "Istanbul",
18+
"chainid" : "0x01"
19+
},
1620
"pre" : {
1721
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1822
"balance" : "0x09184e72a000",

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_CancunEnvConvertionFiller.json

+26
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,32 @@
121121
}
122122
}
123123
]
124+
},
125+
"Prague" : {
126+
"genesisBlockHeader" : {
127+
"baseFeePerGas" : "0x11",
128+
"difficulty" : "0x00",
129+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
130+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
131+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
132+
"excessBlobGas" : "0x07d0",
133+
"blobGasUsed" : "0x00",
134+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
135+
},
136+
"blocks" : [
137+
{
138+
"blockHeader" : {
139+
"difficulty" : "0x00",
140+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
141+
"baseFeePerGas" : "0x0f",
142+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
143+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
144+
"excessBlobGas" : "0x00",
145+
"blobGasUsed" : "0x00",
146+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
147+
}
148+
}
149+
]
124150
}
125151
},
126152
"genesisBlockHeader" : {

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_MergeEnvConvertionFiller.json

+26
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,32 @@
121121
}
122122
}
123123
]
124+
},
125+
"Prague" : {
126+
"genesisBlockHeader" : {
127+
"baseFeePerGas" : "0x11",
128+
"difficulty" : "0x00",
129+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
130+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
131+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
132+
"excessBlobGas" : "0x00",
133+
"blobGasUsed" : "0x00",
134+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
135+
},
136+
"blocks" : [
137+
{
138+
"blockHeader" : {
139+
"difficulty" : "0x00",
140+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
141+
"baseFeePerGas" : "0x0f",
142+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
143+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
144+
"excessBlobGas" : "0x00",
145+
"blobGasUsed" : "0x00",
146+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
147+
}
148+
}
149+
]
124150
}
125151
},
126152
"genesisBlockHeader" : {

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_ShanghaiEnvConvertionFiller.json

+26
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,32 @@
121121
}
122122
}
123123
]
124+
},
125+
"Prague" : {
126+
"genesisBlockHeader" : {
127+
"baseFeePerGas" : "0x11",
128+
"difficulty" : "0x00",
129+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
130+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
131+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
132+
"excessBlobGas" : "0x00",
133+
"blobGasUsed" : "0x00",
134+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
135+
},
136+
"blocks" : [
137+
{
138+
"blockHeader" : {
139+
"difficulty" : "0x00",
140+
"mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
141+
"baseFeePerGas" : "0x0f",
142+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
143+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
144+
"excessBlobGas" : "0x00",
145+
"blobGasUsed" : "0x00",
146+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
147+
}
148+
}
149+
]
124150
}
125151
},
126152
"genesisBlockHeader" : {

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_eip1559EnvConvertionFiller.json

+26
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,32 @@
121121
}
122122
}
123123
]
124+
},
125+
"Prague" : {
126+
"genesisBlockHeader" : {
127+
"baseFeePerGas" : "0x10",
128+
"difficulty" : "0x00",
129+
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
130+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
131+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
132+
"excessBlobGas" : "0x00",
133+
"blobGasUsed" : "0x00",
134+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
135+
},
136+
"blocks" : [
137+
{
138+
"blockHeader" : {
139+
"difficulty" : "0x00",
140+
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
141+
"baseFeePerGas" : "0x0e",
142+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
143+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
144+
"excessBlobGas" : "0x00",
145+
"blobGasUsed" : "0x00",
146+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
147+
}
148+
}
149+
]
124150
}
125151
},
126152
"genesisBlockHeader" : {

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_legacyEnvConvertionFiller.json

+26
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,32 @@
121121
}
122122
}
123123
]
124+
},
125+
"Prague" : {
126+
"genesisBlockHeader" : {
127+
"baseFeePerGas" : "0x10",
128+
"difficulty" : "0x00",
129+
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
130+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
131+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
132+
"excessBlobGas" : "0x00",
133+
"blobGasUsed" : "0x00",
134+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
135+
},
136+
"blocks" : [
137+
{
138+
"blockHeader" : {
139+
"difficulty" : "0x00",
140+
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
141+
"baseFeePerGas" : "0x0e",
142+
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
143+
"requestsHash" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
144+
"excessBlobGas" : "0x00",
145+
"blobGasUsed" : "0x00",
146+
"parentBeaconBlockRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000"
147+
}
148+
}
149+
]
124150
}
125151
},
126152
"genesisBlockHeader" : {

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/unexpectedAccountCopier.json

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
],
1515
"sealEngine" : "NoProof",
1616
"network" : "Istanbul",
17+
"config" : {
18+
"network" : "Istanbul",
19+
"chainid" : "0x01"
20+
},
1721
"pre" : {
1822
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1923
"balance" : "0x09184e72a000",

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/wrongAccountCopier.json

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
},
1111
"sealEngine" : "NoProof",
1212
"network" : "Istanbul",
13+
"config" : {
14+
"network" : "Istanbul",
15+
"chainid" : "0x01"
16+
},
1317
"exceptions" : [
1418
"Check State: Remote account '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b': has incorrect balance '9999999978990', test expected '27592186023406' (0x09184e724dee != 0x19184e724dee)",
1519
"Check State: Remote account '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b': has incorrect nonce '1', test expected '2' (0x01 != 0x02)",

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/wrongRLPGenesisCopier.json

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
},
1111
"sealEngine" : "NoProof",
1212
"network" : "Istanbul",
13+
"config" : {
14+
"network" : "Istanbul",
15+
"chainid" : "0x01"
16+
},
1317
"exceptions" : [
1418
"genesisRLP in test != genesisRLP on remote client! (0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dce4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0' != '0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0'"
1519
],

‎src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/wrongStorageCopier.json

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
},
1111
"sealEngine" : "NoProof",
1212
"network" : "Istanbul",
13+
"config" : {
14+
"network" : "Istanbul",
15+
"chainid" : "0x01"
16+
},
1317
"exceptions" : [
1418
"Check State: Remote account '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b' test expected storage key: '0x00' to be set to: '0x11', but remote key '0x00' does not exist!",
1519
"Check State: Remote account '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b' has storage records that are not checked by expected storage!",

‎src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/intrinsicFiller.yml

+82-1
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,7 @@ intrinsic:
22472247

22482248
expect:
22492249
- network:
2250-
- ">=Cancun"
2250+
- "Cancun"
22512251
result:
22522252
0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC:
22532253
storage:
@@ -2316,6 +2316,87 @@ intrinsic:
23162316

23172317

23182318

2319+
50: 129600 # No call data, 12 addr, 42 storage cells
2320+
51: 129616 # 12 addr, 42 storage cells, 1 non-zero byte , 0 zero bytes
2321+
52: 129632 # 12 addr, 42 storage cells, 2 non-zero bytes, 0 zero bytes
2322+
53: 129620 # 12 addr, 42 storage cells, 1 non-zero byte , 1 zero bytes
2323+
54: 129608 # 12 addr, 42 storage cells, 0 non-zero bytes, 2 zero bytes
2324+
55: 130096 # 12 addr, 42 storage cells, 31 non-zero bytes, 0 zero bytes
2325+
56: 130112 # 12 addr, 42 storage cells, 32 non-zero bytes, 0 zero bytes
2326+
57: 130128 # 12 addr, 42 storage cells, 33 non-zero byte , 0 zero bytes
2327+
58: 129732 # 12 addr, 42 storage cells, 0 non-zero bytes, 33 zero bytes
2328+
59: 130260 # 12 addr, 42 storage cells, 33 non-zero byte , 33 zero bytes
2329+
2330+
- network:
2331+
- ">=Prague"
2332+
result:
2333+
0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC:
2334+
storage:
2335+
1: 1000 # (the base fee in block 1)
2336+
2337+
2338+
0x1111111111111111111111111111111111111111:
2339+
storage:
2340+
0: 21000 # No call data, no access list
2341+
1: 21040 # No access list, 1 non-zero byte , 0 zero bytes
2342+
2: 21080 # No access list, 2 non-zero bytes, 0 zero bytes
2343+
3: 21050 # No access list, 1 non-zero byte , 1 zero bytes
2344+
4: 21020 # No access list, 0 non-zero bytes, 2 zero bytes
2345+
5: 22240 # No access list, 31 non-zero bytes, 0 zero bytes
2346+
6: 22280 # No access list, 32 non-zero bytes, 0 zero bytes
2347+
7: 22320 # No access list, 33 non-zero byte , 0 zero bytes
2348+
8: 21330 # No access list, 0 non-zero bytes, 33 zero bytes
2349+
9: 22650 # No access list, 33 non-zero byte , 33 zero bytes
2350+
10: 23400 # No call data, 1 addr, 0 storage cells
2351+
11: 23416 # 1 addr, 0 storage cells, 1 non-zero byte , 0 zero bytes
2352+
12: 23432 # 1 addr, 0 storage cells, 2 non-zero bytes, 0 zero bytes
2353+
13: 23420 # 1 addr, 0 storage cells, 1 non-zero byte , 1 zero bytes
2354+
14: 23408 # 1 addr, 0 storage cells, 0 non-zero bytes, 2 zero bytes
2355+
15: 23896 # 1 addr, 0 storage cells, 31 non-zero bytes, 0 zero bytes
2356+
16: 23912 # 1 addr, 0 storage cells, 32 non-zero bytes, 0 zero bytes
2357+
17: 23928 # 1 addr, 0 storage cells, 33 non-zero byte , 0 zero bytes
2358+
18: 23532 # 1 addr, 0 storage cells, 0 non-zero bytes, 33 zero bytes
2359+
19: 24060 # 1 addr, 0 storage cells, 33 non-zero byte , 33 zero bytes
2360+
2361+
2362+
20: 25300 # No call data, 1 addr, 1 storage cell
2363+
21: 25316 # 1 addr, 1 storage cell, 1 non-zero byte , 0 zero bytes
2364+
22: 25332 # 1 addr, 1 storage cell, 2 non-zero bytes, 0 zero bytes
2365+
23: 25320 # 1 addr, 1 storage cell, 1 non-zero byte , 1 zero bytes
2366+
24: 25308 # 1 addr, 1 storage cell, 0 non-zero bytes, 2 zero bytes
2367+
25: 25796 # 1 addr, 1 storage cell, 31 non-zero bytes, 0 zero bytes
2368+
26: 25812 # 1 addr, 1 storage cell, 32 non-zero bytes, 0 zero bytes
2369+
27: 25828 # 1 addr, 1 storage cell, 33 non-zero byte , 0 zero bytes
2370+
28: 25432 # 1 addr, 1 storage cell, 0 non-zero bytes, 33 zero bytes
2371+
29: 25960 # 1 addr, 1 storage cell, 33 non-zero byte , 33 zero bytes
2372+
2373+
2374+
30: 27200 # No call data, 1 addr, 2 storage cells
2375+
31: 27216 # 1 addr, 2 storage cells, 1 non-zero byte , 0 zero bytes
2376+
32: 27232 # 1 addr, 2 storage cells, 2 non-zero bytes, 0 zero bytes
2377+
33: 27220 # 1 addr, 2 storage cells, 1 non-zero byte , 1 zero bytes
2378+
34: 27208 # 1 addr, 2 storage cells, 0 non-zero bytes, 2 zero bytes
2379+
35: 27696 # 1 addr, 2 storage cells, 31 non-zero bytes, 0 zero bytes
2380+
36: 27712 # 1 addr, 2 storage cells, 32 non-zero bytes, 0 zero bytes
2381+
37: 27728 # 1 addr, 2 storage cells, 33 non-zero byte , 0 zero bytes
2382+
38: 27332 # 1 addr, 2 storage cells, 0 non-zero bytes, 33 zero bytes
2383+
39: 27860 # 1 addr, 2 storage cells, 33 non-zero byte , 33 zero bytes
2384+
2385+
2386+
2387+
40: 29600 # No call data, 2 addr, 2 storage cells
2388+
41: 29616 # 2 addr, 2 storage cells, 1 non-zero byte , 0 zero bytes
2389+
42: 29632 # 2 addr, 2 storage cells, 2 non-zero bytes, 0 zero bytes
2390+
43: 29620 # 2 addr, 2 storage cells, 1 non-zero byte , 1 zero bytes
2391+
44: 29608 # 2 addr, 2 storage cells, 0 non-zero bytes, 2 zero bytes
2392+
45: 30096 # 2 addr, 2 storage cells, 31 non-zero bytes, 0 zero bytes
2393+
46: 30112 # 2 addr, 2 storage cells, 32 non-zero bytes, 0 zero bytes
2394+
47: 30128 # 2 addr, 2 storage cells, 33 non-zero byte , 0 zero bytes
2395+
48: 29732 # 2 addr, 2 storage cells, 0 non-zero bytes, 33 zero bytes
2396+
49: 30260 # 2 addr, 2 storage cells, 33 non-zero byte , 33 zero bytes
2397+
2398+
2399+
23192400
50: 129600 # No call data, 12 addr, 42 storage cells
23202401
51: 129616 # 12 addr, 42 storage cells, 1 non-zero byte , 0 zero bytes
23212402
52: 129632 # 12 addr, 42 storage cells, 2 non-zero bytes, 0 zero bytes

0 commit comments

Comments
 (0)