Merge commit '4e8a9a1cd4a10370fc4a888af0fb2def6f1b961b' into poc-9

2015-03-05 17:51:26 +01:00
parent a7181bd304 4e8a9a1cd4
commit ca1093f848
35 changed files with 18391 additions and 3942 deletions
--- a/tests/files/StateTests/stExample.json
+++ b/tests/files/StateTests/stExample.json
@@ -13,21 +13,29 @@
        "out" : "0x",
        "post" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000100000",
                "code" : "0x6001600101600055",
                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x02"
+                }
+            },
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "41012",
+                "code" : "0x",
+                "nonce" : "0",
                "storage" : {
                }
            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+                "balance" : "999999999999858988",
                "code" : "0x",
-                "nonce" : "0",
+                "nonce" : "1",
                "storage" : {
                }
            }
        },
-        "postStateRoot" : "4b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16",
+        "postStateRoot" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -44,10 +52,9 @@
                }
            }
        },
-        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
-            "gasLimit" : "10000",
+            "gasLimit" : "400000",
            "gasPrice" : "1",
            "nonce" : "0",
            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",