aboutsummaryrefslogtreecommitdiffstats
path: root/src/GeneralStateTestsFiller/stCreate2
diff options
context:
space:
mode:
Diffstat (limited to 'src/GeneralStateTestsFiller/stCreate2')
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json90
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json34
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json26
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json26
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json40
7 files changed, 310 insertions, 11 deletions
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
index ca9d7caeb..95908c5aa 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
@@ -34,7 +34,7 @@
},
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
@@ -52,6 +52,75 @@
"nonce" : "1"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "nonce" : "1",
+ "code" : "0x",
+ "storage" : {
+ "0x01" : "1"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 2,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "nonce" : "1",
+ "code" : "0x6001600155",
+ "storage" : {}
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 3,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "2",
+ "nonce" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0",
+ "nonce" : "2"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
}
],
"pre" : {
@@ -68,11 +137,28 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CREATE2 0 0 0 0) }"
+ "{ (CREATE2 0 0 0 0) }",
+ "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+ "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }",
+ "{ (CREATE2 1 0 0 0) }"
],
"gasLimit" : [
"400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
index 3788046be..56976bfa3 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
@@ -44,7 +44,20 @@
"e2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0",
"nonce" : "0",
- "code" : "0x010203"
+ "code" : "0x010203",
+ "storage" : {}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "0x010203",
+ "storage" : {}
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "0x010203",
+ "storage" : {}
},
"6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
"balance" : "1",
@@ -71,11 +84,27 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0",
+ "code" : "0x010203",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "code" : "0x010203",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CREATE2 0 0 0 0) }"
+ "{ (CREATE2 0 0 0 0) }",
+ "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+ "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
],
"gasLimit" : [
"400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
index a1d553c97..3be5685f5 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
@@ -42,7 +42,21 @@
"result" : {
"e2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0",
- "nonce" : "1"
+ "nonce" : "1",
+ "code" : "",
+ "storage" : {}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "",
+ "storage" : {}
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "",
+ "storage" : {}
},
"6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
"balance" : "1",
@@ -68,11 +82,27 @@
"nonce" : "1",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CREATE2 0 0 0 0) }"
+ "{ (CREATE2 0 0 0 0) }",
+ "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+ "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
],
"gasLimit" : [
"400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
index 1fb17c1ea..a92a87088 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
@@ -36,7 +36,7 @@
},
{
"indexes" : {
- "data" : -1,
+ "data" : 0,
"gas" : -1,
"value" : -1
},
@@ -59,6 +59,58 @@
"nonce" : "1"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "shouldnotexist" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 2,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "shouldnotexist" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
}
],
"pre" : {
@@ -75,11 +127,27 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) }"
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) }",
+ "{ (CALL 50000 0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+ "{ (CALL 50000 0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
],
"gasLimit" : [
"400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
index 9e6282453..1b92cafd4 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
@@ -46,6 +46,14 @@
"balance" : "1",
"code" : "0x6010ff"
},
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
"0000000000000000000000000000000000000010" : {
"shouldnotexist" : "1"
},
@@ -72,11 +80,27 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (SSTORE 0 0x112233)}"
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (SSTORE 0 0x112233) }",
+ "{ (CALL 50000 0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) (SSTORE 0 0x112233)}",
+ "{ (CALL 50000 0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (SSTORE 0 0x112233)}"
],
"gasLimit" : [
"200000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
index 817623aae..4aaa6b7e1 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
@@ -46,6 +46,14 @@
"balance" : "1",
"code" : "0x6010ff"
},
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
"0000000000000000000000000000000000000010" : {
"shouldnotexist" : "1"
},
@@ -72,11 +80,27 @@
"nonce" : "0",
"storage" : {
}
+ },
+ "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
}
},
"transaction" : {
"data" : [
- "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (MSTORE 0 0x112233) (REVERT 0 10) }"
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (MSTORE 0 0x112233) (REVERT 29 3) }",
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) (MSTORE 0 0x112233) (REVERT 29 3) }",
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (MSTORE 0 0x112233) (REVERT 29 3) }"
],
"gasLimit" : [
"400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
index 27b573a79..502535838 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
@@ -72,6 +72,7 @@
"af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"balance" : "0",
"nonce" : "1",
+ "code" : "0x",
"storage" : {
"0x01" : "0x01"
}
@@ -87,6 +88,34 @@
"nonce" : "1"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : 2,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "0x6001600155",
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
}
],
"pre" : {
@@ -112,12 +141,21 @@
"storage" : {
"0x00" : "0x01"
}
+ },
+ "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
}
},
"transaction" : {
"data" : [
"{ (CREATE2 0 0 0 0) }",
- "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }"
+ "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+ "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
],
"gasLimit" : [
"400000"