From adaa3459f1f381370d56a4449927da97a28ad731 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Thu, 5 Oct 2017 19:44:38 +0300 Subject: fix test fillers --- ...deInCallsOnNonEmptyReturnData_d0g0v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d0g1v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d1g0v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d1g1v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d2g0v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d2g1v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d3g0v0Filler.json | 2 +- ...deInCallsOnNonEmptyReturnData_d3g1v0Filler.json | 2 +- .../bcHomesteadToDao/DaoTransactionsFiller.json | 28 +++---- ...s_EmptyTransactionAndForkBlocksAheadFiller.json | 4 +- .../DaoTransactions_UncleExtradataFiller.json | 4 +- .../DaoTransactions_XBlockm1Filler.json | 4 +- .../EIP150TransitionFiller.json | 2 +- .../bcExploitTest/DelegateCallSpamFiller.json | 4 +- .../bcExploitTest/ShanghaiLoveFiller.json | 2 +- .../stAttackTest/CrashingTransactionFiller.json | 6 +- .../stCallCodes/callcodeDynamicCodeFiller.json | 8 +- ...callcodeInInitcodeToExistingContractFiller.json | 2 +- .../stCreateTest/CreateCollisionToEmptyFiller.json | 2 +- .../stEIP158Specific/EXP_EmptyFiller.json | 72 +++++++++--------- ...copy_0_0_following_successful_createFiller.json | 2 +- ...ndatacopy_following_too_big_transferFiller.json | 6 +- .../RevertDepthCreateAddressCollisionFiller.json | 28 +++---- .../stRevertTest/RevertDepthCreateOOGFiller.json | 40 +++++----- .../stRevertTest/RevertOpcodeCallsFiller.json | 2 +- .../stSolidityTest/AmbiguousMethodFiller.json | 34 ++++----- .../stSolidityTest/CallInfiniteLoopFiller.json | 34 ++++----- .../CallLowLevelCreatesSolidityFiller.json | 52 ++++++------- .../stSolidityTest/CallRecursiveMethodsFiller.json | 34 ++++----- .../stSolidityTest/ContractInheritanceFiller.json | 74 +++++++++---------- .../CreateContractFromMethodFiller.json | 50 ++++++------- ...rsiveCreateContractsCreate4ContractsFiller.json | 82 ++++++++++----------- .../RecursiveCreateContractsFiller.json | 82 ++++++++++----------- .../TestBlockAndTransactionPropertiesFiller.json | 86 +++++++++++----------- .../TestContractInteractionFiller.json | 58 +++++++-------- .../stSolidityTest/TestContractSuicideFiller.json | 60 +++++++-------- .../TestCryptographicFunctionsFiller.json | 56 +++++++------- .../stSolidityTest/TestKeywordsFiller.json | 86 +++++++++++----------- .../stSolidityTest/TestOverflowFiller.json | 50 ++++++------- .../stSolidityTest/TestStoreGasPricesFiller.json | 56 +++++++------- .../TestStructuresAndVariablessFiller.json | 86 +++++++++++----------- .../stZeroCallsTest/ZeroValue_CALLCODEFiller.json | 10 +-- .../stZeroCallsTest/ZeroValue_CALLFiller.json | 10 +-- .../ZeroValue_CALL_ToEmptyFiller.json | 10 +-- .../ZeroValue_CALL_ToNonZeroBalanceFiller.json | 10 +-- .../ZeroValue_CALL_ToOneStorageKeyFiller.json | 10 +-- ...alue_TransactionCALL_ToOneStorageKeyFiller.json | 2 + .../stZeroKnowledge/pairingTestFiller.json | 10 +-- 48 files changed, 642 insertions(+), 632 deletions(-) (limited to 'src') diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json index 2c16bc7d6..b23d76bb0 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json index 8e535b248..ea83568bf 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json index b11ecc1bd..1caf1641a 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json index 0e89e9959..963832174 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json index 1517d4f7d..c42be77f7 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json index 23bfc4f19..1ca9d09bb 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json index 4bcf3959f..182bb9ad3 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json index 0520e52e7..31463c017 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json @@ -95,7 +95,7 @@ }, "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x01", - "code" : "0x600c60015560016000fd", + "code" : "0x600c60015560016000fd600d600355", "nonce" : "0x00", "storage" : { } diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json index 9a4c05c8d..b8b1991ce 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json @@ -1,6 +1,8 @@ { "DaoTransactions" : { - "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.", + "_info" : { + "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets." + }, "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", @@ -339,9 +341,9 @@ "uncleHeaders" : [ ] }, - { - "acomment" : "check balance of one of the accounts from L at 7 block", - "blocknumber" : "4", + { + "//comment" : "check balance of one of the accounts from L at 7 block", + "blocknumber" : "4", "transactions" : [ { "data" : "", @@ -373,12 +375,12 @@ "uncleHeaders" : [ ] }, - { - "acomment" : "check balance of one of the accounts from L at block 8", - "blocknumber" : "5", - "blockHeaderPremine" : { + { + "//comment" : "check balance of one of the accounts from L at block 8", + "blocknumber" : "5", + "blockHeaderPremine" : { "extraData" : "0x64616f2d686172642d666f726b", - "updatePoW" : "1" + "updatePoW" : "1" }, "transactions" : [ { @@ -394,11 +396,11 @@ "uncleHeaders" : [ ] }, - { - "blocknumber" : "6", - "expectExceptionALL" : "InvalidTransactionsRoot", + { + "blocknumber" : "6", + "expectExceptionALL" : "InvalidTransactionsRoot", "transactions" : [ - { + { "data" : "", "gasLimit" : "60000", "gasPrice" : "1", diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json index 96581bd84..41e5fe3d5 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json @@ -1,6 +1,8 @@ { "DaoTransactions_EmptyTransactionAndForkBlocksAhead" : { - "acomment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.", + "_info" : { + "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets." + }, "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json index 85ae657e9..243abacc5 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json @@ -1,6 +1,8 @@ { "DaoTransactions_UncleExtradata" : { - "acomment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.", + "_info" : { + "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets." + }, "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json index 24097766f..e3e553c2c 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json @@ -1,6 +1,8 @@ { "DaoTransactions_XBlockm1" : { - "acomment" : "This test checks that DAO hardfork transition does not occur at the end of block 4", + "_info" : { + "comment" : "This test checks that DAO hardfork transition does not occur at the end of block 4", + }, "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json index 0b9c1f457..5161af3aa 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json @@ -542,7 +542,7 @@ ] }, { - "comment" : "EIP150 rules are applied", + "//comment" : "EIP150 rules are applied", "blocknumber" : "5", "transactions" : [ { diff --git a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json index 61f851c1a..e1a8179a7 100644 --- a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json +++ b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json @@ -42,7 +42,7 @@ "pre" : { "1000000000000000000000000000000000000001" : { "balance" : "0", - "comment" : "A legit solidity contract", + "//comment" : "A legit solidity contract", "code" : "0x6060604052361561020e5760e060020a6000350463013cf08b8114610247578063095ea7b3146102d05780630c3b7b96146103455780630e7082031461034e578063149acf9a1461036057806318160ddd146103725780631f2dc5ef1461037b57806321b5b8dd1461039b578063237e9492146103ad57806323b872dd1461040e5780632632bf2014610441578063341458081461047257806339d1f9081461047b5780634b6753bc146104935780634df6d6cc1461049c5780634e10c3ee146104b7578063590e1ae3146104ca578063612e45a3146104db578063643f7cdd1461057a578063674ed066146105925780636837ff1e1461059b57806370a08231146105e5578063749f98891461060b57806378524b2e1461062457806381f03fcb1461067e57806382661dc41461069657806382bf6464146106b75780638b15a605146106c95780638d7af473146106d257806396d7f3f5146106e1578063a1da2fb9146106ea578063a3912ec814610704578063a9059cbb1461070f578063b7bc2c841461073f578063baac53001461074b578063be7c29c1146107b1578063c9d27afe14610817578063cc9ae3f61461082d578063cdef91d014610841578063dbde198814610859578063dd62ed3e1461087e578063e33734fd146108b2578063e5962195146108c6578063e66f53b7146108de578063eceb2945146108f0578063f8c80d261461094f575b610966600f546000906234bc000142108015610239575060125433600160a060020a03908116911614155b156109785761098033610752565b6109866004356000805482908110156100025750808052600e8202600080516020612a3683398151915201905060038101546004820154600683015460018401548454600786015460058701546009880154600a890154600d8a0154600160a060020a039586169b509599600201989760ff81811698610100909204811697949691951693168c565b61096660043560243533600160a060020a03908116600081815260156020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b61096660105481565b610a7d600754600160a060020a031681565b610a7d600e54600160a060020a031681565b61096660165481565b6109665b60004262127500600f60005054031115610de557506014610983565b610a7d601254600160a060020a031681565b60408051602060248035600481810135601f810185900485028601850190965285855261096695813595919460449492939092019181908401838280828437509496505050505050506000600060006000600060003411156116a857610002565b6109666004356024356044355b60115460009060ff1680156104315750600f5442115b80156124e957506124e78461044b565b6109666000610980335b600160a060020a0381166000908152600b602052604081205481908114156129cb57610b99565b61096660065481565b6109665b600d5430600160a060020a03163103610983565b610966600f5481565b61096660043560046020526000908152604090205460ff1681565b61096660043560243560006124cb610831565b610a9a6000341115610ba457610002565b604080516020604435600481810135601f8101849004840285018401909552848452610966948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a01909352828252969897608497919650602491909101945090925082915084018382808284375094965050933593505060a435915050600060006110c1336105ec565b61096660043560096020526000908152604090205481565b61096660015481565b610a9a60043530600160a060020a031633600160a060020a03161415806105db5750600160a060020a03811660009081526004602052604090205460ff16155b156121cb576121c8565b6109666004355b600160a060020a0381166000908152601460205260409020545b919050565b6109666004356024356000600034111561259957610002565b610966600062e6b680420360026000505410806106505750600354600160a060020a0390811633909116145b80156106645750600254621274ff19420190105b156126145750426002908155600180549091028155610983565b610966600435600a6020526000908152604090205481565b610966600435602435600060006000600060006000341115611ba157610002565b610a7d600854600160a060020a031681565b610966600c5481565b61096660005460001901610983565b61096660025481565b61096660043560006000600060003411156121fc57610002565b6109665b6001610983565b6109666004356024355b60115460009060ff16801561072f5750600f5442115b801561248757506124853361044b565b61096660115460ff1681565b6109666004355b60006000600f600050544210801561076a5750600034115b80156107a457506011546101009004600160a060020a0316600014806107a457506011546101009004600160a060020a0390811633909116145b15610b9f57610a9c61037f565b610a7d600435600060006000508281548110156100025750508080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56b600e83020180548290811015610002575081526020902060030154600160a060020a0316610606565b61096660043560243560006000610e1b336105ec565b6109665b6000600034111561247c57610002565b61096660043560056020526000908152604090205481565b610966600435602435604435600061252f845b6000600060003411156127ac57610002565b610966600435602435600160a060020a0382811660009081526015602090815260408083209385168352929052205461033f565b610a9a600435600034111561254557610002565b610966600435600b6020526000908152604090205481565b610a7d600354600160a060020a031681565b604080516020606435600481810135601f81018490048402850184019095528484526109669481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600034111561103257610002565b610a7d6011546101009004600160a060020a031681565b60408051918252519081900360200190f35b610980610708565b90505b90565b604051808d600160a060020a031681526020018c8152602001806020018b81526020018a815260200189815260200188815260200187815260200186815260200185815260200184815260200183600160a060020a0316815260200182810382528c818154600181600116156101000203166002900481526020019150805460018160011615610100020316600290048015610a635780601f10610a3857610100808354040283529160200191610a63565b820191906000526020600020905b815481529060010190602001808311610a4657829003601f168201915b50509d505050505050505050505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b005b604051601254601434908102939093049350600160a060020a03169183900390600081818185876185025a03f150505050600160a060020a038316600081815260146020908152604080832080548601905560168054860190556013825291829020805434019055815184815291517fdbccb92686efceafb9bb7e0394df7f58f71b954061b81afb57109bf247d3d75a9281900390910190a260105460165410801590610b4c575060115460ff16155b15610b94576011805460ff1916600117905560165460408051918252517ff381a3e2428fdda36615919e8d9c35878d9eb0cf85ac6edf575088e80e4c147e9181900360200190a15b600191505b50919050565b610002565b600f5442118015610bb8575060115460ff16155b15610de357601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f1156100025750506040516012549051600160a060020a039190911631109050610cc9576040805160125460e060020a63d2cc718f0282529151600160a060020a039290921691630221038a913091849163d2cc718f91600482810192602092919082900301816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a039490941660048201526024810193909352516044838101936020935082900301816000876161da5a03f115610002575050505b33600160a060020a0316600081815260136020526040808220549051909181818185876185025a03f19250505015610de35733600160a060020a03167fbb28353e4598c3b9199101a66e0989549b659a59a54d2c27fbb183f1932c8e6d6013600050600033600160a060020a03168152602001908152602001600020600050546040518082815260200191505060405180910390a26014600050600033600160a060020a0316815260200190815260200160002060005054601660008282825054039250508190555060006014600050600033600160a060020a031681526020019081526020016000206000508190555060006013600050600033600160a060020a03168152602001908152602001600020600050819055505b565b4262054600600f60005054031115610e13576201518062127500600f60005054034203046014019050610983565b50601e610983565b60001415610e2857610002565b6000341115610e3657610002565b6000805485908110156100025750600160a060020a03331681527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56e600e8602908101602052604090912054600080516020612a3683398151915291909101915060ff1680610eb05750600c810160205260406000205460ff165b80610ebf575060038101544210155b15610ec957610002565b8215610f0f5733600160a060020a03166000908152601460209081526040808320546009850180549091019055600b84019091529020805460ff19166001179055610f4b565b33600160a060020a0316600090815260146020908152604080832054600a850180549091019055600c84019091529020805460ff191660011790555b33600160a060020a03166000908152600b60205260408120541415610f77576040600020849055610feb565b33600160a060020a03166000908152600b60205260408120548154811015610002579080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566600e909102015460038201541115610feb5733600160a060020a03166000908152600b602052604090208490555b60408051848152905133600160a060020a03169186917f86abfce99b7dd908bec0169288797f85049ec73cbe046ed9de818fab3a497ae09181900360200190a35092915050565b6000805487908110156100025750808052600e8702600080516020612a3683398151915201905090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816005016000505414915050949350505050565b600014156110ce57610002565b82801561111857508660001415806110e857508451600014155b806111005750600354600160a060020a038981169116145b8061110b5750600034115b80611118575062093a8084105b1561112257610002565b8215801561114257506111348861115c565b158061114257506212750084105b156111fe57610002565b83546118e590600160a060020a03165b600160a060020a03811660009081526004602052604081205460ff16806111f15750601254600160a060020a039081169083161480156111f15750601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f115610002575050604051516006541190505b156129a157506001610606565b6249d40084111561120e57610002565b60115460ff1615806112215750600f5442105b806112365750600c5434108015611236575082155b1561124057610002565b42844201101561124f57610002565b30600160a060020a031633600160a060020a0316141561126e57610002565b60008054600181018083559091908280158290116112a557600e0281600e0283600052602060002091820191016112a5919061136a565b505060008054929450918491508110156100025750808052600e8302600080516020612a368339815191520190508054600160a060020a031916891781556001818101899055875160028084018054600082815260209081902096975091959481161561010002600019011691909104601f908101829004840193918b019083901061146257805160ff19168380011785555b5061149292915061144a565b5050600060098201819055600a820155600d81018054600160a060020a03191690556001015b8082111561145e578054600160a060020a03191681556000600182810182905560028084018054848255909281161561010002600019011604601f81901061143057505b506000600383018190556004808401805461ffff19169055600584018290556006840182905560078401805460ff191690556008840180548382559083526020909220611344929091028101905b8082111561145e57600080825560018201818155600283019190915560039091018054600160a060020a03191690556113fc565b601f0160209004906000526020600020908101906113ae91905b8082111561145e576000815560010161144a565b5090565b82800160010185558215611338579182015b82811115611338578251826000505591602001919060010190611474565b50508787866040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160050160005081905550834201816003016000508190555060018160040160006101000a81548160ff02191690830217905550828160070160006101000a81548160ff02191690830217905550821561157857600881018054600181018083559091908280158290116115735760040281600402836000526020600020918201910161157391906113fc565b505050505b600d8082018054600160a060020a031916331790553460068301819055815401905560408051600160a060020a038a16815260208181018a9052918101859052608060608201818152895191830191909152885185937f5790de2c279e58269b93b12828f56fd5f2bc8ad15e61ce08572585c81a38756f938d938d938a938e93929160a084019185810191908190849082908590600090600490601f850104600f02600301f150905090810190601f1680156116485780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a2509695505050505050565b6040805186815260208101839052815189927fdfc78bdca8e3e0b18c16c5c99323c6cb9eb5e00afde190b4e7273f5158702b07928290030190a25b5050505092915050565b6000805488908110156100025750808052600e8802600080516020612a36833981519152019050600781015490945060ff166116e757620d2f006116ec565b622398805b600485015490935060ff16801561170857506003840154830142115b15611716576117b887611890565b600384015442108061172d5750600484015460ff16155b806117ae57508360000160009054906101000a9004600160a060020a03168460010160005054876040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020846005016000505414155b1561114c57610002565b61169e565b60048401805461ff001916610100179055835460019550600160a060020a03908116309091161480159061180157508354600754600160a060020a03908116911614155b801561181d57506008548454600160a060020a03908116911614155b801561183957508354601254600160a060020a03908116911614155b801561185557506003548454600160a060020a03908116911614155b1561188b5760018401805430600160a060020a031660009081526005602052604090208054919091019055546006805490910190555b611663875b6000600060005082815481101561000257908052600e02600080516020612a36833981519152018150600481015490915060ff16156118d757600d80546006830154900390555b600401805460ff1916905550565b15156118f45761190087611890565b6001915061193161047f565b604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050505061169e565b6001850154111561194157600091505b50600a8301546009840154865191019060049010801590611986575085600081518110156100025790602001015160f860020a900460f860020a02606860f860020a02145b80156119b6575085600181518110156100025790602001015160f860020a900460f860020a02603760f860020a02145b80156119e6575085600281518110156100025790602001015160f860020a900460f860020a0260ff60f860020a02145b8015611a16575085600381518110156100025790602001015160f860020a900460f860020a02601e60f860020a02145b8015611a45575030600160a060020a0316600090815260056020526040902054611a4290611a5d61047f565b81105b15611a4f57600091505b6001840154611a8090611a5f565b015b30600160a060020a03166000908152600560205260408120546129a961047f565b8110611ad457604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050501515611abc57610002565b4260025560165460059004811115611ad45760056001555b6001840154611ae290611a5f565b8110158015611af85750600a8401546009850154115b8015611b015750815b1561188b578360000160009054906101000a9004600160a060020a0316600160a060020a0316846001016000505487604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015611b7d5780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f19250505015156117bd57610002565b611baa336105ec565b60001415611bb757610002565b60008054889081101561000257508052600e87027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566810154600080516020612a36833981519152919091019450421080611c1957506003840154622398800142115b80611c3257508354600160a060020a0390811690871614155b80611c425750600784015460ff16155b80611c68575033600160a060020a03166000908152600b8501602052604090205460ff16155b80611c9c575033600160a060020a03166000908152600b60205260409020548714801590611c9c5750604060009081205414155b15611ca657610002565b600884018054600090811015610002579081526020812060030154600160a060020a03161415611e1257611efc86604051600090600160a060020a038316907f9046fefd66f538ab35263248a44217dcb70e2eb2cd136629e141b8b8f9f03b60908390a260408051600e547fe2faf044000000000000000000000000000000000000000000000000000000008252600160a060020a03858116600484015260248301859052604483018590526223988042016064840152925192169163e2faf04491608480820192602092909190829003018187876161da5a03f1156100025750506040515191506106069050565b6008850180546000908110156100025781815260208082209390935530600160a060020a031681526005909252604082205481549092908110156100025790815260208120905060020155601654600885018054600090811015610002579081526020812090506001015560048401805461ff0019166101001790555b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090505433600160a060020a031660009081526014602052604081205460088801805493909102939093049550908110156100025790815260208120905060030154604080517fbaac530000000000000000000000000000000000000000000000000000000000815233600160a060020a0390811660048301529151929091169163baac53009186916024808301926020929190829003018185886185025a03f11561000257505060405151600014159150611f78905057610002565b60088501805460009081101561000257818152602081206003018054600160a060020a03191690931790925580549091908110156100025790815260208120905060030154600160a060020a031660001415611f5757610002565b600d5430600160a060020a0316311015611f7057610002565b611d9561047f565b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090506002015433600160a060020a0390811660009081526014602090815260408083205430909416835260058083528184205460099093529083205460088b018054969095029690960497509487020494508593929091908290811015610002575260208120815060030154600160a060020a0390811682526020828101939093526040918201600090812080549095019094553016835260059091529020548290101561205357610002565b30600160a060020a031660009081526005602052604081208054849003905560088501805483926009929091829081101561000257508152602080822060030154600160a060020a039081168352929052604080822080549094019093553090911681522054819010156120c657610002565b30600160a060020a0390811660009081526009602090815260408083208054869003905533909316808352601482528383205484519081529351929390927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a36121383361086c565b5033600160a060020a03166000908152601460209081526040808320805460168054919091039055839055600a9091528120556001945061169e565b30600160a060020a0390811660008181526005602090815260408083208054958716808552828520805490970190965584845283905560099091528082208054948352908220805490940190935590815290555b50565b604051600160a060020a0382811691309091163190600081818185876185025a03f192505050151561217457610002565b33600160a060020a03818116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f028352935197995091969195929092169363d2cc718f936004848101949193929183900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a03168152602001908152602001600020600050540204101561229d57610002565b600160a060020a03338116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f02835293519296909593169363d2cc718f93600483810194929383900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a0316815260200190815260200160002060005054020403905083156123ec57600860009054906101000a9004600160a060020a0316600160a060020a0316630221038a83600160a060020a0316630e7082036040518160e060020a0281526004018090506020604051808303816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a031660048201526024810186905290516044808301935060209282900301816000876161da5a03f115610002575050604051511515905061245457610002565b6040805160085460e160020a63011081c5028252600160a060020a038581166004840152602483018590529251921691630221038a9160448082019260209290919082900301816000876161da5a03f115610002575050604051511515905061245457610002565b600160a060020a03331660009081526009602052604090208054909101905550600192915050565b6109803361086c565b155b80156124a257506124a23384845b6000600061293a856105ec565b80156124be57506124be83836000600034111561261c57610002565b15610b9f5750600161033f565b15156124d657610002565b6124e08383610719565b905061033f565b155b80156124fb57506124fb848484612495565b80156125185750612518848484600060003411156126c157610002565b15610b9f57506001612528565b90505b9392505050565b151561253a57610002565b61252584848461041b565b30600160a060020a031633600160a060020a031614158061258a575030600160a060020a031660009081526005602052604090205460649061258561047f565b010481115b1561259457610002565b600c55565b600354600160a060020a0390811633909116146125b557610002565b600160a060020a038316600081815260046020908152604091829020805460ff191686179055815185815291517f73ad2a153c8b67991df9459024950b318a609782cee8c7eeda47b905f9baa91f9281900390910190a250600161033f565b506000610983565b33600160a060020a03166000908152601460205260409020548290108015906126455750600082115b156126b957600160a060020a03338116600081815260146020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a350600161033f565b50600061033f565b600160a060020a03841660009081526014602052604090205482901080159061270a5750601560209081526040600081812033600160a060020a03168252909252902054829010155b80156127165750600082115b156127a457600160a060020a03838116600081815260146020908152604080832080548801905588851680845281842080548990039055601583528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a3506001612528565b506000612528565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f11561000257505060405151905061281a866105ec565b0204101561282757610002565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f115610002575050604051519050612895866105ec565b0204039050600760009054906101000a9004600160a060020a0316600160a060020a0316630221038a84836040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506020604051808303816000876161da5a03f115610002575050604051511515905061291357610002565b600160a060020a0383166000908152600a6020526040902080548201905560019150610b99565b600160a060020a0386166000908152600a602052604090205480850291909104915081111561296857610002565b600160a060020a038581166000908152600a60205260408082208054859003905591861681522080548201905560019150509392505050565b506000610606565b0160030260166000505483020460016000505460166000505404019050610606565b600160a060020a0383166000908152600b6020526040812054815481101561000257818052600e02600080516020612a368339815191520190506003810154909150421115610b9457600160a060020a0383166000908152600b602052604081208190559150610b9956290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "nonce" : "0", "storage" : { @@ -50,7 +50,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "0", - "comment" : "A legit solidity contract", + "//comment" : "A legit solidity contract", "code" : "0x6060604052361561020e5760e060020a6000350463013cf08b8114610247578063095ea7b3146102d05780630c3b7b96146103455780630e7082031461034e578063149acf9a1461036057806318160ddd146103725780631f2dc5ef1461037b57806321b5b8dd1461039b578063237e9492146103ad57806323b872dd1461040e5780632632bf2014610441578063341458081461047257806339d1f9081461047b5780634b6753bc146104935780634df6d6cc1461049c5780634e10c3ee146104b7578063590e1ae3146104ca578063612e45a3146104db578063643f7cdd1461057a578063674ed066146105925780636837ff1e1461059b57806370a08231146105e5578063749f98891461060b57806378524b2e1461062457806381f03fcb1461067e57806382661dc41461069657806382bf6464146106b75780638b15a605146106c95780638d7af473146106d257806396d7f3f5146106e1578063a1da2fb9146106ea578063a3912ec814610704578063a9059cbb1461070f578063b7bc2c841461073f578063baac53001461074b578063be7c29c1146107b1578063c9d27afe14610817578063cc9ae3f61461082d578063cdef91d014610841578063dbde198814610859578063dd62ed3e1461087e578063e33734fd146108b2578063e5962195146108c6578063e66f53b7146108de578063eceb2945146108f0578063f8c80d261461094f575b610966600f546000906234bc000142108015610239575060125433600160a060020a03908116911614155b156109785761098033610752565b6109866004356000805482908110156100025750808052600e8202600080516020612a3683398151915201905060038101546004820154600683015460018401548454600786015460058701546009880154600a890154600d8a0154600160a060020a039586169b509599600201989760ff81811698610100909204811697949691951693168c565b61096660043560243533600160a060020a03908116600081815260156020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b61096660105481565b610a7d600754600160a060020a031681565b610a7d600e54600160a060020a031681565b61096660165481565b6109665b60004262127500600f60005054031115610de557506014610983565b610a7d601254600160a060020a031681565b60408051602060248035600481810135601f810185900485028601850190965285855261096695813595919460449492939092019181908401838280828437509496505050505050506000600060006000600060003411156116a857610002565b6109666004356024356044355b60115460009060ff1680156104315750600f5442115b80156124e957506124e78461044b565b6109666000610980335b600160a060020a0381166000908152600b602052604081205481908114156129cb57610b99565b61096660065481565b6109665b600d5430600160a060020a03163103610983565b610966600f5481565b61096660043560046020526000908152604090205460ff1681565b61096660043560243560006124cb610831565b610a9a6000341115610ba457610002565b604080516020604435600481810135601f8101849004840285018401909552848452610966948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a01909352828252969897608497919650602491909101945090925082915084018382808284375094965050933593505060a435915050600060006110c1336105ec565b61096660043560096020526000908152604090205481565b61096660015481565b610a9a60043530600160a060020a031633600160a060020a03161415806105db5750600160a060020a03811660009081526004602052604090205460ff16155b156121cb576121c8565b6109666004355b600160a060020a0381166000908152601460205260409020545b919050565b6109666004356024356000600034111561259957610002565b610966600062e6b680420360026000505410806106505750600354600160a060020a0390811633909116145b80156106645750600254621274ff19420190105b156126145750426002908155600180549091028155610983565b610966600435600a6020526000908152604090205481565b610966600435602435600060006000600060006000341115611ba157610002565b610a7d600854600160a060020a031681565b610966600c5481565b61096660005460001901610983565b61096660025481565b61096660043560006000600060003411156121fc57610002565b6109665b6001610983565b6109666004356024355b60115460009060ff16801561072f5750600f5442115b801561248757506124853361044b565b61096660115460ff1681565b6109666004355b60006000600f600050544210801561076a5750600034115b80156107a457506011546101009004600160a060020a0316600014806107a457506011546101009004600160a060020a0390811633909116145b15610b9f57610a9c61037f565b610a7d600435600060006000508281548110156100025750508080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56b600e83020180548290811015610002575081526020902060030154600160a060020a0316610606565b61096660043560243560006000610e1b336105ec565b6109665b6000600034111561247c57610002565b61096660043560056020526000908152604090205481565b610966600435602435604435600061252f845b6000600060003411156127ac57610002565b610966600435602435600160a060020a0382811660009081526015602090815260408083209385168352929052205461033f565b610a9a600435600034111561254557610002565b610966600435600b6020526000908152604090205481565b610a7d600354600160a060020a031681565b604080516020606435600481810135601f81018490048402850184019095528484526109669481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600034111561103257610002565b610a7d6011546101009004600160a060020a031681565b60408051918252519081900360200190f35b610980610708565b90505b90565b604051808d600160a060020a031681526020018c8152602001806020018b81526020018a815260200189815260200188815260200187815260200186815260200185815260200184815260200183600160a060020a0316815260200182810382528c818154600181600116156101000203166002900481526020019150805460018160011615610100020316600290048015610a635780601f10610a3857610100808354040283529160200191610a63565b820191906000526020600020905b815481529060010190602001808311610a4657829003601f168201915b50509d505050505050505050505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b005b604051601254601434908102939093049350600160a060020a03169183900390600081818185876185025a03f150505050600160a060020a038316600081815260146020908152604080832080548601905560168054860190556013825291829020805434019055815184815291517fdbccb92686efceafb9bb7e0394df7f58f71b954061b81afb57109bf247d3d75a9281900390910190a260105460165410801590610b4c575060115460ff16155b15610b94576011805460ff1916600117905560165460408051918252517ff381a3e2428fdda36615919e8d9c35878d9eb0cf85ac6edf575088e80e4c147e9181900360200190a15b600191505b50919050565b610002565b600f5442118015610bb8575060115460ff16155b15610de357601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f1156100025750506040516012549051600160a060020a039190911631109050610cc9576040805160125460e060020a63d2cc718f0282529151600160a060020a039290921691630221038a913091849163d2cc718f91600482810192602092919082900301816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a039490941660048201526024810193909352516044838101936020935082900301816000876161da5a03f115610002575050505b33600160a060020a0316600081815260136020526040808220549051909181818185876185025a03f19250505015610de35733600160a060020a03167fbb28353e4598c3b9199101a66e0989549b659a59a54d2c27fbb183f1932c8e6d6013600050600033600160a060020a03168152602001908152602001600020600050546040518082815260200191505060405180910390a26014600050600033600160a060020a0316815260200190815260200160002060005054601660008282825054039250508190555060006014600050600033600160a060020a031681526020019081526020016000206000508190555060006013600050600033600160a060020a03168152602001908152602001600020600050819055505b565b4262054600600f60005054031115610e13576201518062127500600f60005054034203046014019050610983565b50601e610983565b60001415610e2857610002565b6000341115610e3657610002565b6000805485908110156100025750600160a060020a03331681527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56e600e8602908101602052604090912054600080516020612a3683398151915291909101915060ff1680610eb05750600c810160205260406000205460ff165b80610ebf575060038101544210155b15610ec957610002565b8215610f0f5733600160a060020a03166000908152601460209081526040808320546009850180549091019055600b84019091529020805460ff19166001179055610f4b565b33600160a060020a0316600090815260146020908152604080832054600a850180549091019055600c84019091529020805460ff191660011790555b33600160a060020a03166000908152600b60205260408120541415610f77576040600020849055610feb565b33600160a060020a03166000908152600b60205260408120548154811015610002579080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566600e909102015460038201541115610feb5733600160a060020a03166000908152600b602052604090208490555b60408051848152905133600160a060020a03169186917f86abfce99b7dd908bec0169288797f85049ec73cbe046ed9de818fab3a497ae09181900360200190a35092915050565b6000805487908110156100025750808052600e8702600080516020612a3683398151915201905090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816005016000505414915050949350505050565b600014156110ce57610002565b82801561111857508660001415806110e857508451600014155b806111005750600354600160a060020a038981169116145b8061110b5750600034115b80611118575062093a8084105b1561112257610002565b8215801561114257506111348861115c565b158061114257506212750084105b156111fe57610002565b83546118e590600160a060020a03165b600160a060020a03811660009081526004602052604081205460ff16806111f15750601254600160a060020a039081169083161480156111f15750601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f115610002575050604051516006541190505b156129a157506001610606565b6249d40084111561120e57610002565b60115460ff1615806112215750600f5442105b806112365750600c5434108015611236575082155b1561124057610002565b42844201101561124f57610002565b30600160a060020a031633600160a060020a0316141561126e57610002565b60008054600181018083559091908280158290116112a557600e0281600e0283600052602060002091820191016112a5919061136a565b505060008054929450918491508110156100025750808052600e8302600080516020612a368339815191520190508054600160a060020a031916891781556001818101899055875160028084018054600082815260209081902096975091959481161561010002600019011691909104601f908101829004840193918b019083901061146257805160ff19168380011785555b5061149292915061144a565b5050600060098201819055600a820155600d81018054600160a060020a03191690556001015b8082111561145e578054600160a060020a03191681556000600182810182905560028084018054848255909281161561010002600019011604601f81901061143057505b506000600383018190556004808401805461ffff19169055600584018290556006840182905560078401805460ff191690556008840180548382559083526020909220611344929091028101905b8082111561145e57600080825560018201818155600283019190915560039091018054600160a060020a03191690556113fc565b601f0160209004906000526020600020908101906113ae91905b8082111561145e576000815560010161144a565b5090565b82800160010185558215611338579182015b82811115611338578251826000505591602001919060010190611474565b50508787866040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160050160005081905550834201816003016000508190555060018160040160006101000a81548160ff02191690830217905550828160070160006101000a81548160ff02191690830217905550821561157857600881018054600181018083559091908280158290116115735760040281600402836000526020600020918201910161157391906113fc565b505050505b600d8082018054600160a060020a031916331790553460068301819055815401905560408051600160a060020a038a16815260208181018a9052918101859052608060608201818152895191830191909152885185937f5790de2c279e58269b93b12828f56fd5f2bc8ad15e61ce08572585c81a38756f938d938d938a938e93929160a084019185810191908190849082908590600090600490601f850104600f02600301f150905090810190601f1680156116485780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a2509695505050505050565b6040805186815260208101839052815189927fdfc78bdca8e3e0b18c16c5c99323c6cb9eb5e00afde190b4e7273f5158702b07928290030190a25b5050505092915050565b6000805488908110156100025750808052600e8802600080516020612a36833981519152019050600781015490945060ff166116e757620d2f006116ec565b622398805b600485015490935060ff16801561170857506003840154830142115b15611716576117b887611890565b600384015442108061172d5750600484015460ff16155b806117ae57508360000160009054906101000a9004600160a060020a03168460010160005054876040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020846005016000505414155b1561114c57610002565b61169e565b60048401805461ff001916610100179055835460019550600160a060020a03908116309091161480159061180157508354600754600160a060020a03908116911614155b801561181d57506008548454600160a060020a03908116911614155b801561183957508354601254600160a060020a03908116911614155b801561185557506003548454600160a060020a03908116911614155b1561188b5760018401805430600160a060020a031660009081526005602052604090208054919091019055546006805490910190555b611663875b6000600060005082815481101561000257908052600e02600080516020612a36833981519152018150600481015490915060ff16156118d757600d80546006830154900390555b600401805460ff1916905550565b15156118f45761190087611890565b6001915061193161047f565b604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050505061169e565b6001850154111561194157600091505b50600a8301546009840154865191019060049010801590611986575085600081518110156100025790602001015160f860020a900460f860020a02606860f860020a02145b80156119b6575085600181518110156100025790602001015160f860020a900460f860020a02603760f860020a02145b80156119e6575085600281518110156100025790602001015160f860020a900460f860020a0260ff60f860020a02145b8015611a16575085600381518110156100025790602001015160f860020a900460f860020a02601e60f860020a02145b8015611a45575030600160a060020a0316600090815260056020526040902054611a4290611a5d61047f565b81105b15611a4f57600091505b6001840154611a8090611a5f565b015b30600160a060020a03166000908152600560205260408120546129a961047f565b8110611ad457604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050501515611abc57610002565b4260025560165460059004811115611ad45760056001555b6001840154611ae290611a5f565b8110158015611af85750600a8401546009850154115b8015611b015750815b1561188b578360000160009054906101000a9004600160a060020a0316600160a060020a0316846001016000505487604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015611b7d5780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f19250505015156117bd57610002565b611baa336105ec565b60001415611bb757610002565b60008054889081101561000257508052600e87027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566810154600080516020612a36833981519152919091019450421080611c1957506003840154622398800142115b80611c3257508354600160a060020a0390811690871614155b80611c425750600784015460ff16155b80611c68575033600160a060020a03166000908152600b8501602052604090205460ff16155b80611c9c575033600160a060020a03166000908152600b60205260409020548714801590611c9c5750604060009081205414155b15611ca657610002565b600884018054600090811015610002579081526020812060030154600160a060020a03161415611e1257611efc86604051600090600160a060020a038316907f9046fefd66f538ab35263248a44217dcb70e2eb2cd136629e141b8b8f9f03b60908390a260408051600e547fe2faf044000000000000000000000000000000000000000000000000000000008252600160a060020a03858116600484015260248301859052604483018590526223988042016064840152925192169163e2faf04491608480820192602092909190829003018187876161da5a03f1156100025750506040515191506106069050565b6008850180546000908110156100025781815260208082209390935530600160a060020a031681526005909252604082205481549092908110156100025790815260208120905060020155601654600885018054600090811015610002579081526020812090506001015560048401805461ff0019166101001790555b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090505433600160a060020a031660009081526014602052604081205460088801805493909102939093049550908110156100025790815260208120905060030154604080517fbaac530000000000000000000000000000000000000000000000000000000000815233600160a060020a0390811660048301529151929091169163baac53009186916024808301926020929190829003018185886185025a03f11561000257505060405151600014159150611f78905057610002565b60088501805460009081101561000257818152602081206003018054600160a060020a03191690931790925580549091908110156100025790815260208120905060030154600160a060020a031660001415611f5757610002565b600d5430600160a060020a0316311015611f7057610002565b611d9561047f565b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090506002015433600160a060020a0390811660009081526014602090815260408083205430909416835260058083528184205460099093529083205460088b018054969095029690960497509487020494508593929091908290811015610002575260208120815060030154600160a060020a0390811682526020828101939093526040918201600090812080549095019094553016835260059091529020548290101561205357610002565b30600160a060020a031660009081526005602052604081208054849003905560088501805483926009929091829081101561000257508152602080822060030154600160a060020a039081168352929052604080822080549094019093553090911681522054819010156120c657610002565b30600160a060020a0390811660009081526009602090815260408083208054869003905533909316808352601482528383205484519081529351929390927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a36121383361086c565b5033600160a060020a03166000908152601460209081526040808320805460168054919091039055839055600a9091528120556001945061169e565b30600160a060020a0390811660008181526005602090815260408083208054958716808552828520805490970190965584845283905560099091528082208054948352908220805490940190935590815290555b50565b604051600160a060020a0382811691309091163190600081818185876185025a03f192505050151561217457610002565b33600160a060020a03818116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f028352935197995091969195929092169363d2cc718f936004848101949193929183900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a03168152602001908152602001600020600050540204101561229d57610002565b600160a060020a03338116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f02835293519296909593169363d2cc718f93600483810194929383900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a0316815260200190815260200160002060005054020403905083156123ec57600860009054906101000a9004600160a060020a0316600160a060020a0316630221038a83600160a060020a0316630e7082036040518160e060020a0281526004018090506020604051808303816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a031660048201526024810186905290516044808301935060209282900301816000876161da5a03f115610002575050604051511515905061245457610002565b6040805160085460e160020a63011081c5028252600160a060020a038581166004840152602483018590529251921691630221038a9160448082019260209290919082900301816000876161da5a03f115610002575050604051511515905061245457610002565b600160a060020a03331660009081526009602052604090208054909101905550600192915050565b6109803361086c565b155b80156124a257506124a23384845b6000600061293a856105ec565b80156124be57506124be83836000600034111561261c57610002565b15610b9f5750600161033f565b15156124d657610002565b6124e08383610719565b905061033f565b155b80156124fb57506124fb848484612495565b80156125185750612518848484600060003411156126c157610002565b15610b9f57506001612528565b90505b9392505050565b151561253a57610002565b61252584848461041b565b30600160a060020a031633600160a060020a031614158061258a575030600160a060020a031660009081526005602052604090205460649061258561047f565b010481115b1561259457610002565b600c55565b600354600160a060020a0390811633909116146125b557610002565b600160a060020a038316600081815260046020908152604091829020805460ff191686179055815185815291517f73ad2a153c8b67991df9459024950b318a609782cee8c7eeda47b905f9baa91f9281900390910190a250600161033f565b506000610983565b33600160a060020a03166000908152601460205260409020548290108015906126455750600082115b156126b957600160a060020a03338116600081815260146020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a350600161033f565b50600061033f565b600160a060020a03841660009081526014602052604090205482901080159061270a5750601560209081526040600081812033600160a060020a03168252909252902054829010155b80156127165750600082115b156127a457600160a060020a03838116600081815260146020908152604080832080548801905588851680845281842080548990039055601583528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a3506001612528565b506000612528565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f11561000257505060405151905061281a866105ec565b0204101561282757610002565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f115610002575050604051519050612895866105ec565b0204039050600760009054906101000a9004600160a060020a0316600160a060020a0316630221038a84836040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506020604051808303816000876161da5a03f115610002575050604051511515905061291357610002565b600160a060020a0383166000908152600a6020526040902080548201905560019150610b99565b600160a060020a0386166000908152600a602052604090205480850291909104915081111561296857610002565b600160a060020a038581166000908152600a60205260408082208054859003905591861681522080548201905560019150509392505050565b506000610606565b0160030260166000505483020460016000505460166000505404019050610606565b600160a060020a0383166000908152600b6020526040812054815481101561000257818052600e02600080516020612a368339815191520190506003810154909150421115610b9457600160a060020a0383166000908152600b602052604081208190559150610b9956290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "nonce" : "0", "storage" : { diff --git a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json index 1d885804a..30c95380e 100644 --- a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json +++ b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json @@ -47,7 +47,7 @@ }, "d6a64d7e8c8a94fa5068ca33229d88436a743b14" : { "balance" : "0", - "comment" : "shanghailove", + "//comment" : "shanghailove", "code" : "0x612800600080734ce312538aa0b69740cbabfbfd8a2a8e628f660d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561001e57506128006000807389ad4426e629368ecb9d63ab01e5ca538fbdc1a43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610076575061280060008073d38af0f92dde2bc5c6c94c6083a9167507aec37b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156100ce575061280060008073679d434b06dee1686eb044cc721d41e20e298abc3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610126575061280060008073ace25ff1eeca76317d3baf12d426624b5298c4e53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561017e575061280060008073fbd5df4ff4790f881b3ad7f64edba082d75a449b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156101d6575061280060008073629fb9aa6daef7e0caf641a6a9e9df796ed83ce73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561022e57506128006000807378cc9e707d760b6693bb114a2259d435fe19b9373c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610286575061280060008073be90f452775a16749c225542501a67065dcb6db73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156102de57506128006000807396ab58c915ee9264c4da5d2f0c92972bb5e1a23a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610336575061280060008073c1371fb167dca98266cc357952f0f9ad2ff723033c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561038e575061280060008073dc0426d50398fd4847ae886def8db0c7f32fc1653c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156103e6575061280060008073ee92e5c794c08581aa92b4a7e78dff62d343afb73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561043e575061280060008073c72c3ebd888ac1970a8712fef74a1f9b9beecad33c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561049657506128006000807313bc06227d1bcff708065491b8e0d7794e0e7de53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156104ee575061280060008073d90b72526e124075805bbb472b70d96da5e4d7473c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610546575061280060008073a9ac072b051c00fa940164949cf6106076d267583c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561059e575061280060008073fbeaafd60c6102583af45fbae9e5c423efa661ab3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156105f6575061280060008073296516205b5fcdeab789d90f307ffad120f2d4573c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561064e57506128006000807304e11d27de725f7e9601167b5e3696da9ce40d7a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156106a6575061280060008073eda6f8f6d6b2e7daf7a11f62e51a72449bd2daf13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156106fe575061280060008073fabcdaeedc07d8013f006e6280e72d1f51dcdd263c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156107565750612800600080731dbc58db158a3a027df480faffdc65a6bfedbbec3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156107ae5750612800600080733f456e749863e7bf1a00e11a7de3f6b47ce999323c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610806575061280060008073ad523418157de7bb715ac689ef099dfced7ab1e63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561085e57506128006000807343ebdeafe1f5f30ed91f26dfc88af7acc113f0123c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156108b65750612800600080737e022766caa162007aea9fc3b429e3d9e49314b43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561090e575061280060008073888bee4c8478e74bf6e066e73ba14179ac7414273c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156109665750612800600080739bf986bf345894f30ff0d22b11bc28bb1fe098c13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156109be575061280060008073123bc327b0a97cfc77074100933aad0ec642beb43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610a16575061280060008073bd674fc9b32eb1099b1affccfc624cb8afcf1c023c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610a6e575061280060008073389f0c87f72d7eed2edcf8893cd0abd3b669f8dd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610ac65750612800600080738ba43f7e6cc99f15c51b724d774a4e908768caef3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610b1e5750612800600080739b9b19947abdd56b902672c50121d793d9fceea93c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610b7657506128006000807396ce5896b217a5d43efe133de63b03b105b66ef63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610bce5750612800600080735c0eb5d9ab93e3a8978e19308e52c140887b7b183c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610c265750612800600080731b4f6b2a9bdab71bfdf24aa87272841bde969ee03c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610c7e575061280060008073e6a2b33e1f00d73609c3e998f5983b558e76541f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610cd6575061280060008073d5f8364f460cd1e7143b06e02f23512244b135b73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610d2e575061280060008073d2fcd0803d95bd5974109a9b6a37028cbf180b6e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610d865750612800600080733e3bbda21848fa0e6778e36b2fbf1533b80502f83c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610dde575061280060008073af8fc22c1c1dc40e35dbf8b9a320a40bf53ab0af3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610e365750612800600080736f7c51628c3690d59bc2e179c3137735cadab1983c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610e8e57506128006000807347f0d4362a266fcf985b8ea0e282c754ffc0d7bf3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610ee6575061280060008073ad45b966235cede0a2684e93c05201b383d764843c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610f3e575061280060008073fa4abfd676caebe39f1fb8804f33bf2bb405069b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610f96575061280060008073c18564061499477df278327ed1c7d31a46ce75193c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610fee5750612800600080734ca8641e969d6892767640b9ac4beadca2736f803c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611046575061280060008073de07b141354cb7dc5ce3a0b65557484c34d720183c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561109e57506128006000807341a7fb9c3fb74001b43816a8d70107ae2844a09f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156110f6575061280060008073ac0fa2de9320e0a850ba888fa05cd86367f63b933c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561114e575061280060008073f163279adf52338218067b59900e752f08617c403c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156111a6575061280060008073f9697f38b6a7c311d8a358a4df493123babbd5843c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156111fe575061280060008073647ec6495f4d958b80a8c7584910b586543fbdac3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156112565750612800600080733317203629861da4f62a04ea70221bdcdf7074cd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156112ae57506128006000807345c2a5216e5b4f132096f64b50ac05f201925e613c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611306575061280060008073d1c8b08b0e13504976ecfdcc407661556bde6ec63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561135e575061280060008073f4e06d554038fedb3a6c6e04278e5129c4e5959b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156113b657506128006000807385068541d456d2af6683474cb7323beef24c4aac3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561140e57506128006000807381c2680b6be2988875b120630fac20c398e1d9de3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561146657506128006000807340c680b29b369af25e247276538241098b5b1f303c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156114be5750612800600080737b9fd32a0a809dee2d8a819d40002fe33aeda21e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611516575061280060008073ef279fb1b4e402320e70967a4f93fd81c9f691333c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561156e5750612800600080739f90e33211226686ce5d0e8065ec046637eec92e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156115c657506128006000807369b636398ce39425fcc43fc10cd0cc4b4e06323e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561161e575061280060008073ab97422e6352b453eee862626451f8138339943e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561167657506128006000807351161dae22a7012751ff4a4d38ef4b6455a3fdd33c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156116ce57506128006000807331ee3ce13a0f1f9231e2d213864b336fd406bd203c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156117265750612800600080733fd26bcef008744941d9ea6d11b233138813695a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561177e57506128006000807363bf6fbd344045f3e1b18bf676d824b8d52218c23c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156117d6575061280060008073c66313b9ef38cafe541fa7ec3d4d700a1c8c5cfe3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561182e57506128006000807347a37c10a74ecdfef7f359fba5991d9ef279a15b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611886575061280060008073044d77fc514c7f566051cafb248ac3f8dc8b36fe3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156118de5750612800600080730428cea98d32c6620f4c84206b84b895b20095f53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156119365750612800600080734bab60362fdc1c064d69628391f87495ecf9ca733c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561198e575061280060008073731aeed483e75d644a975fd3257fc07c7118cc883c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156119e657506128006000807332fe59a975a091540bfbf327f0edf1ced997627b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611a3e575061280060008073ed0c2024896a2564ae69aa3e9f107e4e8be2944a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611a96575061280060008073f604f282a9bf0772a294be1a481ff2c0e437245d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611aee575061280060008073f70cf9be2ccf10b39b93c95fdc16f4b9972f1b643c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611b465750612800600080731a9559716cafded0b9573768ea52ee29e922b6873c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611b9e575061280060008073526634cde83e541ba851a402e5c85bd0838505eb3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611bf657506128006000807315b593e70e0172a3faa046eec8aec3e629610b1c3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611c4e5750612800600080733d408586c7b4dd5d79459d857ff5995c2515fb4d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611ca6575061280060008073f99b0919121a7b8ec0716996030bfe3e0b805e2d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611cfe575061280060008073f440008157ca3744f4e65e42fa31151617e7e02e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611d5657506128006000807307f3738bc35a76e3eafaf2a261e2db81263481fd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611dae575061280060008073cd2895627a599b27b50dfe6775cb25678861fa4d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611e065750612800600080736203146b89af87443c864b39fc679b4ea13dbbca3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611e5e57506128006000807302ec139ed20216bac58e1efa8189839522564fed3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611eb6575061280060008073f10baa92c88b2f03181cff070b95e62c8ab52dcb3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611f0e57506128006000807386d79ba60e0df4ab15aada5615b6764f231a68d13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611f66575061280060008073532f2f3fded63798246f6c512e18a5e33468b2cf3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611fbe5750612800600080734b2cd9baa98e977304b1bb96640c257aa38a9af13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415612016575061280060008073150295d2d7717cd6328214309bcb09474080273f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561206e57506128006000807361efba685735f700d077ce1a82dda58758549ad73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156120c6575061280060008073750e9763d585fd5278c4a2f17653e324c37195223c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561211e57506128006000807325f9f251af7a1eb271925f4318f418830dd6be5e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415612176575061280060008073bfc526d0197abc3be3bc719367ec2333bc235d223c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156121ce575061280060008073b171781675d320498b1cddc0fb938b5fb8cfd62b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561222657506000808080807347b39d9ab2b170fef87705b92988f919503c28b0602b5a03f1", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json index 295f60c2a..7270d6756 100644 --- a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json @@ -1,8 +1,8 @@ { "CrashingTransaction" : { - "_info" : { - "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a" - }, + "_info" : { + "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a" + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json index 2e93ac60d..7f09c9ded 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json @@ -57,11 +57,11 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "10000", - "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }", + "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }", "//comment2" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }", - "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55", - "//comment4" : " 0x0102030405060708091011121314151617181920212223242526272829303132 0x0102030405060708091011121314151617181920212223242526272829303132", - "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }", + "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55", + "//comment4" : " 0x0102030405060708091011121314151617181920212223242526272829303132 0x0102030405060708091011121314151617181920212223242526272829303132", + "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json index 8347ac549..511326a72 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json @@ -31,7 +31,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "10000", "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }", - "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }", + "//code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json index b50c1abde..98496a06f 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json @@ -1,6 +1,6 @@ { "CreateCollisionToEmpty" : { - "_info" : { + "_info" : { "comment" : "data0 - create collision to empty, data1 - to empty but nonce, data2 - to contract with code" }, "env" : { diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json index a3d8b4560..2bbd6986a 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json @@ -17,24 +17,24 @@ }, "network" : ["EIP158"], "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873c4", - "0x03" : "0x01", - "0x04" : "0x07d76c", - "0x06" : "0x07741c", - "0x08" : "0x070f3c", - "0x0a" : "0x06a73c", - "0x0b" : "0x01", - "0x0c" : "0x060ae4", - "0x0d" : "0x01", - "0x0e" : "0x056e8c", - "0x0f" : "0x01", - "0x64" : "0x04d234" - } - } + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "https://etherpad.net/p/EIP158", + "storage" : { + "0x00" : "0x08d5b6", + "0x02" : "0x0873c4", + "0x03" : "0x01", + "0x04" : "0x07d76c", + "0x06" : "0x07741c", + "0x08" : "0x070f3c", + "0x0a" : "0x06a73c", + "0x0b" : "0x01", + "0x0c" : "0x060ae4", + "0x0d" : "0x01", + "0x0e" : "0x056e8c", + "0x0f" : "0x01", + "0x64" : "0x04d234" + } + } } }, { @@ -45,24 +45,24 @@ }, "network" : ["EIP150"], "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873ec", - "0x03" : "0x01", - "0x04" : "0x07d794", - "0x06" : "0x077584", - "0x08" : "0x071324", - "0x0a" : "0x06b024", - "0x0b" : "0x01", - "0x0c" : "0x0613cc", - "0x0d" : "0x01", - "0x0e" : "0x057774", - "0x0f" : "0x01", - "0x64" : "0x04db1c" - } - } + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "https://etherpad.net/p/EIP158", + "storage" : { + "0x00" : "0x08d5b6", + "0x02" : "0x0873ec", + "0x03" : "0x01", + "0x04" : "0x07d794", + "0x06" : "0x077584", + "0x08" : "0x071324", + "0x0a" : "0x06b024", + "0x0b" : "0x01", + "0x0c" : "0x0613cc", + "0x0d" : "0x01", + "0x0e" : "0x057774", + "0x0f" : "0x01", + "0x64" : "0x04db1c" + } + } } }, { 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 0d7c02a66..c6f1f2a1f 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json @@ -22,7 +22,7 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "shouldexist" : false + "shouldnotexist" : "1" } } }, diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json index 27bba6316..a42400913 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json @@ -1,8 +1,8 @@ { "returndatacopy_following_too_big_transfer" : { - "_info" : { - "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance." - }, + "_info" : { + "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance." + }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 22e183874..21297119a 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -31,7 +31,7 @@ } }, { - "comment" : "OOG in subcall", + "//comment" : "OOG in subcall", "indexes" : { "data" : 0, "gas" : 1, @@ -39,12 +39,12 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x06", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { - "0x00" : "0x01", + "0x00" : "0x01", "0x04" : "0x0c" } }, @@ -55,7 +55,7 @@ } }, { - "comment" : "OOG after subcall", + "//comment" : "OOG after subcall", "indexes" : { "data" : 1, "gas" : 0, @@ -63,8 +63,8 @@ }, "network" : ["EIP158", "EIP150"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { @@ -77,7 +77,7 @@ } }, { - "comment" : "OOG after subcall", + "//comment" : "OOG after subcall", "indexes" : { "data" : 1, "gas" : 0, @@ -85,8 +85,8 @@ }, "network" : ["Homestead", "Frontier"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", "nonce" : "54", "storage" : { @@ -99,7 +99,7 @@ } }, { - "comment" : "double OOG", + "//comment" : "double OOG", "indexes" : { "data" : 0, "gas" : 0, @@ -107,9 +107,9 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", + "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json index 2e7aa1ea4..47b0db599 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json @@ -10,7 +10,7 @@ }, "expect" : [ { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -18,10 +18,10 @@ }, "network" : ["EIP158"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "1" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "nonce" : "1" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x01" : "0x01", @@ -37,7 +37,7 @@ } }, { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -45,10 +45,10 @@ }, "network" : ["EIP150"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "0" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "nonce" : "0" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x01" : "0x01", @@ -64,7 +64,7 @@ } }, { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -72,9 +72,9 @@ }, "network" : ["Frontier", "Homestead"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "shouldnotexist" : "1" + }, "a000000000000000000000000000000000000000" : { "storage" : { } @@ -86,7 +86,7 @@ } }, { - "comment" : "OOG in subcall", + "//comment" : "OOG in subcall", "indexes" : { "data" : 0, "gas" : 1, @@ -94,10 +94,10 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "shouldnotexist" : "1" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x04" : "0x0c" @@ -110,7 +110,7 @@ } }, { - "comment" : "OOG after subcall / double OOG", + "//comment" : "OOG after subcall / double OOG", "indexes" : { "data" : [1, 0], "gas" : 0, diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json index 2fa1c198b..c741ddf4f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json @@ -78,7 +78,7 @@ } }, { - "comment" : "OOG", + "//comment" : "OOG", "indexes" : { "data" : 0, "gas" : 1, diff --git a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json index 489d6eb74..a5725a976 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json @@ -28,23 +28,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract contract1", - "//comment2" : "{", - "//comment3" : " uint value;", - "//comment4" : " function run()", - "//comment5" : " {", - "//comment6" : " value = 225;", - "//comment7" : " }", - "//comment8" : "}", - "//comment9" : "", - "//comment10" : "contract contract2", - "//comment11" : "{", - "//comment12" : " uint value2;", - "//comment13" : " function run()", - "//comment14" : " {", - "//comment15" : " value2 = 335;", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract contract1", + "//comment2" : "{", + "//comment3" : " uint value;", + "//comment4" : " function run()", + "//comment5" : " {", + "//comment6" : " value = 225;", + "//comment7" : " }", + "//comment8" : "}", + "//comment9" : "", + "//comment10" : "contract contract2", + "//comment11" : "{", + "//comment12" : " uint value2;", + "//comment13" : " function run()", + "//comment14" : " {", + "//comment15" : " value2 = 335;", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json index a200b099c..4d5c219d9 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json @@ -26,23 +26,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract recursiveMethods", - "//comment2" : "{", - "//comment3" : " function testInfiniteLoop()", - "//comment4" : " {", - "//comment5" : " while(true){}", - "//comment6" : " }", - "//comment7" : " ", - "//comment8" : " function testRecursiveMethods()", - "//comment9" : " {", - "//comment10" : " testRecursiveMethods2();", - "//comment11" : " }", - "//comment12" : " ", - "//comment13" : " function testRecursiveMethods2()", - "//comment14" : " {", - "//comment15" : " testRecursiveMethods();", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract recursiveMethods", + "//comment2" : "{", + "//comment3" : " function testInfiniteLoop()", + "//comment4" : " {", + "//comment5" : " while(true){}", + "//comment6" : " }", + "//comment7" : " ", + "//comment8" : " function testRecursiveMethods()", + "//comment9" : " {", + "//comment10" : " testRecursiveMethods2();", + "//comment11" : " }", + "//comment12" : " ", + "//comment13" : " function testRecursiveMethods2()", + "//comment14" : " {", + "//comment15" : " testRecursiveMethods();", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json index 969d0b243..daef56e6f 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json @@ -30,32 +30,32 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract subcaller", - "//comment2": "{", - "//comment3": " function init(address a)", - "//comment4": " {", - "//comment5": " main(a).setdata(225);", - "//comment6": " }", - "//comment7": "}", - "//comment8": "", - "//comment9": "contract main", - "//comment10": "{", - "//comment11": " uint data;", - "//comment12": " address msgsender;", - "//comment13": " function run() returns (uint)", - "//comment14": " {", - "//comment15": " data = 1;", - "//comment16": " msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment17": " subcaller a = new subcaller();", - "//comment18": " a.init(msgsender);", - "//comment19": " return data;", - "//comment20": " }", - "//comment21": " ", - "//comment22": " function setdata(uint _data)", - "//comment23": " {", - "//comment24": " data = _data;", - "//comment25": " }", - "//comment26": "}", + "//comment1": "contract subcaller", + "//comment2": "{", + "//comment3": " function init(address a)", + "//comment4": " {", + "//comment5": " main(a).setdata(225);", + "//comment6": " }", + "//comment7": "}", + "//comment8": "", + "//comment9": "contract main", + "//comment10": "{", + "//comment11": " uint data;", + "//comment12": " address msgsender;", + "//comment13": " function run() returns (uint)", + "//comment14": " {", + "//comment15": " data = 1;", + "//comment16": " msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment17": " subcaller a = new subcaller();", + "//comment18": " a.init(msgsender);", + "//comment19": " return data;", + "//comment20": " }", + "//comment21": " ", + "//comment22": " function setdata(uint _data)", + "//comment23": " {", + "//comment24": " data = _data;", + "//comment25": " }", + "//comment26": "}", "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json index fd6b2ca62..bfa7bdbac 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json @@ -26,23 +26,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract recursiveMethods", - "//comment2" : "{", - "//comment3" : " function testInfiniteLoop()", - "//comment4" : " {", - "//comment5" : " while(true){}", - "//comment6" : " }", - "//comment7" : " ", - "//comment8" : " function testRecursiveMethods()", - "//comment9" : " {", - "//comment10" : " testRecursiveMethods2();", - "//comment11" : " }", - "//comment12" : " ", - "//comment13" : " function testRecursiveMethods2()", - "//comment14" : " {", - "//comment15" : " testRecursiveMethods();", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract recursiveMethods", + "//comment2" : "{", + "//comment3" : " function testInfiniteLoop()", + "//comment4" : " {", + "//comment5" : " while(true){}", + "//comment6" : " }", + "//comment7" : " ", + "//comment8" : " function testRecursiveMethods()", + "//comment9" : " {", + "//comment10" : " testRecursiveMethods2();", + "//comment11" : " }", + "//comment12" : " ", + "//comment13" : " function testRecursiveMethods2()", + "//comment14" : " {", + "//comment15" : " testRecursiveMethods();", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json index 4dae11ce5..a08f4df95 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json @@ -28,43 +28,43 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract base", - "//comment2" : "{", - "//comment3" : " function methodA() returns (uint32)", - "//comment4" : " {", - "//comment5" : " return 1;", - "//comment6" : " }", - "//comment7" : "}", - "//comment8" : "", - "//comment9" : "contract frombase is base", - "//comment10" : "{", - "//comment11" : " function methodA() returns (uint32)", - "//comment12" : " {", - "//comment13" : " return 2;", - "//comment14" : " }", - "//comment15" : "}", - "//comment16" : "", - "//comment17" : "contract main", - "//comment18" : "{", - "//comment19" : " bool returnValue;", - "//comment20" : " function run() returns (bool)", - "//comment21" : " {", - "//comment22" : " returnValue = testInheretance();", - "//comment23" : " return returnValue;", - "//comment24" : " }", - "//comment25" : " ", - "//comment26" : " function testInheretance() returns (bool res)", - "//comment27" : " {", - "//comment28" : " res = true;", - "//comment29" : " base contract1 = new base();", - "//comment30" : " if (contract1.methodA() != 1)", - "//comment31" : " return false;", - "//comment32" : "", - "//comment33" : " frombase contract2 = new frombase();", - "//comment34" : " if (contract2.methodA() != 2)", - "//comment35" : " return false;", - "//comment36" : " }", - "//comment37" : "}", + "//comment1" : "contract base", + "//comment2" : "{", + "//comment3" : " function methodA() returns (uint32)", + "//comment4" : " {", + "//comment5" : " return 1;", + "//comment6" : " }", + "//comment7" : "}", + "//comment8" : "", + "//comment9" : "contract frombase is base", + "//comment10" : "{", + "//comment11" : " function methodA() returns (uint32)", + "//comment12" : " {", + "//comment13" : " return 2;", + "//comment14" : " }", + "//comment15" : "}", + "//comment16" : "", + "//comment17" : "contract main", + "//comment18" : "{", + "//comment19" : " bool returnValue;", + "//comment20" : " function run() returns (bool)", + "//comment21" : " {", + "//comment22" : " returnValue = testInheretance();", + "//comment23" : " return returnValue;", + "//comment24" : " }", + "//comment25" : " ", + "//comment26" : " function testInheretance() returns (bool res)", + "//comment27" : " {", + "//comment28" : " res = true;", + "//comment29" : " base contract1 = new base();", + "//comment30" : " if (contract1.methodA() != 1)", + "//comment31" : " return false;", + "//comment32" : "", + "//comment33" : " frombase contract2 = new frombase();", + "//comment34" : " if (contract2.methodA() != 2)", + "//comment35" : " return false;", + "//comment36" : " }", + "//comment37" : "}", "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json index b9825847c..d2a3580ad 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json @@ -73,31 +73,31 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "", - "//comment14": "contract main", - "//comment15": "{", - "//comment16": " function run() returns (uint)", - "//comment17": " {", - "//comment18": " createContractFromMethod();", - "//comment19": " }", - "//comment20": " ", - "//comment21": " function createContractFromMethod() returns (TestContract a)", - "//comment22": " {", - "//comment23": " a = new TestContract();", - "//comment24": " }", - "//comment25": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "", + "//comment14": "contract main", + "//comment15": "{", + "//comment16": " function run() returns (uint)", + "//comment17": " {", + "//comment18": " createContractFromMethod();", + "//comment19": " }", + "//comment20": " ", + "//comment21": " function createContractFromMethod() returns (TestContract a)", + "//comment22": " {", + "//comment23": " a = new TestContract();", + "//comment24": " }", + "//comment25": "}", "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json index 47cc179fb..3daad5e81 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json @@ -94,47 +94,47 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000000000000000000", - "//comment1" : "contract recursiveCreate1", - "//comment2" : "{", - "//comment3" : " uint depp;", - "//comment4" : " function recursiveCreate1(address a, uint depth)", - "//comment5" : " {", - "//comment6" : " depth = depth - 1;", - "//comment7" : "depp = depth;", - "//comment8" : " if(depth > 0)", - "//comment9" : " main(a).create2(depth);", - "//comment10" : " }", - "//comment11" : "}", - "//comment12" : "", - "//comment13" : "contract recursiveCreate2", - "//comment14" : "{", - "//comment15" : " uint depp;", - "//comment16" : " function recursiveCreate2(address a, uint depth)", - "//comment17" : " {", - "//comment18" : " depth = depth - 1;", - "//comment19" : "depp = depth;", - "//comment20" : " if(depth > 0)", - "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", - "//comment22" : " }", - "//comment23" : "}", - "//comment24" : "", - "//comment25" : "contract main", - "//comment26" : "{", - "//comment27" : " address maincontract;", - "//comment28" : " uint depp;", - "//comment29" : " function run(uint depth)", - "//comment30" : " {", - "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment32" : " depp = depth;", - "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", - "//comment34" : " }", - "//comment35" : "", - "//comment36" : " function create2(uint depth)", - "//comment37" : " {", - "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", - "//comment39" : " address(rec2).send(2);", - "//comment40" : " }", - "//comment41" : "}", + "//comment1" : "contract recursiveCreate1", + "//comment2" : "{", + "//comment3" : " uint depp;", + "//comment4" : " function recursiveCreate1(address a, uint depth)", + "//comment5" : " {", + "//comment6" : " depth = depth - 1;", + "//comment7" : "depp = depth;", + "//comment8" : " if(depth > 0)", + "//comment9" : " main(a).create2(depth);", + "//comment10" : " }", + "//comment11" : "}", + "//comment12" : "", + "//comment13" : "contract recursiveCreate2", + "//comment14" : "{", + "//comment15" : " uint depp;", + "//comment16" : " function recursiveCreate2(address a, uint depth)", + "//comment17" : " {", + "//comment18" : " depth = depth - 1;", + "//comment19" : "depp = depth;", + "//comment20" : " if(depth > 0)", + "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", + "//comment22" : " }", + "//comment23" : "}", + "//comment24" : "", + "//comment25" : "contract main", + "//comment26" : "{", + "//comment27" : " address maincontract;", + "//comment28" : " uint depp;", + "//comment29" : " function run(uint depth)", + "//comment30" : " {", + "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment32" : " depp = depth;", + "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", + "//comment34" : " }", + "//comment35" : "", + "//comment36" : " function create2(uint depth)", + "//comment37" : " {", + "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", + "//comment39" : " address(rec2).send(2);", + "//comment40" : " }", + "//comment41" : "}", "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json index d253ff969..2ca3857a2 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json @@ -86,47 +86,47 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000000000000000000", - "//comment1" : "contract recursiveCreate1", - "//comment2" : "{", - "//comment3" : " uint depp;", - "//comment4" : " function recursiveCreate1(address a, uint depth)", - "//comment5" : " {", - "//comment6" : " depth = depth - 1;", - "//comment7" : "depp = depth;", - "//comment8" : " if(depth > 0)", - "//comment9" : " main(a).create2(depth);", - "//comment10" : " }", - "//comment11" : "}", - "//comment12" : "", - "//comment13" : "contract recursiveCreate2", - "//comment14" : "{", - "//comment15" : " uint depp;", - "//comment16" : " function recursiveCreate2(address a, uint depth)", - "//comment17" : " {", - "//comment18" : " depth = depth - 1;", - "//comment19" : "depp = depth;", - "//comment20" : " if(depth > 0)", - "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", - "//comment22" : " }", - "//comment23" : "}", - "//comment24" : "", - "//comment25" : "contract main", - "//comment26" : "{", - "//comment27" : " address maincontract;", - "//comment28" : " uint depp;", - "//comment29" : " function run(uint depth)", - "//comment30" : " {", - "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment32" : " depp = depth;", - "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", - "//comment34" : " }", - "//comment35" : "", - "//comment36" : " function create2(uint depth)", - "//comment37" : " {", - "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", - "//comment39" : " address(rec2).send(2);", - "//comment40" : " }", - "//comment41" : "}", + "//comment1" : "contract recursiveCreate1", + "//comment2" : "{", + "//comment3" : " uint depp;", + "//comment4" : " function recursiveCreate1(address a, uint depth)", + "//comment5" : " {", + "//comment6" : " depth = depth - 1;", + "//comment7" : "depp = depth;", + "//comment8" : " if(depth > 0)", + "//comment9" : " main(a).create2(depth);", + "//comment10" : " }", + "//comment11" : "}", + "//comment12" : "", + "//comment13" : "contract recursiveCreate2", + "//comment14" : "{", + "//comment15" : " uint depp;", + "//comment16" : " function recursiveCreate2(address a, uint depth)", + "//comment17" : " {", + "//comment18" : " depth = depth - 1;", + "//comment19" : "depp = depth;", + "//comment20" : " if(depth > 0)", + "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", + "//comment22" : " }", + "//comment23" : "}", + "//comment24" : "", + "//comment25" : "contract main", + "//comment26" : "{", + "//comment27" : " address maincontract;", + "//comment28" : " uint depp;", + "//comment29" : " function run(uint depth)", + "//comment30" : " {", + "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment32" : " depp = depth;", + "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", + "//comment34" : " }", + "//comment35" : "", + "//comment36" : " function create2(uint depth)", + "//comment37" : " {", + "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", + "//comment39" : " address(rec2).send(2);", + "//comment40" : " }", + "//comment41" : "}", "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json index 66fe584ca..7c4d51b28 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json @@ -28,49 +28,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testBlockAndTransactionProperties();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testBlockAndTransactionProperties() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)", - "//comment14" : " return false;", - "//comment15" : "", - "//comment16" : " if (block.difficulty != 45678256)", - "//comment17" : " return false;", - "//comment18" : "", - "//comment19" : " if (block.gaslimit != 0x7fffffffffffffff)", - "//comment20" : " return false;", - "//comment21" : "", - "//comment22" : " if (block.number != 120)", - "//comment23" : " return false;", - "//comment24" : "", - "//comment25" : " //try to call this", - "//comment26" : " block.blockhash(120);", - "//comment27" : " block.timestamp;", - "//comment28" : " msg.gas;", - "//comment29" : "", - "//comment30" : " if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment31" : " return false;", - "//comment32" : "", - "//comment33" : " if (msg.value != 100)", - "//comment34" : " return false;", - "//comment35" : "", - "//comment36" : " if (tx.gasprice != 1)", - "//comment37" : " return false;", - "//comment38" : "", - "//comment39" : " if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment40" : " return false;", - "//comment41" : "", - "//comment42" : " }", - "//comment43" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testBlockAndTransactionProperties();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testBlockAndTransactionProperties() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)", + "//comment14" : " return false;", + "//comment15" : "", + "//comment16" : " if (block.difficulty != 45678256)", + "//comment17" : " return false;", + "//comment18" : "", + "//comment19" : " if (block.gaslimit != 0x7fffffffffffffff)", + "//comment20" : " return false;", + "//comment21" : "", + "//comment22" : " if (block.number != 120)", + "//comment23" : " return false;", + "//comment24" : "", + "//comment25" : " //try to call this", + "//comment26" : " block.blockhash(120);", + "//comment27" : " block.timestamp;", + "//comment28" : " msg.gas;", + "//comment29" : "", + "//comment30" : " if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment31" : " return false;", + "//comment32" : "", + "//comment33" : " if (msg.value != 100)", + "//comment34" : " return false;", + "//comment35" : "", + "//comment36" : " if (tx.gasprice != 1)", + "//comment37" : " return false;", + "//comment38" : "", + "//comment39" : " if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment40" : " return false;", + "//comment41" : "", + "//comment42" : " }", + "//comment43" : "}", "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json index b66bbeeb2..7b540ea53 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json @@ -29,35 +29,35 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "contract main", - "//comment14": "{", - "//comment15": " bool returnValue;", - "//comment16": " function run() returns (bool)", - "//comment17": " {", - "//comment18": " returnValue = testContractInteraction();", - "//comment19": " return returnValue;", - "//comment20": " }", - "//comment21": "", - "//comment22" : " function testContractInteraction() returns (bool res)", - "//comment23" : " {", - "//comment24" : " TestContract a = new TestContract();", - "//comment25" : " if (a.testMethod() == 225)", - "//comment26" : " return true;", - "//comment27" : " return false;", - "//comment28" : " }", - "//comment29": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "contract main", + "//comment14": "{", + "//comment15": " bool returnValue;", + "//comment16": " function run() returns (bool)", + "//comment17": " {", + "//comment18": " returnValue = testContractInteraction();", + "//comment19": " return returnValue;", + "//comment20": " }", + "//comment21": "", + "//comment22" : " function testContractInteraction() returns (bool res)", + "//comment23" : " {", + "//comment24" : " TestContract a = new TestContract();", + "//comment25" : " if (a.testMethod() == 225)", + "//comment26" : " return true;", + "//comment27" : " return false;", + "//comment28" : " }", + "//comment29": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json index c4cf495a8..5c37c33fd 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json @@ -29,36 +29,36 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "contract main", - "//comment14": "{", - "//comment15": " bool returnValue;", - "//comment16": " function run() returns (bool)", - "//comment17": " {", - "//comment18": " returnValue = testContractSuicide();", - "//comment19": " return returnValue;", - "//comment20": " }", - "//comment21": "", - "//comment22": " function testContractSuicide() returns (bool res)", - "//comment23": " {", - "//comment24": " TestContract a = new TestContract();", - "//comment25": " a.destroy(block.coinbase);", - "//comment26": " if (a.testMethod() == 225) //we should be able to call a contract", - "//comment27": " return true;", - "//comment28": " return false;", - "//comment29": " }", - "//comment30": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "contract main", + "//comment14": "{", + "//comment15": " bool returnValue;", + "//comment16": " function run() returns (bool)", + "//comment17": " {", + "//comment18": " returnValue = testContractSuicide();", + "//comment19": " return returnValue;", + "//comment20": " }", + "//comment21": "", + "//comment22": " function testContractSuicide() returns (bool res)", + "//comment23": " {", + "//comment24": " TestContract a = new TestContract();", + "//comment25": " a.destroy(block.coinbase);", + "//comment26": " if (a.testMethod() == 225) //we should be able to call a contract", + "//comment27": " return true;", + "//comment28": " return false;", + "//comment29": " }", + "//comment30": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json index 1e557f2a8..75c7b8f5b 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json @@ -28,34 +28,34 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testCryptographicFunctions();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testCryptographicFunctions() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)", - "//comment14" : " return false;", - "//comment15" : "", - "//comment16" : " if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)", - "//comment17" : " return false;", - "//comment18" : "", - "//comment19" : " if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)", - "//comment20" : " return false;", - "//comment21" : "", - "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,", - "//comment23" : " 28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,", - "//comment24" : " 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)", - "//comment25" : " != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment26" : " return false;", - "//comment27" : " }", - "//comment28" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testCryptographicFunctions();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testCryptographicFunctions() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)", + "//comment14" : " return false;", + "//comment15" : "", + "//comment16" : " if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)", + "//comment17" : " return false;", + "//comment18" : "", + "//comment19" : " if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)", + "//comment20" : " return false;", + "//comment21" : "", + "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,", + "//comment23" : " 28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,", + "//comment24" : " 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)", + "//comment25" : " != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment26" : " return false;", + "//comment27" : " }", + "//comment28" : "}", "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json index 4af87bcc6..06130ed2a 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json @@ -28,49 +28,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract main", - "//comment2": "{", - "//comment3": " bool returnValue;", - "//comment4": " function run() returns (bool)", - "//comment5": " {", - "//comment6": " returnValue = testKeywords();", - "//comment7": " return returnValue;", - "//comment8": " }", - "//comment9": "", - "//comment10": " function testKeywords() returns (bool res)", - "//comment11": " {", - "//comment12": " //some simple checks for the if statemnt", - "//comment13": " //if, else, while, for, break, continue, return", - "//comment14": " int i = 0;", - "//comment15": " res = false;", - "//comment16": "", - "//comment17": " if (i == 0)", - "//comment18": " {", - "//comment19": " if( i <= -25)", - "//comment20": " {", - "//comment21": " return false;", - "//comment22": " }", - "//comment23": " else", - "//comment24": " {", - "//comment25": " while(i < 10)", - "//comment26": " i++;", - "//comment27": "", - "//comment28": " if (i == 10)", - "//comment29": " {", - "//comment30": " for(var j=10; j>0; j--)", - "//comment31": " {", - "//comment32": " i--;", - "//comment33": " }", - "//comment34": " }", - "//comment35": " }", - "//comment36": " }", - "//comment37": "", - "//comment38": " if (i == 0)", - "//comment39": " return true;", - "//comment40": "", - "//comment41": " return false;", - "//comment42": " }", - "//comment43": "}", + "//comment1": "contract main", + "//comment2": "{", + "//comment3": " bool returnValue;", + "//comment4": " function run() returns (bool)", + "//comment5": " {", + "//comment6": " returnValue = testKeywords();", + "//comment7": " return returnValue;", + "//comment8": " }", + "//comment9": "", + "//comment10": " function testKeywords() returns (bool res)", + "//comment11": " {", + "//comment12": " //some simple checks for the if statemnt", + "//comment13": " //if, else, while, for, break, continue, return", + "//comment14": " int i = 0;", + "//comment15": " res = false;", + "//comment16": "", + "//comment17": " if (i == 0)", + "//comment18": " {", + "//comment19": " if( i <= -25)", + "//comment20": " {", + "//comment21": " return false;", + "//comment22": " }", + "//comment23": " else", + "//comment24": " {", + "//comment25": " while(i < 10)", + "//comment26": " i++;", + "//comment27": "", + "//comment28": " if (i == 10)", + "//comment29": " {", + "//comment30": " for(var j=10; j>0; j--)", + "//comment31": " {", + "//comment32": " i--;", + "//comment33": " }", + "//comment34": " }", + "//comment35": " }", + "//comment36": " }", + "//comment37": "", + "//comment38": " if (i == 0)", + "//comment39": " return true;", + "//comment40": "", + "//comment41": " return false;", + "//comment42": " }", + "//comment43": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json index b7362d019..e2ca8da4c 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json @@ -28,31 +28,31 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testOverflow();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testOverflow() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;", - "//comment14" : " if (a + 1 != 0)", - "//comment15" : " return false;", - "//comment16" : "", - "//comment17" : " uint32 b = 4294967295;", - "//comment18" : " if (b + 1 != 0)", - "//comment19" : " return false;", - "//comment20" : "", - "//comment21" : " uint64 c = 18446744073709551615;", - "//comment22" : " if (c + 1 != 0)", - "//comment23" : " return false;", - "//comment24" : " }", - "//comment25" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testOverflow();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testOverflow() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;", + "//comment14" : " if (a + 1 != 0)", + "//comment15" : " return false;", + "//comment16" : "", + "//comment17" : " uint32 b = 4294967295;", + "//comment18" : " if (b + 1 != 0)", + "//comment19" : " return false;", + "//comment20" : "", + "//comment21" : " uint64 c = 18446744073709551615;", + "//comment22" : " if (c + 1 != 0)", + "//comment23" : " return false;", + "//comment24" : " }", + "//comment25" : "}", "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json index 3ec40b75c..4a7e1e5b0 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json @@ -40,34 +40,34 @@ "//comment5" : " function run() returns (bool)", "//comment6" : " {", "//comment7" : " uint startgas = msg.gas;", - "//comment8" : "", - "//comment9" : " storage = 1; //zero to non zero", - "//comment10" : " m_gasUsed[0] = startgas - msg.gas;", - "//comment11" : " startgas = msg.gas;", - "//comment12" : "", - "//comment13" : " storage = 2; //non zero to non zero", - "//comment14" : " m_gasUsed[1] = startgas - msg.gas;", - "//comment15" : " startgas = msg.gas;", - "//comment16" : "", - "//comment17" : " storage = 2; //non zero to same non zero", - "//comment18" : " m_gasUsed[2] = startgas - msg.gas;", - "//comment19" : " startgas = msg.gas;", - "//comment20" : "", - "//comment21" : " storage = 24784793845734; //non zero to huge non zero", - "//comment22" : " m_gasUsed[3] = startgas - msg.gas;", - "//comment23" : " startgas = msg.gas;", - "//comment24" : "", - "//comment25" : " storage = 2; //huge non zero to non zero", - "//comment26" : " m_gasUsed[4] = startgas - msg.gas;", - "//comment27" : " startgas = msg.gas;", - "//comment28" : "", - "//comment29" : " storage = 0; //non zero to zero", - "//comment30" : " m_gasUsed[5] = startgas - msg.gas;", - "//comment31" : " startgas = msg.gas;", - "//comment32" : "", - "//comment33" : " return true;", - "//comment34" : " }", - "//comment35" : "}", + "//comment8" : "", + "//comment9" : " storage = 1; //zero to non zero", + "//comment10" : " m_gasUsed[0] = startgas - msg.gas;", + "//comment11" : " startgas = msg.gas;", + "//comment12" : "", + "//comment13" : " storage = 2; //non zero to non zero", + "//comment14" : " m_gasUsed[1] = startgas - msg.gas;", + "//comment15" : " startgas = msg.gas;", + "//comment16" : "", + "//comment17" : " storage = 2; //non zero to same non zero", + "//comment18" : " m_gasUsed[2] = startgas - msg.gas;", + "//comment19" : " startgas = msg.gas;", + "//comment20" : "", + "//comment21" : " storage = 24784793845734; //non zero to huge non zero", + "//comment22" : " m_gasUsed[3] = startgas - msg.gas;", + "//comment23" : " startgas = msg.gas;", + "//comment24" : "", + "//comment25" : " storage = 2; //huge non zero to non zero", + "//comment26" : " m_gasUsed[4] = startgas - msg.gas;", + "//comment27" : " startgas = msg.gas;", + "//comment28" : "", + "//comment29" : " storage = 0; //non zero to zero", + "//comment30" : " m_gasUsed[5] = startgas - msg.gas;", + "//comment31" : " startgas = msg.gas;", + "//comment32" : "", + "//comment33" : " return true;", + "//comment34" : " }", + "//comment35" : "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json index 53ef8cc9e..660192164 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json @@ -33,49 +33,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " struct StructTest", - "//comment4" : " {", - "//comment5" : " address addr;", - "//comment6" : " int amount;", - "//comment7" : " bytes32 str;", - "//comment8" : " mapping (uint => address) funders;", - "//comment9" : " }", - "//comment10" : "", - "//comment11" : " bool returnValue;", - "//comment12" : " int globalValue;", - "//comment13" : " StructTest globalData;", - "//comment14" : " function run() returns (bool)", - "//comment15" : " {", - "//comment16" : " globalValue = 255;", - "//comment17" : " globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", - "//comment18" : " globalData.amount = 255;", - "//comment19" : " globalData.str = 'global data 32 length string';", - "//comment20" : " globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", - "//comment21" : " returnValue = testStructuresAndVariabless();", - "//comment22" : " return returnValue;", - "//comment23" : " }", - "//comment24" : "", - "//comment25" : " function testStructuresAndVariabless() returns (bool res)", - "//comment26" : " {", - "//comment27" : " res = true;", - "//comment28" : " if (globalValue != 255)", - "//comment29" : " return false;", - "//comment30" : "", - "//comment31" : " if (globalValue != globalData.amount)", - "//comment32" : " return false;", - "//comment33" : "", - "//comment34" : " if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment35" : " return false;", - "//comment36" : "", - "//comment37" : " if (globalData.str != 'global data 32 length string')", - "//comment38" : " return false;", - "//comment39" : "", - "//comment40" : " if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment41" : " return false;", - "//comment42" : " }", - "//comment43" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " struct StructTest", + "//comment4" : " {", + "//comment5" : " address addr;", + "//comment6" : " int amount;", + "//comment7" : " bytes32 str;", + "//comment8" : " mapping (uint => address) funders;", + "//comment9" : " }", + "//comment10" : "", + "//comment11" : " bool returnValue;", + "//comment12" : " int globalValue;", + "//comment13" : " StructTest globalData;", + "//comment14" : " function run() returns (bool)", + "//comment15" : " {", + "//comment16" : " globalValue = 255;", + "//comment17" : " globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", + "//comment18" : " globalData.amount = 255;", + "//comment19" : " globalData.str = 'global data 32 length string';", + "//comment20" : " globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", + "//comment21" : " returnValue = testStructuresAndVariabless();", + "//comment22" : " return returnValue;", + "//comment23" : " }", + "//comment24" : "", + "//comment25" : " function testStructuresAndVariabless() returns (bool res)", + "//comment26" : " {", + "//comment27" : " res = true;", + "//comment28" : " if (globalValue != 255)", + "//comment29" : " return false;", + "//comment30" : "", + "//comment31" : " if (globalValue != globalData.amount)", + "//comment32" : " return false;", + "//comment33" : "", + "//comment34" : " if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment35" : " return false;", + "//comment36" : "", + "//comment37" : " if (globalData.str != 'global data 32 length string')", + "//comment38" : " return false;", + "//comment39" : "", + "//comment40" : " if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment41" : " return false;", + "//comment42" : " }", + "//comment43" : "}", "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json index 669956da7..447f00264 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json @@ -61,11 +61,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", + "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } } }, "transaction" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json index ea3952187..fd3d2c030 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json @@ -89,11 +89,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } } }, "transaction" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json index a63ea92e7..beb12498d 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json @@ -89,11 +89,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json index e5f0e61d1..6cfc8a2fe 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json @@ -61,11 +61,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json index 0c49b0185..ee6a631fe 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json @@ -91,11 +91,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json index 4a3ecc36d..7fff171e2 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json @@ -30,9 +30,11 @@ }, "network" : ["Frontier", "Homestead", "EIP150"], "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x01" } + } } } ], diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json index b5507b80e..b887a7353 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json @@ -69,16 +69,16 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "zeroCash transaction data", - "//comment2" : "inputLength, data1, data2, data3, ...", - "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32) [[1]] (MLOAD 1000) }", + "//comment1" : "zeroCash transaction data", + "//comment2" : "inputLength, data1, data2, data3, ...", + "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32) [[1]] (MLOAD 1000) }", "nonce" : "0", "storage" : { } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "NEGATE", + "//comment" : "NEGATE", "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000) [[0]](CALLCODE 5000000 7 0 0 96 1000 64) [[1]](MLOAD 1000) [[2]](MLOAD 1032) }", "nonce" : "0", "storage" : { @@ -86,7 +86,7 @@ }, "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "ADD", + "//comment" : "ADD", "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 5000000 6 0 0 128 1000 64) [[1]](MLOAD 1000) [[2]](MLOAD 1032) }", "nonce" : "0", "storage" : { -- cgit