From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../stRevertTest/RevertOpcodeCalls.json | 626 +++++++++------------ 1 file changed, 264 insertions(+), 362 deletions(-) (limited to 'GeneralStateTests/stRevertTest/RevertOpcodeCalls.json') diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json index 7596dcc43..b22535462 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json @@ -2,403 +2,305 @@ "RevertOpcodeCalls" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 3, - "gas" : 1, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x01" + } + }, + "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x0e" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 3, - "gas" : 1, - "value" : 0 + }, + { + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } } - ], - "Frontier" : [ - { - "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 3, - "gas" : 1, - "value" : 0 + }, + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x01" + } + }, + "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x00", + "0x02" : "0x0e" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } } - ], - "Homestead" : [ - { - "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 3, - "gas" : 1, - "value" : 0 + }, + { + "comment" : "OOG", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } } - ], - "Metropolis" : [ - { - "hash" : "0x407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - }, - { - "hash" : "0x145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 + }, + { + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x01" + } + }, + "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x00", + "0x02" : "0x0e" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } - }, - { - "hash" : "0xfcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : 0 + } + }, + { + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x01" + } + }, + "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x00", + "0x02" : "0x0e" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } - }, - { - "hash" : "0xbd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } - }, - { - "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", - "indexes" : { - "data" : 3, - "gas" : 1, - "value" : 0 + } + }, + { + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x01" + } + }, + "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x01", + "0x02" : "0x0e" + } + }, + "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x04" : "0x00", + "0x05" : "0x0e" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x600060006000600060006000356203f7a0f1600a55", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255", - "nonce" : "0x00", + "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", + "nonce" : "0", "storage" : { } }, - "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255", - "nonce" : "0x00", + "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]] (CALLCODE 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", + "nonce" : "0", "storage" : { } }, - "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255", - "nonce" : "0x00", + "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]] (DELEGATECALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]] 14 }", + "nonce" : "0", "storage" : { } }, - "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255", - "nonce" : "0x00", + "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]] (CALL 100000 0xb3305374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", + "nonce" : "0", "storage" : { } }, - "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555", - "nonce" : "0x00", + "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[4]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[5]] 14 }", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x600c60015560016000fd", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }", + "nonce" : "0", "storage" : { } } @@ -411,15 +313,15 @@ "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "0x0704e0", - "0x0157c0" + "460000", + "88000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } -- cgit v1.2.3