diff options
| author | Dimitry <dimitry@ethdev.com> | 2016-12-20 23:08:11 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethdev.com> | 2016-12-20 23:08:11 +0800 |
| commit | 55125b1fdd58942077e8a78c81dee9d58a43a334 (patch) | |
| tree | 10fcf9270d79a779499abfe180619edc7eee24da /src/GeneralStateTestsFiller/stWalletTest | |
| parent | bedfa3a50a8daf3161e6795eabbf4bfd7d359c48 (diff) | |
| download | dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar.gz dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar.bz2 dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar.lz dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar.xz dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.tar.zst dexon-tests-55125b1fdd58942077e8a78c81dee9d58a43a334.zip | |
finish eip150 tests to GeneralStateTests
Diffstat (limited to 'src/GeneralStateTestsFiller/stWalletTest')
42 files changed, 290 insertions, 35 deletions
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json index e8c365f96..61754490c 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead"], + "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "code" : "0x", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json index ff52c7e38..107363bdc 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "0x04661a", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json index 6e36ae0b7..30df2068f 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json @@ -43,7 +43,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP158"], + "network" : ["Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "code" : "0x", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json index 30f6134d3..5f2a9361d 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json index ee7bf6d6f..50bd8e8c5 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json index 3d29fd3d2..a71743694 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json index 054c5d559..bbf7677da 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json index 9c6431d1d..130bce370 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json index b14dd1d13..4c19980d8 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json index 5ee4e0a89..3b8f7b19a 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json index 7186b8312..b2bb026b8 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json index 0815cfdaf..78c1dc5f6 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json index 1fa4adba5..24d782d3c 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json index ff18d52e1..bb560820b 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json index cdbaf18b8..412a7e9c8 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json index f47ebf143..32cbf8cbf 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead"], + "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json index ebb3c722c..f4aec8ec7 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "0x03e9c1", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json index ff439bc9f..233f77858 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json @@ -43,7 +43,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP158"], + "network" : ["Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "shouldnotexist" : "1" diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json index 4a535af37..4e3d6a423 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json index 92fab8cb7..7420a61d1 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json index 308387714..d33a19e0f 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json @@ -48,6 +48,39 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "999999999999644910", + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0xc8", + "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json index af646d14a..a84ef5d6d 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json index 38e71e0ac..21c42d064 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json index 64884dce8..0ac00eeca 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json index c766c9a98..d6bf86ec2 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0xc8", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json index adbc23093..e849664b8 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json @@ -53,6 +53,44 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999885078", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x03", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x05" : "0xbbb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x3412a0f379bad2d2f891e4db16a42d964dd63a031e22596f10b4dab2aaa1d252" : "0x03", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json index 85ef6eb7e..9f95706b1 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json @@ -51,6 +51,42 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999891902", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x02", + "0x0107" : "0x0c22e4", + "0x03" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x62ce4f671906be9a217487bb98e428b08e12100fb0007df10572ca00206e7d73" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json index 18fc78b83..171ff5a2d 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json @@ -51,6 +51,42 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999906261", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x02", + "0x01" : "0x02", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json index 98bbc3e6d..5d173bc56 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json @@ -59,6 +59,50 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999950212", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebaaa" : { + "balance" : "0x09", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x5b", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x02", + "0x01" : "0x02", + "0x0104" : "0x01", + "0x0107" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json index 358f6e3fe..3a412549d 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead"], + "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "code" : "0x", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json index 54112a8fe..f2b132944 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json @@ -51,7 +51,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["Homestead", "EIP158"], + "network" : ["Homestead", "EIP150", "EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "1225022", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json index eba3e78af..9501c2362 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead"], + "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json index 5676b0fa5..96c037db6 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json index 156c55497..facaac5eb 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "0x5252", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json index f1308bdf8..ec5f2d29a 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json index 7ac53c160..a83aa8a4b 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json index 56bc17293..df7daa7fd 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json index 139e63157..7ba62a225 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json index 2dd145520..f8879f3e5 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json index 5d0e18ac8..86de9beb5 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json @@ -49,6 +49,40 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "999999999999644639", + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0xc8", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0106" : "0x0c22e4", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json index 404e9f0be..c16b160b3 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0x02", diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json index 21297182a..ed500933c 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json @@ -49,6 +49,40 @@ "gas" : -1, "value" : -1 }, + "network" : ["EIP150"], + "result" : { + "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { + "balance" : "99999999882352", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01", + "storage" : { + } + }, + "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0x0c22e4", + "0x03" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x01" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["EIP158"], "result" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { |