WIP

whilei · Oct 24, 2018 · 796c91c · 796c91c
1 parent 599775e
commit 796c91c
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 42 deletions.
diff --git a/tests/files/VMTests/ECIP1045/vmCreate2/00.tmp b/tests/files/VMTests/ECIP1045/vmCreate2/00.tmp
diff --git a/tests/files/VMTests/ECIP1045/vmCreate2/01.json b/tests/files/VMTests/ECIP1045/vmCreate2/01.json
@@ -0,0 +1,44 @@
+{
+    "create2_1": {
+        "callcreates": [],
+        "env": {
+            "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x0100",
+            "currentGasLimit": "0x0f4240",
+            "currentNumber": "0x00",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0xdeadbeef00000000000000000000000000000000",
+            "caller": "0xdeadbeef00000000000000000000000000000000",
+            "code": "0x6000600160006000f5600055",
+            "data": "0x00",
+            "gas": "0x0186a0",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "0xcd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x0de0b6b3a7640000"
+        },
+        "gas": "0xbb68",
+        "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+        "out": "",
+        "post": {
+            "0xdeadbeef00000000000000000000000000000000": {
+                "balance": "0xd3c21bcecceda1000000",
+                "code": "0x6000600160006000f5600055",
+                "nonce": "0x00",
+                "storage": {
+                    "0x00": "0xB928f69Bb1D91Cd65274e3c79d8986362984fDA3"
+                }
+            }
+        },
+        "pre": {
+            "0xdeadbeef00000000000000000000000000000000": {
+                "balance": "0xd3c21bcecceda1000000",
+                "code": "0x6000600160006000f5600055",
+                "nonce": "0x00",
+                "storage": {
+                }
+            }
+        }
+    }
+}
diff --git a/tests/files/VMTests/ECIP1045/vmCreate2/02.json b/tests/files/VMTests/ECIP1045/vmCreate2/02.json
@@ -0,0 +1,44 @@
+{
+    "create2_2": {
+        "callcreates": [],
+        "env": {
+            "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x0100",
+            "currentGasLimit": "0x0f4240",
+            "currentNumber": "0x00",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0xdeadbeef00000000000000000000000000000000",
+            "caller": "0xdeadbeef00000000000000000000000000000000",
+            "code": "0x7f000000000000000000000000feed000000000000000000000000000000000000600160006000f5600055",
+            "data": "0x00",
+            "gas": "0x0186a0",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "0xcd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x0de0b6b3a7640000"
+        },
+        "gas": "0xbb68",
+        "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+        "out": "",
+        "post": {
+            "0xdeadbeef00000000000000000000000000000000": {
+                "balance": "0xd3c21bcecceda1000000",
+                "code": "0x7f000000000000000000000000feed000000000000000000000000000000000000600160006000f5600055",
+                "nonce": "0x00",
+                "storage": {
+                    "0x00": "0xD04116cDd17beBE565EB2422F2497E06cC1C9833"
+                }
+            }
+        },
+        "pre": {
+            "0xdeadbeef00000000000000000000000000000000": {
+                "balance": "0xd3c21bcecceda1000000",
+                "code": "0x7f000000000000000000000000feed000000000000000000000000000000000000600160006000f5600055",
+                "nonce": "0x00",
+                "storage": {
+                }
+            }
+        }
+    }
+}
diff --git a/.../files/VMTests/ECIP1045/vmCreate2/04.json → .../files/VMTests/ECIP1045/vmCreate2/03.json b/.../files/VMTests/ECIP1045/vmCreate2/04.json → .../files/VMTests/ECIP1045/vmCreate2/03.json
@@ -1,5 +1,5 @@
 {
-    "create2_4": {
+    "create2_3": {
         "callcreates": [],
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -10,30 +10,31 @@
         },
         "exec": {
             "address": "0x0000000000000000000000000000000000000000",
-            "caller": "0xcd1722f3947def4cf144679da39c4c32bdc35681",
-            "code": "0x6000602c60006000f5",
-            "data": "0x",
+            "caller": "0x0000000000000000000000000000000000000000",
+            "code": "0x6000600160006000f5600055",
+            "data": "0xdeadbeef",
             "gas": "0x0186a0",
             "gasPrice": "0x5af3107a4000",
             "origin": "0xcd1722f3947def4cf144679da39c4c32bdc35681",
             "value": "0x0de0b6b3a7640000"
         },
-        "gas": "0x10982",
+        "gas": "0xbb68",
         "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-        "out": "0x",
+        "out": "",
         "post": {
             "0x0000000000000000000000000000000000000000": {
                 "balance": "0xd3c21bcecceda1000000",
-                "code": "0x6000602c60006000f5",
+                "code": "0x6000600160006000f5600055",
                 "nonce": "0x00",
                 "storage": {
+                    "0x00": "0x70f2b2914A2a4b783FaEFb75f459A580616Fcb5e"
                 }
             }
         },
         "pre": {
             "0x0000000000000000000000000000000000000000": {
                 "balance": "0xd3c21bcecceda1000000",
-                "code": "0x6000602c60006000f5",
+                "code": "0x6000600160006000f5600055",
                 "nonce": "0x00",
                 "storage": {
                 }

diff --git a/tests/files/VMTests/ECIP1045/vmCreate2/04.tmp b/tests/files/VMTests/ECIP1045/vmCreate2/04.tmp
diff --git a/tests/vm2_test.go b/tests/vm2_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereumproject/go-ethereum/core/vm"
 	"github.com/ethereumproject/go-ethereum/ethdb"
 	"github.com/ethereumproject/go-ethereum/logger/glog"
+	"log"
 	"math/big"
 	"path/filepath"
 	"strconv"
@@ -107,6 +108,8 @@ func TestECIP1045CREATE2Tests(t *testing.T) {
 		}
 		if err := RunVmTest2(fn, VmSkipTests, rs); err != nil {
 			t.Error(err)
+		} else {
+			log.Println("----")
 		}
 	}
 }
@@ -202,6 +205,8 @@ func runVmTest2(test VmTest2, rs RuleSet) error {
 			vexp := common.HexToHash(value)
 			if v != vexp {
 				return fmt.Errorf("(%x: %s) storage failed. Expected %x, got %x (%v %v)\n", obj.Address().Bytes()[0:4], addr, vexp, v, vexp.Big(), v.Big())
+			} else {
+				log.Printf("matcher: %v == %v", v.Hex(), vexp.Hex())
 			}
 		}
 	}