Merge commit '0867e4fa' into poc-9

tests/files/StateTests/stBlockHashTest.json

@@ -27,7 +27,7 @@
                 }
             }
         },
-        "postStateRoot" : "1698d889dcd86abc293d02f8f52a61e22e9066d5b2055b1a33f3e3cd29a6afcb",
+        "postStateRoot" : "5991795a1f45b319ba9eeaad2a016d05b8e7bcde1386113f5630d27d427641a4",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -82,7 +82,7 @@
                 }
             }
         },
-        "postStateRoot" : "66b86173a1d8ade9a72e3e3f37aeae43a71bece06bae3a134225058551777f5a",
+        "postStateRoot" : "38895b1dec6e4e94204eebf737fb4669be2c81c17200ac87c8ad015a9c905258",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -137,7 +137,7 @@
                 }
             }
         },
-        "postStateRoot" : "d4ce6472e897de394ca7857e37debd474fe73d5c3564b3dfc3e0c7d6af0d06c5",
+        "postStateRoot" : "cffd7c0b521c88a02d0c5329d2639d2ac6e8547d738c8f39ed2d5e0e93555f2f",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",

tests/files/StateTests/stExample.json

@@ -27,7 +27,7 @@
                 }
             }
         },
-        "postStateRoot" : "3a720f5104bfef9d087d1734008ff789ca2b0c01ba0e06a007474edd7c65e055",
+        "postStateRoot" : "4b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",

tests/files/StateTests/stInitCodeTest.json

@@ -43,7 +43,7 @@
                 }
             }
         },
-        "postStateRoot" : "a1200f6936b7b9db68687a96137480203806af78674046df8fb1dd84b2089ec3",
+        "postStateRoot" : "896fd34ae95a677ed96f1740cf7232afc20a042fe1b003bfa9fe897676b30689",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000",
@@ -105,7 +105,7 @@
                 }
             }
         },
-        "postStateRoot" : "e782035260b586e9d2043801adcb58c7601d3be5c19d1c793c41663fef526665",
+        "postStateRoot" : "531ba2a2c553cdbdd3ecec4d3c3e121dd201d49c2192a4aa95455c3b352bf008",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000",
@@ -174,7 +174,7 @@
                 }
             }
         },
-        "postStateRoot" : "7b10e8f46070c7867a5c3783d3466cfe03b048813819891d4b5aa4df880a7380",
+        "postStateRoot" : "befdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -245,7 +245,7 @@
                 }
             }
         },
-        "postStateRoot" : "8398abff6a946fb6b1969410b6def18deab38fd61b547f35e6690948894e0a3d",
+        "postStateRoot" : "1e371aff2cd81c7c84383571bd21b5adfd03c9bd38ad964c57b8334b1e8ea705",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000",
@@ -322,7 +322,7 @@
                 }
             }
         },
-        "postStateRoot" : "6ce3d60dae67acc69cf13afe07db3433f188ea352c180d80945158864826b0db",
+        "postStateRoot" : "a281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1",
@@ -377,7 +377,7 @@
                 }
             }
         },
-        "postStateRoot" : "c72d82a059cebcf5ab8b5ab1cede01cb1b5f840e61e1a3c9ef1dd178c98c6092",
+        "postStateRoot" : "97cece6bf5648d3af08ae84cff4795f33c7fa0ca34b0aec566773e5e148595cd",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -432,7 +432,7 @@
                 }
             }
         },
-        "postStateRoot" : "0a3a9057672a859dd7e92ceb2ea62bf0a424855c069ffc08223a5e9fe8bf461f",
+        "postStateRoot" : "a7eedf1843a4a7a6e3172dd783517e9982ed7c0a3f7de975089c206967348e99",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -480,7 +480,7 @@
                 }
             }
         },
-        "postStateRoot" : "5339ee098aab45cb051c06577c17a6a09e246bf7fc898aa64a47e3ac0dfc0107",
+        "postStateRoot" : "8b349ba4168d101eb80264bf712d8adcd342e41eda6b4bed9e805ac9a31031da",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "2",
@@ -521,7 +521,7 @@
                 }
             }
         },
