aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stEIP150Specific
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/stEIP150Specific
parentf71c2688e1a839f8429f7e94ec5e56bb182d82cf (diff)
downloaddexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.gz
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.zst
dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.zip
update general tests
Diffstat (limited to 'GeneralStateTests/stEIP150Specific')
-rw-r--r--GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json146
-rw-r--r--GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json156
-rw-r--r--GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json154
-rw-r--r--GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json154
-rw-r--r--GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json142
-rw-r--r--GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json144
-rw-r--r--GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json140
-rw-r--r--GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json206
-rw-r--r--GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json142
-rw-r--r--GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json157
-rw-r--r--GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json148
-rw-r--r--GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json148
-rw-r--r--GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json148
13 files changed, 1051 insertions, 934 deletions
diff --git a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
index c0ae17aba..05a00ed10 100644
--- a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
@@ -6,76 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x08" : "0x08d5b6",
- "0x09" : "0x01",
- "0x0a" : "0x01"
- }
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0",
- "0x08" : "0",
- "0x09" : "0",
- "0x0a" : "0"
- }
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000103" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 0x12) } ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000103" : {
+ "balance" : "0x00",
+ "code" : "0x6012600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000103620927c0f160095560006000600060006000731000000000000000000000000000000000000103620927c0f2600a55",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -85,14 +103,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
index 4f8797c18..53b375321 100644
--- a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
@@ -6,89 +6,101 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000107" : {
- "storage" : {
- "0x08" : "0x030d3e",
- "0x09" : "0x01"
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000108" : {
- "storage" : {
- "0x08" : "0x02b157"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000107" : {
- "storage" : {
- "0x08" : "0",
- "0x09" : "0"
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000108" : {
- "storage" : {
- "0x08" : "0"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000107" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000108 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000107" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000108620927c0f1600955",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000108" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS))} ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000108" : {
+ "balance" : "0x00",
+ "code" : "0x5a600855",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 200000 0x1000000000000000000000000000000000000107 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a6008556000600060006000600073100000000000000000000000000000000000010762030d40f1600955",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -98,14 +110,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
index 5f65d3aca..79f9dd2b0 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
@@ -6,91 +6,101 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000110" : {
- "storage" : {
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000111" : {
- "storage" : {
- }
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000110" : {
- "storage" : {
- }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000111" : {
- "storage" : {
- }
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000110" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000111 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000110" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000111620927c0f1600955",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000111" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (CREATE 0 0 0) (CREATE 0 0 0) (SSTORE 9 (GAS)) (SSTORE 10 (GAS)) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000111" : {
+ "balance" : "0x00",
+ "code" : "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000110 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000110620927c0f1600955",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -100,14 +110,14 @@
""
],
"gasLimit" : [
- "220000"
+ "0x035b60"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
index 3927e62d6..2e8d9c740 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
@@ -6,91 +6,101 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000113" : {
- "storage" : {
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000114" : {
- "storage" : {
- }
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000113" : {
- "storage" : {
- }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "1000000000000000000000000000000000000114" : {
- "storage" : {
- }
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000113" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000114 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000113" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000114" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (GAS)) (SSTORE 10 (GAS)) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000114" : {
+ "balance" : "0x00",
+ "code" : "0x5a6008555a6009555a600a55",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000113 0 0 0 0 0)) } ",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000113620927c0f1600955",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -100,14 +110,14 @@
""
],
"gasLimit" : [
- "160000"
+ "0x027100"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
index 76c34a29c..a56e2f42f 100644
--- a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
+++ b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
@@ -6,77 +6,87 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x09" : "0x076e34",
- "0x0a" : "0x08d5b6",
- "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
- "storage" : {
- "0xfd" : "0x07ea53"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x09" : "0x076e34",
- "0x0a" : "0x08d5b6",
- "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
- "storage" : {
- "0xfd" : "0x080a7c"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 10 (GAS)) (MSTORE 0 0x5a60fd55) (SSTORE 11 (CREATE 0 28 4)) (SSTORE 9 (GAS)) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -86,14 +96,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
index fabbc749a..5ef7768ae 100644
--- a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
+++ b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
@@ -6,74 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x08" : "0x08d5b6",
- "0x09" : "0x01"
- }
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0",
- "0x08" : "0",
- "0x09" : "0"
- }
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000105" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 0x12) } ",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000105" : {
+ "balance" : "0x00",
+ "code" : "0x6012600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (DELEGATECALL 600000 0x1000000000000000000000000000000000000105 0 0 0 0)) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -83,14 +103,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
index 0ec6ee4f4..1f8f434ec 100644
--- a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
@@ -6,70 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x0c"
- }
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0"
- }
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000001" : {
- "balance" : "100000",
- "code" : "{ [[1]] 12 }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x0186a0",
+ "code" : "0x600c600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "100000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0186a0",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ [[1]] (CALL 600000 0x1000000000000000000000000000000000000001 0 0 0 0 0) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x60006000600060006000731000000000000000000000000000000000000001620927c0f1600155",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -79,14 +103,14 @@
""
],
"gasLimit" : [
- "100000"
+ "0x0186a0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
index d99d7e947..318db129d 100644
--- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
+++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
@@ -6,141 +6,101 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x01" : "0x20",
- "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
- "0x03" : "0xe8d49be840",
- "0x04" : "0x12",
- "0x07" : "0x01",
- "0x08" : "0x01",
- "0x0a" : "0x05e276",
- "0x64" : "0x11"
- }
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP158"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x01" : "0x20",
- "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
- "0x03" : "0xe8d49be840",
- "0x04" : "0x12",
- "0x07" : "0x01",
- "0x08" : "0x01",
- "0x0a" : "0x06441e",
- "0x64" : "0x11"
- }
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x01" : "0",
- "0x02" : "0",
- "0x03" : "0",
- "0x04" : "0",
- "0x07" : "0",
- "0x08" : "0",
- "0x0a" : "0",
- "0x64" : "0"
- }
- }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xd6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Homestead"
- ],
- "result" : {
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x12",
- "0x01" : "0x20",
- "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
- "0x03" : "0xe8d49be840",
- "0x04" : "0x12",
- "0x07" : "0x01",
- "0x08" : "0x01",
- "0x0a" : "0x05f428",
- "0x64" : "0x11"
- }
- }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xeaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000010" : {
- "balance" : "111",
+ "0x1000000000000000000000000000000000000010" : {
+ "balance" : "0x6f",
"code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000011" : {
- "balance" : "0",
- "code" : "{ (SSTORE 100 0x11) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000011" : {
+ "balance" : "0x00",
+ "code" : "0x6011606455",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (SSTORE 1 (EXTCODESIZE 0x1000000000000000000000000000000000000010)) (EXTCODECOPY 0x1000000000000000000000000000000000000010 0 0 20) (SSTORE 2 (MLOAD 0)) (SSTORE 4 (SLOAD 0)) (SSTORE 5 (CALL 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 6 (CALLCODE 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 7 (DELEGATECALL 30000 0x1000000000000000000000000000000000000011 0 0 0 0)) (SSTORE 8 (CALL 30000 0x1000000000000000000000000000000000000013 0 0 0 0 0)) (SSTORE 3 (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)) (SSTORE 10 (GAS)) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560006000600060006001731000000000000000000000000000000000000011617530f160055560006000600060006001731000000000000000000000000000000000000011617530f26006556000600060006000731000000000000000000000000000000000000011617530f460075560006000600060006000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
+ "nonce" : "0x00",
"storage" : {
"0x00" : "0x12"
}
@@ -151,14 +111,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
index 628c51d3d..cc56fed4e 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
@@ -6,76 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "shouldnotexist" : "1"
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x08bf58"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "shouldnotexist" : "1"
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x08d574"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000118" : {
- "balance" : "0",
- "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000118" : {
+ "balance" : "0x00",
+ "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[1]] (GAS) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x6000600060006000600073100000000000000000000000000000000000011861ea60f1505a600155",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -85,14 +103,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
index e348d2f3a..3bb6514f9 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
@@ -6,95 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150"
- ],
- "result" : {
- "1000000000000000000000000000000000000116" : {
- "shouldnotexist" : "1"
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xb58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x085db0"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000116" : {
- "shouldnotexist" : "1"
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x08bf58"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000116" : {
- "shouldnotexist" : "1"
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x08d574"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000116" : {
- "balance" : "0",
- "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000116" : {
+ "balance" : "0x00",
+ "code" : "0x732000000000000000000000000000000000000115ff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000116 0 0 0 0 0) [[1]] (GAS) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x6000600060006000600073100000000000000000000000000000000000011661ea60f1505a600155",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -104,14 +103,14 @@
""
],
"gasLimit" : [
- "600000"
+ "0x0927c0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
index f2d334ef3..821bfa476 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
@@ -6,82 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0x0c"
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x021f34",
- "0x02" : "0x018016"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0"
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0",
- "0x02" : "0"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000118" : {
- "balance" : "0",
- "code" : "{ [[1]] 12 }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000118" : {
+ "balance" : "0x00",
+ "code" : "0x600c600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -91,14 +103,14 @@
""
],
"gasLimit" : [
- "160062"
+ "0x02713e"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
index 37208e6ad..9c25b8d0d 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
@@ -6,82 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0x0c"
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x021f33",
- "0x02" : "0x018015"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0"
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0",
- "0x02" : "0"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000118" : {
- "balance" : "0",
- "code" : "{ [[1]] 12 }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000118" : {
+ "balance" : "0x00",
+ "code" : "0x600c600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -91,14 +103,14 @@
""
],
"gasLimit" : [
- "160061"
+ "0x02713d"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
index 0053b1442..f6ab7a04e 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
@@ -6,82 +6,94 @@
"source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "EIP150",
- "EIP158"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0x0c"
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0x021f35",
- "0x02" : "0x018017"
- }
- }
+ "logs" : [
+ ]
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "Frontier",
- "Homestead"
- ],
- "result" : {
- "1000000000000000000000000000000000000118" : {
- "storage" : {
- "0x01" : "0"
- }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x00" : "0",
- "0x02" : "0"
- }
- }
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000118" : {
- "balance" : "0",
- "code" : "{ [[1]] 12 }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000118" : {
+ "balance" : "0x00",
+ "code" : "0x600c600155",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0",
- "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
- "nonce" : "0",
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -91,14 +103,14 @@
""
],
"gasLimit" : [
- "160063"
+ "0x02713f"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0"
+ "0x00"
]
}
}