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/stMemoryStressTest.json
+++ b/tests/files/StateTests/stMemoryStressTest.json
@@ -51,6 +51,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "17592320524892",
@@ -113,6 +114,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "37791080412587",