more collision tests

collision with empty, with empty but nonce, empty but code
from transaction and from code execution of create

4 files changed, 449 insertions, 0 deletions

diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
new file mode 100644
index 000000000..b50c1abde
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
@@ -0,0 +1,195 @@
+{
+    "CreateCollisionToEmpty" : {
+	 "_info" : {
+            "comment" : "data0 - create collision to empty, data1 - to empty but nonce, data2 - to contract with code"
+        },
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["Frontier", "Homestead", "EIP150"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+			"nonce" : "1",
+			"storage" : {
+                            "0x01" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
+                        }
+		    },
+		    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+			"nonce" : "0",
+			"code" : "",
+			"storage" : {
+                            "0x01" : "0x01"
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+			"nonce" : "1",
+			"storage" : {
+                            "0x01" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
+                        }
+		    },
+		    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+			"nonce" : "1",
+			"code" : "",
+			"storage" : {
+                            "0x01" : "0x01"
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "2000000000000000000000000000000000000000" : {
+			"nonce" : "0",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    },
+		    "0bf4c804e0579073baf54ec4ec37cd04f3455c65" : {
+			"nonce" : "2",
+			"code" : "",
+			"storage" : {
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "3000000000000000000000000000000000000000" : {
+			"nonce" : "0",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    },
+		    "4b86c4ed99b87f0f396bc0c76885453c343916ed" : {
+			"nonce" : "0",
+			"code" : "0x1122334455",
+			"storage" : {
+                        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1a00000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ (CALL 80000 (CALLDATALOAD 0) 0 0 0 0 0) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "2000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "3000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "0x0bf4c804e0579073baf54ec4ec37cd04f3455c65" : {
+                "balance" : "0",
+                "code" : "",
+                "nonce" : "2",
+                "storage" : {
+                }
+            },
+            "0x4b86c4ed99b87f0f396bc0c76885453c343916ed" : {
+                "balance" : "0",
+                "code" : "0x1122334455",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+		"0x0000000000000000000000001000000000000000000000000000000000000000",
+		"0x0000000000000000000000002000000000000000000000000000000000000000",
+		"0x0000000000000000000000003000000000000000000000000000000000000000"
+            ],
+            "gasLimit" : [
+                "600000", "54000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1a00000000000000000000000000000000000000",
+            "value" : [
+                "0", "1"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json
new file mode 100644
index 000000000..4f4ad461e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json
@@ -0,0 +1,86 @@
+{
+    "TransactionCollisionToEmptyButCode" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["Frontier", "Homestead", "EIP150"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "0",
+			"code" : "0x1122334455",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "0",
+			"code" : "0x1122334455",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		"balance" : "",
+                "code" : "0x1122334455",
+                "nonce" : "0",
+                "storage" : {
+                }
+	    }
+        },
+        "transaction" : {
+            "data" : [
+                "0x6001600155"
+            ],
+            "gasLimit" : [
+                "600000", "54000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0", "1"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json
new file mode 100644
index 000000000..d33a8e361
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json
@@ -0,0 +1,84 @@
+{
+    "TransactionCollisionToEmptyButNonce" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["Frontier", "Homestead", "EIP150"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+                            "0x01" : "0x00"
+                        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		"balance" : "",
+                "code" : "",
+                "nonce" : "1",
+                "storage" : {
+                }
+	    }
+        },
+        "transaction" : {
+            "data" : [
+                "0x6001600155"
+            ],
+            "gasLimit" : [
+                "600000", "54000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0", "1"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyFiller.json
new file mode 100644
index 000000000..e869b59d7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/TransactionCollisionToEmptyFiller.json
@@ -0,0 +1,84 @@
+{
+    "TransactionCollisionToEmpty" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["Frontier", "Homestead", "EIP150"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "0",
+			"storage" : {
+                            "0x01" : "0x01"
+                        }
+		    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["EIP158", "Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "nonce" : "1"
+		    },
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+                            "0x01" : "0x01"
+                        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		"balance" : "",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+	    }
+        },
+        "transaction" : {
+            "data" : [
+                "0x6001600155"
+            ],
+            "gasLimit" : [
+                "600000", "54000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0", "1"
+            ]
+        }
+    }
+}