Merge commit '85fa3790ac9f67232f0e31e7f861c66ef0e0047e' into develop

1 files changed, 33 insertions, 24 deletions

diff --git a/tests/files/StateTests/stPreCompiledContracts.json b/tests/files/StateTests/stPreCompiledContracts.json
index 2b62a8672..1236e0be8 100644
--- a/tests/files/StateTests/stPreCompiledContracts.json
+++ b/tests/files/StateTests/stPreCompiledContracts.json
@@ -21,7 +21,7 @@
             },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20100000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -44,11 +44,11 @@
                 }
             }
         },
-        "postStateRoot" : "e9641bf208eb1bfd6ce856d9b2f2db4f9f866dd05748bce08726db850581bf76",
+        "postStateRoot" : "e59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -93,7 +93,7 @@
             },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20100000",
-                "code" : "0x602060806080600060006001620186a0f160025560a060020a60805106600055",
+                "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
                 "nonce" : "0",
                 "storage" : {
                     "0x02" : "0x01"
@@ -114,11 +114,11 @@
                 }
             }
         },
-        "postStateRoot" : "a5156482e92475404250240ccfee397ae5e0770dcb9a7781f66390cadbe52dbf",
+        "postStateRoot" : "90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",
-                "code" : "0x602060806080600060006001620186a0f160025560a060020a60805106600055",
+                "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -133,7 +133,7 @@
         },
         "transaction" : {
             "data" : "",
-            "gasLimit" : "365224",
+            "gasLimit" : "3652240",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -301,7 +301,7 @@
             },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20100000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f1600255608051600055",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -323,11 +323,11 @@
                 }
             }
         },
-        "postStateRoot" : "370bf4cc6640135bc800518d9f211c3ea46d6af66fca3e64c98656be99fe6d6e",
+        "postStateRoot" : "cf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f1600255608051600055",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -444,7 +444,7 @@
             },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20100000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620186a0f160025560a060020a604051066000556000543214600155",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -467,11 +467,11 @@
                 }
             }
         },
-        "postStateRoot" : "300668e695e19c58d2c121fa59c58ed14438128ce89f4df972deca0f181592a2",
+        "postStateRoot" : "dc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",
-                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620186a0f160025560a060020a604051066000556000543214600155",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1349,33 +1349,42 @@
         ],
         "out" : "0x",
         "post" : {
+            "0000000000000000000000000000000000000002" : {
+                "balance" : "19",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "200100000",
-                "code" : "0x6020600060006000601360026301312d00f1600255600051600055",
+                "balance" : "200099981",
+                "code" : "0x60206000600060006013600262030d40f1600255600051600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                    "0x02" : "0x01"
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "365224",
+                "balance" : "92836",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999534776",
+                "balance" : "999999999999807164",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "a753c25f66dda332d99702bbbf714586d40af0944ab8a95d33b78c525c42b33b",
+        "postStateRoot" : "5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "200000000",
-                "code" : "0x6020600060006000601360026301312d00f1600255600051600055",
+                "code" : "0x60206000600060006013600262030d40f1600255600051600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1704,32 +1713,32 @@
             },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20100000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060026101f4f1600255600051600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2072680",
+                "balance" : "2072780",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999997827320",
+                "balance" : "999999999997827220",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "c2bf8578c3a30e93df325ea09be571aee3f36373a86df29b05079bed7fa6c03d",
+        "postStateRoot" : "eef8211131bd57fbcd523c2a737ac09b379a098bbad98cb25d48650b5f8e25ff",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "20000000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060026101f4f1600255600051600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
                 "nonce" : "0",
                 "storage" : {
                 }