Removed all implicit logging. Fixed gas issues and jump errors

4 files changed, 82 insertions, 88 deletions

diff --git a/tests/files/VMTests/vmArithmeticTest.json b/tests/files/VMTests/vmArithmeticTest.json
index edc91436d..ad3846cf9 100644
--- a/tests/files/VMTests/vmArithmeticTest.json
+++ b/tests/files/VMTests/vmArithmeticTest.json
@@ -2142,28 +2142,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62126af4605016600057",
+            "code" : "0x62126af460500b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4605016600057",
+                "code" : "0x62126af460500b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x126af4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4605016600057",
+                "code" : "0x62126af460500b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2355,28 +2356,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x60ff68f0000000000000000116600057",
+            "code" : "0x60ff68f000000000000000010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x60ff68f0000000000000000116600057",
+                "code" : "0x60ff68f000000000000000010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xff"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x60ff68f0000000000000000116600057",
+                "code" : "0x60ff68f000000000000000010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2439,28 +2441,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62122f6a600016600057",
+            "code" : "0x62122f6a60000b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122f6a600016600057",
+                "code" : "0x62122f6a60000b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x6a"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122f6a600016600057",
+                "code" : "0x62122f6a60000b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2481,28 +2484,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62126af4600116600057",
+            "code" : "0x62126af460010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4600116600057",
+                "code" : "0x62126af460010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x6af4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4600116600057",
+                "code" : "0x62126af460010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2523,28 +2527,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x6212faf4600116600057",
+            "code" : "0x6212faf460010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x6212faf4600116600057",
+                "code" : "0x6212faf460010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaf4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x6212faf4600116600057",
+                "code" : "0x6212faf460010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2565,28 +2570,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x66f000000000000161ffff16600057",
+            "code" : "0x66f000000000000161ffff0b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x66f000000000000161ffff16600057",
+                "code" : "0x66f000000000000161ffff0b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xf0000000000001"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x66f000000000000161ffff16600057",
+                "code" : "0x66f000000000000161ffff0b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2607,28 +2613,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62122ff4600016600057",
+            "code" : "0x62122ff460000b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122ff4600016600057",
+                "code" : "0x62122ff460000b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122ff4600016600057",
+                "code" : "0x62122ff460000b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/vmIOandFlowOperationsTest.json b/tests/files/VMTests/vmIOandFlowOperationsTest.json
index a3a4349fe..027328d0d 100644
--- a/tests/files/VMTests/vmIOandFlowOperationsTest.json
+++ b/tests/files/VMTests/vmIOandFlowOperationsTest.json
@@ -363,7 +363,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "0",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -384,6 +384,48 @@
             }
         }
     },
+    "jump1" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x620fffff620fffff0156",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "0",
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x620fffff620fffff0156",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x620fffff620fffff0156",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
     "jumpi0" : {
         "callcreates" : [
         ],
@@ -1301,7 +1343,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "10000",
+        "gas" : "0",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1479,7 +1521,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "0",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
diff --git a/tests/files/VMTests/vmNamecoin.json b/tests/files/VMTests/vmNamecoin.json
deleted file mode 100644
index 5b8863d0c..000000000
--- a/tests/files/VMTests/vmNamecoin.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "namecoin": {
-        "pre": {
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                "nonce": "1", 
-                "balance": "2500000000000000000", 
-                "storage": {}, 
-                "code": "0x"
-            }, 
-            "c305c901078781c232a2a521c2af7980f8385ee9": {
-                "nonce": "0", 
-                "balance": "0", 
-                "storage": {}, 
-                "code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2"
-            }
-        }, 
-        "exec": {
-            "origin": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2", 
-            "value": "0", 
-            "address": "c305c901078781c232a2a521c2af7980f8385ee9", 
-            "gas": "10000", 
-            "caller": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "data": "0x000000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000004e", 
-            "gasPrice": "1000000000000"
-        }, 
-        "callcreates": [], 
-        "gas": "9663", 
-        "env": {
-            "currentTimestamp": "1405282164", 
-            "currentGasLimit": "999023", 
-            "previousHash": "112a6e7995fcb66376f44e52f011c38d328a9ed3a1dac6eebb1376fccd055fad", 
-            "currentCoinbase": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "currentDifficulty": "4190208", 
-            "currentNumber": "1"
-        }, 
-        "post": {
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                "nonce": "1", 
-                "balance": "2500000000000000000", 
-                "storage": {}, 
-                "code": "0x"
-            }, 
-            "c305c901078781c232a2a521c2af7980f8385ee9": {
-                "nonce": "0", 
-                "balance": "0", 
-                "storage": {
-                    "0x2d": "0x4e"
-                }, 
-                "code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2"
-            }
-        }, 
-        "out": "0x0000000000000000000000000000000000000000000000000000000000000001"
-    }
-}
diff --git a/tests/files/VMTests/vmPushDupSwapTest.json b/tests/files/VMTests/vmPushDupSwapTest.json
index 7391df595..873f95061 100644
--- a/tests/files/VMTests/vmPushDupSwapTest.json
+++ b/tests/files/VMTests/vmPushDupSwapTest.json
@@ -407,7 +407,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9999",
+        "gas" : "0",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -2597,7 +2597,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "0",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {