Merge commit 'd0354b84' into poc-9

2f647c44 · obscuren · c1ef19be · d0354b84 · 2f647c44 · 2f647c44
Commit 2f647c44 authored Mar 03, 2015 by obscuren
20 changed files
--- a/tests/files/StateTests/stBlockHashTest.json
+++ b/tests/files/StateTests/stBlockHashTest.json
@@ -12,6 +12,13 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600040600055600540600155600440600255",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "100000",
                "code" : "0x",
@@ -20,6 +27,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -59,6 +67,13 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60014060005560024060015561010040600255",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "100000",
                "code" : "0x",
@@ -67,6 +82,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -106,6 +122,13 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "100000",
                "code" : "0x",
@@ -114,6 +137,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",

--- a/tests/files/StateTests/stExample.json
+++ b/tests/files/StateTests/stExample.json
@@ -12,6 +12,13 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "1000000000000000000",
                "code" : "0x",
@@ -20,6 +27,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",

--- a/tests/files/StateTests/stInitCodeTest.json
+++ b/tests/files/StateTests/stInitCodeTest.json
--- a/tests/files/StateTests/stLogTests.json
+++ b/tests/files/StateTests/stLogTests.json
--- a/tests/files/StateTests/stMemoryStressTest.json
+++ b/tests/files/StateTests/stMemoryStressTest.json
@@ -3,7 +3,7 @@
        "env" : {
            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
            "currentDifficulty" : "256",
-            "currentGasLimit" : "175923205248920",
+            "currentGasLimit" : "17592320524892",
            "currentNumber" : "0",
            "currentTimestamp" : "1",
            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -14,37 +14,37 @@
        "post" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                "balance" : "1000000000000000010",
-                "code" : "0x602a6401000000005264010000000051600155",
+                "code" : "0x64010000000051600155",
                "nonce" : "0",
                "storage" : {
-                    "0x01" : "0x2a"
                }
            },
            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "17592320525095",
+                "balance" : "17592320524892",
                "code" : "0x",
                "nonce" : "0",
                "storage" : {
                }
            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "158330884723825",
+                "balance" : "158330884724018",
                "code" : "0x",
                "nonce" : "1",
                "storage" : {
                }
            }
        },
+        "postStateRoot" : "6875b995a9c9c58bf04dfab5fd78fd70bde3ef032effea3fb53c11241c02605e",
        "pre" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                "balance" : "1000000000000000000",
-                "code" : "0x602a6401000000005264010000000051600155",
+                "code" : "0x64010000000051600155",
                "nonce" : "0",
                "storage" : {
                }
            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "175923205248930",
+                "balance" : "175923205248920",
                "code" : "0x",
                "nonce" : "0",
                "storage" : {
@@ -53,7 +53,7 @@
        },
        "transaction" : {
            "data" : "",
-            "gasLimit" : "175923205248920",
+            "gasLimit" : "17592320524892",
            "gasPrice" : "1",
            "nonce" : "0",
            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -65,7 +65,7 @@
        "env" : {
            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
            "currentDifficulty" : "256",
-            "currentGasLimit" : "377910804125870",
+            "currentGasLimit" : "37791080412587",
            "currentNumber" : "0",
            "currentTimestamp" : "1",
            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -76,31 +76,31 @@
        "post" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                "balance" : "1000000000000000010",
-                "code" : "0x602a6401773594005264017735940051600155",
+                "code" : "0x64017735940051600155",
                "nonce" : "0",
                "storage" : {
-                    "0x01" : "0x2a"
                }
            },
            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "37791080412790",
+                "balance" : "37791080412587",
                "code" : "0x",
                "nonce" : "0",
                "storage" : {
                }
            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "340119723807050",
+                "balance" : "340119723807253",
                "code" : "0x",
                "nonce" : "1",
                "storage" : {
                }
            }
        },
+        "postStateRoot" : "9dcf90d0402b30613fc1aacc9fe819a1591e3b1ce6e3ac2e15c0073bda4aa656",
        "pre" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                "balance" : "1000000000000000000",
-                "code" : "0x602a6401773594005264017735940051600155",
+                "code" : "0x64017735940051600155",
                "nonce" : "0",
                "storage" : {
                }