-        "postStateRoot" : "1621d0ca902295746dcbdaa1a215fe3d92f07b15c87fdfd6870935363bd952be",
+        "postStateRoot" : "bb8ecac4b17ff3b014cd53a3286ba5e42517ea8edde6a1c97de065943d3a6a2d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
@@ -569,7 +569,7 @@
                 }
             }
         },
-        "postStateRoot" : "7681ddf7e67d6369de35d67bcd60e20d02a6cf9e0272077e7b99a0cfa25ff3b0",
+        "postStateRoot" : "262a214f1ac4aa762d10b7f47aa18ef6d8aeb6462e74a24bc5426ad4833ae3b2",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -624,7 +624,7 @@
                 }
             }
         },
-        "postStateRoot" : "23c93e2325c841c6c565ff72b9e64cc854dfddd3b6d383ff2b5b75ba1945d635",
+        "postStateRoot" : "d49e5f42842dd9e9faead37ece66d06a9f72489ec8741139627bcf1bbc95f19f",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -672,7 +672,7 @@
                 }
             }
         },
-        "postStateRoot" : "1621d0ca902295746dcbdaa1a215fe3d92f07b15c87fdfd6870935363bd952be",
+        "postStateRoot" : "bb8ecac4b17ff3b014cd53a3286ba5e42517ea8edde6a1c97de065943d3a6a2d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
@@ -713,7 +713,7 @@
                 }
             }
         },
-        "postStateRoot" : "f3852391bc153f52b41a80f0b49358476c0ed40e6fe7950d23425d73195aafab",
+        "postStateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -754,7 +754,7 @@
                 }
             }
         },
-        "postStateRoot" : "1621d0ca902295746dcbdaa1a215fe3d92f07b15c87fdfd6870935363bd952be",
+        "postStateRoot" : "bb8ecac4b17ff3b014cd53a3286ba5e42517ea8edde6a1c97de065943d3a6a2d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
@@ -795,7 +795,7 @@
                 }
             }
         },
-        "postStateRoot" : "1621d0ca902295746dcbdaa1a215fe3d92f07b15c87fdfd6870935363bd952be",
+        "postStateRoot" : "bb8ecac4b17ff3b014cd53a3286ba5e42517ea8edde6a1c97de065943d3a6a2d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
@@ -836,7 +836,7 @@
                 }
             }
         },
-        "postStateRoot" : "1621d0ca902295746dcbdaa1a215fe3d92f07b15c87fdfd6870935363bd952be",
+        "postStateRoot" : "bb8ecac4b17ff3b014cd53a3286ba5e42517ea8edde6a1c97de065943d3a6a2d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",

tests/files/StateTests/stMemoryStressTest.json

@@ -34,7 +34,7 @@
                 }
             }
         },
-        "postStateRoot" : "6875b995a9c9c58bf04dfab5fd78fd70bde3ef032effea3fb53c11241c02605e",
+        "postStateRoot" : "090f17dba3bdd58cf107c8155b9066e54f53a9d75bd0ec5524c364f361e32d14",
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -96,7 +96,7 @@
                 }
             }
         },
-        "postStateRoot" : "9dcf90d0402b30613fc1aacc9fe819a1591e3b1ce6e3ac2e15c0073bda4aa656",
+        "postStateRoot" : "bc10fc8e26a51bad7dad35ee2a218076947efd3010ef12d869c3eae434a41b6d",
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",

tests/files/StateTests/stRecursiveCreate.json

@@ -125,7 +125,7 @@
                 }
             }
         },
-        "postStateRoot" : "2af4748839558302a492e85a66ce9bc8da20992955fe255663ce4e08edb4ad20",
+        "postStateRoot" : "155b249b9ed4a0fdbb9041f1edb3ab5a8951a02f0b458777076b6bec751fd3f9",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",

tests/files/StateTests/stRefundTest.json

@@ -20,7 +20,7 @@
                 }
             }
         },
