diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2018-03-22 18:31:14 +0800 |
|---|---|---|
| committer | Yoichi Hirai <i@yoichihirai.com> | 2018-03-22 18:31:14 +0800 |
| commit | 8704ccb8cdf34e71fa8f450bc83bb5d92f198acc (patch) | |
| tree | 3a61bb37e41ec5d5888efcf0fd4e25bb08d90ad5 /src | |
| parent | 80bc4e1d6aed9cfd92938c42c976997d5d05bf47 (diff) | |
| download | tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.gz tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.bz2 tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.lz tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.xz tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.zst tangerine-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.zip | |
Rename duplicated keys in filler JSON files
Diffstat (limited to 'src')
79 files changed, 247 insertions, 260 deletions
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", |