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/stMemoryTest.json
+++ b/tests/files/StateTests/stMemoryTest.json
@@ -52,6 +52,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -115,6 +116,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -178,6 +180,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -242,6 +245,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -306,6 +310,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -370,6 +375,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -434,6 +440,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -498,6 +505,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -562,6 +570,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -626,6 +635,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -690,6 +700,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -754,6 +765,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -817,6 +829,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -880,6 +893,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -943,6 +957,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1006,6 +1021,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1069,6 +1085,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1132,6 +1149,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1195,6 +1213,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1258,6 +1277,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1321,6 +1341,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1384,6 +1405,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1448,6 +1470,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183640",
@@ -1512,6 +1535,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1576,6 +1600,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1640,6 +1665,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1704,6 +1730,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -1768,6 +1795,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183640",
@@ -1832,6 +1860,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183640",
@@ -1896,6 +1925,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183640",
@@ -1960,6 +1990,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2023,6 +2054,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2086,6 +2118,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2149,6 +2182,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2212,6 +2246,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2275,6 +2310,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2338,6 +2374,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2401,6 +2438,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2464,6 +2502,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2527,6 +2566,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1342183320",
@@ -2589,6 +2629,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
            "gasLimit" : "1342183320",
@@ -2651,6 +2692,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "17592320524892",
@@ -2689,7 +2731,7 @@
                }
            }
        },
-        "postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "postStateRoot" : "fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2",
        "pre" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                "balance" : "1000000000000000000",
@@ -2706,6 +2748,7 @@
                }
            }
        },
+        "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
        "transaction" : {
            "data" : "",
            "gasLimit" : "1000",