eth/tracers: report correct gasLimit in call tracers (#27029)

This includes a semantic change to the `callTracer` as well as `flatCallTracer`. The value of field `gas` in the **first** call frame will change as follows: - It previously contained gas available after initial deductions (i.e. tx costs) - It will now contain the full tx gasLimit value Signed-off-by: jsvisa <delweng@gmail.com>
2 years ago · 0b76eb3708
parent d2cf49327f
commit 0b76eb3708
69 changed files with 74 additions and 74 deletions
--- a/eth/tracers/internal/tracetest/calltrace_test.go
+++ b/eth/tracers/internal/tracetest/calltrace_test.go
@ -302,13 +302,13 @@ func TestInternals(t *testing.T) {
 				byte(vm.CALL),
 			},
 			tracer: mkTracer("callTracer", nil),
-			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0x7148","gasUsed":"0x54d8","to":"0x00000000000000000000000000000000deadbeef","input":"0x","calls":[{"from":"0x00000000000000000000000000000000deadbeef","gas":"0x6cbf","gasUsed":"0x0","to":"0x00000000000000000000000000000000000000ff","input":"0x","value":"0x0","type":"CALL"}],"value":"0x0","type":"CALL"}`,
+			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0xc350","gasUsed":"0x54d8","to":"0x00000000000000000000000000000000deadbeef","input":"0x","calls":[{"from":"0x00000000000000000000000000000000deadbeef","gas":"0x6cbf","gasUsed":"0x0","to":"0x00000000000000000000000000000000000000ff","input":"0x","value":"0x0","type":"CALL"}],"value":"0x0","type":"CALL"}`,
 		},
 		{
 			name:   "Stack depletion in LOG0",
 			code:   []byte{byte(vm.LOG3)},
 			tracer: mkTracer("callTracer", json.RawMessage(`{ "withLog": true }`)),
-			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0x7148","gasUsed":"0xc350","to":"0x00000000000000000000000000000000deadbeef","input":"0x","error":"stack underflow (0 \u003c=\u003e 5)","value":"0x0","type":"CALL"}`,
+			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0xc350","gasUsed":"0xc350","to":"0x00000000000000000000000000000000deadbeef","input":"0x","error":"stack underflow (0 \u003c=\u003e 5)","value":"0x0","type":"CALL"}`,
 		},
 		{
 			name: "Mem expansion in LOG0",
@ -321,7 +321,7 @@ func TestInternals(t *testing.T) {
 				byte(vm.LOG0),
 			},
 			tracer: mkTracer("callTracer", json.RawMessage(`{ "withLog": true }`)),
-			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0x7148","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}],"value":"0x0","type":"CALL"}`,
+			want:   `{"from":"0x000000000000000000000000000000000000feed","gas":"0xc350","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}],"value":"0x0","type":"CALL"}`,
 		},
 		{
 			// Leads to OOM on the prestate tracer
--- a/eth/tracers/internal/tracetest/flat_calltrace_test.go
+++ b/eth/tracers/internal/tracetest/flat_calltrace_test.go
@ -124,8 +124,8 @@ func flatCallTracerTestRunner(tracerName string, filename string, dirPath string
 	if err != nil {
 		return fmt.Errorf("failed to retrieve trace result: %v", err)
 	}
-	ret := new([]flatCallTrace)
+	ret := make([]flatCallTrace, 0)
-	if err := json.Unmarshal(res, ret); err != nil {
+	if err := json.Unmarshal(res, &ret); err != nil {
 		return fmt.Errorf("failed to unmarshal trace result: %v", err)
 	}
 	if !jsonEqualFlat(ret, test.Result) {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/create.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/create.json
@ -47,7 +47,7 @@
  "input": "0xf907ef098504e3b29200830897be8080b9079c606060405260405160208061077c83398101604052808051906020019091905050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415151561007d57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460006101000a81548160ff02191690831515021790555050610653806101296000396000f300606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029000000000000000000000000c65e620a3a55451316168d57e268f5702ef56a1129a01060f46676a5dff6f407f0f51eb6f37f5c8c54e238c70221e18e65fc29d3ea65a0557b01c50ff4ffaac8ed6e5d31237a4ecbac843ab1bfe8bb0165a0060df7c54f",
  "result": {
    "from": "0x13e4acefe6a6700604929946e70e6443e4e73447",
-    "gas": "0x5e106",
+    "gas": "0x897be",
    "gasUsed": "0x897be",
    "input": "0x606060405260405160208061077c83398101604052808051906020019091905050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415151561007d57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460006101000a81548160ff02191690831515021790555050610653806101296000396000f300606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029000000000000000000000000c65e620a3a55451316168d57e268f5702ef56a11",
    "output": "0x606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
@ -399,7 +399,7 @@
      }
    ],
    "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-    "gas": "0x37b38",
+    "gas": "0x3d090",
    "gasUsed": "0x1810b",
    "input": "0x51a34eb80000000000000000000000000000000000000000000000280faf689c35ac0000",
    "to": "0xc212e03b9e060e36facad5fd8f4435412ca22e6b",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
@ -87,7 +87,7 @@
      }
    ],
    "from": "0xa529806c67cc6486d4d62024471772f47f6fd672",
-    "gas": "0x2d6e28",
+    "gas": "0x2dc6c0",
    "gasUsed": "0xbd55",
    "input": "0x7065cb480000000000000000000000001523e55a1ca4efbae03355775ae89f8d7699ad9e",
    "to": "0x269296dddce321a6bcbaa2f0181127593d732cba",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
@ -67,7 +67,7 @@
    ],
    "error": "invalid jump destination",
    "from": "0xe4a13bc304682a903e9472f469c33801dd18d9e8",
