aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json64
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json62
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json62
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json64
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json57
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json49
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json51
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json103
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcall_00Filler.json7
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_1Filler.json7
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_2Filler.json7
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json7
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json19
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGEFiller.json10
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json45
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json44
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideEndFiller.json10
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json12
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json39
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001Filler.json53
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json29
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGEFiller.json48
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json10
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json44
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json50
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json54
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json46
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json50
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json45
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json8
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json48
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json39
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json37
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json20
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json32
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json37
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json46
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json24
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json46
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json8
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json43
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json48
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json48
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json47
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json48
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json8
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json39
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json70
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json36
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json22
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json44
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json6
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json38
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json46
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json46
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json43
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json4
69 files changed, 708 insertions, 1619 deletions
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json
index c62a70411..b3577feba 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls0Filler.json
@@ -11,13 +11,14 @@
"expect" : [
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
"storage" : {
"0x24" : "0x00"
}
@@ -26,11 +27,51 @@
"storage" : {
"0x26" : "0x00"
}
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x0ce29d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x24" : "0x00"
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x26" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x0df479"
+ }
}
}
}
],
"pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
"code" : "{ [[ (PC) ]] (STATICCALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
@@ -45,6 +86,20 @@
"storage" : {
}
},
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 1 (PC)) (STATICCALL 100000 0x245304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : " { (MSTORE 1 (PC)) (STATICCALL 50000 0x195e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0) } ",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000000000000000",
"code" : "",
@@ -55,7 +110,8 @@
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "0x000000000000000000000000195e7baea6a6c7c4c2dfeb977efac326af552d87"
],
"gasLimit" : [
"1000000"
@@ -63,7 +119,7 @@
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"100000"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json
index 00f4999c4..247233357 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls1Filler.json
@@ -11,12 +11,44 @@
"expect" : [
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01d8b81b"
+ }
+ },
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x26" : "0x00"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x29" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x3b957609"
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
"0x26" : "0x00"
@@ -31,6 +63,13 @@
}
],
"pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
"code" : "{ [[ (PC) ]] (STATICCALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
@@ -45,6 +84,20 @@
"storage" : {
}
},
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 1 (PC)) (STATICCALL (- (GAS) 100000) 0x245304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : " { (MSTORE (PC) (ADD 1 (STATICCALL (- (GAS) 100000) 0x195e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0)) ) } ",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000000000000000",
"code" : "",
@@ -55,7 +108,8 @@
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "0x000000000000000000000000195e7baea6a6c7c4c2dfeb977efac326af552d87"
],
"gasLimit" : [
"1000000000"
@@ -63,7 +117,7 @@
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"100000"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
index b5743d180..cda5a1a6e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
@@ -31,16 +31,48 @@
},
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158", "Metropolis"],
+ "network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01d8c976"
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
+ "0x" : "0x01"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
"0x" : "0"
}
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x3b955b28"
+ }
+ },
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x00"
+ }
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"storage" : {
@@ -51,6 +83,13 @@
}
],
"pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
"code" : "{ [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
@@ -65,6 +104,20 @@
"storage" : {
}
},
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ ( MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL (- (GAS) 100000) 0x245304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "0",
+ "code" : " { ( MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL (- (GAS) 100000) 0x195e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0) } ",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000000000000000",
"code" : "",
@@ -75,7 +128,8 @@
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "0x000000000000000000000000195e7baea6a6c7c4c2dfeb977efac326af552d87"
],
"gasLimit" : [
"1000000000"
@@ -83,7 +137,7 @@
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"100000"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
index 8be1e8fc6..ee91e7ea7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
@@ -31,15 +31,21 @@
},
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158", "Metropolis"],
+ "network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x0467fd"
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
- "0x" : "0"
+ "0x" : "0x01"
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -48,9 +54,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x95c35c"
+ }
+ },
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0"
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x" : "0"
+ }
+ }
+ }
}
],
"pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1025000",
"code" : "{ [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
@@ -65,6 +104,20 @@
"storage" : {
}
},
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1025000",
+ "code" : "{ (MSTORE 0 (ADD (SLOAD 0) 1)) (STATICCALL (- (GAS) 100000) 0x245304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "0",
+ "code" : " { (MSTORE 0 (ADD (SLOAD 0) 1)) (STATICCALL (- (GAS) 100000) 0x195e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0) } ",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000000000000000",
"code" : "",
@@ -75,7 +128,8 @@
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "0x000000000000000000000000195e7baea6a6c7c4c2dfeb977efac326af552d87"
],
"gasLimit" : [
"10000000"
@@ -83,7 +137,7 @@
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"100000"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
index 770f12fa8..72931d652 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
@@ -11,21 +11,55 @@
"expect" : [
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"storage" : {
"0x26" : "0"
}
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x962352"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x96f73c"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x26" : "0"
+ }
}
}
}
],
"pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
"code" : "{ [[ (PC) ]] (STATICCALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }",
@@ -40,6 +74,20 @@
"storage" : {
}
},
+ "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE (PC) (STATICCALL 100000 0x245304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0)) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "{ (MSTORE (PC) (ADD 1 (STATICCALL 50000 0x195e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0)) ) } ",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000000000000000",
"code" : "",
@@ -50,7 +98,8 @@
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "0x000000000000000000000000195e7baea6a6c7c4c2dfeb977efac326af552d87"
],
"gasLimit" : [
"10000000"
@@ -58,7 +107,7 @@
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"100000"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
index d37949408..9327c6e1e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
@@ -38,14 +38,14 @@
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
- "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (STATICCALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 32 0 0) }",
+ "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 32 0 0) }",
"nonce" : "0",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (STATICCALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 32 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+ "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 32 0 0) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
index 169cb2aca..7aff2173a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
@@ -10,7 +10,7 @@
},
"expect" : [
{
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+ "indexes" : { "data" : 0, "gas" : -1, "value" : -1 },
"network" : [ "Metropolis" ],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -18,7 +18,31 @@
"0x00" : "0x01",
"0x01" : "0x00"
}
- }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x7effff9ff4"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : { "data" : 1, "gas" : -1, "value" : -1 },
+ "network" : [ "Metropolis" ],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x1000001848dd"
+ }
+ }
}
}
],
@@ -37,25 +61,40 @@
"storage" : {
}
},
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1024",
"code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0) }",
"nonce" : "0",
"storage" : {
}
+ },
+ "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1024",
+ "code" : "{ (MSTORE 0 (ADD (MLOAD 0) 1)) (MSTORE 32 (STATICCALL 0xfffffffffff 0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b (MLOAD 0) 0 0 0)) }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000cbbf5374fce5edbc8e2a8697c15331677e6ebf0b"
],
"gasLimit" : [
- "17592186099592"
+ "0x10000000d788"
],
"gasPrice" : "1",
"nonce" : "",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"10"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
index 74d2ba4a5..d8aaead40 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
@@ -22,7 +22,35 @@
"0x00" : "1",
"0x01" : "0x0a"
}
- }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x7ffffffffffdadb4"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0"
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x7ffffffffffef99b"
+ }
+ }
}
}
],
@@ -41,17 +69,32 @@
"storage" : {
}
},
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000",
"code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](STATICCALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
+ },
+ "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000",
+ "code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) (MSTORE 0 (STATICCALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 50000 0 0)) ) (MSTORE 32 @i)}",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000cbbf5374fce5edbc8e2a8697c15331677e6ebf0b"
],
"gasLimit" : [
"0x7ffffffffffffff0"
@@ -59,7 +102,7 @@
"gasPrice" : "1",
"nonce" : "",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"10"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json
index 9255e33f8..fb3d7110b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1MB1024CalldepthFiller.json
@@ -9,82 +9,56 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
+ {
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0xffffffffffffffffffffff3286e6a6ff",
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- },
- "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0fffffffffffff",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
- },
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "882500000000",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
- },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0fffffffffffff",
- "code" : "0x60016000540160005561040060005410601b5760016002556047565b60006000620f42406000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03f16001555b",
+ "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b",
"nonce" : "0x00",
"storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
}
- }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "340282366920938463463374606576630825020"
+ }
}
},
{
"indexes" : {
- "data" : -1,
+ "data" : 1,
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158", "Metropolis"],
+ "network" : ["Metropolis"],
"result" : {
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "340282366920938463463374607430637251019",
- "code" : "0x",
- "nonce" : "0x01",
- "storage" : {
- }
- },
- "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0fffffffffffff",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
- },
- "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1130960426",
- "code" : "0x",
- "nonce" : "0x00",
- "storage" : {
- }
- },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "4503599627370505",
- "code" : "0x60016000540160005561040060005410601b5760016002556047565b60006000620f42406000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03f16001555b",
+ "code" : "0x60016000540160005561040060005410601b5760016002556045565b60006000620f4240600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03fa6001555b",
"nonce" : "0x00",
"storage" : {
- "0x00" : "0x0231",
- "0x01" : "0x01"
+ "0x00" : "0x00",
+ "0x01" : "0x00"
}
- }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "340282366920938463463374607430644755785"
+ }
}
}
],
@@ -103,17 +77,32 @@
"storage" : {
}
},
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0xfffffffffffff",
+ "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (STATICCALL (- (GAS) 1005000) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 1000000 0 0) [[ 2 ]] 1 ) }",
"nonce" : "0",
"storage" : {
}
+ },
+ "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xfffffffffffff",
+ "code" : "{ (def 'i 0x80) (MSTORE 0 (+ (MLOAD 0) 1)) (if (LT (MLOAD 0) 1024) (MSTORE 32 (STATICCALL (- (GAS) 1005000) 0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 1000000 0 0)) (MSTORE 64 1) ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- ""
+ "0x000000000000000000000000bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "0x000000000000000000000000cbbf5374fce5edbc8e2a8697c15331677e6ebf0b"
],
"gasLimit" : [
"882500000000"
@@ -121,7 +110,7 @@
"gasPrice" : "1",
"nonce" : "",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
"10"
]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00Filler.json
index 79a7e5466..598bb5ed7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00Filler.json
@@ -13,6 +13,11 @@
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
"network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
"1000000000000000000000000000000000000002" : {
"storage" : {
"0x02" : "0x00",
@@ -38,7 +43,7 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 250000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json
index 1faf5e147..4ddea4cbc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json
@@ -11,11 +11,11 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00"
}
@@ -44,7 +44,7 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 20020 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_1Filler.json
index 63077270b..b858d8427 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_1Filler.json
@@ -17,6 +17,11 @@
},
"network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
"1000000000000000000000000000000000000002" : {
"storage" : {
"0x02" : "0x00",
@@ -35,7 +40,7 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_2Filler.json
index 05df50c69..9522c04ba 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGE_2Filler.json
@@ -22,6 +22,11 @@
"0x02" : "0x00",
"0x05" : "0x00"
}
+ },
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
}
}
}
@@ -35,7 +40,7 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
index 3d1ab43d0..aad89b7b3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
@@ -14,7 +14,10 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000000000000000"
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
@@ -35,7 +38,7 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+ "code" : "{ (STATICCALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json
index 5496dbc2b..84f3a3a5c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.json
@@ -11,8 +11,21 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ }
+ },
"1000000000000000000000000000000000000003" : {
"storage" : {
"0x014a" : "0x00",
@@ -38,14 +51,14 @@
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGEFiller.json
index 0ae9303db..ee72783fc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGEFiller.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -23,7 +23,7 @@
},
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
}
@@ -45,21 +45,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json
index d67bd0a0b..ebb876f2e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json
@@ -9,48 +9,17 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
- "0x03" : "0x00"
+ "0x03" : "0x00",
+ "0x6f" : "0x015cb7"
}
},
"1000000000000000000000000000000000000001" : {
@@ -77,21 +46,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 56000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 111 ]] (GAS) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "code" : "{ (STATICCALL 45000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json
index cfee3edbd..10ca3459e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json
@@ -15,43 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -86,19 +50,19 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) )}",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json
index 5cb24c51d..9f4ac28c4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -45,21 +45,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ (MSTORE 3 1) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideEndFiller.json
index 584ced914..f227ce048 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideEndFiller.json
@@ -14,12 +14,12 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000001" : {
- "balance" : "20000000000"
+ "balance" : "10000000000"
},
"1000000000000000000000000000000000000003" : {
"balance" : "10000000000",
"storage" : {
- "0x03" : "0x01"
+ "0x03" : "0x00"
}
}
}
@@ -28,21 +28,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
+ "code" : "{ (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json
index 2598985c5..3a7709346 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json
@@ -11,10 +11,10 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
+ "balance" : "1000000000000000000",
"storage" : {
"0x00" : "0x01"
}
@@ -22,7 +22,7 @@
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
"storage" : {
- "0x01" : "0x01"
+ "0x01" : "0x00"
}
}
}
@@ -31,21 +31,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
index a97faf42a..171292f54 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
@@ -9,36 +9,9 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "566210"
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -48,7 +21,7 @@
},
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00"
}
},
@@ -59,7 +32,7 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "568190"
+ "balance" : "157293"
}
}
}
@@ -67,21 +40,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001Filler.json
index fdefdd548..69a788c31 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -53,71 +53,26 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x03" : "0x00",
- "0x04" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x03" : "0x00",
- "0x04" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x014a" : "0x1000000000000000000000000000000000000002",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x02" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000001",
- "0x07" : "0x02"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00",
- "0x04" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 2 ]] (DELEGATECALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "code" : "{ (DELEGATECALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
index 65e7f830f..c0155175d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
@@ -11,19 +11,24 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
"1000000000000000000000000000000000000002" : {
"storage" : {
- "0x014a" : "0x1000000000000000000000000000000000000002",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x02" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000002",
- "0x07" : "0x03"
+ "0x014a" : "0x00",
+ "0x014c" : "0x00",
+ "0x0150" : "0x00",
+ "0x0152" : "0x00",
+ "0x0154" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00",
+ "0x04" : "0x00",
+ "0x07" : "0x00"
}
}
}
@@ -32,14 +37,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGEFiller.json
index 4afddbfc7..0040e697b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGEFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -48,66 +48,26 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "code" : "{ (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json
index 22355f9f8..9ada3d602 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["ALL"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -24,7 +24,7 @@
"1000000000000000000000000000000000000001" : {
"storage" : {
"0x00" : "0x00",
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
}
@@ -48,21 +48,21 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json
index 4286be7d4..ecff0c027 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json
@@ -9,45 +9,13 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -77,28 +45,28 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1)}",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000003" : {
"balance" : "0",
- "code" : "{ (SSTORE 3 1) }",
+ "code" : "{ (MSTORE 3 1) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json
index 1da3444ab..01b1e6093 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json
@@ -15,51 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -101,14 +57,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json
index 588eb8d67..a3dee7650 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json
@@ -15,51 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158", "Frontier"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -102,19 +58,19 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "code" : "{ (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "code" : "{ (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -122,7 +78,7 @@
"1000000000000000000000000000000000000003" : {
"balance" : "0",
"nonce" : "0",
- "code" : "{ (SSTORE 3 1) }",
+ "code" : "{ (MSTORE 3 1) }",
"storage": {}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json
index 5da343ed7..3cebed8a2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json
@@ -15,43 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -86,19 +50,19 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1)}",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -106,7 +70,7 @@
"1000000000000000000000000000000000000003" : {
"balance" : "0",
"nonce" : "0",
- "code" : "{ (SSTORE 3 1) }",
+ "code" : "{ (MSTORE 3 1) }",
"storage": {}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json
index 79dde9803..7a006e03a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -45,14 +45,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json
index 9b50a5bf4..8750a1027 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json
@@ -15,53 +15,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -97,14 +55,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "0",
- "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json
index c8d696990..3a19988df 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json
@@ -14,7 +14,7 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000001" : {
- "balance" : "20000000000"
+ "balance" : "10000000000"
},
"1000000000000000000000000000000000000003" : {
"balance" : "10000000000",
@@ -28,14 +28,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json
index 5811a22a5..b5c16a6ff 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json
@@ -15,11 +15,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x02" : "0x00"
}
},
@@ -30,42 +30,7 @@
}
},
"1000000000000000000000000000000000000002" : {
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "shouldnotexist" : "1"
+ "balance" : "10000000000"
},
"1000000000000000000000000000000000000003" : {
"storage" : {
@@ -84,14 +49,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json
index 25cff1963..c320a420e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json
@@ -14,9 +14,9 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
+ "balance" : "1000000000000000000",
"storage" : {
- "0x00" : "0x01"
+ "0x00" : "0x00"
}
},
"1000000000000000000000000000000000000003" : {
@@ -32,14 +32,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json
index 1241c4371..f7e59f4ac 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json
@@ -15,54 +15,18 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
+ "balance" : "1000000000000000000",
"storage" : {
- "0x00" : "0x01"
+ "0x00" : "0x00"
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
"storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "balance" : "10000000000",
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
- "storage" : {
- "0x00" : "0x01"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "balance" : "10000000000",
- "storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00"
}
},
@@ -85,14 +49,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
index 78fb7f899..6340cd716 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
@@ -9,46 +9,19 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "566210"
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00"
}
},
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00"
}
},
@@ -59,7 +32,7 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "568190"
+ "balance" : "25026727"
}
}
}
@@ -67,14 +40,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
index 2f7e2d679..8cf3c2322 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -15,11 +15,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00"
}
},
@@ -36,69 +36,7 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "1046140"
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "566207"
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "568187"
+ "balance" : "25026727"
}
}
}
@@ -106,14 +44,14 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
},
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
- "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+ "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json
index 19f420fab..e5aa299f0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -41,45 +41,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000000",
- "0x07" : "0x01",
- "0xe6" : "0x1000000000000000000000000000000000000001",
- "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0xec" : "0x40",
- "0xee" : "0x21",
- "0xf0" : "0x01"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x04" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
index c8a2c4c68..50c85e546 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
@@ -15,15 +15,15 @@
"result" : {
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
- "0x02" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000001",
- "0x07" : "0x02",
- "0xe6" : "0x1000000000000000000000000000000000000001",
- "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0xec" : "0x40",
- "0xee" : "0x21",
- "0xf0" : "0x01"
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x04" : "0x00",
+ "0x07" : "0x00",
+ "0xe6" : "0x00",
+ "0xe8" : "0x00",
+ "0xec" : "0x00",
+ "0xee" : "0x00",
+ "0xf0" : "0x00"
}
}
}
@@ -32,7 +32,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json
index cef0a41b0..bf648b92b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -36,40 +36,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
index 45ae415bd..40d604afa 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00"
}
@@ -37,7 +37,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
index 1089c3bc4..7be63eb4a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
@@ -14,7 +14,7 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000"
+ "balance" : "1000000000000000000"
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
@@ -28,7 +28,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
index 7935d506d..5c968fbbf 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -24,38 +24,7 @@
}
},
"1000000000000000000000000000000000000001" : {
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "shouldnotexist" : "1"
+ "balance" : "10000000000"
},
"1000000000000000000000000000000000000002" : {
"storage" : {
@@ -76,7 +45,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
index 343491c28..f4db8c1ce 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -48,52 +48,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x01",
- "0x05" : "0x1000000000000000000000000000000000000000"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x014a" : "0x1000000000000000000000000000000000000003",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000001",
- "0x07" : "0x02"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -107,7 +67,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SSTORE 5 (CALLER))}",
+ "code" : "{ [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SSTORE 5 (CALLER))}",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
index 86a3cb7c3..f786b2bb0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
@@ -15,20 +15,20 @@
"result" : {
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
- "0x02" : "0x01"
+ "0x01" : "0x00",
+ "0x02" : "0x00"
}
},
"1000000000000000000000000000000000000003" : {
"storage" : {
- "0x014a" : "0x1000000000000000000000000000000000000003",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000001",
- "0x07" : "0x03"
+ "0x014a" : "0x00",
+ "0x014c" : "0x00",
+ "0x0150" : "0x00",
+ "0x0152" : "0x00",
+ "0x0154" : "0x00",
+ "0x03" : "0x00",
+ "0x04" : "0x00",
+ "0x07" : "0x00"
}
}
}
@@ -37,7 +37,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -51,7 +51,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
index 3a91f8691..5ba0658dc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -48,52 +48,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -107,7 +67,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
index d72e709b5..068998625 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -24,7 +24,7 @@
"1000000000000000000000000000000000000001" : {
"storage" : {
"0x00" : "0x00",
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
}
@@ -48,7 +48,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -62,7 +62,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
index 4d2618870..95fcbea0f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
@@ -9,48 +9,13 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -83,7 +48,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -97,7 +62,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json
index 1dbe57534..75b715624 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -50,54 +50,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -111,7 +69,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20040 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20040 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json
index f18f44bb7..ace0681a5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json
@@ -9,55 +9,13 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
{
"indexes" : {
"data" : -1,
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -98,7 +56,7 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
@@ -110,7 +68,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20040 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20040 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json
index 1d3c690cd..628c1a445 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json
@@ -15,46 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -84,7 +45,7 @@
"storage" : {
"0x03" : "0x00"
}
- }
+ }
}
}
],
@@ -92,7 +53,7 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
@@ -104,7 +65,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json
index ac0e6f61c..5d8ba9ade 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -48,7 +48,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -62,7 +62,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ (MSTORE 3 1) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (MSTORE 3 1) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json
index fc0d0c4c5..b18faba61 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -50,54 +50,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -111,7 +69,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "0",
- "code" : "{ (MSTORE 3 1) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (MSTORE 3 1) [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json
index 6a2f0983b..b4352fe45 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json
@@ -23,7 +23,7 @@
"1000000000000000000000000000000000000003" : {
"balance" : "10000000000",
"storage" : {
- "0x03" : "0x01"
+ "0x03" : "0x00"
}
}
}
@@ -32,7 +32,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -46,7 +46,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json
index 3b9e831fd..2c3feb0bb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -25,6 +25,7 @@
}
},
"1000000000000000000000000000000000000001" : {
+ "balance" : "10000000000"
},
"1000000000000000000000000000000000000003" : {
"storage" : {
@@ -38,43 +39,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "shouldnotexist" : "1"
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x01"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -88,7 +58,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json
index f7c9d03c1..e44dfdf57 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json
@@ -14,9 +14,9 @@
"network" : ["ALL"],
"result" : {
"1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
+ "balance" : "1000000000000000000",
"storage" : {
- "0x00" : "0x01"
+ "0x00" : "0x00"
}
},
"1000000000000000000000000000000000000002" : {
@@ -38,7 +38,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -52,7 +52,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json
index 76a5f0be8..d5b1c0d48 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
@@ -39,44 +39,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "1000000010000000000",
- "storage" : {
- "0x00" : "0x01"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "shouldnotexist" : "1"
- },
- "1000000000000000000000000000000000000003" : {
- "balance" : "10000000000",
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -90,7 +58,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
index b5b1b36ed..7058e4952 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
@@ -9,46 +9,19 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "566210"
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00"
}
},
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00"
}
},
@@ -59,7 +32,7 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "568190"
+ "balance" : "25026727"
}
}
}
@@ -67,7 +40,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -81,7 +54,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
index 278165537..2e416307d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -36,69 +36,7 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "25026070"
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "566207"
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- },
- "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "568187"
+ "balance" : "25026727"
}
}
}
@@ -106,7 +44,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
@@ -120,7 +58,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
- "code" : "{ [[ 2 ]] (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 2 ]] (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json
index ced3553c4..2a28ffbc0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -40,44 +40,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00",
- "0x04" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x014a" : "0x1000000000000000000000000000000000000001",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x02" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000000",
- "0x07" : "0x01"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json
index d6446935e..a965eae82 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json
@@ -15,16 +15,16 @@
"result" : {
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
- "0x014a" : "0x1000000000000000000000000000000000000001",
- "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x0150" : "0x40",
- "0x0152" : "0x26",
- "0x0154" : "0x01",
- "0x02" : "0x01",
- "0x03" : "0x01",
- "0x04" : "0x1000000000000000000000000000000000000001",
- "0x07" : "0x03"
+ "0x01" : "0x00",
+ "0x014a" : "0x00",
+ "0x014c" : "0x00",
+ "0x0150" : "0x00",
+ "0x0152" : "0x00",
+ "0x0154" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00",
+ "0x04" : "0x00",
+ "0x07" : "0x00"
}
}
}
@@ -33,7 +33,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json
index 577492d8d..002e64df2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -48,52 +48,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Homestead", "EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x01",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json
index 1c9bda4de..ef3f8f608 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -23,7 +23,7 @@
},
"1000000000000000000000000000000000000001" : {
"storage" : {
- "0x01" : "0x01",
+ "0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
}
@@ -46,7 +46,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json
index b35d1be36..1d775aa1e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json
@@ -9,45 +9,13 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x00",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["EIP158", "EIP150"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -77,7 +45,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json
index 17b85a4c0..4815b0cbd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -50,54 +50,12 @@
}
}
}
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP158", "EIP150"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 60140 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60140 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
index a64fb2285..5a9d87395 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
@@ -9,55 +9,13 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00"
- }
- }
- }
- },
{
"indexes" : {
"data" : -1,
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -98,7 +56,7 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60140 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60140 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
index 109f0f3dc..a1120ab5d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
@@ -15,44 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["EIP150", "EIP158"],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "storage" : {
- "0x00" : "0x01",
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000001" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000002" : {
- "storage" : {
- "0x01" : "0x00",
- "0x02" : "0x00",
- "0x03" : "0x00"
- }
- },
- "1000000000000000000000000000000000000003" : {
- "storage" : {
- "0x03" : "0x00"
- }
- }
- }
- },
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Metropolis"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,7 +43,7 @@
"storage" : {
"0x03" : "0x00"
}
- }
+ }
}
}
],
@@ -88,7 +51,7 @@
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
"nonce" : "0",
- "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"storage": {}
},
"1000000000000000000000000000000000000001" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json
index c07610a26..f04feb2fc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json
@@ -15,7 +15,7 @@
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -45,7 +45,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
"nonce" : "0",
"storage" : {
}