From b2c47a6c5bf786ede388b92c9e2c4be699bc4eb9 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethdev.com>
Date: Wed, 22 Mar 2017 19:30:20 +0400
Subject: revert opcode test fillers
---
.../stRevertTest/RevertOpcodeCallsFiller.json | 298 +++++++++++++++++++++
.../stRevertTest/RevertOpcodeCreateFiller.json | 56 +++-
.../stRevertTest/RevertOpcodeDirectCallFiller.json | 116 ++++++++
.../stRevertTest/RevertOpcodeFailFiller.json | 64 -----
.../stRevertTest/RevertOpcodeFiller.json | 49 +++-
.../stRevertTest/RevertOpcodeInInitFiller.json | 120 +++++++++
.../TouchToEmptyAccountRevert3Filler.json | 4 +-
7 files changed, 630 insertions(+), 77 deletions(-)
create mode 100644 src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
create mode 100644 src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
delete mode 100644 src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFailFiller.json
create mode 100644 src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
new file mode 100644
index 000000000..65b1da723
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
@@ -0,0 +1,298 @@
+{
+ "RevertOpcodeCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0a" : "0x01"
+ }
+ },
+ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x0e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0a" : "0x01"
+ }
+ },
+ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x02" : "0x0e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0a" : "0x01"
+ }
+ },
+ "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x02" : "0x0e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 2,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0a" : "0x01"
+ }
+ },
+ "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x02" : "0x0e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 2,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 3,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0a" : "0x01"
+ }
+ },
+ "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x02" : "0x0e"
+ }
+ },
+ "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x04" : "0x01",
+ "0x05" : "0x0e"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CALLCODE 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (DELEGATECALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CALL 100000 0xb3305374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[4]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[5]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b"
+ ],
+ "gasLimit" : [
+ "460000", "100000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json
index e4861d89b..9e0304078 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json
@@ -15,13 +15,49 @@
"gas" : -1,
"value" : -1
},
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "result" : {
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x00" : "0x0c",
+ "0x01" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
"network" : ["Metropolis"],
"result" : {
- "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
"shouldnotexist" : "1"
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "nonce" : "1"
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
}
}
}
@@ -34,19 +70,27 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }",
+ "code" : "{ (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE 1 17 15) [[0]] 12 }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "0x600160005560016000fd"
+ "0x600160005560016000fe6011600155"
],
"gasLimit" : [
- "160000"
+ "460000", "70000"
],
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
"0"
]
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
new file mode 100644
index 000000000..71c78d645
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json
@@ -0,0 +1,116 @@
+{
+ "RevertOpcodeDirectCall" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "result" : {
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x02" : "0x0e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[10]] (CALL 60000 (CALLDATALOAD 0) 0 0 0 0 0)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "!!! STRANGE: CALL works, but if called from 094... it wont work. even if gas is enough. seems to be OOG.",
+ "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+ ],
+ "gasLimit" : [
+ "460000", "70000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFailFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFailFiller.json
deleted file mode 100644
index c5e604350..000000000
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFailFiller.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "RevertOpcodeFail" : {
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "0x020000",
- "currentGasLimit" : "10000000",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Metropolis"],
- "result" : {
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "nonce" : "0"
- },
- "a000000000000000000000000000000000000000" : {
- "storage" : {
- }
- }
- }
- }
- ],
- "pre" :
- {
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000",
- "code" : "",
- "nonce" : "0",
- "storage" : {
- }
- },
- "a000000000000000000000000000000000000000" : {
- "balance" : "1",
- "code" : "0x600160005560016000fd",
- "nonce" : "",
- "storage" : {
- }
- }
- },
- "transaction" : {
- "data" : "",
- "data" : [
- ""
- ],
- "gasLimit" : [
- "800000"
- ],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "a000000000000000000000000000000000000000",
- "value" : [
- "10"
- ]
- }
- }
-}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json
index 17c87bb63..be1a3146a 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json
@@ -15,12 +15,51 @@
"gas" : -1,
"value" : -1
},
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999958985",
+ "nonce" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
"network" : ["Metropolis"],
"result" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999970000",
"nonce" : "1"
},
"a000000000000000000000000000000000000000" : {
+ "balance" : "0",
"storage" : {
}
}
@@ -37,27 +76,27 @@
}
},
"a000000000000000000000000000000000000000" : {
- "balance" : "1",
- "code" : "0x600160005560016000fd",
+ "balance" : "0",
+ "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 11 }",
+ "code" : "0x600160005560016000fd6011600155",
"nonce" : "",
"storage" : {
}
}
},
"transaction" : {
- "data" : "",
"data" : [
""
],
"gasLimit" : [
- "800000"
+ "800000", "30000"
],
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "a000000000000000000000000000000000000000",
"value" : [
- "10"
+ "0", "10"
]
}
}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
new file mode 100644
index 000000000..8aa10605c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
@@ -0,0 +1,120 @@
+{
+ "RevertOpcodeInInit" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead", "EIP158", "EIP150"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158", "EIP150"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }",
+ "data" : [
+ "0x600160005560016000fd6011600155"
+ ],
+ "gasLimit" : [
+ "160000", "40000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0", "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
index 5bbf12567..c7402caf3 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
@@ -60,14 +60,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": {
}
}
--
cgit v1.2.3