diff options
160 files changed, 1297 insertions, 445 deletions
diff --git a/.travis.yml b/.travis.yml index 84b8fa28a..a8cc9bd7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ branches: - master - develop sudo: false -install: "npm install jsonschema json-duplicate-key-handle" +install: "npm install jsonschema json-dup-key-validator" script: # won't fail, but print problems - find . -name 'node_modules' -prune -o \( -name "*.json" -not -name "*Filler.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 \) | grep -v -B 1 "^\./" | cat diff --git a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json index 35627f893..b3ca35b48 100644 --- a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json +++ b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json", - "sourceHash" : "d670835429d4e558691353c660a0e0127e3db97543e1b7748a6bb8274855202b" + "sourceHash" : "ef1e08e6a557b9b9aa718ed33d2d205c4ee6951f4ba44051a49e6201df73547c" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json index e59d8e3f0..ee9ad2d2f 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json", - "sourceHash" : "0bc6667c509d6c8e7a1706305dd1c4f8376657bfe2a39b95f4758b72ca64714a" + "sourceHash" : "5ef75d6526b215876ecb706628e57da4680aa97eb7acf32a8dfc1cfbb60deb69" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json index c81dfa94b..a1bd52bac 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json", - "sourceHash" : "a9bd7504da4a25c435f4c573a188114cb1ab795a0c361a74a0e98fc0dda9cf15" + "sourceHash" : "de8e627fd427aa8e519eb6aad5072a96267d4f560b55478525c2779fd65d0851" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json index 8f9b0f4a9..04c9a79da 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json", - "sourceHash" : "62974636138f9f37b514c268eb614a19d88d03fd4159ef4cbd743d3bd5a781ff" + "sourceHash" : "15e8bb371048bd957eee0a957c4cb1c16c91e688535e622f44023b5e740bddf1" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json index 76e56dc33..6cf2e9842 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json", - "sourceHash" : "fd76d39a110e69471fbd0d80b29c043dfb7f4a3323e692377a7a47c315eca0ec" + "sourceHash" : "a2c42e8d0f8bec45eb04f76224d79519a8b91a3079d1b823d42204b4198206ad" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json index ea935f33f..2caa6f0b9 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json", - "sourceHash" : "d5c6bab9b8b6d5d89b144247530745c9959ae0131489d8c40133840103d98ce1" + "sourceHash" : "20b3c41e1a13347c1e060bff302a27ac05ec85133bf675a751e2b05717bbb241" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json index d7c81168a..3ea408d0b 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json", - "sourceHash" : "30485c3e7ceee1accf87f310c85393dbae76a3ab5b0f4c9ffe1b6b0309ccb6e8" + "sourceHash" : "fd1179c540e426e6e6a0d9c76803448a3070a8ea9f8fb9c33469d6677e1e8809" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json index 1919b974d..cfb9962c8 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json", - "sourceHash" : "23a78158332a5f0e0dae10d0bcdd0f660b84d3ba0501bbca8d2542a606c8b707" + "sourceHash" : "38be189fad4969fd08a4c8ba4060bb0c96a61280cd599616e7d2745addb8642f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json index 541c1cf25..8377d21f0 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json @@ -2,10 +2,10 @@ "CREATE_EmptyContractWithStorage" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json", - "sourceHash" : "25c3d9b20fb077c69d9ef40e4a9cddb3821c176d5239cd654ba7c23fcee1c55f" + "sourceHash" : "d2dfba26298a1d382bf43ed1cde80bf7bda2048439221fd7cb4fe7cfb7112cfc" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb", diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json index 22e1923c7..29e2f9032 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json @@ -2,10 +2,10 @@ "CREATE_EmptyContractWithStorageAndCallIt_0wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json", - "sourceHash" : "1e2492814c7b35f756b8fdc9ed3ac3f80fd38371627c35c679faf223a637ee7d" + "sourceHash" : "02620473f62d86076d7c14abcc41b416cce0f44f5270e2c4bc11a06d4820acf6" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018", diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json index f670ff4fd..1a34e6b69 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json @@ -2,10 +2,10 @@ "CREATE_EmptyContractWithStorageAndCallIt_1wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json", - "sourceHash" : "ff8dd96a04fcd8e0e4c5a58bc7d13eff72705d189f9fbb951cb30e0ca2c4026f" + "sourceHash" : "d5fde2baa93b96a23b938c833bb277aa83eb9d026612c7cbee2de32cf18273cc" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d", diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json index c4011416c..b384dd967 100644 --- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json +++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json", - "sourceHash" : "293d448be64164d232e29ef0ebf3af02612b799376bad914609005bf0b3d76e3" + "sourceHash" : "b034e8c45d592641c1d23f865e449b794113490017aef133d9d2035a782d1fb0" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json index 50dddd9a4..2daad6a36 100644 --- a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json +++ b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json @@ -2,10 +2,10 @@ "CallAndCallcodeConsumeMoreGasThenTransactionHas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json", - "sourceHash" : "8561348f8127ec4401034793b28a33608652c14eb0236b842cd6db6d52ef860b" + "sourceHash" : "19d69ead45a7333d95cb22a6901647e4e9096868e70d9564d8eaa3fac60e9ea5" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786", diff --git a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json index 3b116623d..a39febfb3 100644 --- a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json +++ b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json @@ -2,10 +2,10 @@ "CallAskMoreGasOnDepth2ThenTransactionHas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json", - "sourceHash" : "2c9e64144a58e54080c683dc32b535619f08a9584b3d4f89677801529102ec0f" + "sourceHash" : "caf2c62a88553da98a90e8069fd300f97f193cd85e1ccffc6c826f8c3b0e371b" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4", diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json index 97a0e99b6..9406f164d 100644 --- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json +++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json @@ -2,10 +2,10 @@ "CallGoesOOGOnSecondLevel" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json", - "sourceHash" : "b6234f9396b4bb7bebbb060c5f8669933d3558b404933f8012b2c9b7967b216f" + "sourceHash" : "c666b96c8cc136a3750f6423142550508dc0ccc30ee52b18c4ab49bb9d35cbe3" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043", diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json index 8fb2c9147..eea2181d3 100644 --- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json +++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json @@ -2,10 +2,10 @@ "CallGoesOOGOnSecondLevel2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json", - "sourceHash" : "c7e6297df154773b475ccf683f4885f791a1ce1f1aef1ad6a5a62a2496932425" + "sourceHash" : "945e07a630662a4ff7bd6c0acfcf17031493c0dde95c0e4c29e0056fcad45e56" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49", diff --git a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json index fb494563c..905aed223 100644 --- a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json +++ b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json @@ -2,10 +2,10 @@ "CreateAndGasInsideCreate" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json", - "sourceHash" : "ca310121c1d5e31faf6e2219c2599857f95acd900183f9991b3cb2a5e17ae449" + "sourceHash" : "0ce5640d6d440abd220a8fabd81858b23f9dfc077e6f5e7ec2ae3611903275a3" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5", diff --git a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json index 0f38bae64..c513fcf3a 100644 --- a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json +++ b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json @@ -2,10 +2,10 @@ "DelegateCallOnEIP" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json", - "sourceHash" : "0d3dc830e3a9226dcd9c440561593a9ddf41306385ba31de4aa5f9d5d60176a6" + "sourceHash" : "3fea6d32c8fa84f044173dbeea2eaa50332ab1a69c943d60984a6b4359a90054" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff", diff --git a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json index a03475239..8e7680ecc 100644 --- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json +++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json @@ -2,10 +2,10 @@ "NewGasPriceForCodes" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json", - "sourceHash" : "1592b5d1a4f71ba4994d1800af32f6f592e6bba1e799287af06ef31d4b744605" + "sourceHash" : "71fe031a422e91a74c75f2beeabc88ebbd67e34f5b065d45a8ec0c5d94ed3494" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e", diff --git a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json index efe4fab4c..2a78f6f4c 100644 --- a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json +++ b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json @@ -2,10 +2,10 @@ "SuicideToExistingContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json", - "sourceHash" : "2e1d3241d815eec9ca4fa34346308251797a64580f7eb83e39d8f878b019fc68" + "sourceHash" : "d4297c20064a2ca36e7ac72609e6f456166db516308c3ecd2080e732be92d8a9" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc", diff --git a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json index 91c8cea00..a61509ac7 100644 --- a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json +++ b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json @@ -2,10 +2,10 @@ "SuicideToNotExistingContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json", - "sourceHash" : "fcf32076512ce4d15cd9e9dc1e85439a08430f35f6471ae15ce2c69f64d9fa5f" + "sourceHash" : "d9f88ca199560891582c56bbb12ed60ce23fa861675e5a92e21e5c15296c05a8" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xb58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6", diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json index 3eca919bd..be67363bd 100644 --- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json +++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json @@ -2,10 +2,10 @@ "Transaction64Rule_d64e0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json", - "sourceHash" : "d1b927753a2fbad43156229a7e8cdd3ef9f3f5661d1abd38b38647f147a4e3ad" + "sourceHash" : "f80f7fcf6cad0bf0b3017ac33be68120ed3e3bbb7ead3bdc6a0141cc4263e80f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde", diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json index 55c2ce77f..7514cec6e 100644 --- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json +++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json @@ -2,10 +2,10 @@ "Transaction64Rule_d64m1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json", - "sourceHash" : "7f170cf60eaf73c46dfec428eb2fc6f28ace5873a6e9fc9d0611e41974771776" + "sourceHash" : "756a0a1942e9d27c1f77f2bec906cf836276f124a7ae8ab4ac0b6df4d94c3cca" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0", diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json index 14ecba7aa..3fbecee01 100644 --- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json +++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json @@ -2,10 +2,10 @@ "Transaction64Rule_d64p1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json", - "sourceHash" : "adbfe546020c88d93420c055798be3368c6a0c936ff9f121e2ead3460cf95904" + "sourceHash" : "4f2623c31585686d7e7ac85cb660e80e60b7f20e63e9195d3b782c0a6e224c3f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e", diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json index 02b083190..f56c21e65 100644 --- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json +++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json", - "sourceHash" : "5348652a812cfed1363a1455018bc784d5654003197ab8316be30fbaf874cf8d" + "sourceHash" : "93004cf5aa2cfe773a92a4c0b22af5a961dcfc0db6f203a83bc0c041e958af66" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json index 46ce5312d..6884d1a34 100644 --- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json +++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json", - "sourceHash" : "76e13f3817e84c362c3258ff6c9adfb29f89de6de4d1ba7a4ef58c5223de5685" + "sourceHash" : "6866133ad761bbb4914831234754b30ab8964fac424d8b65781b33f70b67f3c3" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json index 048c1bcaf..c2ee4dab1 100644 --- a/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json +++ b/GeneralStateTests/stMemoryStressTest/JUMP_Bounds2.json @@ -2,10 +2,10 @@ "JUMP_Bounds2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json", - "sourceHash" : "6803133f723b7bae4e663c6a64f1ac29550fa9e53e1b75ba10e4c00fab5b7c60" + "sourceHash" : "d7ecc36dca7215c4c11aca542f6f6e7f46b4feaf99e4b8b7c9ec7d4e2b822cbf" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -35,6 +35,26 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x222a750937b203db5eb109e1b79f1500a9cb65192ad3eb97f5b333f8718ad979", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json index e080d31a0..c2fe19e12 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json @@ -2,10 +2,10 @@ "returndatacopy_0_0_following_successful_create" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json", - "sourceHash" : "27d165ed6e87e436fb7b95ca5922b93d742fbfb44b000d2b624167dbee9b95fd" + "sourceHash" : "01768be9124b42d82a6e2272c21a6d823c670a1a05e52becf5a1ce01729dcd24" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xe5612a75f1f88badf3d4faf86108f59eb5c568d658cd7fb37f1fbf8fcf96f307", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020", diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json index 0d13117ae..8925af318 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json @@ -2,10 +2,10 @@ "returndatacopy_following_failing_call" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json", - "sourceHash" : "faf50bbb3721f5f37eb0dae83ecf0a9ec840ab7824c416fce6f598c661f54e20" + "sourceHash" : "5a3e0a714377057278996b2114ccc773425ca0f18ca898bcb67dd62763309d1b" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json index 83ce05eb1..3f4e9cc88 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json +++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json @@ -2,10 +2,10 @@ "LoopCallsDepthThenRevert2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json", - "sourceHash" : "36b299f61a7da1b15b499c9ed2f01bc9a1179d1f1466731213d3704ea6e3c135" + "sourceHash" : "2d78b54188ab30fd29da9acd2b1e67022e2bf2feda813c2dd5b5da0b21922dee" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP158" : [ { "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f", diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json index 39de3d1fc..563dda76a 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json +++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json @@ -2,10 +2,10 @@ "LoopCallsDepthThenRevert3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json", - "sourceHash" : "bcab8552678c134e59724275008f6f3a12243c88fcf676771ca9b1f8d761543e" + "sourceHash" : "b4c8e92721600dadbd6e5b1661fe4f32133fb82703f6df62478fbd86d4053f1a" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP158" : [ { "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a", diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json index 2f1e3013b..a7a266687 100644 --- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json +++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json", - "sourceHash" : "9fc4f02ade3e60f0afbca51518c4183af5371e67dad1d9a63f13ca0eee2b3a6c" + "sourceHash" : "c2dd7ca63058a1f560ebde35e31594c5e114bba8124ec7ebd4324ccb5b8f8671" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stRevertTest/RevertOpcode.json b/GeneralStateTests/stRevertTest/RevertOpcode.json index 2dd6902b1..84f45fe1d 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcode.json +++ b/GeneralStateTests/stRevertTest/RevertOpcode.json @@ -2,10 +2,10 @@ "RevertOpcode" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json", - "sourceHash" : "7374fed9030de85918fc9be29397b72a741f8b2608c88856dee17841e50e3e7b" + "sourceHash" : "6b6338bd17c48e5100b42ff334921166acb8824b3895b1dbfbf177629dc243a6" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -54,6 +54,44 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json index b2ec74d5d..2e4e5c73e 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json @@ -2,10 +2,10 @@ "RevertOpcodeCreate" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json", - "sourceHash" : "9e356ffb8e986e3771cd363292947e4ece3e6187ede4da979f405e8ed48e790b" + "sourceHash" : "25cc79c841e57fd0eb5eede04fc22aae72c6a54ba6e1d62f53f43a0194eb126f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -36,6 +36,26 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xeeac7cc67af32c9fc40749602cda167c54269830d2cb71fd3586e1ed4f458baa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e", diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json index 5a9021682..d5de38254 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json @@ -2,10 +2,10 @@ "RevertOpcodeDirectCall" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json", - "sourceHash" : "7640bbd7bf6a2c84e4d9b6500452786677fba49601c9ef0bf46ca7a984c8d700" + "sourceHash" : "aa722a62d8eab9f323a7c4a58e0fc038e981e5af4aab3fe2e1bcfd8ad4058652" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -36,6 +36,26 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xbb8ca799edcbad582f5b22c6727ab0c73490d53134e81ede12ef5fb6e72e33ba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x16b4dfe6001056e07ac7f5d8eada91b69231b05ba3700354354c107768348d2e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x349b3092857aeb19e2186a3d257ede11b46075f2aa5169ea17235fcd7a60dadd", diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json index 29e641488..eb9cc22d0 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json @@ -2,10 +2,10 @@ "RevertOpcodeMultipleSubCalls" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json", - "sourceHash" : "5551c97d97751c57f88f04df4b39521d0de1f3158629f10d228f899d23572b56" + "sourceHash" : "48084af529e01cd8a351fdd1305e6b1595a5193eac8affea6b7fd661fad8f0ca" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -306,6 +306,296 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09", diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json index 09e666bb9..7538c63da 100644 --- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json +++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json", - "sourceHash" : "d83f5a22391281d84eb4e4fff9c8f3ad26776825eabc1d10bcf6c736183c0a23" + "sourceHash" : "97072a40ef2bdc84978f1331a45a2f622dbb86103322e388762a26ab23bdcd06" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json index dca5ab9ab..3b7b0266e 100644 --- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json +++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json", - "sourceHash" : "7249132938ca9e115ca7aff2827e43c3630a92d48467fe7f6fae286b9f3c0278" + "sourceHash" : "38ce37b6a9cb0d8887cb76d2c8c69514fe9e6ea91f0fb7204ae1bfc27466119a" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json index 4d04a974c..9d5b7a9eb 100644 --- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json +++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json", - "sourceHash" : "b9cdd22b6803ed19c8f236f79d8b109816a8ee30a7635eec0a7b44dee2ffc026" + "sourceHash" : "b34318fdf4f9afb2c12ab5aef812c3a63a65494ab933b0681c8140ab14c6c891" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json index b571da7e8..b3bca8bde 100644 --- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json +++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json", - "sourceHash" : "cc65f9bb8a45352d6351a5036179f2e51c28287834aeb04a28b96ff13b2ccd7a" + "sourceHash" : "f2ec6d168bf9da1f0577ef9797c58aa9e9958e03e4aefd96c0eda3d468097293" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl01-0100.json b/GeneralStateTests/stShift/shl01-0100.json index c3f0ca486..06600d5e9 100644 --- a/GeneralStateTests/stShift/shl01-0100.json +++ b/GeneralStateTests/stShift/shl01-0100.json @@ -2,10 +2,10 @@ "shl01-0100" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl01-0100Filler.json", - "sourceHash" : "544c29da6fd269ba0ab3ec94ec9be835fa584912475c466b352aa0f3e061342f" + "sourceHash" : "f564f4c8d83a2e5e220867eeaec0fe2bc432db8c703dacbc97cfa489058c226b" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl01-0101.json b/GeneralStateTests/stShift/shl01-0101.json index be22600b8..bb1f51050 100644 --- a/GeneralStateTests/stShift/shl01-0101.json +++ b/GeneralStateTests/stShift/shl01-0101.json @@ -2,10 +2,10 @@ "shl01-0101" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl01-0101Filler.json", - "sourceHash" : "88fe15f38989ffbda5a78d6a439859c4d560c8f8252548960e3ce11d682b4ed9" + "sourceHash" : "1bb1b2907084f5206a9520210fd6bc055e82e7a1cf639e17061752fc5b3ece0d" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl01-ff.json b/GeneralStateTests/stShift/shl01-ff.json index 5956159bb..cdceb25d7 100644 --- a/GeneralStateTests/stShift/shl01-ff.json +++ b/GeneralStateTests/stShift/shl01-ff.json @@ -2,10 +2,10 @@ "shl01-ff" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl01-ffFiller.json", - "sourceHash" : "6a12fccf1ecf7ac59970e398fb51c9260d2ecf8de23e4497a08a71b58fde64dd" + "sourceHash" : "a84b7ec565a13d6dacf8022baafcc798c8c93e98cf377d0da8e11e7fbe200f77" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl01.json b/GeneralStateTests/stShift/shl01.json index 444cc166b..803975778 100644 --- a/GeneralStateTests/stShift/shl01.json +++ b/GeneralStateTests/stShift/shl01.json @@ -2,10 +2,10 @@ "shl01" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl01Filler.json", - "sourceHash" : "17cd4961dacc97a5e23a0e36b5f24eedbe2acd29ca1ae4347e7714760cfffe06" + "sourceHash" : "3c77da33f54d2d5ee31395ab480594a1c1ec8c1d72d5388e7c378f5dbc9e3f4a" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl10.json b/GeneralStateTests/stShift/shl10.json index 0042f493b..49687e374 100644 --- a/GeneralStateTests/stShift/shl10.json +++ b/GeneralStateTests/stShift/shl10.json @@ -2,10 +2,10 @@ "shl10" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl10Filler.json", - "sourceHash" : "58be8cbd1796e70849dfbd779eac6af9b828a8051554a0985cfda64808edc41e" + "sourceHash" : "eff1a604a8916fac8904250ba8d86607833963e84cd42506f33b0eb51f40657a" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl11.json b/GeneralStateTests/stShift/shl11.json index 785ec21aa..10baddaaf 100644 --- a/GeneralStateTests/stShift/shl11.json +++ b/GeneralStateTests/stShift/shl11.json @@ -2,10 +2,10 @@ "shl11" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl11Filler.json", - "sourceHash" : "dc7c477990197ec48c78984bb66e90037b9fddd81e4b21ae87414dcb55548517" + "sourceHash" : "9d30496e1b0c69399d9acb7058ef03a68a5ae6d8acaa66b93b9b272594311924" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl_-1_0.json b/GeneralStateTests/stShift/shl_-1_0.json index eb9289774..547bb2c2c 100644 --- a/GeneralStateTests/stShift/shl_-1_0.json +++ b/GeneralStateTests/stShift/shl_-1_0.json @@ -2,10 +2,10 @@ "shl_-1_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl_-1_0Filler.json", - "sourceHash" : "4a2c60bf6a2abacc4b4b0915835688dff15080a3e4f35b4efb57947086ab0e24" + "sourceHash" : "cba1bde2385c7083b43085e0b91ff64b878c387f8e4e13fd73103fa39fdb3ccc" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl_-1_1.json b/GeneralStateTests/stShift/shl_-1_1.json index 486f8f1c3..bac2fc7c6 100644 --- a/GeneralStateTests/stShift/shl_-1_1.json +++ b/GeneralStateTests/stShift/shl_-1_1.json @@ -2,10 +2,10 @@ "shl_-1_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl_-1_1Filler.json", - "sourceHash" : "ee787df7413beaf8abc9ce82c20a89f1cb253d15c8388954c9ddae2af0ebe35a" + "sourceHash" : "dc5cee0ae42a3c9735445a2f9dcfe08451145b8e146311d4dfa09702a274c105" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl_-1_255.json b/GeneralStateTests/stShift/shl_-1_255.json index 245c2750d..6121fa60d 100644 --- a/GeneralStateTests/stShift/shl_-1_255.json +++ b/GeneralStateTests/stShift/shl_-1_255.json @@ -2,10 +2,10 @@ "shl_-1_255" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl_-1_255Filler.json", - "sourceHash" : "399297f52caaa179ebfc9c5823e71cb0ad96500b7f37385cba96e4f219f7c891" + "sourceHash" : "93cb77b8ceb5910e5342579b43e19185b7727152e697c3bb343c4c57cb9754b9" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl_-1_256.json b/GeneralStateTests/stShift/shl_-1_256.json index 5bfd24d29..931cf95a6 100644 --- a/GeneralStateTests/stShift/shl_-1_256.json +++ b/GeneralStateTests/stShift/shl_-1_256.json @@ -2,10 +2,10 @@ "shl_-1_256" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl_-1_256Filler.json", - "sourceHash" : "c118ce3b7b92fb87e8bbdabb2a37f5732069fba9ab63717a6eb017563bfae057" + "sourceHash" : "2dbc327c8bea2c8bdddff7e2049960f3dbc2790ee413d94e5fadba4563d856d0" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stShift/shl_2^255-1_1.json b/GeneralStateTests/stShift/shl_2^255-1_1.json index 1ad3145a6..19f5c53c4 100644 --- a/GeneralStateTests/stShift/shl_2^255-1_1.json +++ b/GeneralStateTests/stShift/shl_2^255-1_1.json @@ -2,10 +2,10 @@ "shl_2^255-1_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.7f06dbfd.Linux.g++", - "lllcversion" : "Version: 0.4.21-develop.2018.2.27+commit.2abc5be7.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stShift/shl_2^255-1_1Filler.json", - "sourceHash" : "bb451608c0cf2907d8d538cbf18f99c2aa676ff7014722ce8dc2c554078eb799" + "sourceHash" : "3eb0936479348b750a726fedadc75125eab126240031c5b8d1f978977093cff7" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStackTests/shallowStack.json b/GeneralStateTests/stStackTests/shallowStack.json index d6c859cb4..162a82711 100644 --- a/GeneralStateTests/stStackTests/shallowStack.json +++ b/GeneralStateTests/stStackTests/shallowStack.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json", - "sourceHash" : "017c4d82502503bfba8e0f49b126b032e0c2a1415e1af3f3dd02a9d847d8cba4" + "sourceHash" : "a982469c83c8a2adbbfe3d8fbe239cdcac5d9b80522294c95bc831c6e56aba82" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json index 05a1a5d94..97f9f58eb 100644 --- a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json +++ b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json", - "sourceHash" : "2f853910844ea36a811167fdf0a2cba6ba91bdb3ca777877315bf39b462613ab" + "sourceHash" : "17774504fde159c6cfa87ad074a8f59c6b12ac4e453df286220b88eb2fa2521c" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json index 06a08c83e..1e801a430 100644 --- a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json +++ b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json", - "sourceHash" : "36c37cb66277f09aeb6d64eb96376554a9cbf9d6b42d57bee3e1460665e72b45" + "sourceHash" : "951dcac0807b05ef385757bbada114139db4bdb3fcc1094c32b8a78e59aa28c0" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValue.json index d673d6165..caebcaddd 100644 --- a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValue.json +++ b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValue.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json", - "sourceHash" : "3aec432ec3dabde39e2d8354b654bb40579446cc0e42cc755a48e10e96f29db1" + "sourceHash" : "1e3a2342b1b213e8951d66cea0de3968051fe0714a0f371c1fc723b894813c10" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0wei.json index 870350080..1ba580ce8 100644 --- a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0wei.json +++ b/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0wei.json @@ -2,10 +2,10 @@ "static_CREATE_EmptyContractWithStorageAndCallIt_0wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json", - "sourceHash" : "6d93db6100c846949e4ed1cc786985befb535be048ea6facc027e472dc4e2c0a" + "sourceHash" : "4160c848d345798d8a590f22cc224e1ee5a8767659310e5a30adce1ebdeec54f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x4bcc548cba959981ce4cc689cf3c71fc583c7e98702efb6507db8cb62dd4f8eb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHas.json index fdae4cb64..13c3a6d10 100644 --- a/GeneralStateTests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHas.json +++ b/GeneralStateTests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHas.json @@ -2,10 +2,10 @@ "static_CallAndCallcodeConsumeMoreGasThenTransactionHas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json", - "sourceHash" : "a94bcdaf0ee5fa3c66180dee1de53dd31cabe9ba477d99e655cbd2376b511d8b" + "sourceHash" : "8d29505ead884bdd136441cac033b119828ec687f8327adbb3454c46a7ebcb3b" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -35,6 +35,26 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x0a6c3402fe06dc0e6f70af7635a3456f263510a69a6793665402501ce48e57db", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x5ce6e42362f24ee3a630c7a5668b761f8d63f5e0bab65d3c0a31cf6a06877872", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHas.json index b1097b258..aff2e0297 100644 --- a/GeneralStateTests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHas.json +++ b/GeneralStateTests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHas.json @@ -2,10 +2,10 @@ "static_CallAskMoreGasOnDepth2ThenTransactionHas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json", - "sourceHash" : "4c6507f43c76b7711e748590382d084c5a07536a938f7bc4fe1db85a035352da" + "sourceHash" : "e860d1e2b0b30e1b313bf59f181ae03bba420fe17ae96cdd989c1becd2ff0f47" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -35,6 +35,26 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x066e481908ced482d7be5c5ac447d6b0d8ff64b7a966492005b89fb80c9f47ea", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xefd7d763a79a55208a7d78abfa9b08c51adbab6d5c244817225fc13c6cbd41c6", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel.json index a0477d020..439841e1f 100644 --- a/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel.json +++ b/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel.json @@ -2,10 +2,10 @@ "static_CallGoesOOGOnSecondLevel" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json", - "sourceHash" : "ba63fd20fffc3a4856c7ca449a1fd0c2914ef0b9cbd3105d60905b42081e25ac" + "sourceHash" : "da6bb583e3fbbad01de722f91e610b915751adf500ca126330f04ba0d99b1d8b" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0xc8c5e72520501c7c79d4743428d8a56185862a68ef0effe80e329a3acce1c323", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel2.json index 7a97b985c..74822fd15 100644 --- a/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel2.json +++ b/GeneralStateTests/stStaticCall/static_CallGoesOOGOnSecondLevel2.json @@ -2,10 +2,10 @@ "static_CallGoesOOGOnSecondLevel2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json", - "sourceHash" : "c2217b5c8277632cc34f00e9a331e48d7f03c7db2970b54c0bf073de1dfdc953" + "sourceHash" : "e2cf1daa23ea35f81056915dd6fb54a73e262ce75911f489c674369b9b4dd23f" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -35,6 +35,26 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x01b25566a434772f10b8153a551ffe6aa9a8fe93d4cf95a2620620a95192a470", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x01b25566a434772f10b8153a551ffe6aa9a8fe93d4cf95a2620620a95192a470", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes.json index a524081f3..d518a436c 100644 --- a/GeneralStateTests/stStaticCall/static_CheckOpcodes.json +++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json", - "sourceHash" : "f90a5b8a13370590804a8e881e99c0f50fe0f33165ac4150273a352018a6dde2" + "sourceHash" : "7a4ab7184075bf05a0c1852867f645c6ed05c450c1a96a579b488312a1357741" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes2.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes2.json index 7dca2c1cc..e3ef69113 100644 --- a/GeneralStateTests/stStaticCall/static_CheckOpcodes2.json +++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes2.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json", - "sourceHash" : "e0e9eecad9192b54512dcc400a5b9f567b8b47050ce846b39136988e1274d2db" + "sourceHash" : "b8e4c9c4b9914d1d6951f34a2e9a574b4d581d7167516c81462304aa4d7cb830" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes3.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes3.json index 54423c9ed..9fd311c3c 100644 --- a/GeneralStateTests/stStaticCall/static_CheckOpcodes3.json +++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes3.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json", - "sourceHash" : "f322ae13975c72045992826c8c3373e276e953ebdea46a83ec8df1e58222b22e" + "sourceHash" : "d18dcfb288a32cdde32bc857c7e1b5b5216d74045bc4fba116a387a9e10edf16" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json index 6bec89a59..00dd0100d 100644 --- a/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json +++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes4.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json", - "sourceHash" : "e0b97aef30073ad7e3f0816f9e9b6577e6b105599a6da7086d68c2f45cd78da4" + "sourceHash" : "bdd5b8a265032fe28df002628a35372bbeed5e69650b2c7c2903860d53bef914" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_CheckOpcodes5.json b/GeneralStateTests/stStaticCall/static_CheckOpcodes5.json index 8487522c2..6aa7f3ef7 100644 --- a/GeneralStateTests/stStaticCall/static_CheckOpcodes5.json +++ b/GeneralStateTests/stStaticCall/static_CheckOpcodes5.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json", - "sourceHash" : "e62bbf81c81c199f3102cf60307a2eb7644f63481ed5dbc42df4042ea6360ea9" + "sourceHash" : "17577604d1d863c0ed3b2fbbc1704329fa2ff74c46e961d645ed4f5a65d32847" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert2.json b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert2.json index 57d42ede2..ba931b0c9 100644 --- a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert2.json +++ b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert2.json @@ -2,10 +2,10 @@ "static_LoopCallsDepthThenRevert2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json", - "sourceHash" : "7f1a2fa70cec8f6ab46fd8f19ce35e500faf1b6c77f2c63e422ddb6db627ae81" + "sourceHash" : "237b9e8e82a2ef9aa619f46dab39134fb1b62a8fa48b178a7659e9790cff45d1" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0xc5ea49092dd6839ec754c99d09a161dcd272d1fd69901f000fb6028c0d260656", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert3.json b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert3.json index 1278802d6..5c5f66c99 100644 --- a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert3.json +++ b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert3.json @@ -2,10 +2,10 @@ "static_LoopCallsDepthThenRevert3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json", - "sourceHash" : "81ed162c90915fbb80296fc1e6f8d78597801cce6bd745250deae58932dd04a6" + "sourceHash" : "5cbc6b1e7abb9b1d047869fe533293781a94f83f962e985e6f7d9c61e33318e0" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x1bf4518519a3e297eccaf0c3f51c5d7f8887e09b36be22595bdaabf5806b9f1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callBasic.json b/GeneralStateTests/stStaticCall/static_callBasic.json index 1ca2594cb..2f81d5f25 100644 --- a/GeneralStateTests/stStaticCall/static_callBasic.json +++ b/GeneralStateTests/stStaticCall/static_callBasic.json @@ -2,10 +2,10 @@ "static_callBasic" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json", - "sourceHash" : "4415734b3d9db156ebc9ba3a2e1f4b9fec704afcb26a35e3e1faf737030b5965" + "sourceHash" : "8a85f40e65557d6338b4a1b4838978afba774c6f9a805b877ec65878ff66f274" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -53,6 +53,44 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x9e7aa1a7c5c8d833eddc371a7f345164c71f351cdec57f88694a43e9808cb266", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x9e7aa1a7c5c8d833eddc371a7f345164c71f351cdec57f88694a43e9808cb266", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa36b307bf39fda51ee5d0e625576b54edffce138c72af2ac59ad89933af2f486", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x9de54a362f7300bda55c9888c94c4b822c3db8a1a4913698622a63fbd629ec56", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callCreate.json b/GeneralStateTests/stStaticCall/static_callCreate.json index a05101043..1fff2393e 100644 --- a/GeneralStateTests/stStaticCall/static_callCreate.json +++ b/GeneralStateTests/stStaticCall/static_callCreate.json @@ -2,10 +2,10 @@ "static_callCreate" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json", - "sourceHash" : "3519ec9ca8ae6e884be98ca05899652caa2d7f0a74abc7eb8b21cf87b1923dc3" + "sourceHash" : "c5890d3f6536c73e86d3eb934e999ecc5eb3fdc1cc650b66a682babe67476805" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -53,6 +53,44 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x4913a843fbbb28522841c365fda4cc864fe0289326d4b3818fa411e69a48056a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x572451704b993036d72ba5e2fbce35551573d5750623101e23c06c501ab45ce0", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x9b5302ee01f42b5282b0a0f4daf587e3e19797b71c1838524e0abb9daca74a79", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x9b5302ee01f42b5282b0a0f4daf587e3e19797b71c1838524e0abb9daca74a79", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callCreate3.json b/GeneralStateTests/stStaticCall/static_callCreate3.json index c2550f1e2..bdcb96fe2 100644 --- a/GeneralStateTests/stStaticCall/static_callCreate3.json +++ b/GeneralStateTests/stStaticCall/static_callCreate3.json @@ -2,10 +2,10 @@ "static_callCreate3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json", - "sourceHash" : "6899497f07d53e341897403e57d690265685181ad3a39479a7b0289d764dce9b" + "sourceHash" : "e5a2e5a57fd9f5173ecf7da8a55db4be893a604bc7b6bd3ce7609c8855998236" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0xa2655cccdd6db292d3ca596efcec973c768c33a68f99e6edda1fe2c6f024dc94", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callToCallCodeOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToCallCodeOpCodeCheck.json index 8df9d8604..4a3887185 100644 --- a/GeneralStateTests/stStaticCall/static_callToCallCodeOpCodeCheck.json +++ b/GeneralStateTests/stStaticCall/static_callToCallCodeOpCodeCheck.json @@ -2,10 +2,10 @@ "static_callToCallCodeOpCodeCheck" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json", - "sourceHash" : "09fc0b15a0993861b5895ed738e5cadc8061c091e34520e3730e69399edd9757" + "sourceHash" : "ec0385c8e93e82a19be8faa67e1fce5f8d93235aeee5dd90f559dcc4e678842c" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x9ee4a79f211e99a66a190f1ee07b9d8e55f8268da4e4d3bd8d1432f8044b40e5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callToCallOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToCallOpCodeCheck.json index c234048eb..50e3ab4e8 100644 --- a/GeneralStateTests/stStaticCall/static_callToCallOpCodeCheck.json +++ b/GeneralStateTests/stStaticCall/static_callToCallOpCodeCheck.json @@ -2,10 +2,10 @@ "static_callToCallOpCodeCheck" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json", - "sourceHash" : "78806b7af60773baa11e02f40a6a2a9947ce2d9acc2c59eedc8c0e695dde62e6" + "sourceHash" : "ed6545af106ebc1c93b38aad175882c069dcb3d6e46810ee95eecc3077a6a32a" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0xa1263f951927904a54d7e668e89eb03b4cb2b173275f3db7bd77982aec9c4057", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json index 63d5fe2e6..ae7cfe073 100644 --- a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json +++ b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json @@ -2,10 +2,10 @@ "static_callToDelCallOpCodeCheck" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json", - "sourceHash" : "487cb8a4086137b15a405d1d25be69bb78368f3f53e24c902e0cfbe3eeaddcb1" + "sourceHash" : "8b632038d4d147395c5decd44ffdfee9697eeb208702db910ccbe37ae5ae26ef" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0xf27b07631e1e35993285fd56e6e21dc79b16c4aa0710c20334773f1b9a4dc624", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json index 91b15446c..fc67e7a78 100644 --- a/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json +++ b/GeneralStateTests/stStaticCall/static_callToStaticOpCodeCheck.json @@ -2,10 +2,10 @@ "static_callToStaticOpCodeCheck" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ab4ca6d1.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json", - "sourceHash" : "a63b8b9db3a76696fa84dd4de3e312839b4aa01c0ed482c02071d9ca8541a811" + "sourceHash" : "3b103afc8b52ca5998e8e65aa263eee56e11a29ab85552ae3321a6ec27d4d8ca" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x84398cb8003abdfdfe57ab2377b14dbd83e4f7633e04f72784e45a387d5998c7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json index af304bfe3..fcb274d9b 100644 --- a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json +++ b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json @@ -2,10 +2,10 @@ "StoreGasOnCreate" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json", - "sourceHash" : "c1ffb280727a6d3de8bca86460f64aa79ed0c589d3e8816d696b07169e69a681" + "sourceHash" : "a84f0f96080c961bb5e1f1249b2d5f9f5c06e106603d55a317ab5a6b4e62dd16" }, "env" : { "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", @@ -27,6 +27,17 @@ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], + "Constantinople" : [ + { + "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], "EIP150" : [ { "hash" : "0x981251c50c9eaf41a1b1c05b9e396999e16dda2117366dfc6435e930f9024a6b", diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json index 57b453297..0d2693b2c 100644 --- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json +++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json @@ -2,10 +2,10 @@ "ZeroValue_TransactionCALL_OOGRevert" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json", - "sourceHash" : "160ca9a38eb0589db5985088efe56dbdf413f615a8b858015f195d51188ba960" + "sourceHash" : "be4714b861397f10a880f54488097f7eb6a8790ced2c46d8bd544d2f1dc9a848" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json index 4eb2d8133..8d6db9400 100644 --- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json +++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json @@ -2,10 +2,10 @@ "ZeroValue_TransactionCALLwithData_OOGRevert" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++", - "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", + "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json", - "sourceHash" : "5de8df6c0647415e64250ae8b05805046f33ef54e47fa95ae2fcefe9069dfa33" + "sourceHash" : "3372be83700caa7dbe9aabed9f43e53edf7f0feaf5a94e8212b58a3e5dc48015" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -26,6 +26,17 @@ }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } + ], + "Constantinople" : [ + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } ] }, "pre" : { diff --git a/GeneralStateTests/stZeroKnowledge/pointMulAdd.json b/GeneralStateTests/stZeroKnowledge/pointMulAdd.json index c56a99c2d..c23d45736 100644 --- a/GeneralStateTests/stZeroKnowledge/pointMulAdd.json +++ b/GeneralStateTests/stZeroKnowledge/pointMulAdd.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json", - "sourceHash" : "d901b268e2e2c7cc46a0a6e93f978842ce1a2fbd86b5d45d4deb353f1341eb3d" + "sourceHash" : "39d976fe8cbddc6769c41ff2a2074bde559c95f69eb7eab9d9cfcc2068f0cbf1" }, "env" : { "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", diff --git a/GeneralStateTests/stZeroKnowledge/pointMulAdd2.json b/GeneralStateTests/stZeroKnowledge/pointMulAdd2.json index 3db27770f..b97d15207 100644 --- a/GeneralStateTests/stZeroKnowledge/pointMulAdd2.json +++ b/GeneralStateTests/stZeroKnowledge/pointMulAdd2.json @@ -5,7 +5,7 @@ "filledwith" : "cpp-1.3.0+commit.6a813f04.Linux.g++", "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++", "source" : "src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json", - "sourceHash" : "2a7ed99982cf1628ac2cfe308d95eb73480b8233cdeafe41aac7ff90d3769e3c" + "sourceHash" : "85cd103eab7d1277bf705c68b119e44870687d5fc78a76909a4fad267ae17bc6" }, "env" : { "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", diff --git a/JSONSchema/validate.js b/JSONSchema/validate.js index 4e4e1fde0..e4c41140e 100755 --- a/JSONSchema/validate.js +++ b/JSONSchema/validate.js @@ -4,7 +4,7 @@ var fs = require('fs'); var validate = require('jsonschema').validate; var readline = require('readline'); var process = require('process'); -var dup = require('json-duplicate-key-handle'); +var dup = require('json-dup-key-validator'); var schemaFile = process.argv[2]; diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json index 26ba193fb..f99a02591 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json @@ -60,39 +60,39 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000000000", - "code" : "pragma solidity ^0.4.0; Better Make it with LLL", - "code" : "contract CSuicide", - "code" : "{", - "code" : " uint v;", - "code" : " function killitself()", - "code" : " {", - "code" : " suicide(0x11);", - "code" : " }", - "code" : " ", - "code" : " function storesmth()", - "code" : " {", - "code" : " v = 12;", - "code" : " }", - "code" : " ", - "code" : " function getsmth() returns(uint)", - "code" : " {", - "code" : " return v;", - "code" : " }", - "code" : "}", - "code" : "", - "code" : "contract CreateTest {", - "code" : " uint res;", - "code" : " uint resV;", - "code" : " function run()", - "code" : " {", - "code" : " CSuicide a = new CSuicide();", - "code" : " a.killitself();", - "code" : " a.storesmth();", - "code" : " resV = a.getsmth();", - "code" : " res = 1;", - "code" : " }", - "code" : "}", - "code" : "", + "//00 code" : "pragma solidity ^0.4.0; Better Make it with LLL", + "//01 code" : "contract CSuicide", + "//02 code" : "{", + "//03 code" : " uint v;", + "//04 code" : " function killitself()", + "//05 code" : " {", + "//06 code" : " suicide(0x11);", + "//07 code" : " }", + "//08 code" : " ", + "//09 code" : " function storesmth()", + "//0a code" : " {", + "//0b code" : " v = 12;", + "//0c code" : " }", + "//0d code" : " ", + "//0e code" : " function getsmth() returns(uint)", + "//0f code" : " {", + "//10 code" : " return v;", + "//11 code" : " }", + "//12 code" : "}", + "//13 code" : "", + "//14 code" : "contract CreateTest {", + "//15 code" : " uint res;", + "//16 code" : " uint resV;", + "//17 code" : " function run()", + "//18 code" : " {", + "//19 code" : " CSuicide a = new CSuicide();", + "//1a code" : " a.killitself();", + "//1b code" : " a.storesmth();", + "//1c code" : " resV = a.getsmth();", + "//1d code" : " res = 1;", + "//1e code" : " }", + "//1f code" : "}", + "//20 code" : "", "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003c57610037565b610002565b346100025761004e6004805050610050565b005b600060405160c9806101d3833901809050604051809103906000f080156100025790508073ffffffffffffffffffffffffffffffffffffffff166369bda7aa604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16633ac6dff3604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16636f118b2b600060405160200152604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050602060405180830381600087803b156100025760325a03f115610002575050506040518051906020015060016000508190555060016000600050819055505b5056606060405260b98060106000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480633ac6dff314604d57806369bda7aa14605e5780636f118b2b14606f576049565b6002565b34600257605c60048050506094565b005b34600257606d600480505060a2565b005b34600257607e600480505060a8565b6040518082815260200191505060405180910390f35b600c6000600050819055505b565b6011ff5b565b6000600060005054905060b6565b9056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json index ce09e3c95..6e0fc3621 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json @@ -59,7 +59,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json index c06636996..a84dea288 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json @@ -71,7 +71,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { @@ -79,7 +79,7 @@ }, "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json index 6c8fda8ed..79d8d1891 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json @@ -59,7 +59,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json index 279e8b7f8..5668ddcb3 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json @@ -149,7 +149,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json index 35b3d95ef..2a825e073 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json @@ -75,7 +75,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000000000", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json index 62f065ee8..d3a6b6130 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json @@ -109,7 +109,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000000000", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json index 4c5843745..99705115d 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json @@ -84,7 +84,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000000000", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json index 48ae08763..02d8784b1 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json @@ -103,7 +103,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", + "// code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json index 6b54707f0..726422dee 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json @@ -82,7 +82,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", + "// code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json index a78064140..c18b00d7f 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json @@ -97,7 +97,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", + "// code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[100]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json index 56d147a85..bd707cc2b 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json @@ -88,7 +88,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000000000", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json index f1ef2f585..fd2558173 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json @@ -40,7 +40,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", + "// code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) } ", "storage": { } @@ -48,7 +48,7 @@ "1000000000000000000000000000000000000103" : { "balance" : "0", "nonce" : "0", - "code" : "should be 12 in the post state", + "// code" : "should be 12 in the post state", "code" : "{ (SSTORE 0 0x12) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json index 0f83f4a00..0b9c67ebe 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json @@ -43,7 +43,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "ordinal call should work but on second depth it has call that asks more gas than left", + "// code" : "ordinal call should work but on second depth it has call that asks more gas than left", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 200000 0x1000000000000000000000000000000000000107 0 0 0 0 0)) } ", "storage": { } @@ -51,7 +51,7 @@ "1000000000000000000000000000000000000107" : { "balance" : "0", "nonce" : "0", - "code" : "should work on EIP150", + "// code" : "should work on EIP150", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000108 0 0 0 0 0)) } ", "storage": { } @@ -59,7 +59,7 @@ "1000000000000000000000000000000000000108" : { "balance" : "0", "nonce" : "0", - "code" : "should be set in the post state", + "// code" : "should be set in the post state", "code" : "{ (SSTORE 8 (GAS))} ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json index 628daa728..df25c82db 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json @@ -44,7 +44,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "OOG Call transaction has less gas then in example above", + "// code" : "OOG Call transaction has less gas then in example above", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000113 0 0 0 0 0)) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json index 2998e4c58..eae0a016d 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json @@ -44,7 +44,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "OOG Call because call goes OOG on second level", + "// code" : "OOG Call because call goes OOG on second level", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000110 0 0 0 0 0)) } ", "storage": { } @@ -52,7 +52,7 @@ "1000000000000000000000000000000000000110" : { "balance" : "0", "nonce" : "0", - "code" : "Inner CaLL goes OOG on EIP150", + "// code" : "Inner CaLL goes OOG on EIP150", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000111 0 0 0 0 0)) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json index c2db12a53..b85eb5b9a 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json @@ -44,7 +44,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "Test gas before Create, inside create and after", + "// code" : "Test gas before Create, inside create and after", "code" : "{ (SSTORE 10 (GAS)) (MSTORE 0 0x5a60fd55) (SSTORE 11 (CREATE 0 28 4)) (SSTORE 9 (GAS)) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json index 1491e00db..a5c3947fe 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json @@ -39,7 +39,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "should work on EIP150 rules", + "// code" : "should work on EIP150 rules", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (DELEGATECALL 600000 0x1000000000000000000000000000000000000105 0 0 0 0)) }", "storage": { } @@ -47,7 +47,7 @@ "1000000000000000000000000000000000000105" : { "balance" : "0", "nonce" : "0", - "code" : "should be 12 in the post state", + "// code" : "should be 12 in the post state", "code" : "{ (SSTORE 0 0x12) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json index 27ed057d6..9d32a597b 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json @@ -105,7 +105,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "Test gasPrice of thise codes after EIP150 transition", + "// code" : "Test gasPrice of thise codes after EIP150 transition", "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)) }", "storage": { "0x00" : "0x12" diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json index a59e614a6..82d4e9f2d 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json @@ -40,7 +40,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "check gas spent on suicide known contract on EIP150", + "// code" : "check gas spent on suicide known contract on EIP150", "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[1]] (GAS) }", "storage": { } @@ -48,7 +48,7 @@ "1000000000000000000000000000000000000118" : { "balance" : "0", "nonce" : "0", - "code" : "Suicide to existing account", + "// code" : "Suicide to existing account", "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json index e40220009..66afb7600 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json @@ -58,7 +58,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "check gas spent on suicide to unknown contract on EIP150", + "// code" : "check gas spent on suicide to unknown contract on EIP150", "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000116 0 0 0 0 0) [[1]] (GAS) }", "storage": { } @@ -66,7 +66,7 @@ "1000000000000000000000000000000000000116" : { "balance" : "0", "nonce" : "0", - "code" : "Suicide to not existing account", + "// code" : "Suicide to not existing account", "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json index 3bad742c7..e1064c334 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json @@ -43,7 +43,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "check gas spent on suicide known contract on EIP150", + "// code" : "check gas spent on suicide known contract on EIP150", "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json index 150c282bd..64362ba2a 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json @@ -43,7 +43,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "check gas spent on suicide known contract on EIP150", + "// code" : "check gas spent on suicide known contract on EIP150", "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json index e8cb411d6..0bbb8cd41 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json @@ -43,7 +43,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "check gas spent on suicide known contract on EIP150", + "// code" : "check gas spent on suicide known contract on EIP150", "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json index 3170b6879..c5b3301c0 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json @@ -31,7 +31,7 @@ { "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) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)", + "// 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) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)", "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json index e979bd46c..46aa6ffc7 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json @@ -31,7 +31,7 @@ { "1000000000000000000000000000000000000000" : { "balance" : "0", - "code" : " ", + "// code" : " ", "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json index b2ca93ce4..b088a9de5 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json @@ -27,7 +27,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{ (JUMP 0xffffffff) (JUMP 0xffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "// code" : "{ (JUMP 0xffffffff) (JUMP 0xffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json index 51dbc0d87..d1fec78cf 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json @@ -49,7 +49,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "create should succeed. RETURNDATACOPY should also succeed in Byzantium.", + "// code" : "create should succeed. RETURNDATACOPY should also succeed in Byzantium.", "code" : "{ (create 0 0 (lll {(SSTORE 0 1)} 0)) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) }", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json index 0db2d7d30..eae6ddb39 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json @@ -27,7 +27,7 @@ "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "Something that fails.", + "// code" : "Something that fails.", "code" : "0xfd", "nonce" : "0x00", "storage" : { @@ -35,7 +35,7 @@ }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "CALL should fail because of an invalid instruction, and RETURNDATACOPY should also fail because of out-of-bound access. SSTORE should not be reached", + "// code" : "CALL should fail because of an invalid instruction, and RETURNDATACOPY should also fail because of out-of-bound access. SSTORE should not be reached", "code" : "{ (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }", "nonce" : "0x00", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json index 452544dd8..450641860 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json @@ -35,8 +35,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "code" : "create in init code on depth = 1024. account should not be created", - "//code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1023)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1024. account should not be created", + "//1 code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1023)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json index 7e7a8b298..690634c60 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json @@ -39,8 +39,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "code" : "create in init code on depth = 1023. account would be created", - "//code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1022)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1023. account would be created", + "//1 code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1022)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 03a554083..a274fd09b 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -142,8 +142,8 @@ } }, "transaction" : { - "// data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.", - "// data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG", + "//0 data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.", + "//1 data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG", "data" : [ "0x000000000000000000000000000000000000000000000000000000000000ea60", "0x000000000000000000000000000000000000000000000000000000000001ea60" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json index 4bd233137..02569debf 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json @@ -73,7 +73,7 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", - "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", + "// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", "code" : "{ (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE 1 17 15) [[0]] 12 }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json index 04f007cf6..ab9ebbba2 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json @@ -83,7 +83,7 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", - "code" : "!!! STRANGE: CALL works, but if called from 094... it wont work. even if gas is enough. seems to be OOG.", + "// code" : "!!! STRANGE: CALL works, but if called from 094... it wont work. even if gas is enough. seems to be OOG.", "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json index ad2b6a9a4..049a8cad0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json @@ -77,7 +77,7 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 11 }", + "// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 11 }", "code" : "0x600160005560016000fd6011600155", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json index 90f9ba163..c0d0a370e 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json @@ -384,8 +384,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "simple calls", - "code" : "call -> callA-> revert | callB -> revert | some code * and OOG scenarious", + "//0 code" : "simple calls", + "//1 code" : "call -> callA-> revert | callB -> revert | some code * and OOG scenarious", "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json index cdd9e834a..3ac0e44cb 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json @@ -73,28 +73,28 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract B ", - "code" : "{", - "code" : " function callback(address x)", - "code" : " {", - "code" : " x.call(bytes4(sha3('stor()'))); ", - "code" : " }", - "code" : "}", - "code" : "", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " B caller = new B();", - "code" : " caller.callback(this);", - "code" : " s = 13;", - "code" : " s2 = 14;", - "code" : " return true;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//00 code" : "contract B ", + "//01 code" : "{", + "//02 code" : " function callback(address x)", + "//03 code" : " {", + "//04 code" : " x.call(bytes4(sha3('stor()'))); ", + "//05 code" : " }", + "//06 code" : "}", + "//07 code" : "", + "//08 code" : "contract A {", + "//09 code" : " int s;", + "//0a code" : " int s2;", + "//0b code" : " function run() returns (bool){", + "//0c code" : " B caller = new B();", + "//0d code" : " caller.callback(this);", + "//0e code" : " s = 13;", + "//0f code" : " s2 = 14;", + "//10 code" : " return true;", + "//11 code" : " }", + "//12 code" : " function stor() {", + "//13 code" : " s = 12;", + "//14 code" : " }", + "//15 code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json index a04132332..37977ff09 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json @@ -72,27 +72,27 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract B ", - "code" : "{", - "code" : " function callback(address x)", - "code" : " {", - "code" : " x.call(bytes4(sha3('stor()'))); ", - "code" : " }", - "code" : "}", - "code" : "", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " B caller = new B();", - "code" : " caller.callback(this);", - "code" : " s2 = 13;", - "code" : " return true;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//00 code" : "contract B ", + "//01 code" : "{", + "//02 code" : " function callback(address x)", + "//03 code" : " {", + "//04 code" : " x.call(bytes4(sha3('stor()'))); ", + "//05 code" : " }", + "//06 code" : "}", + "//07 code" : "", + "//08 code" : "contract A {", + "//09 code" : " int s;", + "//0a code" : " int s2;", + "//0b code" : " function run() returns (bool){", + "//0c code" : " B caller = new B();", + "//0d code" : " caller.callback(this);", + "//0e code" : " s2 = 13;", + "//0f code" : " return true;", + "//10 code" : " }", + "//11 code" : " function stor() {", + "//12 code" : " s = 12;", + "//13 code" : " }", + "//14 code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json index b273397e0..ff15a7fb5 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json @@ -71,18 +71,18 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " stor();", - "code" : " s = 13;", - "code" : " s2 = 14;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//0 code" : "contract A {", + "//1 code" : " int s;", + "//2 code" : " int s2;", + "//3 code" : " function run() returns (bool){", + "//4 code" : " stor();", + "//5 code" : " s = 13;", + "//6 code" : " s2 = 14;", + "//7 code" : " }", + "//8 code" : " function stor() {", + "//9 code" : " s = 12;", + "//a code" : " }", + "//b code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json index 20ddd970a..2394858f0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json @@ -72,19 +72,19 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " int s3;", - "code" : " function run() returns (bool){", - "code" : " stor();", - "code" : " s2 = 13;", - "code" : " s3 = 14;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//0 code" : "contract A {", + "//1 code" : " int s;", + "//2 code" : " int s2;", + "//3 code" : " int s3;", + "//4 code" : " function run() returns (bool){", + "//5 code" : " stor();", + "//6 code" : " s2 = 13;", + "//7 code" : " s3 = 14;", + "//8 code" : " }", + "//9 code" : " function stor() {", + "//a code" : " s = 12;", + "//b code" : " }", + "//c code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl01-0100Filler.json b/src/GeneralStateTestsFiller/stShift/shl01-0100Filler.json index 5f8fbb2c3..666ab60d7 100644 --- a/src/GeneralStateTestsFiller/stShift/shl01-0100Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl01-0100Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 1; PUSH2 0x0100; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 1; PUSH2 0x0100; SHL; PUSH1 0; SSTORE", "code" : "0x60016101001b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl01-0101Filler.json b/src/GeneralStateTestsFiller/stShift/shl01-0101Filler.json index 3e214a599..8948f040e 100644 --- a/src/GeneralStateTestsFiller/stShift/shl01-0101Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl01-0101Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 1; PUSH2 0x0101; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 1; PUSH2 0x0101; SHL; PUSH1 0; SSTORE", "code" : "0x60016101011b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl01-ffFiller.json b/src/GeneralStateTestsFiller/stShift/shl01-ffFiller.json index e0ef17d1a..faf290c7d 100644 --- a/src/GeneralStateTestsFiller/stShift/shl01-ffFiller.json +++ b/src/GeneralStateTestsFiller/stShift/shl01-ffFiller.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 1; PUSH1 0xff; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 1; PUSH1 0xff; SHL; PUSH1 0; SSTORE", "code" : "0x600160ff1b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl01Filler.json b/src/GeneralStateTestsFiller/stShift/shl01Filler.json index d1ef0da09..d8c3c17e3 100644 --- a/src/GeneralStateTestsFiller/stShift/shl01Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl01Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 0; PUSH1 1; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 0; PUSH1 1; SHL; PUSH1 0; SSTORE", "code" : "0x600060011b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl10Filler.json b/src/GeneralStateTestsFiller/stShift/shl10Filler.json index 3b9375078..02ddb08da 100644 --- a/src/GeneralStateTestsFiller/stShift/shl10Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl10Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 1; PUSH1 0; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 1; PUSH1 0; SHL; PUSH1 0; SSTORE", "code" : "0x600160001b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl11Filler.json b/src/GeneralStateTestsFiller/stShift/shl11Filler.json index e7932e846..4e27aa975 100644 --- a/src/GeneralStateTestsFiller/stShift/shl11Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl11Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH1 1; PUSH1 1; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH1 1; PUSH1 1; SHL; PUSH1 0; SSTORE", "code" : "0x600160011b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl_-1_0Filler.json b/src/GeneralStateTestsFiller/stShift/shl_-1_0Filler.json index c9c0196b7..2d92a0d36 100644 --- a/src/GeneralStateTestsFiller/stShift/shl_-1_0Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl_-1_0Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x00; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x00; SHL; PUSH1 0; SSTORE", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl_-1_1Filler.json b/src/GeneralStateTestsFiller/stShift/shl_-1_1Filler.json index b19bf32f4..5fe85cbf2 100644 --- a/src/GeneralStateTestsFiller/stShift/shl_-1_1Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl_-1_1Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x01; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x01; SHL; PUSH1 0; SSTORE", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl_-1_255Filler.json b/src/GeneralStateTestsFiller/stShift/shl_-1_255Filler.json index 9b9050561..6febc6e68 100644 --- a/src/GeneralStateTestsFiller/stShift/shl_-1_255Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl_-1_255Filler.json @@ -75,7 +75,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0xff; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0xff; SHL; PUSH1 0; SSTORE", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl_-1_256Filler.json b/src/GeneralStateTestsFiller/stShift/shl_-1_256Filler.json index 9f330f76e..212975f1b 100644 --- a/src/GeneralStateTestsFiller/stShift/shl_-1_256Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl_-1_256Filler.json @@ -73,7 +73,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH2 0x0100; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH2 0x0100; SHL; PUSH1 0; SSTORE", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stShift/shl_2^255-1_1Filler.json b/src/GeneralStateTestsFiller/stShift/shl_2^255-1_1Filler.json index c4b0b6e90..b97137908 100644 --- a/src/GeneralStateTestsFiller/stShift/shl_2^255-1_1Filler.json +++ b/src/GeneralStateTestsFiller/stShift/shl_2^255-1_1Filler.json @@ -73,7 +73,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "PUSH32 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x01; SHL; PUSH1 0; SSTORE", + "// code" : "PUSH32 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x01; SHL; PUSH1 0; SSTORE", "code" : "0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011b600055", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json b/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json index b14498670..1180dda6d 100644 --- a/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json @@ -33,8 +33,8 @@ } }, "transaction" : { - "// data" : "Data is corrupted. Number of elements pop'ed from the stack is < then pushed", - "// data" : { + "//0 data" : "Data is corrupted. Number of elements pop'ed from the stack is < then pushed", + "//1 data" : { "0x6002600101600055" : "{[[0]](ADD 1 2)}" }, "data" : [ diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json index 89c0d33ad..9babdb9dd 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json @@ -40,7 +40,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{ (MSTORE 1 1) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json index fadc575ee..ea85195d7 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json @@ -58,7 +58,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { @@ -66,7 +66,7 @@ }, "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { @@ -74,7 +74,7 @@ }, "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{ (MSTORE 1 1) }", "nonce" : "0", "storage" : { @@ -82,7 +82,7 @@ }, "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{(MSTORE 1 1) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json index 0e17db365..6c92cdc9c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json @@ -40,7 +40,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{[[1]]12}", "nonce" : "0", "storage" : { @@ -48,7 +48,7 @@ }, "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", + "// code" : "This indicates that a call from transaction was initiated", "code" : "{ (MSTORE 1 1) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json index 08f5f29be..87ce19b50 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json @@ -49,7 +49,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ [[0]]12 (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", + "// code" : "{ [[0]]12 (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}", "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (STATICCALL 60000 (SLOAD 1) 0 0 0 0) [[100]] (GAS) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json index 9ee79f5e6..2ff2dd54e 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json @@ -77,8 +77,8 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", - "code" : "Staticcall goes oog and eats 600k gas", + "//0 code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", + "//1 code" : "Staticcall goes oog and eats 600k gas", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000103 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) }", "storage": { } @@ -86,7 +86,7 @@ "1000000000000000000000000000000000000103" : { "balance" : "0", "nonce" : "0", - "code" : "should be 12 in the post state", + "// code" : "should be 12 in the post state", "code" : "{ (SSTORE 0 0x12) } ", "storage": { } @@ -94,8 +94,8 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", - "code" : "Staticcall goes oog and eats 600k gas", + "//0 code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.", + "//1 code" : "Staticcall goes oog and eats 600k gas", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 600000 0x2000000000000000000000000000000000000103 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json index 09a0cc6e1..f485c0412 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json @@ -95,7 +95,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "ordinal call should work but on second depth it has call that asks more gas than left", + "// code" : "ordinal call should work but on second depth it has call that asks more gas than left", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 200000 0x1000000000000000000000000000000000000107 0 0 0 0)) } ", "storage": { } @@ -110,7 +110,7 @@ "1000000000000000000000000000000000000108" : { "balance" : "0", "nonce" : "0", - "code" : "should be set in the post state", + "// code" : "should be set in the post state", "code" : "{ (SSTORE 8 (GAS))} ", "storage": { } @@ -118,7 +118,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "ordinal call should work but on second depth it has call that asks more gas than left", + "// code" : "ordinal call should work but on second depth it has call that asks more gas than left", "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 200000 0x2000000000000000000000000000000000000107 0 0 0 0)) } ", "storage": { } @@ -133,7 +133,7 @@ "2000000000000000000000000000000000000108" : { "balance" : "0", "nonce" : "0", - "code" : "should be set in the post state", + "// code" : "should be set in the post state", "code" : "{ (MSTORE 8 (GAS))} ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json index 6dbec98aa..1630aa1ce 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json @@ -38,7 +38,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "OOG Call transaction has less gas then in example above", + "// code" : "OOG Call transaction has less gas then in example above", "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 0x1000000000000000000000000000000000000113 0 32 0 0) [[ 1 ]] (GAS) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json index 1be6aa0f5..ca89ad48d 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json @@ -44,7 +44,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "OOG Call because call goes OOG on second level", + "// code" : "OOG Call because call goes OOG on second level", "code" : "{ (SSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000110 0 0 0 0)) [[ 10 ]] (GAS) } ", "storage": { } @@ -52,7 +52,7 @@ "1000000000000000000000000000000000000110" : { "balance" : "0", "nonce" : "0", - "code" : "Inner CaLL goes OOG on EIP150", + "// code" : "Inner CaLL goes OOG on EIP150", "code" : "{ (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000111 0 0 0 0)) } ", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json index 5e90de689..5d6298bc1 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json @@ -58,7 +58,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json index abca1bfcc..6f59e78f9 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json @@ -112,7 +112,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json index a93a469ae..04b3223c1 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json @@ -84,7 +84,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ [[1]] (STATICCALL 100000 0x1000000000000000000000000000000000000001 0 0 0 0) [[2]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (ORIGIN) [[6]] (ADDRESS) }", "storage": { } @@ -99,7 +99,7 @@ "1000000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json index 50657c599..9dd9bed32 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json @@ -112,7 +112,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ [[1]] (CALL 250000 (CALLDATALOAD 0) 0 0 0 0 0) }", "storage": { } @@ -162,7 +162,7 @@ "b000000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xa000000000000000000000000000000000000002 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xb000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }", "storage": { } @@ -170,7 +170,7 @@ "c300000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x3000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc300000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }", "storage": { } @@ -178,7 +178,7 @@ "c400000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x4000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc400000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }", "storage": { } @@ -186,7 +186,7 @@ "c500000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x5000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc500000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json index c66eb4a5c..669a84783 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json @@ -76,7 +76,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "storage": { } @@ -91,7 +91,7 @@ "1000000000000000000000000000000000000002" : { "balance" : "0", "nonce" : "0", - "code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", + "// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall", "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000003 0 0 0 0) }", "storage": { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json index e4d101902..90421070c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json @@ -34,8 +34,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "//code" : "create in init code on depth = 1024. account should not be created", - "//code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1023)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (MLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1024. account should not be created", + "//1 code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1023)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (MLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103ff60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600051106051575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json index a52aebd66..648ec564e 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json @@ -37,8 +37,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "//code" : "create in init code on depth = 1023. account would be created", - "//code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1022)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (CALLDATALOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1023. account would be created", + "//1 code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1022)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (CALLDATALOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103fe60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600035106051575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json index f0af42dc8..cf426c2f3 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json @@ -52,7 +52,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json index 31629adef..91b5c78ce 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json @@ -33,8 +33,8 @@ }, "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ (STATICCALL 100000 (ADDRESS) 0 0 0 0) } ", - "code" : "{ (MSTORE 0 0x600060006000600030620186a0fa) (RETURN 18 14) }", + "//0 code" : "{ (STATICCALL 100000 (ADDRESS) 0 0 0 0) } ", + "//1 code" : "{ (MSTORE 0 0x600060006000600030620186a0fa) (RETURN 18 14) }", "code" : "{ (MSTORE 0 0x6d600060006000600030620186a0fa600052600e6012f3) [[ 0 ]] (CREATE 1 9 23) [[ 1 ]] (STATICCALL 30000 (SLOAD 0) 0 0 0 0) [[ 2 ]] (GAS) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json index e48d422db..cbe331b46 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json @@ -47,13 +47,6 @@ "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "1000000000000000000", - "code" : "{ (CALLCODE 150000 0x1000000000000000000000000000000000000002 0 0 0 0 0) }", - "nonce" : "0", - "storage" : { - } - }, "1000000000000000000000000000000000000003" : { "balance" : "1000000000000000000", "code" : "{ (DELEGATECALL 150000 0x1000000000000000000000000000000000000002 0 0 0 0) }", diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json index 89f175581..e8488a45d 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json @@ -24,7 +24,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "nonce" : "0", "storage" : { @@ -32,7 +32,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ (MSTORE 0 (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json index ecd00caf9..334584a8a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json @@ -24,7 +24,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "nonce" : "0", "storage" : { @@ -32,7 +32,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ (MSTORE 0 (CALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json index e9acc0602..1f70fc96a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json @@ -24,7 +24,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "Static call succeed", + "// code" : "Static call succeed", "code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "nonce" : "0", "storage" : { @@ -32,7 +32,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ (MSTORE 0 (DELEGATECALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json index e8d242cc7..c187d8c55 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json @@ -24,7 +24,7 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }", "nonce" : "0", "storage" : { @@ -32,7 +32,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "1000000000000000000", - "code" : "Static call success", + "// code" : "Static call success", "code" : "{ (MSTORE 0 (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json index 1f1b1f39b..b2720e325 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json @@ -52,7 +52,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "code" : "{ [[0]] (GAS) }", + "// code" : "{ [[0]] (GAS) }", "code" : "{ (MSTORE 0 0x5a60fd55) (CREATE 0 28 4)}", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json index 31e23b0f4..031fb0d44 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json @@ -17,9 +17,6 @@ }, "network" : [">=Byzantium"], "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "shouldnotexist" : "1" }, diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json index d3f404d42..63244517b 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json @@ -17,9 +17,6 @@ }, "network" : [">=Byzantium"], "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "shouldnotexist" : "1" }, diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json index cac5c4212..a06bc18ff 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json @@ -662,27 +662,27 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "code" : " 00-32 : x", - "code" : " 32-64 : y", - "code" : " 64-96 : a", - "code" : " 96-128 : b", - "code" : "128-160 : x2", - "code" : "160-192 : y2", - "code" : "192-224 : z", + "//00 code" : " 00-32 : x", + "//01 code" : " 32-64 : y", + "//02 code" : " 64-96 : a", + "//03 code" : " 96-128 : b", + "//04 code" : "128-160 : x2", + "//05 code" : "160-192 : y2", + "//06 code" : "192-224 : z", - "code" : "300-332 : x+a", - "code" : "332-364 : y+b", - "code" : "400-432 : x2*z", - "code" : "432-464 : y2*z", + "//07 code" : "300-332 : x+a", + "//08 code" : "332-364 : y+b", + "//09 code" : "400-432 : x2*z", + "//0a code" : "432-464 : y2*z", - "code" : " [[0]] : add(xy + ab)", - "code" : " [[1]] : mul(x2y2 * z)", - "code" : " [[2]] : (x + a) == (x2 * z)", - "code" : " [[3]] : (y + b) == (y2 * z)", - "code" : " [[0a]] : x + a", - "code" : " [[0b]] : y + b", - "code" : " [[14]] : x2 * z", - "code" : " [[15]] : y2 * z", + "//0b code" : " [[0]] : add(xy + ab)", + "//0c code" : " [[1]] : mul(x2y2 * z)", + "//0d code" : " [[2]] : (x + a) == (x2 * z)", + "//0e code" : " [[3]] : (y + b) == (y2 * z)", + "//0f code" : " [[0a]] : x + a", + "//10 code" : " [[0b]] : y + b", + "//11 code" : " [[14]] : x2 * z", + "//12 code" : " [[15]] : y2 * z", "code" : "{(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64) [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300) [[11]] (MLOAD 332) [[20]] (MLOAD 400) [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json index c04526a04..643af091d 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json @@ -302,27 +302,27 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "code" : " 00-32 : x", - "code" : " 32-64 : y", - "code" : " 64-96 : a", - "code" : " 96-128 : b", - "code" : "128-160 : x2", - "code" : "160-192 : y2", - "code" : "192-224 : z", + "//00 code0" : " 00-32 : x", + "//01 code" : " 32-64 : y", + "//02 code" : " 64-96 : a", + "//03 code" : " 96-128 : b", + "//04 code" : "128-160 : x2", + "//05 code" : "160-192 : y2", + "//06 code" : "192-224 : z", - "code" : "300-332 : x+a", - "code" : "332-364 : y+b", - "code" : "400-432 : x2*z", - "code" : "432-464 : y2*z", + "//07 code" : "300-332 : x+a", + "//08 code" : "332-364 : y+b", + "//09 code" : "400-432 : x2*z", + "//0a code" : "432-464 : y2*z", - "code" : " [[0]] : add(xy + ab)", - "code" : " [[1]] : mul(x2y2 * z)", - "code" : " [[2]] : (x + a) == (x2 * z)", - "code" : " [[3]] : (y + b) == (y2 * z)", - "code" : " [[0a]] : x + a", - "code" : " [[0b]] : y + b", - "code" : " [[14]] : x2 * z", - "code" : " [[15]] : y2 * z", + "//0b code" : " [[0]] : add(xy + ab)", + "//0c code" : " [[1]] : mul(x2y2 * z)", + "//0d code" : " [[2]] : (x + a) == (x2 * z)", + "//0e code" : " [[3]] : (y + b) == (y2 * z)", + "//0f code" : " [[0a]] : x + a", + "//10 code" : " [[0b]] : y + b", + "//11 code" : " [[14]] : x2 * z", + "//12 code" : " [[15]] : y2 * z", "code" : "{(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64) [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300) [[11]] (MLOAD 332) [[20]] (MLOAD 400) [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}", "nonce" : "0", |