-    "gas": "0x435c8",
+    "gas": "0x493e0",
    "gasUsed": "0x493e0",
    "input": "0x3b91f506000000000000000000000000a14bdd7e5666d784dcce98ad24d383a6b1cd4182000000000000000000000000e4a13bc304682a903e9472f469c33801dd18d9e8",
    "to": "0x1d3ddf7caf024f253487e18bc4a15b1a360c170a",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
@ -54,7 +54,7 @@
    "from": "0x66fdfd05e46126a07465ad24e40cc0597bc1ef31",
    "to": "0x6c06b16512b332e6cd8293a2974872674716ce18",
    "value": "0x0",
-    "gas": "0x1a466",
+    "gas": "0x1f97e",
    "gasUsed": "0x72de",
    "input": "0x2e1a7d4d00000000000000000000000000000000000000000000000014d1120d7b160000"
  }
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
@ -50,7 +50,7 @@
  "input": "0x02f9029d82053980849502f90085010c388d00832dc6c08080b90241608060405234801561001057600080fd5b50600060405161001f906100a2565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c04062266040518163ffffffff1660e01b815260040160006040518083038186803b15801561008457600080fd5b505afa158015610098573d6000803e3d6000fd5b50505050506100af565b610145806100fc83390190565b603f806100bd6000396000f3fe6080604052600080fdfea264697066735822122077f7dbd3450d6e817079cf3fe27107de5768bb3163a402b94e2206b468eb025664736f6c63430008070033608060405234801561001057600080fd5b50610125806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033c001a07566181071cabaf58b70fc41557eb813bfc7a24f5c58554e7fed0bf7c031f169a0420af50b5fe791a4d839e181a676db5250b415dfb35cb85d544db7a1475ae2cc",
  "result": {
    "from": "0x3623191d4ccfbbdf09e8ebf6382a1f8257417bc1",
-    "gas": "0x2cd774",
+    "gas": "0x2dc6c0",
    "gasUsed": "0x25590",
    "input": "0x608060405234801561001057600080fd5b50600060405161001f906100a2565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c04062266040518163ffffffff1660e01b815260040160006040518083038186803b15801561008457600080fd5b505afa158015610098573d6000803e3d6000fd5b50505050506100af565b610145806100fc83390190565b603f806100bd6000396000f3fe6080604052600080fdfea264697066735822122077f7dbd3450d6e817079cf3fe27107de5768bb3163a402b94e2206b468eb025664736f6c63430008070033608060405234801561001057600080fd5b50610125806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033",
    "output": "0x08c379a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000012546869732063616c6c6564206661696c65640000000000000000000000000000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
@ -71,7 +71,7 @@
    ],
    "error": "execution reverted",
    "from": "0xd4fcab9f0a6dc0493af47c864f6f17a8a5e2e826",
-    "gas": "0x78d9e",
+    "gas": "0x7dfa6",
    "gasUsed": "0x7c1c8",
    "input": "0x",
    "to": "0x33056b5dcac09a9b4becad0e1dcf92c19bd0af76",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
