From cb9c7e552d816255d3b97a20b8fd7f1d20832b05 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Mon, 19 Mar 2018 16:01:14 +0100 Subject: Remove duplicate properties from fillers --- .../stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json | 2 +- .../stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json | 2 +- .../stCreateTest/CREATE_ContractSuicideDuringInitFiller.json | 2 +- .../CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json | 2 +- .../CREATE_ContractSuicideDuringInit_WithValueFiller.json | 2 +- .../CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json | 2 +- .../stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json | 2 +- .../CREATE_EContractCreateNEContractInInitOOG_TrFiller.json | 2 +- .../stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json | 2 +- .../CREATE_empty000CreateinInitCode_TransactionFiller.json | 2 +- .../stHomesteadSpecific/createContractViaContractFiller.json | 2 +- .../stMemoryStressTest/CALLCODE_Bounds2Filler.json | 2 +- .../stMemoryStressTest/CALLCODE_Bounds3Filler.json | 2 +- .../stMemoryStressTest/CALLCODE_BoundsFiller.json | 2 +- .../stMemoryStressTest/CALL_Bounds2Filler.json | 2 +- .../stMemoryStressTest/CALL_Bounds2aFiller.json | 2 +- src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json | 2 +- .../stMemoryStressTest/CREATE_Bounds2Filler.json | 2 +- .../stMemoryStressTest/CREATE_BoundsFiller.json | 2 +- .../stMemoryStressTest/DELEGATECALL_Bounds2Filler.json | 2 +- .../stMemoryStressTest/DELEGATECALL_BoundsFiller.json | 2 +- .../stMemoryStressTest/MLOAD_Bounds3Filler.json | 2 +- .../stMemoryStressTest/MLOAD_BoundsFiller.json | 2 +- .../stMemoryStressTest/MSTORE_Bounds2Filler.json | 2 +- .../stMemoryStressTest/MSTORE_Bounds2aFiller.json | 2 +- .../stMemoryStressTest/static_CALL_Bounds2Filler.json | 2 +- .../stMemoryStressTest/static_CALL_Bounds2aFiller.json | 2 +- .../stMemoryStressTest/static_CALL_BoundsFiller.json | 2 +- src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json | 2 +- .../stReturnDataTest/returndatacopy_initial_256Filler.json | 2 +- src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json | 2 +- .../stRevertTest/RevertDepthCreateAddressCollisionFiller.json | 4 ++-- .../stRevertTest/RevertDepthCreateOOGFiller.json | 4 ++-- .../stRevertTest/RevertOpcodeInInitFiller.json | 2 +- .../stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json | 2 +- .../stRevertTest/RevertPrefoundCallFiller.json | 2 +- .../stRevertTest/RevertPrefoundCallOOGFiller.json | 2 +- .../stRevertTest/RevertPrefoundEmptyCallFiller.json | 2 +- .../stRevertTest/RevertPrefoundEmptyCallOOGFiller.json | 2 +- .../stRevertTest/RevertPrefoundEmptyFiller.json | 2 +- .../stRevertTest/RevertPrefoundEmptyOOGFiller.json | 2 +- src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.json | 2 +- src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.json | 2 +- .../stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json | 2 +- .../stRevertTest/RevertRemoteSubCallStorageOOGFiller.json | 2 +- .../stRevertTest/RevertSubCallStorageOOG2Filler.json | 2 +- .../stRevertTest/RevertSubCallStorageOOGFiller.json | 2 +- src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json | 4 ++-- src/GeneralStateTestsFiller/stStackTests/stackOverflowDUPFiller.json | 2 +- src/GeneralStateTestsFiller/stStackTests/stackOverflowFiller.json | 2 +- .../stStackTests/stackOverflowM1DUPFiller.json | 2 +- src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json | 2 +- .../stStackTests/stackOverflowM1PUSHFiller.json | 2 +- src/GeneralStateTestsFiller/stStackTests/stackOverflowPUSHFiller.json | 2 +- .../stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json | 2 +- ...ic_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json | 2 +- .../static_CREATE_ContractSuicideDuringInit_WithValueFiller.json | 2 +- .../stStaticCall/static_CheckOpcodes2Filler.json | 2 +- .../stStaticCall/static_CheckOpcodes3Filler.json | 2 +- .../stStaticCall/static_CheckOpcodes4Filler.json | 2 +- .../stStaticCall/static_CheckOpcodes5Filler.json | 2 +- .../stStaticCall/static_CheckOpcodesFiller.json | 2 +- .../stStaticCall/static_RevertDepth2Filler.json | 2 +- .../stTransactionTest/RefundOverflow2Filler.json | 2 +- src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json | 2 +- src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json | 2 +- src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json | 2 +- src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json | 2 +- 68 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json index adab3356e..26ba193fb 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json @@ -100,7 +100,7 @@ } }, "transaction" : { - "data" : "run()", + "// data" : "run()", "data" : [ "0xc0406226" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json index 04b3aa70e..5d458031c 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json @@ -36,7 +36,7 @@ } }, "transaction" : { - "data" : "{ (SSTORE 0 0xff) }", + "// data" : "{ (SSTORE 0 0xff) }", "data" : [ "0x60ff600055" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json index 11604a960..ce09e3c95 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json @@ -67,7 +67,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json index b38e63b43..c06636996 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json @@ -87,7 +87,7 @@ } }, "transaction" : { - "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", + "// data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json index fbef6c9e2..6c8fda8ed 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json @@ -67,7 +67,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json index fe27e4870..279e8b7f8 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json @@ -157,7 +157,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT (ADDRESS))}", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT (ADDRESS))}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005230ff" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json index f54d6e7a3..35b3d95ef 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json @@ -83,7 +83,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 32) }", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 32) }", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150602060006000f0" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json index 1dc236c97..62f065ee8 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json @@ -117,7 +117,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json index 59517e36c..4c5843745 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json @@ -92,7 +92,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json index af1fd2462..56d147a85 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json @@ -96,7 +96,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 0) }", + "// data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 0) }", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600060006000f0" ], diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json index f713a067d..c9048c80d 100644 --- a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json +++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json @@ -14,7 +14,7 @@ "network" : ["Homestead", ">=Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "21000 + Code Execution + Contract Creation", + "// balance" : "21000 + Code Execution + Contract Creation", "balance" : "46991", "nonce" : "1" } diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json index 507ca1431..3170b6879 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json index fe22a3223..e979bd46c 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json index b2740c89c..d28c6c326 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json index 04ce2e50e..2527be5f2 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json index bdaf23606..09cd6abac 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json index 232f5576d..0a5a271cd 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json index fcb9dbdb4..7e19d7cfc 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json index 07431b54a..c35f2214f 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json index eb3f52d6a..01bc48b10 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json index 7ab58cd49..c53edcf6f 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json index 9c0f7a55b..dd8153f5e 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json index 249a9d966..96e27a4fd 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json index 13727ffe9..ba05930fa 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json index 1e7486752..4bf28aef3 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "//currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json index e751fd1b5..9ca21dd6e 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json index 34e4fe561..4f7314b2d 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "// currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json index 656864eec..868c2f22a 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json @@ -3,7 +3,7 @@ "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "2^63-1", + "//currentGasLimit" : "2^63-1", "currentGasLimit" : "0x7fffffffffffffff", "currentNumber" : "1", "currentTimestamp" : "1000", diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json index 1e47922f4..46edbf7e1 100644 --- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json +++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json @@ -251,7 +251,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "(BASE**EXPONENT) % MODULUS", "0 - example: 3**(2**256 - 2**32 - 978) % (2**256 - 2**32 - 977).", "1 - Would be parsed as a base of 0, exponent of 2**256 - 2**32 - 978 and modulus of 2**256 - 2**32 - 978, and so would return 0. Notice how if the length_of_BASE is 0, then it does not interpret any data as the base, instead immediately interpreting the next 32 bytes as length_of_EXPONENT.", diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json index a9265823a..576b9c026 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json @@ -42,7 +42,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "0: the sum of RETURNDATACOPY's first and third arguments is 2^256", "1: one smaller", "2: one bigger", "anyway the RETURNDATACOPY should cause an exceptional halt." diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json index 62cfa9ce1..049099b06 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.json @@ -87,7 +87,7 @@ } }, "transaction" : { - "data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.", + "// data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 48c6dcf1a..03a554083 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", + "// 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", "data" : [ "0x000000000000000000000000000000000000000000000000000000000000ea60", "0x000000000000000000000000000000000000000000000000000000000001ea60" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json index a17ef9c54..255518bc7 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json @@ -157,8 +157,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", + "//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", "data" : [ "0x000000000000000000000000000000000000000000000000000000000000ea60", "0x000000000000000000000000000000000000000000000000000000000001ea60" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json index ab64c1de0..083e3ae4f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json @@ -101,7 +101,7 @@ } }, "transaction" : { - "data" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", + "// data" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", "data" : [ "0x600160005560016000fd6011600155" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json index ca650e856..58fc63354 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json @@ -104,7 +104,7 @@ } }, "transaction" : { - "data" : "{ [[0]] 1 (REVERT 0 24600) [[1]] 12 }", + "// data" : "{ [[0]] 1 (REVERT 0 24600) [[1]] 12 }", "data" : [ "0x600160005560016000fd6011600155" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallFiller.json index 6e6ad2da5..a7c6e4e93 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallFiller.json @@ -86,7 +86,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallOOGFiller.json index ae1d04147..1202cc928 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallOOGFiller.json @@ -52,7 +52,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallFiller.json index abdeb3eaf..56950a489 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallFiller.json @@ -82,7 +82,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallOOGFiller.json index 107cbb940..ecbdb63af 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallOOGFiller.json @@ -52,7 +52,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyFiller.json index 6e44439cf..7a064fa26 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyFiller.json @@ -86,7 +86,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyOOGFiller.json index 739613c5f..758af9c04 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyOOGFiller.json @@ -52,7 +52,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.json index 965988417..ce905ff10 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.json @@ -86,7 +86,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.json index d6e2541d0..7a81abd62 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.json @@ -52,7 +52,7 @@ } }, "transaction" : { - "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", + "// data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json index 2306da4e7..cdd9e834a 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json @@ -102,7 +102,7 @@ } }, "transaction" : { - "data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", + "// data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", "data" : [ "0xc0406226" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json index 1c88a5579..a04132332 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json @@ -100,7 +100,7 @@ } }, "transaction" : { - "data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", + "// data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", "data" : [ "0xc0406226" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json index b813d8f68..b273397e0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json @@ -90,7 +90,7 @@ } }, "transaction" : { - "data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", + "// data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", "data" : [ "0xc0406226" ], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json index 513f1f74b..20ddd970a 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json @@ -92,7 +92,7 @@ } }, "transaction" : { - "data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", + "// data" : "contract A calls itself. In the sub-call, storage is modified, the calls returns successfully. After that, storage is modified again and then an exception occurs. 0xc0406226 == sha(run())", "data" : [ "0xc0406226" ], diff --git a/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json b/src/GeneralStateTestsFiller/stStackTests/shallowStackFiller.json index 04658714b..b14498670 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" : { + "// data" : "Data is corrupted. Number of elements pop'ed from the stack is < then pushed", + "// data" : { "0x6002600101600055" : "{[[0]](ADD 1 2)}" }, "data" : [ diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowDUPFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowDUPFiller.json index 49876c1a7..b90e3c3cb 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowDUPFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowDUPFiller.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1025 times DUP" ], "data" : [ diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowFiller.json index 4eba90671..cf99ffa4c 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowFiller.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1025 times ADDRESS", "1025 times ORIGIN", "1025 times CALLER", diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json index b3ab601f6..cec309238 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1025 times DUP" ], "data" : [ diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json index cd0509481..18edd057f 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1024 times ADDRESS", "1024 times ORIGIN", "1024 times CALLER", diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json index d57cf6c07..d4d563738 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1025 times PUSH", "1025 times DUP" ], diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowPUSHFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowPUSHFiller.json index 70536c2a3..80bdfc7e2 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowPUSHFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowPUSHFiller.json @@ -40,7 +40,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "1025 times PUSH", "1025 times DUP" ], diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json index 3ca080929..89c0d33ad 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json @@ -69,7 +69,7 @@ } }, "transaction" : { - "data" : "{(STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "// data" : "{(STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", "0x600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json index f3d31a080..fadc575ee 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json @@ -90,7 +90,7 @@ } }, "transaction" : { - "data" : "{ (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (STATICCALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[0]]11 (RETURN 18 14)}", + "// data" : "{ (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (STATICCALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[0]]11 (RETURN 18 14)}", "data" : [ "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa50600b600055600e6012f3", "0x600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa50600b600055600e6012f3" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json index 59a693efa..0e17db365 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json @@ -56,7 +56,7 @@ } }, "transaction" : { - "data" : "{(STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "// data" : "{(STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", "0x600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json index 8da711b9f..5e90de689 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json @@ -135,7 +135,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "10 - staticcall -> call -> check", "20 - staticcall -> call with value (oogs here because call has value) -> check", "30 - staticcall -> callcode -> check", diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json index a62558e7d..abca1bfcc 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json @@ -196,7 +196,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "10 - staticcall -> call -> check", "20 - staticcall -> call with value (oogs here because call has value) -> check", "30 - staticcall -> callcode -> check", diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json index 4bf9e49c1..a93a469ae 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json @@ -106,7 +106,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "0 - staticcall -> do smth | staticcall -> check | check " ], "data" : [ diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json index e0e413b62..50657c599 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json @@ -193,7 +193,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "0 - call | callcode | delegatecall -> staticcall -> check " ], "data" : [ diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json index 3eb8be028..c66eb4a5c 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json @@ -105,7 +105,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "0 - staticcall -> check", "1 - staticcall -> staticcall -> check" ], diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json index 386f14266..87d82243b 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json @@ -87,7 +87,7 @@ } }, "transaction" : { - "data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.", + "// data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.", "data" : [ "" ], diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json index ac8e615ae..c90e79fda 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json @@ -38,7 +38,7 @@ "data" : [ "" ], - "gasLimit" : "(2**63+399)/20", + "// gasLimit" : "(2**63+399)/20", "gasLimit" : [ "461168601842738810" ], diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json index 8e7b05ba3..b1faf480f 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json @@ -243,7 +243,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "(1,2) + (1,2)", "(0,0) + (0,0)", "(x,x) + (invalid)", diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json index 2203c860b..ef6daa33e 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json @@ -258,7 +258,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "(1,2) + (1,2)", "(0,0) + (0,0)", "(x,x) + (invalid)", diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json index 5f56135a7..cac5c4212 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json @@ -691,7 +691,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "[0] (x,y) + (x,y) == (x,y) * 2", "[1] (x,y) + (x,y) + (x,y) == (x,y) * 3", "[2] (-x, -y) + (x,y) == (x,y) * 0", diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json index 7c6c5e2bf..c04526a04 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json @@ -331,7 +331,7 @@ } }, "transaction" : { - "data" : [ + "// data" : [ "(x,y) + (x,y) == (x,y) * 2", "(x,y) + (x,y) + (x,y) == (x,y) * 3", "(-x, -y) + (x,y) == (x,y) * 0", -- cgit v1.2.3