From 7504dbd6eb3f62371f86b06b03ffd665690951f2 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Tue, 12 Mar 2019 10:40:05 +0100
Subject: core/vm: 64 bit memory and gas calculations (#19210)

* core/vm: remove function call for stack validation from evm runloop

* core/vm: separate gas  calc into static + dynamic

* core/vm: optimize push1

* core/vm: reuse pooled bigints for ADDRESS, ORIGIN and CALLER

* core/vm: use generic error message for jump/jumpi, to avoid string interpolation

* testdata: fix tests for new error message

* core/vm: use 64-bit memory calculations

* core/vm: fix error in memory calculation

* core/vm: address review concerns

* core/vm: avoid unnecessary use of big.Int:BitLen()
---
 eth/tracers/testdata/call_tracer_inner_create_oog_outer_throw.json | 2 +-
 eth/tracers/testdata/call_tracer_throw.json                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'eth')

diff --git a/eth/tracers/testdata/call_tracer_inner_create_oog_outer_throw.json b/eth/tracers/testdata/call_tracer_inner_create_oog_outer_throw.json
index b8a4cdd23..d1c8ac913 100644
--- a/eth/tracers/testdata/call_tracer_inner_create_oog_outer_throw.json
+++ b/eth/tracers/testdata/call_tracer_inner_create_oog_outer_throw.json
@@ -65,7 +65,7 @@
         "value": "0x0"
       }
     ],
-    "error": "invalid jump destination (PUSH1) 0",
+    "error": "evm: invalid jump destination",
     "from": "0xe4a13bc304682a903e9472f469c33801dd18d9e8",
     "gas": "0x435c8",
     "gasUsed": "0x435c8",
diff --git a/eth/tracers/testdata/call_tracer_throw.json b/eth/tracers/testdata/call_tracer_throw.json
index 60d4d1071..d66f1ffa6 100644
--- a/eth/tracers/testdata/call_tracer_throw.json
+++ b/eth/tracers/testdata/call_tracer_throw.json
@@ -50,7 +50,7 @@
   },
   "input": "0xf88b8206668504a817c8008303d09094c212e03b9e060e36facad5fd8f4435412ca22e6b80a451a34eb8000000000000000000000000000000000000000000000027fad02094277c000029a0692a3b4e7b2842f8dd7832e712c21e09f451f416c8976d5b8d02e8c0c2b4bea9a07645e90fc421b63dd755767fd93d3c03b4ec0c4d8fafa059558d08cf11d59750",
   "result": {
-    "error": "invalid jump destination (PUSH1) 2",
+    "error": "evm: invalid jump destination",
     "from": "0x70c9217d814985faef62b124420f8dfbddd96433",
     "gas": "0x37b38",
     "gasUsed": "0x37b38",
-- 
cgit v1.2.3