diff options
| author | Dimitry <winsvega@mail.ru> | 2017-04-19 18:28:03 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2017-04-19 18:28:03 +0800 |
| commit | 3b90fbfaf0b6180be9276bbd050ac2475b95d949 (patch) | |
| tree | b11b36454485f496c92a7bb3a6c2aa060034647c /src | |
| parent | 789c43bdbb4cb5913e28f855df35703ac87a40c9 (diff) | |
| download | dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar.gz dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar.bz2 dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar.lz dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar.xz dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.tar.zst dexon-tests-3b90fbfaf0b6180be9276bbd050ac2475b95d949.zip | |
replace SUICIDE with SELFDESTRUCT
Diffstat (limited to 'src')
147 files changed, 504 insertions, 504 deletions
diff --git a/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json b/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json index df3afdd31..d99a3929f 100644 --- a/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json +++ b/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json @@ -32,7 +32,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} } }, diff --git a/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json b/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json index bffcaf06d..79431f14b 100644 --- a/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json +++ b/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json @@ -32,7 +32,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} } }, diff --git a/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json b/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json index 52033b895..ac6e0b54e 100644 --- a/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json +++ b/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json @@ -341,14 +341,14 @@ "1000000000000000000000000000000000000012" : { "balance" : "10000", "nonce" : "0", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000002) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000002) }", "storage": { } }, "1000000000000000000000000000000000000013" : { "balance" : "10000", "nonce" : "0", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000003) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000003) }", "storage": { } }, @@ -539,7 +539,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to not existing account", - "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000015) }", + "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000015) }", "storage": { } }, @@ -555,7 +555,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to not existing account", - "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }", + "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }", "storage": { } }, @@ -571,7 +571,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to existing account", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000117) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000117) }", "storage": { } }, diff --git a/src/BlockchainTestsFiller/bcStateTestFiller.json b/src/BlockchainTestsFiller/bcStateTestFiller.json index 15a667782..0514d40cc 100644 --- a/src/BlockchainTestsFiller/bcStateTestFiller.json +++ b/src/BlockchainTestsFiller/bcStateTestFiller.json @@ -32,7 +32,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} } }, diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json index 83b77d0cf..2f3e92b33 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json @@ -35,7 +35,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json index 914d693e1..ef0bb44d6 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json @@ -42,7 +42,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json index 91545acd8..e909e0fc6 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json @@ -45,7 +45,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json index 5001c9607..feb633668 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json @@ -42,7 +42,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json index 80cc09ead..375028a18 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json @@ -46,7 +46,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json index 3e10ebba4..faaff2298 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json @@ -35,7 +35,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json index 96606d0d7..e5c3039c3 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json @@ -46,7 +46,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json index b60e64c9e..3c184ddd2 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json @@ -52,7 +52,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json index 057636511..3adf0327c 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json @@ -41,7 +41,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json index a877fdf9c..7566f127c 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json @@ -55,7 +55,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json index a34b7df31..0168295ab 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json @@ -39,7 +39,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json index 263112150..ebc1b2302 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json @@ -52,7 +52,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json index 4b43bf9e6..2b7f35f8c 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json @@ -46,7 +46,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json index 15e78422e..996f4077f 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json @@ -45,7 +45,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json index 4eee2cac3..c42863d36 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json @@ -54,7 +54,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json index 23057bf9a..07dff169f 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json @@ -39,7 +39,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json index e70babfde..f43bd14bb 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json @@ -42,7 +42,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json index 3901f4fdf..c8dbec083 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json @@ -53,7 +53,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json index 1c38146e4..a87c67478 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json @@ -44,7 +44,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json index 3e6288f3a..b7343121e 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json @@ -53,7 +53,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json index cfb398699..a092d3623 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json @@ -31,7 +31,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json index ad58180c9..31e8d5600 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json @@ -22,7 +22,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json index 0bf73dab8..39d74750d 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json @@ -22,7 +22,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json index ccccc33f2..f5e8ec2fa 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json @@ -22,7 +22,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json index 75f644a2b..3c6425939 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json @@ -22,7 +22,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json index c9984e3a7..da9704605 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json @@ -31,7 +31,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json index 502c0dd1f..96111346f 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json @@ -22,7 +22,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json index 25aedb077..2cda03a6e 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json @@ -98,7 +98,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json index 076ea80a0..bb57086f9 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json @@ -107,7 +107,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json index 08dcfa3c3..7db69b677 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json @@ -85,7 +85,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json index e72fb0068..b6261929a 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json index 5a296329a..f59ae993a 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json @@ -92,7 +92,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json index 558c36254..69f7d9893 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json @@ -98,7 +98,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json index 9e45da78b..e5477c366 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json @@ -73,7 +73,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json index a2cb13d97..a0bee2a91 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json @@ -69,7 +69,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json index c918fa5e4..8007b66b5 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json @@ -102,7 +102,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json index a83507801..855ecd359 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json @@ -86,7 +86,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json index be879c584..16a198900 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json @@ -100,7 +100,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json index fa42b1019..830a16306 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json @@ -98,7 +98,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json index 0c2b600ed..f41fb351a 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json @@ -71,7 +71,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json index 1249951ff..1c412f2b7 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json @@ -86,7 +86,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json index 6298fd043..29148030e 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json index ebe9c351e..9d2fb634b 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json @@ -94,7 +94,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json index c4528a180..a1848d5f6 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json @@ -89,7 +89,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json index 234ec5c40..1b742c96e 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json @@ -98,7 +98,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json index 0505998d8..4c9f52470 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json @@ -99,7 +99,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json index d5d7f2c6a..51d6917b7 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json @@ -83,7 +83,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json index 501ab453d..7e1e0b1a4 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json index bdd214663..02f14dd08 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json @@ -90,7 +90,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json index 2f9aef167..013a0ea8f 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json @@ -96,7 +96,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json index 56928a872..578943ffb 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json @@ -73,7 +73,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json index fb059d2a9..3488bc2d8 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json @@ -69,7 +69,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json index 8cfa4455b..322b5e42c 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json @@ -100,7 +100,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json index 7d99b556b..4d123c8b8 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json index 9477a67d0..aaf41d44b 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json @@ -104,7 +104,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json index d107e72c5..348af2dde 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json index 0c2b600ed..f41fb351a 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json @@ -71,7 +71,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json index 07c73d1b2..b89be6046 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json @@ -86,7 +86,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json index 26c13a8ce..6c31fce9a 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json @@ -88,7 +88,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json index 8a9c7e02e..bc99bd832 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json @@ -81,7 +81,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json index c4528a180..a1848d5f6 100644 --- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json @@ -89,7 +89,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json index 167291223..26f537b9d 100644 --- a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json +++ b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json @@ -55,7 +55,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json index 111aa7627..d53132caa 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json @@ -67,7 +67,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json index ae0a83c97..9526fec42 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json @@ -87,7 +87,7 @@ } }, "transaction" : { - "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", + "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json index 736e89f11..d48bfded9 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json @@ -67,7 +67,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json index 1c231bc62..d71de4068 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json @@ -129,7 +129,7 @@ } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}", "data" : [ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff" ], diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json index b2186f209..ca07be06d 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json @@ -67,7 +67,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to existing account", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json index 932f81024..ed8f8b575 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json @@ -85,7 +85,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to not existing account", - "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }", + "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json index 5c243b09f..274ae2eae 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json @@ -69,7 +69,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json index a890117e2..d58532c9b 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json @@ -69,7 +69,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json index 3c37373a2..a32edcdc4 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json @@ -1,5 +1,5 @@ { - "NonZeroValue_SUICIDE" : { + "NonZeroValue_SELFDESTRUCT" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -57,7 +57,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json index d156c983e..72be2bcf3 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json @@ -1,5 +1,5 @@ { - "NonZeroValue_SUICIDE_ToEmpty" : { + "NonZeroValue_SELFDESTRUCT_ToEmpty" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -54,7 +54,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json index b0efd8f4e..e37231aaf 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json @@ -1,5 +1,5 @@ { - "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : { + "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -54,7 +54,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json index 390687346..8c0b3d678 100644 --- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json @@ -1,5 +1,5 @@ { - "NonZeroValue_SUICIDE_ToOneStorageKey" : { + "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -60,7 +60,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json index 5816c4238..cc7dd4309 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json @@ -85,7 +85,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json index 5385ac41c..4d1177535 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json @@ -76,7 +76,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json index c637905b9..d5f61e742 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json @@ -79,7 +79,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { "0x01" : "0x01" diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json index e38ebe7f2..13cecaff7 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json @@ -82,7 +82,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { "0x01" : "0x01" diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json index 419c699cc..e24ec383b 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json @@ -70,7 +70,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { "0x01" : "0x01" diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json index 6012272b9..d401e15b3 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json @@ -43,7 +43,7 @@ }, "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "nonce" : "0", "storage" : { "0x01" : "0x01" diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json index c2b534728..a60c1abf5 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json @@ -28,7 +28,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json index a247d258c..466dce4b6 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json @@ -68,7 +68,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json index 258378d44..4daaf0e1f 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json @@ -45,7 +45,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}", + "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json index 4397eb18f..97b2fa689 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json @@ -47,7 +47,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json index 40076abd2..c44e78d78 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json @@ -26,7 +26,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json index fd92889c3..cac829be5 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json @@ -47,7 +47,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json index 42d60e8a5..4a1cffdc1 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json @@ -41,7 +41,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json index 779637b30..cc81f0187 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json @@ -26,7 +26,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json index 02078c696..9a96c41ab 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json @@ -45,7 +45,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}", + "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json index ad0745635..957d15027 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json @@ -47,7 +47,7 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json index 2aa4c53e2..17c27cb35 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json @@ -27,7 +27,7 @@ "pre" : { "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -41,7 +41,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json index f81b29861..de3e26a78 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json @@ -45,7 +45,7 @@ "pre" : { "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -59,7 +59,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json index 59f922df1..b8d121402 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json @@ -33,7 +33,7 @@ "pre" : { "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -47,7 +47,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json index 4d3ebc847..87b090434 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json @@ -43,7 +43,7 @@ "pre" : { "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -57,7 +57,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json index 58dc51cb9..3105ff6d5 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json @@ -54,7 +54,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json index f11bfb9ce..c7a3ad5f8 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json @@ -58,7 +58,7 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json index 02c35e802..588e82640 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json @@ -34,7 +34,7 @@ "pre" : { "0000000000000000000000000000000000000000" : { "balance" : "1110", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -48,7 +48,7 @@ }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10000", - "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", + "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json index b53fe4c85..4967e8386 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -48,7 +48,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json index 5517686c5..55d92b0f6 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -48,7 +48,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json index 55cd560a5..773d18fc4 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -48,7 +48,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json index af4905cd3..c2938a067 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -49,7 +49,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json index 0b7cf79ef..16ebbf32e 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE" : { + "ZeroValue_SELFDESTRUCT" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -58,7 +58,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json index ec98daec2..b093b921c 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToEmpty" : { + "ZeroValue_SELFDESTRUCT_ToEmpty" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -58,7 +58,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json index e67f1f756..fde15c8d5 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToNonZeroBalance" : { + "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -54,7 +54,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json index 0273c70b1..11b1aeed7 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json @@ -1,5 +1,5 @@ { - "ZeroValue_SUICIDE_ToOneStorageKey" : { + "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -56,7 +56,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json index 8757f5bd5..688e8374f 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json @@ -3167,7 +3167,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3233,7 +3233,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3303,7 +3303,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3368,7 +3368,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3444,7 +3444,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3513,7 +3513,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3579,7 +3579,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3647,7 +3647,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3706,7 +3706,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3765,7 +3765,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3828,7 +3828,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3891,7 +3891,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3960,7 +3960,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4030,7 +4030,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4106,7 +4106,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4185,7 +4185,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4255,7 +4255,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4333,7 +4333,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4410,7 +4410,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4487,7 +4487,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json index 2e8992d79..58357a71e 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json @@ -976,7 +976,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1015,7 +1015,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1054,7 +1054,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1096,7 +1096,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1135,7 +1135,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1174,7 +1174,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1208,7 +1208,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json index dcb62ded0..c831e5434 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json @@ -2963,7 +2963,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3041,7 +3041,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3124,7 +3124,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3209,7 +3209,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3293,7 +3293,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3370,7 +3370,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3451,7 +3451,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3524,7 +3524,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3589,7 +3589,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3655,7 +3655,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3742,7 +3742,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3822,7 +3822,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3892,7 +3892,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3969,7 +3969,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4052,7 +4052,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4130,7 +4130,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4208,7 +4208,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json index b184b37dd..6067473cf 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json @@ -2947,7 +2947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3025,7 +3025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3107,7 +3107,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3191,7 +3191,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3277,7 +3277,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3354,7 +3354,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3434,7 +3434,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3506,7 +3506,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3571,7 +3571,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3637,7 +3637,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3720,7 +3720,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3799,7 +3799,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3869,7 +3869,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3947,7 +3947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4025,7 +4025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4103,7 +4103,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4181,7 +4181,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json index 8f91dc704..81802b849 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json @@ -468,7 +468,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} } }, @@ -520,7 +520,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -580,7 +580,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -628,7 +628,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -679,7 +679,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -739,7 +739,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } diff --git a/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json index 9f0d4d362..a3c93f7b7 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json @@ -1662,7 +1662,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1702,7 +1702,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1742,7 +1742,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1781,7 +1781,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1820,7 +1820,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}", + "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1859,7 +1859,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}", + "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1898,7 +1898,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1938,7 +1938,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -2526,7 +2526,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -2582,7 +2582,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json index 6a1bbed53..4a1d1dae1 100644 --- a/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json +++ b/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json @@ -1029,7 +1029,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1037,7 +1037,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1083,7 +1083,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 25000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 25000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1091,7 +1091,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1143,7 +1143,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1151,7 +1151,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1198,7 +1198,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1206,7 +1206,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1257,7 +1257,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10000", - "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", + "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", "nonce" : "0", "storage" : { } @@ -1265,7 +1265,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "1110", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1314,7 +1314,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } @@ -1362,7 +1362,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json index f26e23046..4c8f8a50c 100644 --- a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json +++ b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json @@ -2304,7 +2304,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json b/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json index d45751abb..076410684 100644 --- a/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json +++ b/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json @@ -529,7 +529,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to not existing account", - "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }", + "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }", "storage": { } } @@ -586,7 +586,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to existing account", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json index dee375034..7dcf29885 100644 --- a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json +++ b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json @@ -2334,7 +2334,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json index 86fb47b85..a2a165a4d 100644 --- a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json +++ b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json @@ -529,7 +529,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to not existing account", - "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }", + "code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }", "storage": { } } @@ -586,7 +586,7 @@ "balance" : "0", "nonce" : "0", "code" : "Suicide to existing account", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json index b0ff7a237..80ca25ae3 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json @@ -3167,7 +3167,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3233,7 +3233,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3303,7 +3303,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3368,7 +3368,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3444,7 +3444,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3513,7 +3513,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3579,7 +3579,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3647,7 +3647,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3706,7 +3706,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3765,7 +3765,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3828,7 +3828,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3891,7 +3891,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3960,7 +3960,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4030,7 +4030,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4106,7 +4106,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4185,7 +4185,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4255,7 +4255,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4333,7 +4333,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4410,7 +4410,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4487,7 +4487,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json index b96b47839..dd5a297fa 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json @@ -976,7 +976,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1015,7 +1015,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1054,7 +1054,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1096,7 +1096,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1135,7 +1135,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1174,7 +1174,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1208,7 +1208,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json index fb629328b..c5fdfda65 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json @@ -2963,7 +2963,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3041,7 +3041,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3124,7 +3124,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3209,7 +3209,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3293,7 +3293,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3370,7 +3370,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3451,7 +3451,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3524,7 +3524,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3589,7 +3589,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3655,7 +3655,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3742,7 +3742,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3822,7 +3822,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3892,7 +3892,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3969,7 +3969,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4052,7 +4052,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4130,7 +4130,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4208,7 +4208,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json index 77539dadc..cf39d2df4 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json @@ -2947,7 +2947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3025,7 +3025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3107,7 +3107,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3191,7 +3191,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3277,7 +3277,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3354,7 +3354,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3434,7 +3434,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3506,7 +3506,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3571,7 +3571,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3637,7 +3637,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3720,7 +3720,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3799,7 +3799,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3869,7 +3869,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3947,7 +3947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4025,7 +4025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4103,7 +4103,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4181,7 +4181,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json index 4efb1cd77..4ade48d12 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json @@ -468,7 +468,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} } }, @@ -520,7 +520,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -580,7 +580,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -628,7 +628,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -679,7 +679,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -739,7 +739,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } diff --git a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json index 202acbfef..c3d054071 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json @@ -1662,7 +1662,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1702,7 +1702,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1742,7 +1742,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1781,7 +1781,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1820,7 +1820,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}", + "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1859,7 +1859,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}", + "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1898,7 +1898,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1938,7 +1938,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -2526,7 +2526,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -2582,7 +2582,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json index e03ba1729..b053617b3 100644 --- a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json +++ b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json @@ -1023,7 +1023,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1031,7 +1031,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1077,7 +1077,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1085,7 +1085,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1137,7 +1137,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1145,7 +1145,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1192,7 +1192,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1200,7 +1200,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1251,7 +1251,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10000", - "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", + "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", "nonce" : "0", "storage" : { } @@ -1259,7 +1259,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "1110", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1308,7 +1308,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } @@ -1356,7 +1356,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/EIP158/stCreateTestFiller.json b/src/StateTestsFiller/EIP158/stCreateTestFiller.json index c8dc11898..6abe31d81 100644 --- a/src/StateTestsFiller/EIP158/stCreateTestFiller.json +++ b/src/StateTestsFiller/EIP158/stCreateTestFiller.json @@ -705,7 +705,7 @@ }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", "gasLimit" : "100000", "gasPrice" : "1", @@ -756,7 +756,7 @@ }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", "gasLimit" : "100000", "gasPrice" : "1", @@ -813,7 +813,7 @@ }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}", "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff", "gasLimit" : "100000", "gasPrice" : "1", @@ -878,7 +878,7 @@ }, "transaction" : { - "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", + "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}", "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3", "gasLimit" : "600000", "gasPrice" : "1", diff --git a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json index 18a7fce16..52760effa 100644 --- a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json +++ b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json @@ -96,7 +96,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -153,7 +153,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -454,14 +454,14 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "storage": { } }, "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "storage": { } } diff --git a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json index 5d11d158a..b616f1e49 100644 --- a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json +++ b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json @@ -238,7 +238,7 @@ } }, - "NonZeroValue_SUICIDE" : { + "NonZeroValue_SELFDESTRUCT" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -270,7 +270,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -552,7 +552,7 @@ } }, - "NonZeroValue_SUICIDE_ToEmpty" : { + "NonZeroValue_SELFDESTRUCT_ToEmpty" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -581,7 +581,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -860,7 +860,7 @@ } }, - "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : { + "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -889,7 +889,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -1190,7 +1190,7 @@ } }, - "NonZeroValue_SUICIDE_ToOneStorageKey" : { + "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -1222,7 +1222,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json index 357b3fef4..4b9d343ea 100644 --- a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json +++ b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json @@ -242,7 +242,7 @@ } }, - "ZeroValue_SUICIDE_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -281,7 +281,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -578,7 +578,7 @@ } }, - "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -617,7 +617,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -913,7 +913,7 @@ } }, - "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -952,7 +952,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -1257,7 +1257,7 @@ } }, - "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -1297,7 +1297,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json index 6e6cf5cda..bd9243a48 100644 --- a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json +++ b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json @@ -229,7 +229,7 @@ } }, - "ZeroValue_SUICIDE" : { + "ZeroValue_SELFDESTRUCT" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -258,7 +258,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -541,7 +541,7 @@ } }, - "ZeroValue_SUICIDE_ToEmpty" : { + "ZeroValue_SELFDESTRUCT_ToEmpty" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -570,7 +570,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -852,7 +852,7 @@ } }, - "ZeroValue_SUICIDE_ToNonZeroBalance" : { + "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -881,7 +881,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -1172,7 +1172,7 @@ } }, - "ZeroValue_SUICIDE_ToOneStorageKey" : { + "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -1201,7 +1201,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/StateTestsFiller/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/Homestead/stCallCodesFiller.json index 415f3317b..f688f03a8 100644 --- a/src/StateTestsFiller/Homestead/stCallCodesFiller.json +++ b/src/StateTestsFiller/Homestead/stCallCodesFiller.json @@ -3167,7 +3167,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3233,7 +3233,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3303,7 +3303,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3368,7 +3368,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3444,7 +3444,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3513,7 +3513,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3579,7 +3579,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3647,7 +3647,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3706,7 +3706,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3765,7 +3765,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3828,7 +3828,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3891,7 +3891,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3960,7 +3960,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4030,7 +4030,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4106,7 +4106,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4185,7 +4185,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4255,7 +4255,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4333,7 +4333,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4410,7 +4410,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4487,7 +4487,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json index 0fd62627c..5d388df27 100644 --- a/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json +++ b/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json @@ -973,7 +973,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1012,7 +1012,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1051,7 +1051,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1090,7 +1090,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1129,7 +1129,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1168,7 +1168,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1202,7 +1202,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json index 2fad51215..f38499d1e 100644 --- a/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json +++ b/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json @@ -2963,7 +2963,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3041,7 +3041,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3124,7 +3124,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3209,7 +3209,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3293,7 +3293,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3370,7 +3370,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3451,7 +3451,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3524,7 +3524,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3589,7 +3589,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3655,7 +3655,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3742,7 +3742,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3822,7 +3822,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3892,7 +3892,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3969,7 +3969,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4052,7 +4052,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4130,7 +4130,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4208,7 +4208,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json index 70fc2d3aa..2f1a387ac 100644 --- a/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json +++ b/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json @@ -2947,7 +2947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3025,7 +3025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3107,7 +3107,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3191,7 +3191,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3277,7 +3277,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3354,7 +3354,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3434,7 +3434,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3506,7 +3506,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3571,7 +3571,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3637,7 +3637,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3720,7 +3720,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3799,7 +3799,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3869,7 +3869,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -3947,7 +3947,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4025,7 +4025,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4103,7 +4103,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4181,7 +4181,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/Homestead/stRefundTestFiller.json index 9d43c0889..8206df941 100644 --- a/src/StateTestsFiller/Homestead/stRefundTestFiller.json +++ b/src/StateTestsFiller/Homestead/stRefundTestFiller.json @@ -468,7 +468,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} } }, @@ -520,7 +520,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -580,7 +580,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -628,7 +628,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -679,7 +679,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -739,7 +739,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } diff --git a/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json index 71139df94..a8d8e06fa 100644 --- a/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json +++ b/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json @@ -1660,7 +1660,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1700,7 +1700,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1740,7 +1740,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1779,7 +1779,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1818,7 +1818,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}", + "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1857,7 +1857,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}", + "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1896,7 +1896,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1936,7 +1936,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -2524,7 +2524,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -2581,7 +2581,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/Homestead/stTransactionTestFiller.json index 7da27123f..fed46dcdd 100644 --- a/src/StateTestsFiller/Homestead/stTransactionTestFiller.json +++ b/src/StateTestsFiller/Homestead/stTransactionTestFiller.json @@ -1023,7 +1023,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1031,7 +1031,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1077,7 +1077,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1085,7 +1085,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1137,7 +1137,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1145,7 +1145,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1192,7 +1192,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1200,7 +1200,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1251,7 +1251,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10000", - "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", + "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", "nonce" : "0", "storage" : { } @@ -1259,7 +1259,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "1110", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1308,7 +1308,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } @@ -1356,7 +1356,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json b/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json index 0b93440a7..890ae1ddd 100644 --- a/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json +++ b/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json @@ -242,7 +242,7 @@ } }, - "ZeroValue_SUICIDE_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -281,7 +281,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } } @@ -578,7 +578,7 @@ } }, - "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -617,7 +617,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -913,7 +913,7 @@ } }, - "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -952,7 +952,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { } }, @@ -1257,7 +1257,7 @@ } }, - "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : { + "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "45678256", @@ -1297,7 +1297,7 @@ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", "nonce" : "0", - "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": { "0x00" : "0x01" } diff --git a/src/StateTestsFiller/stCallCodesFiller.json b/src/StateTestsFiller/stCallCodesFiller.json index 1ca66a931..91884c74e 100644 --- a/src/StateTestsFiller/stCallCodesFiller.json +++ b/src/StateTestsFiller/stCallCodesFiller.json @@ -3222,7 +3222,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3288,7 +3288,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3358,7 +3358,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3423,7 +3423,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3499,7 +3499,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3568,7 +3568,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3634,7 +3634,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3702,7 +3702,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } @@ -3761,7 +3761,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3820,7 +3820,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3883,7 +3883,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -3946,7 +3946,7 @@ }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", "nonce" : "0", "storage" : { } @@ -4015,7 +4015,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4085,7 +4085,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4161,7 +4161,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4240,7 +4240,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4310,7 +4310,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4388,7 +4388,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4465,7 +4465,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } @@ -4542,7 +4542,7 @@ }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json index 73acb6452..69056c664 100644 --- a/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json +++ b/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json @@ -922,7 +922,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -956,7 +956,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -990,7 +990,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1024,7 +1024,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1058,7 +1058,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1092,7 +1092,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1126,7 +1126,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/StateTestsFiller/stRefundTestFiller.json b/src/StateTestsFiller/stRefundTestFiller.json index 9119fd2d8..2cba9985e 100644 --- a/src/StateTestsFiller/stRefundTestFiller.json +++ b/src/StateTestsFiller/stRefundTestFiller.json @@ -468,7 +468,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} } }, @@ -520,7 +520,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -580,7 +580,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -628,7 +628,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -679,7 +679,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } @@ -739,7 +739,7 @@ "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", + "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", "storage" : { "0x01" : "0x01" } diff --git a/src/StateTestsFiller/stSystemOperationsTestFiller.json b/src/StateTestsFiller/stSystemOperationsTestFiller.json index fbd0a8c99..ae29a0f9b 100644 --- a/src/StateTestsFiller/stSystemOperationsTestFiller.json +++ b/src/StateTestsFiller/stSystemOperationsTestFiller.json @@ -1662,7 +1662,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", + "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1702,7 +1702,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1742,7 +1742,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1781,7 +1781,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", + "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1820,7 +1820,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}", + "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1859,7 +1859,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}", + "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1898,7 +1898,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -1938,7 +1938,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { @@ -2526,7 +2526,7 @@ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -2583,7 +2583,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } diff --git a/src/StateTestsFiller/stTransactionTestFiller.json b/src/StateTestsFiller/stTransactionTestFiller.json index fb9517f8c..41736d2f6 100644 --- a/src/StateTestsFiller/stTransactionTestFiller.json +++ b/src/StateTestsFiller/stTransactionTestFiller.json @@ -1023,7 +1023,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1031,7 +1031,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1077,7 +1077,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1085,7 +1085,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1137,7 +1137,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1145,7 +1145,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1192,7 +1192,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}", + "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}", "nonce" : "0", "storage" : { } @@ -1200,7 +1200,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1251,7 +1251,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "10000", - "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", + "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }", "nonce" : "0", "storage" : { } @@ -1259,7 +1259,7 @@ "0000000000000000000000000000000000000000" : { "balance" : "1110", - "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}", + "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}", "nonce" : "0", "storage" : { } @@ -1308,7 +1308,7 @@ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } @@ -1356,7 +1356,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000", - "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", + "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}", "nonce" : "0", "storage" : { } diff --git a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json index f0b8b3838..af413fa0c 100644 --- a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json +++ b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json @@ -1849,7 +1849,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "10000000000000033000", "nonce" : "88", - "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 SHA3 ADDRESS SUICIDE 1 2 RETURN)", + "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 SHA3 ADDRESS SELFDESTRUCT 1 2 RETURN)", "storage": {} } }, diff --git a/src/VMTestsFiller/vmSystemOperationsTestFiller.json b/src/VMTestsFiller/vmSystemOperationsTestFiller.json index e1c3c49fe..0b91e22cc 100644 --- a/src/VMTestsFiller/vmSystemOperationsTestFiller.json +++ b/src/VMTestsFiller/vmSystemOperationsTestFiller.json @@ -784,7 +784,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (CALLER))}", + "code" : "{ (SELFDESTRUCT (CALLER))}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -825,7 +825,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -866,7 +866,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -1345,7 +1345,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -1396,7 +1396,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } |