Merge commit '58c6cc8fd7ff8a27004ed62d912e0a61ae1b73bb' into develop

1 files changed, 53 insertions, 214 deletions

diff --git a/tests/files/StateTests/stInitCodeTest.json b/tests/files/StateTests/stInitCodeTest.json
index ad87c877b..252a0effb 100644
--- a/tests/files/StateTests/stInitCodeTest.json
+++ b/tests/files/StateTests/stInitCodeTest.json
@@ -13,44 +13,28 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "998",
+                "balance" : "1000",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f060005560006000600060006001600054620186a0f1",
-                "nonce" : "1",
-                "storage" : {
-                    "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "133284",
-                "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
-                "balance" : "0",
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "1000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99866716",
+                "balance" : "99000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
-            },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "2",
-                "code" : "0x602060406000f0",
-                "nonce" : "1",
-                "storage" : {
-                    "0x" : "0x0c"
-                }
             }
         },
-        "postStateRoot" : "ab47419dd8fd8a551767e37babc9a7a7d52011a465762f8122b164f28d3cb1dd",
+        "postStateRoot" : "a2cfcaba473009ba6a90cacfb642df630b0188ff895db1118751300577313c99",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000",
@@ -98,21 +82,21 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "58028",
+                "balance" : "20000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99941972",
+                "balance" : "80000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+        "postStateRoot" : "46ed22bcc3ae242009f13879b2cf000b00c09c128cef081064d798d99508eeda",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "10000",
@@ -152,13 +136,6 @@
         ],
         "out" : "0x",
         "post" : {
-            "0000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
@@ -167,21 +144,21 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "83139",
+                "balance" : "20000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99916861",
+                "balance" : "80000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "befdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
+        "postStateRoot" : "b1da57b0bbb25a58e65b266037f4d61480ba74fcfe858fb837562cf03b4d6a5d",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -222,37 +199,28 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "99",
+                "balance" : "112",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
-                "nonce" : "1",
+                "nonce" : "0",
                 "storage" : {
-                    "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "103566",
+                "balance" : "20000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99896434",
+                "balance" : "80000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
-            },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "13",
-                "code" : "0x602060406000f0",
-                "nonce" : "0",
-                "storage" : {
-                    "0x" : "0x0c"
-                }
             }
         },
-        "postStateRoot" : "d9d9243f2f6b7ff0ac2258f582a6c9a2f58db6b153c4dc93ce4f35d286234e52",
+        "postStateRoot" : "0310c255d8e4935a0ed8da3f4fe7737ca4f1d2ac54ab26ede870f8f668c35cf8",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "112",
@@ -293,44 +261,28 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "998",
+                "balance" : "1000",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
-                "nonce" : "1",
-                "storage" : {
-                    "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "133284",
-                "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
-                "balance" : "0",
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "20000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99866716",
+                "balance" : "80000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
-            },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "2",
-                "code" : "0x602060406000f0",
-                "nonce" : "1",
-                "storage" : {
-                    "0x" : "0x0c"
-                }
             }
         },
-        "postStateRoot" : "82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810",
+        "postStateRoot" : "136a3b97a718ca5fba723caada66cbce5831b139e48c7455e0de9275ef59545b",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000",
@@ -373,41 +325,26 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
-                "nonce" : "1",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "105049",
-                "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
-                "balance" : "0",
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "20000000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "99894951",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                }
-            },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "0",
+                "balance" : "80000000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x" : "0x0c"
                 }
             }
         },
-        "postStateRoot" : "a281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
+        "postStateRoot" : "3d083a76c41b29a0cc5c6bbdc1f9daeac3ba75582743f371c8ab3a30ef2eba42",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1",
@@ -448,19 +385,10 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1",
-                "code" : "0x3060025560206000600039602060006000f0",
-                "nonce" : "41",
-                "storage" : {
-                    "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
-                }
-            },
-            "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
                 "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
+                "code" : "0x3060025560206000600039602060006000f0",
+                "nonce" : "40",
                 "storage" : {
-                    "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180"
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -470,62 +398,15 @@
                 "storage" : {
                 }
             },
-            "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                    "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686"
-                }
-            },
-            "9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                    "0x02" : "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee"
-                }
-            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "599999",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                }
-            },
-            "bbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                    "0x02" : "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3"
-                }
-            },
-            "c417ed2eeb560e08f9de20b22788a132f96946bd" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
-            "dfceaa082d190ab34e3c37943de35ae8fc01f300" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                    "0x02" : "0xdfceaa082d190ab34e3c37943de35ae8fc01f300"
-                }
-            },
-            "f0064be0919341a45680ec0d592eaee47df671ac" : {
-                "balance" : "0",
+                "balance" : "600000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
                 }
             }
         },
-        "postStateRoot" : "b7e065d5c547d7d150d8183d3633de32dc19127f67d44d5f35737627ddee5bf7",
+        "postStateRoot" : "971515a56b2efc3ac390d46697e6f9bfb8cb25df2a41210ae5dbdc83281f07ce",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -566,35 +447,28 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1",
+                "balance" : "0",
                 "code" : "0x602060006000f0",
-                "nonce" : "1",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "53016",
+                "balance" : "100000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "946983",
+                "balance" : "900000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
-            },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
             }
         },
-        "postStateRoot" : "00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
+        "postStateRoot" : "7ed234fb9d505d4710b1be4309c710dfd42a884a8523fc59b2afd2ab5a298428",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
@@ -714,17 +588,17 @@
         },
         "logs" : [
         ],
-        "out" : "0x0015",
+        "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "21090",
+                "balance" : "41000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "78910",
+                "balance" : "59000",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506002601ef3",
                 "nonce" : "1",
                 "storage" : {
@@ -738,7 +612,7 @@
                 }
             }
         },
-        "postStateRoot" : "42ef55e243c47be922c62b4056fbbce8801576631352c43ed3c0a8db99922a52",
+        "postStateRoot" : "2a859d6a892d75c2cf0596f951d3a7fe5d6c4908179a3bfcca2f566955ad35fb",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -776,17 +650,17 @@
         },
         "logs" : [
         ],
-        "out" : "0x0000000000000000000000000000000000000000000000000000000000000015000000000000000000000000000000000000000000000000000000000000003f",
+        "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "21113",
+                "balance" : "250000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "978887",
+                "balance" : "750000",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060406000f3",
                 "nonce" : "1",
                 "storage" : {
@@ -800,7 +674,7 @@
                 }
             }
         },
-        "postStateRoot" : "d2b3bc033f31492907a141d2dc390c3a9cc6b05933b939f47c07e6fecf22d92f",
+        "postStateRoot" : "4ca5e05664f3a4207ccc5b82ade35cf72e953b847753ca730ef52f7d6e82905d",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000000",
@@ -847,13 +721,6 @@
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
                 "code" : "0x",
@@ -862,7 +729,7 @@
                 }
             }
         },
-        "postStateRoot" : "413c855a22b2e40a76999f9bd796cf2599b84a6b148712fe7430fc2f892a4d7c",
+        "postStateRoot" : "513a8c6605f11e258856d079b6d9c3cc228eb5f4788977a5a04a0a05d54a5b99",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "50000",
@@ -895,29 +762,22 @@
         ],
         "out" : "0x",
         "post" : {
-            "0000000000000000000000000000000000000000" : {
-                "balance" : "15",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "11198",
+                "balance" : "23000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "88787",
+                "balance" : "77000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "5e2d18e12d28a412e04a57800ba998a10739ee10aa35127cfcb8e675c2bbd290",
+        "postStateRoot" : "b231c450a665052fe6577f93350aeedb39ceeceacc2ba93a5ee640dd63f9d29a",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -957,22 +817,15 @@
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "67400",
+                "balance" : "67401",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "3cfd002a3559783f75228964cc1ac46adaddec77224361d58485898a02d418c3",
+        "postStateRoot" : "5733390723cba15437e2ee1d1649b1189eeab81f092f7883171d9f7a4b9f514e",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -1006,28 +859,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "22204",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "1",
+                "balance" : "23000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "77795",
+                "balance" : "77000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "b2de012ac480412426664a68a009920fb4ce8c9651543900c440070e8e286644",
+        "postStateRoot" : "b231c450a665052fe6577f93350aeedb39ceeceacc2ba93a5ee640dd63f9d29a",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
@@ -1067,22 +913,15 @@
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "1",
-                "code" : "0x",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "76999",
+                "balance" : "77000",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "84c0364010c8d918ded07ca3c2fa555bf1dd3f116670fb237204347eec2ff004",
+        "postStateRoot" : "b231c450a665052fe6577f93350aeedb39ceeceacc2ba93a5ee640dd63f9d29a",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",