aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stMemoryStressTest
diff options
context:
space:
mode:
authorDimitry <winsvega@mail.ru>2017-08-01 16:04:30 +0800
committerDimitry <winsvega@mail.ru>2017-08-01 16:04:30 +0800
commit78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 (patch)
treec3d6bf604954c6fbd3f0416d972ca922dda331c3 /GeneralStateTests/stMemoryStressTest
parentf71c2688e1a839f8429f7e94ec5e56bb182d82cf (diff)
downloaddexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.gz
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.bz2
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.lz
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.xz
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.zst
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.zip
update general tests
Diffstat (limited to 'GeneralStateTests/stMemoryStressTest')
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds4.json222
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds3.json222
-rw-r--r--GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json163
-rw-r--r--GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json162
-rw-r--r--GeneralStateTests/stMemoryStressTest/CREATE_Bounds3.json214
-rw-r--r--GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json169
-rw-r--r--GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json222
-rw-r--r--GeneralStateTests/stMemoryStressTest/DUP_Bounds.json211
-rw-r--r--GeneralStateTests/stMemoryStressTest/FillStack.json206
-rw-r--r--GeneralStateTests/stMemoryStressTest/JUMPI_Bounds.json160
-rw-r--r--GeneralStateTests/stMemoryStressTest/JUMP_Bounds.json159
-rw-r--r--GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json158
-rw-r--r--GeneralStateTests/stMemoryStressTest/MLOAD_Bounds.json161
-rw-r--r--GeneralStateTests/stMemoryStressTest/MLOAD_Bounds2.json161
-rw-r--r--GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json161
-rw-r--r--GeneralStateTests/stMemoryStressTest/MSTORE_Bounds.json159
-rw-r--r--GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2.json159
-rw-r--r--GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json159
-rw-r--r--GeneralStateTests/stMemoryStressTest/POP_Bounds.json161
-rw-r--r--GeneralStateTests/stMemoryStressTest/RETURN_Bounds.json318
-rw-r--r--GeneralStateTests/stMemoryStressTest/SLOAD_Bounds.json161
-rw-r--r--GeneralStateTests/stMemoryStressTest/SSTORE_Bounds.json171
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound.json176
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound2.json203
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json177
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json176
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json176
-rw-r--r--GeneralStateTests/stMemoryStressTest/static_CALL_Bounds.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2.json170
-rw-r--r--GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2a.json169
-rw-r--r--GeneralStateTests/stMemoryStressTest/static_CALL_Bounds3.json170
38 files changed, 5193 insertions, 1623 deletions
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
index 46f7271ba..c3022209a 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
@@ -6,52 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0xe66e0ad8262c9d853abeac8c9181f7523f3f3908e0fd2225539fa30a825320ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe66e0ad8262c9d853abeac8c9181f7523f3f3908e0fd2225539fa30a825320ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe66e0ad8262c9d853abeac8c9181f7523f3f3908e0fd2225539fa30a825320ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe66e0ad8262c9d853abeac8c9181f7523f3f3908e0fd2225539fa30a825320ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe66e0ad8262c9d853abeac8c9181f7523f3f3908e0fd2225539fa30a825320ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0 0) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xfffffff 0 0xfffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffff 0 0xffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0 0xfffffff 0) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0 0xffffffff 0) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff 0) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff250630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
index ca43777f0..57e073a11 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
@@ -6,52 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
index ef1770798..aef1cdd07 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
@@ -6,52 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0xc42356a2337d4ef98581ca4fec268dbcfcec6c6b4a66b502d4d7e388a5af909e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc42356a2337d4ef98581ca4fec268dbcfcec6c6b4a66b502d4d7e388a5af909e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc42356a2337d4ef98581ca4fec268dbcfcec6c6b4a66b502d4d7e388a5af909e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc42356a2337d4ef98581ca4fec268dbcfcec6c6b4a66b502d4d7e388a5af909e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc42356a2337d4ef98581ca4fec268dbcfcec6c6b4a66b502d4d7e388a5af909e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds4.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds4.json
index 1111f0364..fe8d4d1ce 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds4.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds4.json
@@ -6,52 +6,194 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds4Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0x449e023c1959494c7afa1550f14396ca46a30a0b1526143f9eefe034c98e13d1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x25d72f814c35bbe716a94b3239e8eb88bf990d80e3edef6613161bbffe9623d9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x449e023c1959494c7afa1550f14396ca46a30a0b1526143f9eefe034c98e13d1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x25d72f814c35bbe716a94b3239e8eb88bf990d80e3edef6613161bbffe9623d9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x449e023c1959494c7afa1550f14396ca46a30a0b1526143f9eefe034c98e13d1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x25d72f814c35bbe716a94b3239e8eb88bf990d80e3edef6613161bbffe9623d9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x449e023c1959494c7afa1550f14396ca46a30a0b1526143f9eefe034c98e13d1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x25d72f814c35bbe716a94b3239e8eb88bf990d80e3edef6613161bbffe9623d9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x449e023c1959494c7afa1550f14396ca46a30a0b1526143f9eefe034c98e13d1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x25d72f814c35bbe716a94b3239e8eb88bf990d80e3edef6613161bbffe9623d9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffff 0 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,16 +203,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
index dd2f2c3b9..488f031b1 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x0a80fa99736510a6965c48da2b7d59aaea80b6db377bd8746bae6765002e48b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x0a80fa99736510a6965c48da2b7d59aaea80b6db377bd8746bae6765002e48b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x0a80fa99736510a6965c48da2b7d59aaea80b6db377bd8746bae6765002e48b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x0a80fa99736510a6965c48da2b7d59aaea80b6db377bd8746bae6765002e48b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x0a80fa99736510a6965c48da2b7d59aaea80b6db377bd8746bae6765002e48b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0 0) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xfffffff 0 0xfffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffff 0 0xffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0 0xfffffff 0) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0 0xffffffff 0) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff 0) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff150630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
index 23b04326b..c99e4ebe0 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0xf7f87c59b5147540ba22a69169d27aaa67a368d73848454a833c7155149c669d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xf7f87c59b5147540ba22a69169d27aaa67a368d73848454a833c7155149c669d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xf7f87c59b5147540ba22a69169d27aaa67a368d73848454a833c7155149c669d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xf7f87c59b5147540ba22a69169d27aaa67a368d73848454a833c7155149c669d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xf7f87c59b5147540ba22a69169d27aaa67a368d73848454a833c7155149c669d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
index f31766d9b..55f37c8fd 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x82c8a1d327c1689dc349a495620d09ee4fb4557232fde97bf1b347ea38239f61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x82c8a1d327c1689dc349a495620d09ee4fb4557232fde97bf1b347ea38239f61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x82c8a1d327c1689dc349a495620d09ee4fb4557232fde97bf1b347ea38239f61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x82c8a1d327c1689dc349a495620d09ee4fb4557232fde97bf1b347ea38239f61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x82c8a1d327c1689dc349a495620d09ee4fb4557232fde97bf1b347ea38239f61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds3.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds3.json
index 6437287a0..c35c1b009 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds3.json
@@ -6,54 +6,194 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6cc972fd413dcd97d394081a1d046ccb8b0e56302db4836f44df27c180d1e015",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0xc3ef45f580e085856f5f0f3b93020e304dbfcb7c3f8ac8e019112a56bfcc0793",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6cc972fd413dcd97d394081a1d046ccb8b0e56302db4836f44df27c180d1e015",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc3ef45f580e085856f5f0f3b93020e304dbfcb7c3f8ac8e019112a56bfcc0793",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6cc972fd413dcd97d394081a1d046ccb8b0e56302db4836f44df27c180d1e015",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc3ef45f580e085856f5f0f3b93020e304dbfcb7c3f8ac8e019112a56bfcc0793",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6cc972fd413dcd97d394081a1d046ccb8b0e56302db4836f44df27c180d1e015",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc3ef45f580e085856f5f0f3b93020e304dbfcb7c3f8ac8e019112a56bfcc0793",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6cc972fd413dcd97d394081a1d046ccb8b0e56302db4836f44df27c180d1e015",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc3ef45f580e085856f5f0f3b93020e304dbfcb7c3f8ac8e019112a56bfcc0793",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffff 0 0xffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,16 +203,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
index 6e2b8b3c7..f5d07fa9a 100644
--- a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
@@ -6,48 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100"
+ {
+ "hash" : "0xe286d5477dd43ef438fd7d2cfc94bdabc3b37404b0908b2ad298405cf788f0ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "13136008b64ff592819b2fa6d43f2835c452020e" : {
- "shouldnotexist" : "1"
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe286d5477dd43ef438fd7d2cfc94bdabc3b37404b0908b2ad298405cf788f0ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "7c5a2c91b22d7a9226523d4ba717db6afb741ebd" : {
- "shouldnotexist" : "1"
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe286d5477dd43ef438fd7d2cfc94bdabc3b37404b0908b2ad298405cf788f0ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe286d5477dd43ef438fd7d2cfc94bdabc3b37404b0908b2ad298405cf788f0ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe286d5477dd43ef438fd7d2cfc94bdabc3b37404b0908b2ad298405cf788f0ce",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100",
- "code" : "{ (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0) (CREATE 1 0 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x64",
+ "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153600060006001f050630fffffff60006001f0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0xfffffffffffffffffffffffffffffffffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -57,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
index 1dce4a494..f48e9fb82 100644
--- a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
@@ -6,45 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100"
+ {
+ "hash" : "0x6f851a4eb465efdec258536d9f9c237d5629273aac43d0686523eb983249eba0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "13136008b64ff592819b2fa6d43f2835c452020e" : {
- "shouldnotexist" : "1"
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6f851a4eb465efdec258536d9f9c237d5629273aac43d0686523eb983249eba0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6f851a4eb465efdec258536d9f9c237d5629273aac43d0686523eb983249eba0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6f851a4eb465efdec258536d9f9c237d5629273aac43d0686523eb983249eba0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6f851a4eb465efdec258536d9f9c237d5629273aac43d0686523eb983249eba0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100",
- "code" : "{ (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x64",
+ "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215363ffffffff60006001f0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0xfffffffffffffffffffffffffffffffffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -54,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds3.json b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds3.json
index aba69f5d8..9044c7231 100644
--- a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds3.json
@@ -6,45 +6,187 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x60a6ca8cd651c6025acb1128210b94f385d1faa663a5d63cb6a98a77de0fbe43",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100"
+ {
+ "hash" : "0x6e20f394c4191fc2d92564fcbaf545c5939aeccb35a252d3024c3eb90d76441f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
},
- "13136008b64ff592819b2fa6d43f2835c452020e" : {
- "shouldnotexist" : "1"
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x60a6ca8cd651c6025acb1128210b94f385d1faa663a5d63cb6a98a77de0fbe43",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6e20f394c4191fc2d92564fcbaf545c5939aeccb35a252d3024c3eb90d76441f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x60a6ca8cd651c6025acb1128210b94f385d1faa663a5d63cb6a98a77de0fbe43",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6e20f394c4191fc2d92564fcbaf545c5939aeccb35a252d3024c3eb90d76441f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x60a6ca8cd651c6025acb1128210b94f385d1faa663a5d63cb6a98a77de0fbe43",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6e20f394c4191fc2d92564fcbaf545c5939aeccb35a252d3024c3eb90d76441f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x60a6ca8cd651c6025acb1128210b94f385d1faa663a5d63cb6a98a77de0fbe43",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x6e20f394c4191fc2d92564fcbaf545c5939aeccb35a252d3024c3eb90d76441f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "100",
- "code" : "{ (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0xffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CREATE 1 0xfffffff 0) (CREATE 1 0xffffffff 0) (CREATE 1 0xffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (CREATE 1 0xfffffff 0xfffffff) (CREATE 1 0xffffffff 0xffffffff) (CREATE 1 0xffffffffffffffff 0xffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x64",
+ "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215367ffffffffffffffff60006001f0506fffffffffffffffffffffffffffffffff60006001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60006001f0506000630fffffff6001f050600063ffffffff6001f050600067ffffffffffffffff6001f05060006fffffffffffffffffffffffffffffffff6001f05060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f050630fffffff630fffffff6001f05063ffffffff63ffffffff6001f05067ffffffffffffffff67ffffffffffffffff6001f0506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0xfffffffffffffffffffffffffffffffffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -54,16 +196,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
index 98a3c4d81..397e07c9b 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
@@ -6,52 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0x3724e7769ef032a8866e938c837e241ba35343678082b54c7048153a96055fae",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3724e7769ef032a8866e938c837e241ba35343678082b54c7048153a96055fae",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3724e7769ef032a8866e938c837e241ba35343678082b54c7048153a96055fae",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3724e7769ef032a8866e938c837e241ba35343678082b54c7048153a96055fae",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3724e7769ef032a8866e938c837e241ba35343678082b54c7048153a96055fae",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{(DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0 0xfffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0 0xffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0 0xfffffff 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0 0xffffffff 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0 0xffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x60006000600060007310000000000000000000000000000000000000016707fffffffffffffff450630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff45063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506000630fffffff6000630fffffff7310000000000000000000000000000000000000016707fffffffffffffff450600063ffffffff600063ffffffff7310000000000000000000000000000000000000016707fffffffffffffff450600067ffffffffffffffff600067ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff450630fffffff630fffffff630fffffff630fffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
index b39152266..e8d469750 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
@@ -6,51 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- }
- }
+ {
+ "hash" : "0x5409aca9dca3a6fd974bf0c5584b7f0fafb7f749baa1ff44a6a63e00450ecee7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5409aca9dca3a6fd974bf0c5584b7f0fafb7f749baa1ff44a6a63e00450ecee7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5409aca9dca3a6fd974bf0c5584b7f0fafb7f749baa1ff44a6a63e00450ecee7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5409aca9dca3a6fd974bf0c5584b7f0fafb7f749baa1ff44a6a63e00450ecee7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5409aca9dca3a6fd974bf0c5584b7f0fafb7f749baa1ff44a6a63e00450ecee7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -60,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
index 8a769d248..17659ea69 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
@@ -6,52 +6,194 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,16 +203,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DUP_Bounds.json b/GeneralStateTests/stMemoryStressTest/DUP_Bounds.json
index eaa152cf8..f0b1b7d9c 100644
--- a/GeneralStateTests/stMemoryStressTest/DUP_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/DUP_Bounds.json
@@ -6,42 +6,187 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DUP_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1"
- }
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (DUP1 0) (DUP1 0xffffffff) (DUP1 0xffffffffffffffff) (DUP1 0xffffffffffffffffffffffffffffffff) (DUP1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP2 0 0) (DUP2 0xffffffff 0xffffffff) (DUP2 0xffffffffffffffff 0xffffffffffffffff) (DUP2 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP3 0 0 0) (DUP3 0xffffffff 0xffffffff 0xffffffff) (DUP3 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP3 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP4 0 0 0 0) (DUP4 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP4 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP4 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP5 0 0 0 0 0) (DUP5 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP5 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP5 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP5 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP6 0 0 0 0 0 0) (DUP6 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP6 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP6 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP6 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP7 0 0 0 0 0 0 0) (DUP7 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP7 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP7 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP7 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP8 0 0 0 0 0 0 0 0) (DUP8 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP8 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP8 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP8 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff87",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x7fffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,16 +196,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/FillStack.json b/GeneralStateTests/stMemoryStressTest/FillStack.json
index 920219fa4..eaf27b1b3 100644
--- a/GeneralStateTests/stMemoryStressTest/FillStack.json
+++ b/GeneralStateTests/stMemoryStressTest/FillStack.json
@@ -6,98 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/FillStackFiller.json"
},
"env" : {
- "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+ "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "9223372036854775807",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : "Frontier",
- "result" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x00",
- "code" : "0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155",
- "nonce" : "0x00",
- "storage" : {
- }
+ {
+ "hash" : "0x4ef14fe7ec56413ed67fe9fa0efc398fe87f727b5c33dd60b48957334e03bdd5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "250000046",
- "code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4ef14fe7ec56413ed67fe9fa0efc398fe87f727b5c33dd60b48957334e03bdd5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4ef14fe7ec56413ed67fe9fa0efc398fe87f727b5c33dd60b48957334e03bdd5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "Homestead",
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x00",
- "code" : "0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155",
- "nonce" : "0x00",
- "storage" : {
- }
+ {
+ "hash" : "0x4ef14fe7ec56413ed67fe9fa0efc398fe87f727b5c33dd60b48957334e03bdd5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "250000046",
- "code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4ef14fe7ec56413ed67fe9fa0efc398fe87f727b5c33dd60b48957334e03bdd5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ]
+ },
"pre" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0",
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x00",
"code" : "0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "46",
+ "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "0x2e",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000000000",
- "code" : "0x",
- "nonce" : "0",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -107,15 +153,15 @@
"0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97"
],
"gasLimit" : [
- "3141592",
- "250000000"
+ "0x2fefd8",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "264050067"
+ "0x0fbd1593"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/JUMPI_Bounds.json b/GeneralStateTests/stMemoryStressTest/JUMPI_Bounds.json
index a1dbf5e9c..6dc7177fd 100644
--- a/GeneralStateTests/stMemoryStressTest/JUMPI_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/JUMPI_Bounds.json
@@ -6,43 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/JUMPI_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57"
- }
+ {
+ "hash" : "0x5f1ab61a3e2aaea767090be6f018a0d4744a0f520f17c0bb96897ec4307add4a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5f1ab61a3e2aaea767090be6f018a0d4744a0f520f17c0bb96897ec4307add4a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5f1ab61a3e2aaea767090be6f018a0d4744a0f520f17c0bb96897ec4307add4a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5f1ab61a3e2aaea767090be6f018a0d4744a0f520f17c0bb96897ec4307add4a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x5f1ab61a3e2aaea767090be6f018a0d4744a0f520f17c0bb96897ec4307add4a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (JUMPI 0xffffffff 1) (JUMPI 0xffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x7fffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -52,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds.json b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds.json
index 9df5fec98..4f38cdda2 100644
--- a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
- }
+ {
+ "hash" : "0x76875c479924ac8061462f0b590886fd5d0f75fa8947ae6e7c4e5decdf82fb61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x76875c479924ac8061462f0b590886fd5d0f75fa8947ae6e7c4e5decdf82fb61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x76875c479924ac8061462f0b590886fd5d0f75fa8947ae6e7c4e5decdf82fb61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x76875c479924ac8061462f0b590886fd5d0f75fa8947ae6e7c4e5decdf82fb61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x76875c479924ac8061462f0b590886fd5d0f75fa8947ae6e7c4e5decdf82fb61",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (JUMP 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600056",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x7fffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json
index 6b2b65786..a875b2b4e 100644
--- a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json
@@ -6,43 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56"
- }
+ {
+ "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
"code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x7fffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -52,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds.json b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds.json
index bfc899764..5c390f009 100644
--- a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
- }
+ {
+ "hash" : "0x3267b33b6cdf79690cefd9c70cb6aeda7e329e76e527279f015be18f6c9a749c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3267b33b6cdf79690cefd9c70cb6aeda7e329e76e527279f015be18f6c9a749c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3267b33b6cdf79690cefd9c70cb6aeda7e329e76e527279f015be18f6c9a749c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3267b33b6cdf79690cefd9c70cb6aeda7e329e76e527279f015be18f6c9a749c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x3267b33b6cdf79690cefd9c70cb6aeda7e329e76e527279f015be18f6c9a749c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MLOAD 0) (MLOAD 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff51",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds2.json b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds2.json
index a79d00edd..b6d0cc073 100644
--- a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds2.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
- }
+ {
+ "hash" : "0x45e95ab4467aa5036253d6ab6ed80a119c4236cbb1c51239e995b98f92fe4f9e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x45e95ab4467aa5036253d6ab6ed80a119c4236cbb1c51239e995b98f92fe4f9e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x45e95ab4467aa5036253d6ab6ed80a119c4236cbb1c51239e995b98f92fe4f9e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x45e95ab4467aa5036253d6ab6ed80a119c4236cbb1c51239e995b98f92fe4f9e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x45e95ab4467aa5036253d6ab6ed80a119c4236cbb1c51239e995b98f92fe4f9e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MLOAD 0xffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
index 8f1bf7cfe..c3b3f4007 100644
--- a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1"
- }
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MLOAD 0x400000) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6240000051",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "35000000",
- "250000000"
+ "0x02160ec0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds.json b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds.json
index 25e21bb07..f679ed837 100644
--- a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
- }
+ {
+ "hash" : "0xc0154248b60b10edbbf0d812f02d3f8e6c2e7aef1654b2b5056a73ab799906f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc0154248b60b10edbbf0d812f02d3f8e6c2e7aef1654b2b5056a73ab799906f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc0154248b60b10edbbf0d812f02d3f8e6c2e7aef1654b2b5056a73ab799906f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc0154248b60b10edbbf0d812f02d3f8e6c2e7aef1654b2b5056a73ab799906f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xc0154248b60b10edbbf0d812f02d3f8e6c2e7aef1654b2b5056a73ab799906f3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MSTORE 0xffffffffffffffff 1)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600167ffffffffffffffff52",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2.json
index b69edcfe0..b5db229b9 100644
--- a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
- }
+ {
+ "hash" : "0x1e0015a30eba56798562ebe9ee485251bd5218ed97199c8206c819711e96abc3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x1e0015a30eba56798562ebe9ee485251bd5218ed97199c8206c819711e96abc3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x1e0015a30eba56798562ebe9ee485251bd5218ed97199c8206c819711e96abc3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x1e0015a30eba56798562ebe9ee485251bd5218ed97199c8206c819711e96abc3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x1e0015a30eba56798562ebe9ee485251bd5218ed97199c8206c819711e96abc3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MSTORE 0xffffffffff 1)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600164ffffffffff52",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
index 60194785b..ffee5bbf3 100644
--- a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
+++ b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xb5ab241c9c0430cff81353c2e3cb936ac7a4fc21a304e799979f3e7bfeee4f4c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1"
- }
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xb5ab241c9c0430cff81353c2e3cb936ac7a4fc21a304e799979f3e7bfeee4f4c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xb5ab241c9c0430cff81353c2e3cb936ac7a4fc21a304e799979f3e7bfeee4f4c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xb5ab241c9c0430cff81353c2e3cb936ac7a4fc21a304e799979f3e7bfeee4f4c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xb5ab241c9c0430cff81353c2e3cb936ac7a4fc21a304e799979f3e7bfeee4f4c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (MSTORE 0x3fffff 1)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001623fffff52",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/POP_Bounds.json b/GeneralStateTests/stMemoryStressTest/POP_Bounds.json
index 1b1fb5e11..d53eb4fbc 100644
--- a/GeneralStateTests/stMemoryStressTest/POP_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/POP_Bounds.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/POP_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1"
- }
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (POP 0) (POP 0xffffffff) (POP 0xffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/RETURN_Bounds.json b/GeneralStateTests/stMemoryStressTest/RETURN_Bounds.json
index 6175c0dd1..9a327583d 100644
--- a/GeneralStateTests/stMemoryStressTest/RETURN_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/RETURN_Bounds.json
@@ -6,187 +6,249 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/RETURN_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ {
+ "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "EIP158",
- "EIP150",
- "Metropolis"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1",
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x01",
- "0x05" : "0x01",
- "0x06" : "0x01",
- "0x07" : "0x01",
- "0x08" : "0x01",
- "0x09" : "0x01",
- "0x0a" : "0x01",
- "0x0b" : "0x01"
- }
- }
+ {
+ "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x56c3fd964ba2136f6818a7d7b154d4477310912c3a39edf2c7ec1b860c06d8a5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x56c3fd964ba2136f6818a7d7b154d4477310912c3a39edf2c7ec1b860c06d8a5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ [[1]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0 0) [[2]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000002 0 0 0 0 0) [[3]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000003 0 0 0 0 0) [[4]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000004 0 0 0 0 0) [[5]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000005 0 0 0 0 0) [[6]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[7]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[8]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[9]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[10]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[11]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[12]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[13]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[14]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[15]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[16]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0)}",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff1600155600060006000600060007310000000000000000000000000000000000000026707fffffffffffffff1600255600060006000600060007310000000000000000000000000000000000000036707fffffffffffffff1600355600060006000600060007310000000000000000000000000000000000000046707fffffffffffffff1600455600060006000600060007310000000000000000000000000000000000000056707fffffffffffffff1600555600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600655600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600755600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600855600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600955600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600a55600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600b55600060006000600060007310000000000000000000000000000000",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x60006000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000002" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xfffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000002" : {
+ "balance" : "0x00",
+ "code" : "0x6000630ffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000003" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000003" : {
+ "balance" : "0x00",
+ "code" : "0x600063fffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000004" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000004" : {
+ "balance" : "0x00",
+ "code" : "0x600067fffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000005" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xfffffffffffffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000005" : {
+ "balance" : "0x00",
+ "code" : "0x60006d0ffffffffffffffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000006" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000006" : {
+ "balance" : "0x00",
+ "code" : "0x60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000007" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000007" : {
+ "balance" : "0x00",
+ "code" : "0x630fffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000008" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000008" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000009" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0xffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000009" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000010" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0xfffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000010" : {
+ "balance" : "0x00",
+ "code" : "0x6d0fffffffffffffffffffffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000011" : {
- "balance" : "0",
- "code" : "{ (RETURN 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000011" : {
+ "balance" : "0x00",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000012" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xfffffff 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000012" : {
+ "balance" : "0x00",
+ "code" : "0x630fffffff630ffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000013" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffff 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000013" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff63fffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000014" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffffffffffff 0xffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000014" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff67fffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000015" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xfffffffffffffffffffffffffff 0xfffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000015" : {
+ "balance" : "0x00",
+ "code" : "0x6d0fffffffffffffffffffffffffff6d0ffffffffffffffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000016" : {
- "balance" : "0",
- "code" : "{ (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000016" : {
+ "balance" : "0x00",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -196,15 +258,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/SLOAD_Bounds.json b/GeneralStateTests/stMemoryStressTest/SLOAD_Bounds.json
index ff6ff0dee..185e907ee 100644
--- a/GeneralStateTests/stMemoryStressTest/SLOAD_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/SLOAD_Bounds.json
@@ -6,42 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/SLOAD_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1"
- }
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (SLOAD 0) (SLOAD 0xffffffff) (SLOAD 0xffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -51,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/SSTORE_Bounds.json b/GeneralStateTests/stMemoryStressTest/SSTORE_Bounds.json
index 6cc9c9fde..6b4c4b2aa 100644
--- a/GeneralStateTests/stMemoryStressTest/SSTORE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/SSTORE_Bounds.json
@@ -6,52 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/SSTORE_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1",
- "storage" : {
- "0xffffffff" : "1",
- "0xffffffffffffffff" : "1",
- "0xffffffffffffffffffffffffffffffff" : "1",
- "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "1",
- "128" : "0xffffffffffffffffffffffffffffffff",
- "256" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "32" : "0xffffffff",
- "64" : "0xffffffffffffffff"
- }
- }
+ {
+ "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0xffffffff 1) (SSTORE 0xffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) (SSTORE 32 0xffffffff) (SSTORE 64 0xffffffffffffffff) (SSTORE 128 0xffffffffffffffffffffffffffffffff) (SSTORE 256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600163ffffffff55600167ffffffffffffffff5560016fffffffffffffffffffffffffffffffff5560017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5563ffffffff60205567ffffffffffffffff6040556fffffffffffffffffffffffffffffffff6080557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61010055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x7ffffffffffffffffff",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x07ffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
index c13878bf4..65d80a770 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
@@ -6,59 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBoundFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "17592320524892",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x10000804025c",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xe5365baae653efdbfffc79841728b890ab9a0814cc0a56ccd0e7ea6ee0d21950",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x64010000000051600155",
- "nonce" : "0x00",
- "storage" : {
- }
+ {
+ "hash" : "0x61d9015edd9252dc94aa73cdd60c92794ba5b98001d47c80c2eb51bacfb68126",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xe5365baae653efdbfffc79841728b890ab9a0814cc0a56ccd0e7ea6ee0d21950",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "250000000",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x61d9015edd9252dc94aa73cdd60c92794ba5b98001d47c80c2eb51bacfb68126",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xe5365baae653efdbfffc79841728b890ab9a0814cc0a56ccd0e7ea6ee0d21950",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x61d9015edd9252dc94aa73cdd60c92794ba5b98001d47c80c2eb51bacfb68126",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xe5365baae653efdbfffc79841728b890ab9a0814cc0a56ccd0e7ea6ee0d21950",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x61d9015edd9252dc94aa73cdd60c92794ba5b98001d47c80c2eb51bacfb68126",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xe5365baae653efdbfffc79841728b890ab9a0814cc0a56ccd0e7ea6ee0d21950",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x61d9015edd9252dc94aa73cdd60c92794ba5b98001d47c80c2eb51bacfb68126",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (MLOAD 4294967296) } ",
- "nonce" : "0",
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x64010000000051600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "175923205248920",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xa00050281798",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -68,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "10"
+ "0x0a"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
index 63f569dd1..299229449 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
@@ -6,98 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "37791080412587",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x225eebec75ab",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xdd0682b57f5666e5d866e348ac7d3e539acd681ea27c9b0a814763f9c26f9792",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : "Frontier",
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x64017735940051600155",
- "nonce" : "0x00",
- "storage" : {
- }
+ {
+ "hash" : "0x325badc62761abdab23d0313acd3279d4109b53465c6efeeba3d46197740bc1c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xdd0682b57f5666e5d866e348ac7d3e539acd681ea27c9b0a814763f9c26f9792",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "250000000",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x325badc62761abdab23d0313acd3279d4109b53465c6efeeba3d46197740bc1c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xdd0682b57f5666e5d866e348ac7d3e539acd681ea27c9b0a814763f9c26f9792",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "Homestead",
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x64017735940051600155",
- "nonce" : "0x00",
- "storage" : {
- }
+ {
+ "hash" : "0x325badc62761abdab23d0313acd3279d4109b53465c6efeeba3d46197740bc1c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xdd0682b57f5666e5d866e348ac7d3e539acd681ea27c9b0a814763f9c26f9792",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "250000000",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x325badc62761abdab23d0313acd3279d4109b53465c6efeeba3d46197740bc1c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "377910554219850",
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "storage" : {
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xdd0682b57f5666e5d866e348ac7d3e539acd681ea27c9b0a814763f9c26f9792",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x325badc62761abdab23d0313acd3279d4109b53465c6efeeba3d46197740bc1c",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
+ ]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (MLOAD 6294967296) } ",
- "nonce" : "0",
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x64017735940051600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "377910804219850",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0157b5373e07ca",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -107,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "10"
+ "0x0a"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
index 0edae1fdb..47e26d20a 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
@@ -6,60 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_MsizeFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "175923205248920000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x027101391c9c29c0",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : 1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x827f5d94dc3940fb58461cb4e92f05056e6c09ac15883f7af4b18bcb6c2b7fb5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x600163ffffffff5259600055",
- "nonce" : "0x00",
- "storage" : {
- "0x00" : "0x00"
- }
+ {
+ "hash" : "0x62c6daa60b3f396ea04236f24b67e19860d9f0d9fc8ac30db3ad56317272f27f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x827f5d94dc3940fb58461cb4e92f05056e6c09ac15883f7af4b18bcb6c2b7fb5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "250000000",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x62c6daa60b3f396ea04236f24b67e19860d9f0d9fc8ac30db3ad56317272f27f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x827f5d94dc3940fb58461cb4e92f05056e6c09ac15883f7af4b18bcb6c2b7fb5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x62c6daa60b3f396ea04236f24b67e19860d9f0d9fc8ac30db3ad56317272f27f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x827f5d94dc3940fb58461cb4e92f05056e6c09ac15883f7af4b18bcb6c2b7fb5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x62c6daa60b3f396ea04236f24b67e19860d9f0d9fc8ac30db3ad56317272f27f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x827f5d94dc3940fb58461cb4e92f05056e6c09ac15883f7af4b18bcb6c2b7fb5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x62c6daa60b3f396ea04236f24b67e19860d9f0d9fc8ac30db3ad56317272f27f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "{ [4294967295] 1 [[ 0 ]] (MSIZE)} ",
- "nonce" : "0",
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600163ffffffff5259600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1759232052489200000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x186a0c3b1e19a180",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -69,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
index ee57c3d73..012cc19cc 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
@@ -6,59 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_returnFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "17592320524892",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x10000804025c",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x4657df8e7e86f21b70de01af2de4e6e62578cf2a3793f21ed92e05e5c3d342fc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : "Frontier",
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "storage" : {
- }
- }
+ {
+ "hash" : "0xd0edc1f5e92a979fd19f8c28c3a30f2108f7b7cdf79ec91176bb84ec518a00f0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x4657df8e7e86f21b70de01af2de4e6e62578cf2a3793f21ed92e05e5c3d342fc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "Homestead",
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "storage" : {
- }
- }
+ {
+ "hash" : "0xd0edc1f5e92a979fd19f8c28c3a30f2108f7b7cdf79ec91176bb84ec518a00f0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x4657df8e7e86f21b70de01af2de4e6e62578cf2a3793f21ed92e05e5c3d342fc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd0edc1f5e92a979fd19f8c28c3a30f2108f7b7cdf79ec91176bb84ec518a00f0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x4657df8e7e86f21b70de01af2de4e6e62578cf2a3793f21ed92e05e5c3d342fc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd0edc1f5e92a979fd19f8c28c3a30f2108f7b7cdf79ec91176bb84ec518a00f0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x4657df8e7e86f21b70de01af2de4e6e62578cf2a3793f21ed92e05e5c3d342fc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xd0edc1f5e92a979fd19f8c28c3a30f2108f7b7cdf79ec91176bb84ec518a00f0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "{ (RETURN 0 4294967295) } ",
- "nonce" : "0",
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x63ffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1759232052489200000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x186a0c3b1e19a180",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -68,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
index aec45bb47..796d18364 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
@@ -6,59 +6,137 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_return2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "175923205248920000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x027101391c9c29c0",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x4cca87515299336f6b213b88d0754296be349b981b7b282615f230319b98a74a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : "Frontier",
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "storage" : {
- }
- }
+ {
+ "hash" : "0xa2bb0ae80eda2e0936e89d3cfa8298b600a2b9d0dd2c12ce529593e9aae2544e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x4cca87515299336f6b213b88d0754296be349b981b7b282615f230319b98a74a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "Homestead",
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "storage" : {
- }
- }
+ {
+ "hash" : "0xa2bb0ae80eda2e0936e89d3cfa8298b600a2b9d0dd2c12ce529593e9aae2544e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x4cca87515299336f6b213b88d0754296be349b981b7b282615f230319b98a74a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xa2bb0ae80eda2e0936e89d3cfa8298b600a2b9d0dd2c12ce529593e9aae2544e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x4cca87515299336f6b213b88d0754296be349b981b7b282615f230319b98a74a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xa2bb0ae80eda2e0936e89d3cfa8298b600a2b9d0dd2c12ce529593e9aae2544e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x4cca87515299336f6b213b88d0754296be349b981b7b282615f230319b98a74a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0xa2bb0ae80eda2e0936e89d3cfa8298b600a2b9d0dd2c12ce529593e9aae2544e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "{ [ 0 ] 1 (RETURN 0 4294967295) } ",
- "nonce" : "0",
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600160005263ffffffff6000f3",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1759232052489200000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x186a0c3b1e19a180",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -68,15 +146,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds.json b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds.json
index 34ec8fc31..c02bdff92 100644
--- a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x48de9d28998951446e5c0d7f95b1e8bf45d3ce5e37185043f69acb8f85eebe9b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x427ea33eba4f0f717326e7b65a6e5c430bee7ce98b409bc85327b69c5e82cfc6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x48de9d28998951446e5c0d7f95b1e8bf45d3ce5e37185043f69acb8f85eebe9b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x427ea33eba4f0f717326e7b65a6e5c430bee7ce98b409bc85327b69c5e82cfc6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x48de9d28998951446e5c0d7f95b1e8bf45d3ce5e37185043f69acb8f85eebe9b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x427ea33eba4f0f717326e7b65a6e5c430bee7ce98b409bc85327b69c5e82cfc6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x48de9d28998951446e5c0d7f95b1e8bf45d3ce5e37185043f69acb8f85eebe9b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x427ea33eba4f0f717326e7b65a6e5c430bee7ce98b409bc85327b69c5e82cfc6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x48de9d28998951446e5c0d7f95b1e8bf45d3ce5e37185043f69acb8f85eebe9b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x427ea33eba4f0f717326e7b65a6e5c430bee7ce98b409bc85327b69c5e82cfc6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0 0xfffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0 0xffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0 0xfffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0 0xffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0 0xffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x60006000600060007310000000000000000000000000000000000000016707fffffffffffffffa50630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffffa5063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffffa506000630fffffff6000630fffffff7310000000000000000000000000000000000000016707fffffffffffffffa50600063ffffffff600063ffffffff7310000000000000000000000000000000000000016707fffffffffffffffa50600067ffffffffffffffff600067ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffffa5060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffffa5060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffffa",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (MSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600052",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2.json b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2.json
index eeb6b2578..d42a7a81a 100644
--- a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x975be6d475693704b32fd500ed343455d3703a7f98ead26c511bad06b61b4d84",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x35634733acdd267a2dd265f0af47953e1501b827d05eb963dd41ec83c182336b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x975be6d475693704b32fd500ed343455d3703a7f98ead26c511bad06b61b4d84",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x35634733acdd267a2dd265f0af47953e1501b827d05eb963dd41ec83c182336b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x975be6d475693704b32fd500ed343455d3703a7f98ead26c511bad06b61b4d84",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x35634733acdd267a2dd265f0af47953e1501b827d05eb963dd41ec83c182336b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x975be6d475693704b32fd500ed343455d3703a7f98ead26c511bad06b61b4d84",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x35634733acdd267a2dd265f0af47953e1501b827d05eb963dd41ec83c182336b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x975be6d475693704b32fd500ed343455d3703a7f98ead26c511bad06b61b4d84",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x35634733acdd267a2dd265f0af47953e1501b827d05eb963dd41ec83c182336b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x630fffffff630fffffff630fffffff630fffffff7310000000000000000000000000000000000000016707fffffffffffffffa",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2a.json b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2a.json
index 9b7f226e9..adaf5b72d 100644
--- a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2a.json
+++ b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds2a.json
@@ -6,53 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xcfbf7eb8f84c61521ec86584a53a98e49d0acd7f53d6debf5fbc09a7ba3c8c09",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x71a181a75f7d5b531e23579d497c8a55d9f9c846e2c6f7099826d008b9571ed9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xcfbf7eb8f84c61521ec86584a53a98e49d0acd7f53d6debf5fbc09a7ba3c8c09",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x71a181a75f7d5b531e23579d497c8a55d9f9c846e2c6f7099826d008b9571ed9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xcfbf7eb8f84c61521ec86584a53a98e49d0acd7f53d6debf5fbc09a7ba3c8c09",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x71a181a75f7d5b531e23579d497c8a55d9f9c846e2c6f7099826d008b9571ed9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xcfbf7eb8f84c61521ec86584a53a98e49d0acd7f53d6debf5fbc09a7ba3c8c09",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x71a181a75f7d5b531e23579d497c8a55d9f9c846e2c6f7099826d008b9571ed9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xcfbf7eb8f84c61521ec86584a53a98e49d0acd7f53d6debf5fbc09a7ba3c8c09",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x71a181a75f7d5b531e23579d497c8a55d9f9c846e2c6f7099826d008b9571ed9",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffffa",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -62,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds3.json b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds3.json
index e42bb0215..d7e06fcf2 100644
--- a/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/static_CALL_Bounds3.json
@@ -6,54 +6,144 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x097a8c1473b2389b8d296986833e995f1ba1059096188c9d8e39ff7dd292f908",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0"
+ {
+ "hash" : "0x95ec920c486fb4ba9bd59bf271f65faa21e07bf51e319c9ae018e3a64a79bfed",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
},
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x097a8c1473b2389b8d296986833e995f1ba1059096188c9d8e39ff7dd292f908",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x95ec920c486fb4ba9bd59bf271f65faa21e07bf51e319c9ae018e3a64a79bfed",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x097a8c1473b2389b8d296986833e995f1ba1059096188c9d8e39ff7dd292f908",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x95ec920c486fb4ba9bd59bf271f65faa21e07bf51e319c9ae018e3a64a79bfed",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x097a8c1473b2389b8d296986833e995f1ba1059096188c9d8e39ff7dd292f908",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x95ec920c486fb4ba9bd59bf271f65faa21e07bf51e319c9ae018e3a64a79bfed",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x097a8c1473b2389b8d296986833e995f1ba1059096188c9d8e39ff7dd292f908",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x95ec920c486fb4ba9bd59bf271f65faa21e07bf51e319c9ae018e3a64a79bfed",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffffa506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffffa507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffffa5063ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffffa5067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffffa506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffffa507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (MSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600052",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -63,15 +153,15 @@
""
],
"gasLimit" : [
- "150000",
- "250000000"
+ "0x0249f0",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 02:04:35 +0800