@ -50,7 +50,7 @@
  "result": {
    "error": "out of gas",
    "from": "0x94194bc2aaf494501d7880b61274a169f6502a54",
-    "gas": "0x7045",
+    "gas": "0xca1d",
    "gasUsed": "0xca1d",
    "input": "0xa9059cbb000000000000000000000000e77b1ac803616503510bed0086e3a7be2627a69900000000000000000000000000000000000000000000000000000009502f9000",
    "to": "0x43064693d3d38ad6a7cb579e0d6d9718c8aa6b62",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
@ -48,7 +48,7 @@
  "result": {
    "error": "execution reverted",
    "from": "0x0f6cef2b7fbb504782e35aa82a2207e816a2b7a9",
-    "gas": "0x2d55e8",
+    "gas": "0x2dc6c0",
    "gasUsed": "0x719b",
    "input": "0x73b40a5c000000000000000000000000400de2e016bda6577407dfc379faba9899bc73ef0000000000000000000000002cc31912b2b0f3075a87b3640923d45a26cef3ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d79d8e6c7265636f76657279416464726573730000000000000000000000000000000000000000000000000000000000383e3ec32dc0f66d8fe60dbdc2f6815bdf73a988383e3ec32dc0f66d8fe60dbdc2f6815bdf73a98800000000000000000000000000000000000000000000000000000000000000000000000000000000",
    "to": "0xabbcd5b340c80b5f1c0545c04c987b87310296ae",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
@ -27,7 +27,7 @@
      "byzantiumBlock": 0,
      "constantinopleBlock": 0,
      "petersburgBlock": 0,
-      "IstanbulBlock":1561651,
+      "IstanbulBlock":  1561651,
      "chainId": 5,
      "daoForkSupport": true,
      "eip150Block": 0,
@ -53,7 +53,7 @@
  "result": {
    "error": "execution reverted",
    "from": "0xf7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
-    "gas": "0x2d7308",
+    "gas": "0x2dc6c0",
    "gasUsed": "0x5940",
    "input": "0x5c19a95c000000000000000000000000f7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
    "to": "0xf58833cf0c791881b494eb79d461e08a1f043f52",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
@ -64,7 +64,7 @@
      }
    ],
    "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-    "gas": "0x10738",
+    "gas": "0x15f90",
    "gasUsed": "0x6fcb",
    "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
    "to": "0x3b873a919aa0512d5a0f09e6dcceaa4a6727fafe",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
@ -69,7 +69,7 @@
      }
    ],
    "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-    "gas": "0x10738",
+    "gas": "0x15f90",
    "gasUsed": "0x9751",
    "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
    "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
