diff options
| author | Dimitry <dimitry@ethereum.org> | 2018-03-23 00:21:36 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethereum.org> | 2018-05-15 22:43:32 +0800 |
| commit | a55c8c39203d3ae6c65a1517b8c001b274f41d10 (patch) | |
| tree | 5b24a33d24778de62d4f4a1e040532a0868b4952 | |
| parent | f4faae91c5ba192c3fd9b8cf418c24e627786312 (diff) | |
| download | dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar.gz dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar.bz2 dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar.lz dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar.xz dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.tar.zst dexon-tests-a55c8c39203d3ae6c65a1517b8c001b274f41d10.zip | |
fix oog transaction execution
2 files changed, 58 insertions, 31 deletions
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json index 2ff2279e9..ba148575a 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json @@ -2,10 +2,11 @@ "createNameRegistratorPerTxsNotEnoughGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.84983edf.Linux.g++", + "retesteth" : "cpp-0.0.1+commit.b346d8e6.Linux.g++", "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json", - "sourceHash" : "5ccc925d99e38a57fd6841dcd2ee9c81f218e410b049865b73c72a08cf4d7060" + "sourceHash" : "49891640a751c8249afd8d18774b635038571328ec7e74379e4106f73a361824" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -15,72 +16,92 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555" + ], + "gasLimit" : [ + "0x544d", + "0xb44d" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "", + "value" : [ + "0x0186a0" + ] + }, "post" : { "Byzantium" : [ { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, + "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, { + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], + "Constantinople" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { "indexes" : { "data" : 0, "gas" : 1, "value" : 0 }, + "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Frontier" : [ { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, + "hash" : "0x29c73824becd004bed00de09919b81c17c32b53a0b4a12a59279699e4c5db146", "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, { - "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007", "indexes" : { "data" : 0, "gas" : 1, "value" : 0 }, + "hash" : "0x29c73824becd004bed00de09919b81c17c32b53a0b4a12a59279699e4c5db146", "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555" - ], - "gasLimit" : [ - "0x544d", - "0xb44d" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "", - "value" : [ - "0x0186a0" - ] } } }
\ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json index 1b32847d8..3ce51c24a 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json @@ -10,12 +10,15 @@ }, "expect" : [ { - "indexes" : { "data" : -1, "gas" : [0], "value" : -1}, + "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, "network" : ["Frontier"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a7640000", "nonce" : "0x00" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x00" } } }, @@ -26,6 +29,9 @@ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a7640000", "nonce" : "0x00" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" } } } |