@@ -115,7 +115,7 @@
        },
        "transaction" : {
            "data" : "",
-            "gasLimit" : "377910804125870",
+            "gasLimit" : "37791080412587",
            "gasPrice" : "1",
            "nonce" : "0",
            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",

--- a/tests/files/StateTests/stMemoryTest.json
+++ b/tests/files/StateTests/stMemoryTest.json
--- a/tests/files/StateTests/stPreCompiledContracts.json
+++ b/tests/files/StateTests/stPreCompiledContracts.json
--- a/tests/files/StateTests/stQuadraticComplexityTest.json
+++ b/tests/files/StateTests/stQuadraticComplexityTest.json
--- a/tests/files/StateTests/stRecursiveCreate.json
+++ b/tests/files/StateTests/stRecursiveCreate.json
@@ -12,7 +12,120 @@
        ],
        "out" : "0x",
        "post" : {
+            "04110d816c380812a427968ece99b1c963dfbce6" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "20100000",
+                "code" : "0x60206000600039602060006000f0",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "24dd378f51adc67a50e339e8031fe9bd4aafab36" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "465224",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2cf5732f017b0cf1b1f13a1478e10239716bf6b5" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "37f998764813b136ddf5a754f34063fd03065e36" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "37fa399a749c121f8a15ce77e3d9f9bec8020d7a" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "62c01474f089b07dae603491675dc5b5748f7049" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "83e3e5a16d3b696a0314b30b2534804dd5e11197" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "8703df2417e0d7c59d063caa9583cb10a4d20532" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "99b2fcba8120bedd048fe79f5262a6690ed38c39" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "a4202b8b8afd5354e3e40a219bdc17f6001bf2cf" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "999999999999434776",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "a9647f4a0a14042d91dc33c0328030a7157c93ae" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "aae4a2e3c51c04606dcb3723456e58f3ed214f45" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
        },
+        "postStateRoot" : "2af4748839558302a492e85a66ce9bc8da20992955fe255663ce4e08edb4ad20",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "20000000",

--- a/tests/files/StateTests/stRefundTest.json
+++ b/tests/files/StateTests/stRefundTest.json
@@ -20,6 +20,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "400",
@@ -52,6 +53,19 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "10000",
                "code" : "0x",
@@ -60,6 +74,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -105,6 +120,18 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001556000600255600060035560006004556000600555",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "10000",
                "code" : "0x",
@@ -113,6 +140,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -157,6 +185,18 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "10000",
                "code" : "0x",
@@ -165,6 +205,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -209,6 +250,19 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "10000",
                "code" : "0x",
@@ -217,6 +271,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -262,6 +317,14 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6000600155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "502",
                "code" : "0x",
@@ -270,6 +333,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -310,6 +374,14 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6000600155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "500",
                "code" : "0x",
@@ -318,6 +390,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -358,6 +431,14 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6017600155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "1000",
                "code" : "0x",
@@ -366,6 +447,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",
@@ -406,6 +488,14 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6000600155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "1000",
                "code" : "0x",
@@ -414,6 +504,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",

--- a/tests/files/StateTests/stSolidityTest.json
+++ b/tests/files/StateTests/stSolidityTest.json
--- a/tests/files/StateTests/stSpecialTest.json
+++ b/tests/files/StateTests/stSpecialTest.json
@@ -20,6 +20,7 @@
                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "1000",
@@ -52,14 +53,29 @@
        ],
        "out" : "0x",
        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7b601080600c6000396000f200600035541560095700602035600035556000526000600060006000601773aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecf1",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                "balance" : "1000",
                "code" : "0x",
                "nonce" : "0",
                "storage" : {
                }
+            },
+            "aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600160015532600255",
+                "nonce" : "0",
+                "storage" : {
+                }
            }
        },
+        "postStateRoot" : "255f005689b4eb8d7a0144473577eb02bfaf25970cda9323a734bb8f18f34252",
        "pre" : {
            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                "balance" : "1000000000000000000",

--- a/tests/files/StateTests/stSystemOperationsTest.json
+++ b/tests/files/StateTests/stSystemOperationsTest.json
--- a/tests/files/StateTests/stTransactionTest.json
+++ b/tests/files/StateTests/stTransactionTest.json
--- a/tests/files/VMTests/vmEnvironmentalInfoTest.json
+++ b/tests/files/VMTests/vmEnvironmentalInfoTest.json
@@ -1406,7 +1406,7 @@
            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
            "value" : "10000000001111111"
        },
-        "gas" : "99999872361",
+        "gas" : "99999897361",
        "logs" : [
        ],
        "out" : "0x",

--- a/tests/files/VMTests/vmIOandFlowOperationsTest.json
+++ b/tests/files/VMTests/vmIOandFlowOperationsTest.json
--- a/tests/files/VMTests/vmMemoryTest.json
+++ b/tests/files/VMTests/vmMemoryTest.json
--- a/tests/files/VMTests/vmPerformanceTest.json
+++ b/tests/files/VMTests/vmPerformanceTest.json
--- a/tests/files/VMTests/vmPushDupSwapTest.json
+++ b/tests/files/VMTests/vmPushDupSwapTest.json
@@ -2095,7 +2095,7 @@
            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
            "value" : "1000000000000000000"
        },
-        "gas" : "9941",
+        "gas" : "9939",
        "logs" : [
        ],
        "out" : "0x03",

--- a/tests/files/VMTests/vmSystemOperationsTest.json
+++ b/tests/files/VMTests/vmSystemOperationsTest.json