Merge commit '58c6cc8fd7ff8a27004ed62d912e0a61ae1b73bb' into develop

2015-03-24 11:22:58 +01:00
parent 118b79eca7 58c6cc8fd7
commit 4877e52c15
39 changed files with 5798 additions and 3675 deletions
--- a/tests/files/VMTests/vmIOandFlowOperationsTest.json
+++ b/tests/files/VMTests/vmIOandFlowOperationsTest.json
@@ -2341,6 +2341,35 @@
            }
        }
    },
+    "gasOverFlow" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x6060035b60600160800380606002576868010000000000000016565b6363badf000d6060115500",
+            "data" : "0x",
+            "gas" : "100000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100000000000000000000000",
+                "code" : "0x6060035b60600160800380606002576868010000000000000016565b6363badf000d6060115500",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
    "indirect_jump1" : {
        "callcreates" : [
        ],