-        "postStateRoot" : "4423fd0d2166bd91624d94dfaab1219dab8224bb63151d407cfb7f3d8b6679bf",
+        "postStateRoot" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "400",
@@ -74,7 +74,7 @@
                 }
             }
         },
-        "postStateRoot" : "06bedd0af7828bb1a25dafbb93fbfe66ad1a3c25ba3a01476a094aa0c158ae79",
+        "postStateRoot" : "474f462c223af7131ea26e4fa90afa13d2699f5d1475d4ce9aadec59ea01afb5",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -140,7 +140,7 @@
                 }
             }
         },
-        "postStateRoot" : "59a039e6b3439dde2e4cf7e56ce4952c2bf2918786bf8659be17094404670ed9",
+        "postStateRoot" : "73c582fa60e3e566845180766d925cbb38ef88d91712ac8c28751d16013adad3",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -205,7 +205,7 @@
                 }
             }
         },
-        "postStateRoot" : "eb31299a223b9109c0386d4a113a4f176a33ed758d7890ce5ff91595a27e5879",
+        "postStateRoot" : "336d6709c0a4eb5aa7936d1eb151cf7faa9c884b46393253f69e159885330034",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -271,7 +271,7 @@
                 }
             }
         },
-        "postStateRoot" : "c76e9e86d7fb01770e5581c1b6e3b31e4ed1ed26547c6187440dceb484ba3026",
+        "postStateRoot" : "60c3973fadf0cbde89c55b69b8ac46314d4fa9fc0d585b9ee75c390e3a9da00b",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -333,7 +333,7 @@
                 }
             }
         },
-        "postStateRoot" : "2df0cef89092735bbfa42f0c82ccb36e9707117f2fce5c56459edd6f0ce47584",
+        "postStateRoot" : "4bbcf27592ac2fcdc64eecf45b8c8f37377e7d2b297344db12acd56a8a6d9fe9",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -390,7 +390,7 @@
                 }
             }
         },
-        "postStateRoot" : "96d22572e44e5b92044a385f9eb18477bc3f55b5d1ceb29c4137b8090b5724d5",
+        "postStateRoot" : "3267d372a060d12f996b1fda01f53b661a81e55013da90d7ec27774ec0c8b4b4",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -447,7 +447,7 @@
                 }
             }
         },
-        "postStateRoot" : "346377bb33fc194e9caf93e4735a7e0510cb748c304481dc48fec052711b0cfc",
+        "postStateRoot" : "a98f9a59a95e7f47e25b239381678849c8dcb2f39595b4916050b00406f74364",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -504,7 +504,7 @@
                 }
             }
         },
-        "postStateRoot" : "059896420a0d5f7eae67758a127673b9aacc16d31160f4f674fae2a49e769144",
+        "postStateRoot" : "a77f2277f9fb82641aee02cac48503cfd4bb7eafc2c61a701b4124450d44ab84",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",

tests/files/StateTests/stSolidityTest.json

@@ -27,7 +27,7 @@
                 }
             }
         },
-        "postStateRoot" : "5fe44b5f7d00d06ddc76a4107b12e6e990e61b3ecaaf51aeefc6553ec9946848",
+        "postStateRoot" : "fb10f5e6bb91ac2c2bdd99645a174f653efd54a27e3fcac8edcfc43e25a27fe5",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
@@ -83,7 +83,7 @@
                 }
             }
         },
-        "postStateRoot" : "0d4906088abccdd5640a01c0b04c222d0d572cd90b30000529e5846c5659958c",
+        "postStateRoot" : "c0007603bf1d9314327a2b028513ddfcadacefa4a4f987d8dd3211db25836d51",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
@@ -139,7 +139,7 @@
                 }
             }
         },
-        "postStateRoot" : "d24ee35c93e51fa54ae2b021628ace493efd20df4aadef944b3e70aae7c669fe",
+        "postStateRoot" : "067b39d9a7a9860f1eb3ac1651eb797b573ff2c00b53acc6d6cdbc817e1cc31e",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
@@ -195,7 +195,7 @@
                 }
             }
         },