@ -61,7 +61,7 @@
  },
  "result": {
    "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-    "gas": "0x10738",
+    "gas": "0x15f90",
    "gasUsed": "0x9751",
    "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
    "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
@ -52,7 +52,7 @@
  "result": {
    "error": "invalid jump destination",
    "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-    "gas": "0x37b38",
+    "gas": "0x3d090",
    "gasUsed": "0x3d090",
    "input": "0x51a34eb8000000000000000000000000000000000000000000000027fad02094277c0000",
    "to": "0xc212e03b9e060e36facad5fd8f4435412ca22e6b",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/big_slow.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/big_slow.json
@ -46,7 +46,7 @@
    {
      "action": {
        "from": "0xf8bda96b67036ee48107f2a0695ea673479dda56",
-        "gas": "0x22410c",
+        "gas": "0x231860",
        "init": "0x5b620186a05a131560135760016020526000565b600080601f600039601f565b6000f3",
        "value": "0x0"
      },
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_fail_hide.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_fail_hide.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x19f78",
        "init": "0x60206000600060006013600462030d40f260025560005160005500"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_oog.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_oog.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x1a758",
        "init": "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a60805106600055600054321460015500"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_throw.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x1a034",
        "init": "0x36600060003760406103e8366000600060095af26001556103e8516002556104085160035500"
      },
      "error": "out of gas",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/create.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/create.json
@ -49,7 +49,7 @@
    {
      "action": {
        "from": "0x13e4acefe6a6700604929946e70e6443e4e73447",
-        "gas": "0x5e106",
+        "gas": "0x897be",
        "init": "0x606060405260405160208061077c83398101604052808051906020019091905050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415151561007d57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460006101000a81548160ff02191690831515021790555050610653806101296000396000f300606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029000000000000000000000000c65e620a3a55451316168d57e268f5702ef56a11",
        "value": "0x0"
      },
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/deep_calls.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/deep_calls.json
@ -113,7 +113,7 @@
      "action": {
        "callType": "call",
        "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-        "gas": "0x37b38",
+        "gas": "0x3d090",
        "input": "0x51a34eb80000000000000000000000000000000000000000000000280faf689c35ac0000",
        "to": "0xc212e03b9e060e36facad5fd8f4435412ca22e6b",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/delegatecall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/delegatecall.json
@ -66,7 +66,7 @@
      "action": {
        "callType": "call",
        "from": "0xa529806c67cc6486d4d62024471772f47f6fd672",
-        "gas": "0x2d6e28",
+        "gas": "0x2dc6c0",
        "input": "0x7065cb480000000000000000000000001523e55a1ca4efbae03355775ae89f8d7699ad9e",
        "to": "0x269296dddce321a6bcbaa2f0181127593d732cba",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/delegatecall_parent_value.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/delegatecall_parent_value.json
@ -59,7 +59,7 @@
      "action": {
        "callType": "call",
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
-        "gas": "0x10b68",
+        "gas": "0x15f90",
        "input": "0x4e45375a47413941",
        "to": "0x91765918420bcb5ad22ee0997abed04056705798",
        "value": "0x8ac7230489e80000"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/gas.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/gas.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x1a9c8",
        "init": "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/include_precompiled.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/include_precompiled.json
@ -83,7 +83,7 @@
        "balance": "0x0",
        "callType": "call",
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
-        "gas": "0x119d28",
+        "gas": "0x124f80",
        "input": "0x13f955e100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000019004000000afbe013b4a83b2f91f3d9b6627cf382394c4914fd2b7510700000000000000008621196eb526a0e02430b6dd5c72fd368e768977f3a8364861e5a471a8ae61a1028f745609c40b185f537a67040000005b53875b0f1381589859adcf938980f4a8fb0af4c8845007000000000000000075289d1c48c8f71deee521a76c8d92948cbe14343991998dfaea6b08596d97dcc891745609c40b18ae825ae704000000abbacd8711f647ab97c6c9b9658eb9bef081e2cedb630f010000000000000000549bcab22422baef6c34af382b227e4b1a27bec3312e04dbb62fc315203c67f30f9d745609c40b180fdfc30304000000e93433dde5128942e47e8722d37ec4dcc1c8a78cf9c4a4030000000000000000bf92c09e8e37b2c8ffbb4b9cadfccc563e474c4feae6997f52d56236fedafce20a9f745609c40b1840cc27de04000000f2e372a0b5b837116eee8f968840393d85975a1531346807000000000000000076bc91399edda1de98976ee0774e2ad3b21dd38ad9f5f34d2c816a832747fe7f4c9e745609c40b18e290e9e000000000000000000000000000000000",
        "refundAddress": "0x0000000000000000000000000000000000000000",
        "to": "0x6cc68eb482a757c690dd151d2bd5e774ada38bdc",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_create_oog_outer_throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_create_oog_outer_throw.json
@ -58,7 +58,7 @@
      "action": {
        "callType": "call",
        "from": "0xe4a13bc304682a903e9472f469c33801dd18d9e8",
-        "gas": "0x435c8",
+        "gas": "0x493e0",
        "input": "0x3b91f506000000000000000000000000a14bdd7e5666d784dcce98ad24d383a6b1cd4182000000000000000000000000e4a13bc304682a903e9472f469c33801dd18d9e8",
        "to": "0x1d3ddf7caf024f253487e18bc4a15b1a360c170a",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_instafail.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_instafail.json
@ -54,7 +54,7 @@
      "action": {
        "callType": "call",
        "from": "0x66fdfd05e46126a07465ad24e40cc0597bc1ef31",
-        "gas": "0x1a466",
+        "gas": "0x1f97e",
        "input": "0x2e1a7d4d00000000000000000000000000000000000000000000000014d1120d7b160000",
        "to": "0x6c06b16512b332e6cd8293a2974872674716ce18",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_precompiled_wrong_gas.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_precompiled_wrong_gas.json
@ -80,7 +80,7 @@
        "balance": "0x0",
        "callType": "call",
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
-        "gas": "0x119d28",
+        "gas": "0x124f80",
        "input": "0x13f955e100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000019004000000afbe013b4a83b2f91f3d9b6627cf382394c4914fd2b7510700000000000000008621196eb526a0e02430b6dd5c72fd368e768977f3a8364861e5a471a8ae61a1028f745609c40b185f537a67040000005b53875b0f1381589859adcf938980f4a8fb0af4c8845007000000000000000075289d1c48c8f71deee521a76c8d92948cbe14343991998dfaea6b08596d97dcc891745609c40b18ae825ae704000000abbacd8711f647ab97c6c9b9658eb9bef081e2cedb630f010000000000000000549bcab22422baef6c34af382b227e4b1a27bec3312e04dbb62fc315203c67f30f9d745609c40b180fdfc30304000000e93433dde5128942e47e8722d37ec4dcc1c8a78cf9c4a4030000000000000000bf92c09e8e37b2c8ffbb4b9cadfccc563e474c4feae6997f52d56236fedafce20a9f745609c40b1840cc27de04000000f2e372a0b5b837116eee8f968840393d85975a1531346807000000000000000076bc91399edda1de98976ee0774e2ad3b21dd38ad9f5f34d2c816a832747fe7f4c9e745609c40b18e290e9e000000000000000000000000000000000",
        "refundAddress": "0x0000000000000000000000000000000000000000",
        "to": "0x6cc68eb482a757c690dd151d2bd5e774ada38bdc",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_throw_outer_revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/inner_throw_outer_revert.json
@ -61,7 +61,7 @@
      "action": {
        "callType": "call",
        "from": "0xd4fcab9f0a6dc0493af47c864f6f17a8a5e2e826",
-        "gas": "0x78d9e",
+        "gas": "0x7dfa6",
        "input": "0x",
        "to": "0x33056b5dcac09a9b4becad0e1dcf92c19bd0af76",
        "value": "0xe92596fd6290000"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0x3951c",
+        "gas": "0x53e90",
        "init": "0x60606040525b60405161015b806102a0833901809050604051809103906000f0600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b610247806100596000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900480632ef9db1314610044578063e37678761461007157610042565b005b61005b6004803590602001803590602001506100ad565b6040518082815260200191505060405180910390f35b61008860048035906020018035906020015061008a565b005b8060006000506000848152602001908152602001600020600050819055505b5050565b6000600060008484604051808381526020018281526020019250505060405180910390209150610120600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff167f6164640000000000000000000000000000000000000000000000000000000000846101e3565b9050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681868660405180807f616464000000000000000000000000000000000000000000000000000000000081526020015060200184815260200183815260200182815260200193505050506000604051808303816000866161da5a03f191505050600060005060008281526020019081526020016000206000505492506101db565b505092915050565b60004340848484604051808581526020018473ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140183815260200182815260200194505050505060405180910390209050610240565b9392505050566060604052610148806100136000396000f30060606040526000357c010000000000000000000000000000000000000000000000000000000090048063471407e614610044578063e37678761461007757610042565b005b6100616004803590602001803590602001803590602001506100b3565b6040518082815260200191505060405180910390f35b61008e600480359060200180359060200150610090565b005b8060006000506000848152602001908152602001600020600050819055505b5050565b6000818301905080506100c684826100d5565b8090506100ce565b9392505050565b3373ffffffffffffffffffffffffffffffffffffffff16828260405180807f7265676973746572496e74000000000000000000000000000000000000000000815260200150602001838152602001828152602001925050506000604051808303816000866161da5a03f1915050505b505056"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create2_action_gas.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create2_action_gas.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf6c",
+        "gas": "0x19ed8",
        "init": "0x6000600060006000f500"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create_action_gas.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create_action_gas.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x19ee4",
        "init": "0x5a600055600060006000f0505a60015500"
      },
      "error": "out of gas",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create_inerror.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create_inerror.json
@ -61,7 +61,7 @@
        "from": "0xa3b31cbd5168d3c99756660d4b7625d679e12573",
        "to": "0x76554b33410b6d90b7dc889bfed0451ad195f27e",
        "value": "0x0",
-        "gas": "0x2e138",
+        "gas": "0x33450",
        "input": "0x391521f4",
        "callType": "call"
      },
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_pointer_issue.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_pointer_issue.json
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/oog.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/oog.json
@ -52,7 +52,7 @@
      "action": {
        "callType": "call",
        "from": "0x94194bc2aaf494501d7880b61274a169f6502a54",
-        "gas": "0x7045",
+        "gas": "0xca1d",
        "input": "0xa9059cbb000000000000000000000000e77b1ac803616503510bed0086e3a7be2627a69900000000000000000000000000000000000000000000000000000009502f9000",
        "to": "0x43064693d3d38ad6a7cb579e0d6d9718c8aa6b62",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/option_convert_parity_errors.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/option_convert_parity_errors.json
@ -55,7 +55,7 @@
      "action": {
        "callType": "call",
        "from": "0x94194bc2aaf494501d7880b61274a169f6502a54",
-        "gas": "0x7045",
+        "gas": "0xca1d",
        "input": "0xa9059cbb000000000000000000000000e77b1ac803616503510bed0086e3a7be2627a69900000000000000000000000000000000000000000000000000000009502f9000",
        "to": "0x43064693d3d38ad6a7cb579e0d6d9718c8aa6b62",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/result_output.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/result_output.json
@ -68,7 +68,7 @@
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "to": "0x531f76bad925f6a925474996c7d738c1008045f6",
        "value": "0xde0b6b3a7640000",
-        "gas": "0x3b920",
+        "gas": "0x40b28",
        "input": "0x",
        "callType": "call"
      },
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/revert.json
@ -50,7 +50,7 @@
      "action": {
        "callType": "call",
        "from": "0x0f6cef2b7fbb504782e35aa82a2207e816a2b7a9",
-        "gas": "0x2d55e8",
+        "gas": "0x2dc6c0",
        "input": "0x73b40a5c000000000000000000000000400de2e016bda6577407dfc379faba9899bc73ef0000000000000000000000002cc31912b2b0f3075a87b3640923d45a26cef3ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d79d8e6c7265636f76657279416464726573730000000000000000000000000000000000000000000000000000000000383e3ec32dc0f66d8fe60dbdc2f6815bdf73a988383e3ec32dc0f66d8fe60dbdc2f6815bdf73a98800000000000000000000000000000000000000000000000000000000000000000000000000000000",
        "to": "0xabbcd5b340c80b5f1c0545c04c987b87310296ae",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/revert_reason.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/revert_reason.json
@ -55,7 +55,7 @@
      "action": {
        "callType": "call",
        "from": "0xf7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
-        "gas": "0x2d7308",
+        "gas": "0x2dc6c0",
        "input": "0x5c19a95c000000000000000000000000f7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
        "to": "0xf58833cf0c791881b494eb79d461e08a1f043f52",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/selfdestruct.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/selfdestruct.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xcf08",
+        "gas": "0x19ecc",
        "init": "0x605a600053600160006001f0ff00"
      },
      "result": {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/simple.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/simple.json
@ -61,7 +61,7 @@
      "action": {
        "callType": "call",
        "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-        "gas": "0x10738",
+        "gas": "0x15f90",
        "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
        "to": "0x3b873a919aa0512d5a0f09e6dcceaa4a6727fafe",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/skip_no_balance_error.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/skip_no_balance_error.json
@ -54,7 +54,7 @@
      "action": {
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
        "value": "0x0",
-        "gas": "0xd550",
+        "gas": "0x1aab0",
        "init": "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000037f055"
      },
      "error": "out of gas",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/staticcall_precompiled.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/staticcall_precompiled.json
@ -65,7 +65,7 @@
        "balance": "0x0",
        "callType": "call",
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
-        "gas": "0x4053e",
+        "gas": "0x48196",
        "input": "0x200b1e64000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001b9af799918107e9a339eba0584b8b60b35aae6f087c74f6bfc00c9301849b204d094ed65e09c76c2597f5516f9440aad2921e50dde096e7caaa65a536d4d9265e00000000000000000000000000000000000000000000000000000000000000504269747669657720697320616e20616d617a696e6720776562736974652e20596f752073686f756c6420646566696e6974656c792061646420796f75722070726f6475637420746f2069742e20e282bf00000000000000000000000000000000",
        "refundAddress": "0x0000000000000000000000000000000000000000",
        "to": "0x8521f13dd5e4bc3dab3cf0f01a195a5af899e851",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/suicide.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/suicide.json
@ -55,7 +55,7 @@
      "action": {
        "callType": "call",
        "from": "0x877bd459c9b7d8576b44e59e09d076c25946f443",
-        "gas": "0x445708",
+        "gas": "0x44aa20",
        "input": "0x41c0e1b5",
        "to": "0x8ee79c5b3f6e1d214d2c4fcf7ea4092a32e26e91",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_flat/throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_flat/throw.json
@ -54,7 +54,7 @@
      "action": {
        "callType": "call",
        "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-        "gas": "0x37b38",
+        "gas": "0x3d090",
        "input": "0x51a34eb8000000000000000000000000000000000000000000000027fad02094277c0000",
        "to": "0xc212e03b9e060e36facad5fd8f4435412ca22e6b",
        "value": "0x0"
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/create.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/create.json
@ -47,7 +47,7 @@
  "input": "0xf907ef098504e3b29200830897be8080b9079c606060405260405160208061077c83398101604052808051906020019091905050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415151561007d57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460006101000a81548160ff02191690831515021790555050610653806101296000396000f300606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029000000000000000000000000c65e620a3a55451316168d57e268f5702ef56a1129a01060f46676a5dff6f407f0f51eb6f37f5c8c54e238c70221e18e65fc29d3ea65a0557b01c50ff4ffaac8ed6e5d31237a4ecbac843ab1bfe8bb0165a0060df7c54f",
  "result": {
    "from": "0x13e4acefe6a6700604929946e70e6443e4e73447",
-    "gas": "0x5e106",
+    "gas": "0x897be",
    "gasUsed": "0x897be",
    "input": "0x606060405260405160208061077c83398101604052808051906020019091905050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415151561007d57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460006101000a81548160ff02191690831515021790555050610653806101296000396000f300606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029000000000000000000000000c65e620a3a55451316168d57e268f5702ef56a11",
    "output": "0x606060405260043610610083576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806305e4382a146100855780631c02708d146100ae5780632e1a7d4d146100c35780635114cb52146100e6578063a37dda2c146100fe578063ae200e7914610153578063b5769f70146101a8575b005b341561009057600080fd5b6100986101d1565b6040518082815260200191505060405180910390f35b34156100b957600080fd5b6100c16101d7565b005b34156100ce57600080fd5b6100e460048080359060200190919050506102eb565b005b6100fc6004808035906020019091905050610513565b005b341561010957600080fd5b6101116105d6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561015e57600080fd5b6101666105fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101b357600080fd5b6101bb610621565b6040518082815260200191505060405180910390f35b60025481565b60011515600460009054906101000a900460ff1615151415156101f957600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102a15750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b15156102ac57600080fd5b6000600460006101000a81548160ff0219169083151502179055506003543073ffffffffffffffffffffffffffffffffffffffff163103600281905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103935750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561039e57600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561048357600060025411801561040757506002548111155b151561041257600080fd5b80600254036002819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561047e57600080fd5b610510565b600060035411801561049757506003548111155b15156104a257600080fd5b8060035403600381905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050151561050f57600080fd5b5b50565b60011515600460009054906101000a900460ff16151514151561053557600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614801561059657506003548160035401115b80156105bd575080600354013073ffffffffffffffffffffffffffffffffffffffff163110155b15156105c857600080fd5b806003540160038190555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600354815600a165627a7a72305820c3b849e8440987ce43eae3097b77672a69234d516351368b03fe5b7de03807910029",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/deep_calls.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/deep_calls.json
@ -404,7 +404,7 @@
      }
    ],
    "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-    "gas": "0x37b38",
+    "gas": "0x3d090",
    "gasUsed": "0x1810b",
    "input": "0x51a34eb80000000000000000000000000000000000000000000000280faf689c35ac0000",
    "output": "0x",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/delegatecall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/delegatecall.json
@ -86,7 +86,7 @@
      }
    ],
    "from": "0xa529806c67cc6486d4d62024471772f47f6fd672",
-    "gas": "0x2d6e28",
+    "gas": "0x2dc6c0",
    "gasUsed": "0xbd55",
    "input": "0x7065cb480000000000000000000000001523e55a1ca4efbae03355775ae89f8d7699ad9e",
    "output": "0x",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_create_oog_outer_throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_create_oog_outer_throw.json
@ -67,7 +67,7 @@
    ],
    "error": "invalid jump destination",
    "from": "0xe4a13bc304682a903e9472f469c33801dd18d9e8",
-    "gas": "0x435c8",
+    "gas": "0x493e0",
    "gasUsed": "0x493e0",
    "input": "0x3b91f506000000000000000000000000a14bdd7e5666d784dcce98ad24d383a6b1cd4182000000000000000000000000e4a13bc304682a903e9472f469c33801dd18d9e8",
    "to": "0x1d3ddf7caf024f253487e18bc4a15b1a360c170a",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_instafail.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_instafail.json
@ -54,7 +54,7 @@
    "from": "0x66fdfd05e46126a07465ad24e40cc0597bc1ef31",
    "to": "0x6c06b16512b332e6cd8293a2974872674716ce18",
    "value": "0x0",
-    "gas": "0x1a466",
+    "gas": "0x1f97e",
    "gasUsed": "0x72de",
    "input": "0x2e1a7d4d00000000000000000000000000000000000000000000000014d1120d7b160000",
    "output": "0x",
@ -64,7 +64,7 @@
        "from": "0x6c06b16512b332e6cd8293a2974872674716ce18",
        "to": "0x66fdfd05e46126a07465ad24e40cc0597bc1ef31",
        "value": "0x14d1120d7b160000",
-        "error":"internal failure",
+        "error":  "internal failure",
        "input": "0x"
      }
    ]
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json
@ -71,7 +71,7 @@
    ],
    "error": "execution reverted",
    "from": "0xd4fcab9f0a6dc0493af47c864f6f17a8a5e2e826",
-    "gas": "0x78d9e",
+    "gas": "0x7dfa6",
    "gasUsed": "0x7c1c8",
    "input": "0x",
    "to": "0x33056b5dcac09a9b4becad0e1dcf92c19bd0af76",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/oog.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/oog.json
@ -50,7 +50,7 @@
  "result": {
    "error": "out of gas",
    "from": "0x94194bc2aaf494501d7880b61274a169f6502a54",
-    "gas": "0x7045",
+    "gas": "0xca1d",
    "gasUsed": "0xca1d",
    "input": "0xa9059cbb000000000000000000000000e77b1ac803616503510bed0086e3a7be2627a69900000000000000000000000000000000000000000000000000000009502f9000",
    "to": "0x43064693d3d38ad6a7cb579e0d6d9718c8aa6b62",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert.json
@ -48,7 +48,7 @@
  "result": {
    "error": "execution reverted",
    "from": "0x0f6cef2b7fbb504782e35aa82a2207e816a2b7a9",
-    "gas": "0x2d55e8",
+    "gas": "0x2dc6c0",
    "gasUsed": "0x719b",
    "input": "0x73b40a5c000000000000000000000000400de2e016bda6577407dfc379faba9899bc73ef0000000000000000000000002cc31912b2b0f3075a87b3640923d45a26cef3ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d79d8e6c7265636f76657279416464726573730000000000000000000000000000000000000000000000000000000000383e3ec32dc0f66d8fe60dbdc2f6815bdf73a988383e3ec32dc0f66d8fe60dbdc2f6815bdf73a98800000000000000000000000000000000000000000000000000000000000000000000000000000000",
    "to": "0xabbcd5b340c80b5f1c0545c04c987b87310296ae",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert_reason.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert_reason.json
@ -53,7 +53,7 @@
  "result": {
    "error": "execution reverted",
    "from": "0xf7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
-    "gas": "0x2d7308",
+    "gas": "0x2dc6c0",
    "gasUsed": "0x5940",
    "input": "0x5c19a95c000000000000000000000000f7579c3d8a669c89d5ed246a22eb6db8f6fedbf1",
    "to": "0xf58833cf0c791881b494eb79d461e08a1f043f52",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/selfdestruct.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/selfdestruct.json
@ -62,7 +62,7 @@
      }
    ],
    "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-    "gas": "0x10738",
+    "gas": "0x15f90",
    "gasUsed": "0x6fcb",
    "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
    "output": "0x",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/simple.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/simple.json
@ -67,7 +67,7 @@
      }
    ],
    "from": "0xb436ba50d378d4bbc8660d312a13df6af6e89dfb",
-    "gas": "0x10738",
+    "gas": "0x15f90",
    "gasUsed": "0x9751",
    "input": "0x63e4bff40000000000000000000000000024f658a46fbb89d8ac105e98d7ac7cbbaf27c5",
    "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/throw.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/throw.json
@ -52,7 +52,7 @@
  "result": {
    "error": "invalid jump destination",
    "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
-    "gas": "0x37b38",
+    "gas": "0x3d090",
    "gasUsed": "0x3d090",
    "input": "0x51a34eb8000000000000000000000000000000000000000000000027fad02094277c0000",
    "to": "0xc212e03b9e060e36facad5fd8f4435412ca22e6b",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
@ -77,7 +77,7 @@
  },
  "result": {
    "from": "0x4f5777744b500616697cb655dcb02ee6cd51deb5",
-    "gas": "0x2dced",
+    "gas": "0x33085",
    "gasUsed": "0x1a9e5",
    "to": "0x200edd17f30485a8735878661960cd7a9a95733f",
    "input": "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
@ -134,7 +134,7 @@
  },
  "result": {
    "from": "0x3de712784baf97260455ae25fb74f574ec9c1add",
-    "gas": "0x7e2c0",
+    "gas": "0x84398",
    "gasUsed": "0x27ec3",
    "to": "0x6ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba5",
    "input": "0xbbd4f854e9efd3ab89acad6a3edf9828c3b00ed1c4a74e974d05d32d3b2fb15aa16fc3770000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000080d29fa5cccfadac",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
@ -299,7 +299,7 @@
  },
  "result": {
    "from": "0xbe3ae5cb97c253dda67181c6e34e43f5c275e08b",
-    "gas": "0x3514c8",
+    "gas": "0x3567e0",
    "gasUsed": "0x26e1ef",
    "to": "0x03e3d4561a8f8e975fdcd798d32857a20cf25e7e",
    "input": "0xbe9a6555",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
@ -102,7 +102,7 @@
  },
  "result": {
    "from": "0x6412becf35cc7e2a9e7e47966e443f295e1e4f4a",
-    "gas": "0x2bb38",
+    "gas": "0x30d40",
    "gasUsed": "0x249eb",
    "to": "0x50739060a2c32dc076e507ae1a893aab28ecfe68",
    "input": "0x",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
@ -63,7 +63,7 @@
  },
  "result": {
    "from": "0xd1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
-    "gas": "0x1f36d",
+    "gas": "0x24d45",
    "gasUsed": "0xc6a5",
    "to": "0xf4eced2f682ce333f96f2d8966c613ded8fc95dd",
    "input": "0xa9059cbb000000000000000000000000dbf03b407c01e7cd3cbea99509d93f8dddc8c6fb0000000000000000000000000000000000000000000000000000000000989680",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_failed.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_failed.json
@ -137,7 +137,7 @@
  },
  "result": {
    "from": "0xe6002189a74b43e6868b20c1311bc108e38aac57",
-    "gas": "0xa59c8",
+    "gas": "0xaae60",
    "gasUsed": "0xaae60",
    "to": "0x630a0cd35d5bd57e61410fda76fea850225cda18",
    "input": "0xe1fa763800000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000000000000000000000000000000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
@ -75,7 +75,7 @@
  },
  "result": {
    "from": "0x01115b41bd2731353dd3e6abf44818fdc035aaf1",
-    "gas": "0x28e28",
+    "gas": "0x30d40",
    "gasUsed": "0x288c9",
    "to": "0xcf1476387d780169410d4e936d75a206fda2a68c",
    "input": "0xb61d27f6000000000000000000000000bb9bc244d798123fde783fcc1c72d3bb8c18941300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000008861393035396362623030303030303030303030303030303030303030303030303930643363313831326465323636396266383037626437373538636562316533343937616337653430303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303031633662663532363334303030000000000000000000000000000000000000000000000000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
@ -78,7 +78,7 @@
  },
  "result": {
    "from": "0x4f5777744b500616697cb655dcb02ee6cd51deb5",
-    "gas": "0x2dced",
+    "gas": "0x33085",
    "gasUsed": "0x1a9e5",
    "to": "0x200edd17f30485a8735878661960cd7a9a95733f",
    "input": "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000",
--- a/eth/tracers/js/goja.go
+++ b/eth/tracers/js/goja.go
@ -235,7 +235,7 @@ func (t *jsTracer) CaptureStart(env *vm.EVM, from common.Address, to common.Addr
 	t.ctx["from"] = t.vm.ToValue(from.Bytes())
 	t.ctx["to"] = t.vm.ToValue(to.Bytes())
 	t.ctx["input"] = t.vm.ToValue(input)
-	t.ctx["gas"] = t.vm.ToValue(gas)
+	t.ctx["gas"] = t.vm.ToValue(t.gasLimit)
 	t.ctx["gasPrice"] = t.vm.ToValue(env.TxContext.GasPrice)
 	valueBig, err := t.toBig(t.vm, value.String())
 	if err != nil {
--- a/eth/tracers/native/call.go
+++ b/eth/tracers/native/call.go
@ -133,7 +133,7 @@ func (t *callTracer) CaptureStart(env *vm.EVM, from common.Address, to common.Ad
 		From:  from,
 		To:    &toCopy,
 		Input: common.CopyBytes(input),
-		Gas:   gas,
+		Gas:   t.gasLimit,
 		Value: value,
 	}
 	if create {