Merge commit 'b7ec9fbb0e49e345a8a2566226a76d50b48266a7' into poc-9

2 files changed, 221 insertions, 65 deletions

diff --git a/tests/files/VMTests/vmLogTest.json b/tests/files/VMTests/vmLogTest.json
index b9826b02d..f1140bfd2 100644
--- a/tests/files/VMTests/vmLogTest.json
+++ b/tests/files/VMTests/vmLogTest.json
@@ -20,11 +20,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7994",
+        "gas" : "9619",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                 ]
@@ -129,11 +129,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7982",
+        "gas" : "9607",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                 ]
@@ -180,11 +180,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7726",
+        "gas" : "9351",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
                 ]
@@ -231,11 +231,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7974",
+        "gas" : "9599",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xaa",
                 "topics" : [
                 ]
@@ -282,11 +282,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7974",
+        "gas" : "9599",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xdd",
                 "topics" : [
                 ]
@@ -333,11 +333,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5724",
+        "gas" : "8974",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000008000000808100000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
                     "000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681"
@@ -385,11 +385,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5723",
+        "gas" : "8973",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
@@ -437,11 +437,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5991",
+        "gas" : "9241",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000"
@@ -547,11 +547,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5979",
+        "gas" : "9229",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000"
@@ -599,11 +599,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5723",
+        "gas" : "8973",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000"
@@ -651,11 +651,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5971",
+        "gas" : "9221",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xaa",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000"
@@ -703,11 +703,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5971",
+        "gas" : "9221",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xdd",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000"
@@ -755,11 +755,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3721",
+        "gas" : "8596",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000008000000808100000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000800000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -808,11 +808,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3720",
+        "gas" : "8595",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -861,11 +861,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3988",
+        "gas" : "8863",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -972,11 +972,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3976",
+        "gas" : "8851",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1025,11 +1025,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3720",
+        "gas" : "8595",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1078,11 +1078,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3968",
+        "gas" : "8843",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xaa",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1131,11 +1131,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3968",
+        "gas" : "8843",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xdd",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1184,11 +1184,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1718",
+        "gas" : "8218",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000008000000808100000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000800000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1238,11 +1238,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1717",
+        "gas" : "8217",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -1292,11 +1292,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1720",
+        "gas" : "8220",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00003004000000000000800000000010000008000000000000000980000000000000000000000000000000000000000000001000000400000000000800000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000400000000000000000000000030000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000001000000800000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000800000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000007",
@@ -1346,11 +1346,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1985",
+        "gas" : "8485",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1458,11 +1458,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1973",
+        "gas" : "8473",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0x",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1512,11 +1512,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1717",
+        "gas" : "8217",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1566,11 +1566,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1965",
+        "gas" : "8465",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xaa",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1620,11 +1620,11 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1965",
+        "gas" : "8465",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xdd",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
@@ -1698,6 +1698,8 @@
         }
     },
     "log4_MaxTopic" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1716,6 +1718,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "7839",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
+                "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
+                "topics" : [
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60206000a4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1771,6 +1797,8 @@
         }
     },
     "log4_emptyMem" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1789,6 +1817,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "8107",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                "data" : "0x",
+                "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x600060006000600060006000a4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1858,6 +1910,8 @@
         }
     },
     "log4_logMemsizeZero" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1876,6 +1930,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "8095",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                "data" : "0x",
+                "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006000600060006001a4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1887,6 +1965,8 @@
         }
     },
     "log4_nonEmptyMem" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1905,6 +1985,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "7839",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600052600060006000600060206000a4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1916,6 +2020,8 @@
         }
     },
     "log4_nonEmptyMem_logMemSize1" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1934,6 +2040,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "8087",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                "data" : "0xaa",
+                "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006000600060016000a4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1945,6 +2075,8 @@
         }
     },
     "log4_nonEmptyMem_logMemSize1_logMemStart31" : {
+        "callcreates" : [
+        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1963,6 +2095,30 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
+        "gas" : "8087",
+        "logs" : [
+            {
+                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                "data" : "0xdd",
+                "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000"
+                ]
+            }
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060006001601fa4",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1994,18 +2150,18 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5592",
+        "gas" : "8842",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
                 ]
             },
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
+                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "data" : "0xffffffffffffffffffffffffffffffff",
                 "topics" : [
                 ]
diff --git a/tests/files/VMTests/vmSystemOperationsTest.json b/tests/files/VMTests/vmSystemOperationsTest.json
index 7912245dd..c2c193d79 100644
--- a/tests/files/VMTests/vmSystemOperationsTest.json
+++ b/tests/files/VMTests/vmSystemOperationsTest.json
@@ -4,7 +4,7 @@
             {
                 "data" : "0x",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "1000",
+                "gasLimit" : "3300",
                 "value" : "24"
             }
         ],
@@ -177,7 +177,7 @@
             {
                 "data" : "0x",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "1000",
+                "gasLimit" : "3300",
                 "value" : "24"
             }
         ],
@@ -234,7 +234,7 @@
             {
                 "data" : "0x",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "1000",
+                "gasLimit" : "3300",
                 "value" : "24"
             }
         ],
@@ -299,7 +299,7 @@
             {
                 "data" : "0x",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "100000",
+                "gasLimit" : "102300",
                 "value" : "23"
             }
         ],
@@ -519,7 +519,7 @@
             {
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "1000000",
+                "gasLimit" : "1002300",
                 "value" : "23"
             }
         ],
@@ -829,7 +829,7 @@
             {
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
                 "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-                "gasLimit" : "1000000",
+                "gasLimit" : "1002300",
                 "value" : "23"
             }
         ],
@@ -1039,7 +1039,7 @@
             {
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
                 "destination" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "gasLimit" : "1000000",
+                "gasLimit" : "1002300",
                 "value" : "23"
             }
         ],
@@ -1104,7 +1104,7 @@
             {
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
                 "destination" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "gasLimit" : "500",
+                "gasLimit" : "2800",
                 "value" : "23"
             }
         ],