Merge commit 'a6e04ab05150d1b5aa4adb297f3e5146b1559b02' into poc-9

2015-03-03 15:39:34 +01:00
parent 651b2158ba a6e04ab051
commit 6518da7c01
13 changed files with 378 additions and 135 deletions
--- a/tests/files/StateTests/stExample.json
+++ b/tests/files/StateTests/stExample.json
@@ -27,7 +27,7 @@
                }
            }
        },
-        "postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "postStateRoot" : "4b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -44,6 +44,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "10000",