-        "postStateRoot" : "24f4dc37e45b1340f98b88a6c8742947a6d194f60863a8bad7286b9ead234065",
+        "postStateRoot" : "0e28dbdfe5e9fc9e2edbdb90849fc7a3982d21d400c59304aa791193d5e6e3da",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
@@ -258,7 +258,7 @@
                 }
             }
         },
-        "postStateRoot" : "0f97c5e002fa472857c499ad434bc7f8031df0e535c8832c24118c9b7378a8d0",
+        "postStateRoot" : "7d5742aed246f2483ad573d595588c4b032fb2bfd596ebe7e746274925bba18e",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000000",
@@ -314,7 +314,7 @@
                 }
             }
         },
-        "postStateRoot" : "91f571bd00073ca4bc66731941f05a49be053395c958f566e31f474be133b14d",
+        "postStateRoot" : "ec9eadbedfa101ee02b24666825027434d3f8f1dc1c356270b60dbad8f342714",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000",
@@ -377,7 +377,7 @@
                 }
             }
         },
-        "postStateRoot" : "4273ac184f3c131e890efc5874717a4dbc9c11120168fa6de09a9e5f32925646",
+        "postStateRoot" : "cd8428d43b8b08e7ff22bdd2aecab32789c75aa9fd75d5d5b9e9742a7a79b72f",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000000000000000",

tests/files/StateTests/stSpecialTest.json

@@ -20,7 +20,7 @@
                 }
             }
         },
-        "postStateRoot" : "cbd79e0e2afd7daf7f8600093018490915777ad3ecc80c19de232f10d7e88106",
+        "postStateRoot" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
@@ -75,7 +75,7 @@
                 }
             }
         },
-        "postStateRoot" : "d42e1fe030221b083f7bd3d30c03bb9ea7cdfbde89b5f20310aeba8ac6a0d03b",
+        "postStateRoot" : "45a2a0c2ccdbef34e6b9c9514025624c7de68630fb4b654abcc0c25052fea8e0",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",

tests/files/TrieTests/hex_encoded_securetrie_test.json

 {
     "test1": {
-        "in": [
-            [
-                "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", 
-                "0xf848018405f446a7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            ], 
-            [
-                "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", 
-                "0xf8440101a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a004bccc5d94f4d1f99aab44369a910179931772f2a5c001c3229f57831c102769"
-            ], 
-            [
-                "0xd2571607e241ecf590ed94b12d87c94babe36db6", 
-                "0xf8440180a0ba4b47865c55a341a4a78759bb913cd15c3ee8eaf30a62fa8d1c8863113d84e8a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            ], 
-            [
-                "0x62c01474f089b07dae603491675dc5b5748f7049", 
-                "0xf8448080a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            ], 
-            [
-                "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", 
+        "in": {
+                "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": 
+                "0xf848018405f446a7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                "0x095e7baea6a6c7c4c2dfeb977efac326af552d87":
+                "0xf8440101a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a004bccc5d94f4d1f99aab44369a910179931772f2a5c001c3229f57831c102769",
+                "0xd2571607e241ecf590ed94b12d87c94babe36db6": 
+                "0xf8440180a0ba4b47865c55a341a4a78759bb913cd15c3ee8eaf30a62fa8d1c8863113d84e8a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                "0x62c01474f089b07dae603491675dc5b5748f7049":
+                "0xf8448080a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": 
                 "0xf8478083019a59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            ]
-        ],
+        },
         "root": "0x730a444e08ab4b8dee147c9b232fc52d34a223d600031c1e9d25bfc985cbd797",
         "hexEncoded": true
     },
+    "test2": {
+        "in": {
+                "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": 
+                "0xf84c01880de0b6b3a7622746a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                "0x095e7baea6a6c7c4c2dfeb977efac326af552d87": 
+                "0xf84780830186b7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0501653f02840675b1aab0328c6634762af5d51764e78f9641cccd9b27b90db4f",
+                "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": 
+                "0xf8468082521aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+        },
+        "root": "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+        "hexEncoded": true
+    }
 }