diff --git a/Cargo.lock b/Cargo.lock
index 903f873..98f99aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -28,7 +43,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "arrayref",
- "arrayvec",
+ "arrayvec 0.7.2",
  "async-recursion",
  "async-stream",
  "async-trait",
@@ -37,7 +52,8 @@ dependencies = [
  "bytes",
  "bytes-literal",
  "bytesize",
- "clap",
+ "clap 3.0.14",
+ "criterion",
  "croaring",
  "crossterm",
  "derive_more",
@@ -60,6 +76,7 @@ dependencies = [
  "hex-literal",
  "http",
  "i256",
+ "include_dir",
  "itertools",
  "jsonrpsee",
  "libmdbx",
@@ -72,6 +89,7 @@ dependencies = [
  "once_cell",
  "parity-scale-codec 3.0.0",
  "parking_lot 0.12.0",
+ "pprof",
  "proptest",
  "rand 0.8.4",
  "rayon",
@@ -127,9 +145,17 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+dependencies = [
+ "nodrop",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.2"
+source = "git+https://github.com/vorot93/arrayvec?branch=pop-unchecked#9e430a94359435dfe8e21467f160708ebcc01226"
 dependencies = [
  "serde",
 ]
@@ -223,6 +249,21 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
+[[package]]
+name = "backtrace"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -314,7 +355,10 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
+ "lazy_static",
  "memchr",
+ "regex-automata",
+ "serde",
 ]
 
 [[package]]
@@ -323,6 +367,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
 
+[[package]]
+name = "bumpalo"
+version = "3.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+
 [[package]]
 name = "byte-slice-cast"
 version = "1.2.0"
@@ -338,6 +388,12 @@ dependencies = [
  "utf8-width",
 ]
 
+[[package]]
+name = "bytemuck"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -374,6 +430,15 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
+[[package]]
+name = "cast"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
+dependencies = [
+ "rustc_version",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.72"
@@ -422,6 +487,17 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "bitflags",
+ "textwrap 0.11.0",
+ "unicode-width",
+]
+
 [[package]]
 name = "clap"
 version = "3.0.14"
@@ -436,7 +512,7 @@ dependencies = [
  "os_str_bytes",
  "strsim",
  "termcolor",
- "textwrap",
+ "textwrap 0.14.2",
 ]
 
 [[package]]
@@ -491,6 +567,15 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
+[[package]]
+name = "cpp_demangle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.1"
@@ -509,6 +594,42 @@ dependencies = [
  "build_const",
 ]
 
+[[package]]
+name = "criterion"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
+dependencies = [
+ "atty",
+ "cast",
+ "clap 2.34.0",
+ "criterion-plot",
+ "csv",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
 [[package]]
 name = "croaring"
 version = "0.5.1"
@@ -613,6 +734,28 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "csv"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa 0.4.8",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "darling"
 version = "0.13.1"
@@ -648,6 +791,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "debugid"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba"
+dependencies = [
+ "uuid",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -881,6 +1033,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "findshlibs"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
+dependencies = [
+ "cc",
+ "lazy_static",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "fixed-hash"
 version = "0.7.0"
@@ -1043,6 +1207,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+
 [[package]]
 name = "git2"
 version = "0.13.25"
@@ -1094,6 +1264,12 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
 [[package]]
 name = "hash-db"
 version = "0.15.2"
@@ -1227,7 +1403,7 @@ dependencies = [
 [[package]]
 name = "i256"
 version = "0.1.0"
-source = "git+https://github.com/vorot93/rust-i256?branch=ethnum#e64fab8a4f9eed4b0acd25b0c83b290e6b633a3e"
+source = "git+https://github.com/vorot93/rust-i256?branch=ethnum-2#5e1b234879cb29ad0a753d2da4aea1dd6d9adc43"
 dependencies = [
  "ethnum",
 ]
@@ -1287,6 +1463,25 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "include_dir"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.8.0"
@@ -1297,6 +1492,24 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "inferno"
+version = "0.10.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3886428c6400486522cf44b8626e7b94ad794c14390290f2a274dcf728a58f"
+dependencies = [
+ "ahash",
+ "atty",
+ "indexmap",
+ "itoa 1.0.1",
+ "lazy_static",
+ "log",
+ "num-format",
+ "quick-xml",
+ "rgb",
+ "str_stack",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -1336,6 +1549,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "jsonrpsee"
 version = "0.9.0"
@@ -1354,7 +1576,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech/jsonrpsee#f66ef5517d7936d87cd72141963659fa6f3e4328"
 dependencies = [
  "anyhow",
- "arrayvec",
+ "arrayvec 0.7.2",
  "async-channel",
  "async-trait",
  "beef",
@@ -1576,6 +1798,15 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
+[[package]]
+name = "memmap2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.6.5"
@@ -1591,6 +1822,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg 1.0.1",
+]
+
 [[package]]
 name = "mio"
 version = "0.7.14"
@@ -1640,6 +1881,25 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "nix"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
 [[package]]
 name = "nom"
 version = "7.1.0"
@@ -1671,6 +1931,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-format"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465"
+dependencies = [
+ "arrayvec 0.4.12",
+ "itoa 0.4.8",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -1700,12 +1970,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -1727,7 +2012,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.2",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive 2.3.1",
@@ -1739,7 +2024,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a7f3fcf5e45fc28b84dcdab6b983e77f197ec01f325a33f404ba6855afd1070"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.2",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -1880,6 +2165,55 @@ version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
+[[package]]
+name = "plotters"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "pprof"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f35f865aa964be21fcde114cbd1cfbd9bf8a471460ed965b0f84f96c711401"
+dependencies = [
+ "backtrace",
+ "cfg-if",
+ "findshlibs",
+ "inferno",
+ "lazy_static",
+ "libc",
+ "log",
+ "nix",
+ "parking_lot 0.11.2",
+ "smallvec",
+ "symbolic-demangle",
+ "tempfile",
+ "thiserror",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.16"
@@ -2028,6 +2362,15 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
+[[package]]
+name = "quick-xml"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.15"
@@ -2286,6 +2629,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rgb"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "ripemd"
 version = "0.1.0"
@@ -2327,6 +2679,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2445,6 +2803,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.136"
@@ -2612,12 +2980,24 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "str_stack"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
+
 [[package]]
 name = "string"
 version = "0.3.0"
@@ -2667,6 +3047,29 @@ dependencies = [
  "rustc-hex",
 ]
 
+[[package]]
+name = "symbolic-common"
+version = "8.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e92a52f07eed9afba3d6f883652cde7cd75fcf327dd44e84f210958379158737"
+dependencies = [
+ "debugid",
+ "memmap2",
+ "stable_deref_trait",
+ "uuid",
+]
+
+[[package]]
+name = "symbolic-demangle"
+version = "8.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9abc81544d9964975269165bfe5ad198d8b9e2e809c46527323f95588a57693"
+dependencies = [
+ "cpp_demangle",
+ "rustc-demangle",
+ "symbolic-common",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.86"
@@ -2721,6 +3124,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.14.2"
@@ -2775,6 +3187,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.5.1"
@@ -2876,6 +3298,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
+ "indexmap",
  "serde",
 ]
 
@@ -3092,6 +3515,12 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
 
+[[package]]
+name = "unicode-width"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.2"
@@ -3116,6 +3545,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b"
 
+[[package]]
+name = "uuid"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -3188,6 +3623,70 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+
+[[package]]
+name = "web-sys"
+version = "0.3.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "which"
 version = "4.2.4"
diff --git a/Cargo.toml b/Cargo.toml
index 8ca8904..800c7f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ hash256-std-hasher = "0.15"
 hex = "0.4"
 hex-literal = "0.3"
 http = "0.2"
-i256 = { git = "https://github.com/vorot93/rust-i256", branch = "ethnum" }
+i256 = { git = "https://github.com/vorot93/rust-i256", branch = "ethnum-2" }
 itertools = "0.10"
 jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", features = [
     "server",
@@ -83,7 +83,7 @@ tempfile = "3"
 thiserror = "1"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
-toml = "0.5"
+toml = { version = "0.5", features = ["preserve_order"] }
 tonic = { version = "0.6", default-features = false, features = [
     "codegen",
     "prost",
@@ -101,13 +101,18 @@ vergen = "6"
 
 [dev-dependencies]
 bytes-literal = { git = "https://github.com/vorot93/bytes-literal" }
+criterion = { version = "0.3", default-features = false }
+include_dir = "0.7"
+pprof = { version = "0.6", features = ["flamegraph"] }
 proptest = "1.0.0"
+rand = { version = "0.8", features = ["std"] }
 tokio = { version = "1", features = ["full"] }
 tokio-test = "0.4.2"
 fdlimit = "0.2"
 
 [patch.crates-io]
 ethnum = { git = "https://github.com/vorot93/ethnum-rs", branch = "staging" }
+arrayvec = { git = "https://github.com/vorot93/arrayvec", branch = "pop-unchecked" }
 
 [[bin]]
 path = "bin/akula.rs"
@@ -125,7 +130,17 @@ name = "akula-toolbox"
 path = "bin/consensus-tests.rs"
 name = "consensus-tests"
 
+[[bench]]
+name = "bench"
+path = "./src/execution/evm/benches/bench.rs"
+harness = false
+
 [profile.production]
 inherits = "release"
+panic = "abort"
+codegen-units = 1
+lto = true
+
+[profile.bench]
 codegen-units = 1
 lto = true
diff --git a/src/consensus/blockchain.rs b/src/consensus/blockchain.rs
index c4c2ee4..7968719 100644
--- a/src/consensus/blockchain.rs
+++ b/src/consensus/blockchain.rs
@@ -1,6 +1,6 @@
 use crate::{
     consensus::*,
-    execution::{analysis_cache::AnalysisCache, processor::ExecutionProcessor},
+    execution::{analysis_cache::AnalysisCache, processor::ExecutionProcessor, tracer::NoopTracer},
     models::*,
     state::*,
 };
@@ -135,9 +135,10 @@ impl<'state> Blockchain<'state> {
         let block_spec = self.config.collect_block_spec(block.header.number);
 
         let mut analysis_cache = AnalysisCache::default();
+        let mut tracer = NoopTracer;
         let processor = ExecutionProcessor::new(
             self.state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *self.engine,
             &block.header,
diff --git a/src/crypto/blake2.rs b/src/crypto/blake2.rs
index 84d7086..57d0eac 100644
--- a/src/crypto/blake2.rs
+++ b/src/crypto/blake2.rs
@@ -29,7 +29,7 @@ const IV: [u64; 8] = [
     0x5be0cd19137e2179,
 ];
 
-#[inline(always)]
+#[inline]
 /// The G mixing function. See https://tools.ietf.org/html/rfc7693#section-3.1
 fn g(v: &mut [u64], a: usize, b: usize, c: usize, d: usize, x: u64, y: u64) {
     v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
diff --git a/src/execution/analysis_cache.rs b/src/execution/analysis_cache.rs
index 940c790..4d8ba16 100644
--- a/src/execution/analysis_cache.rs
+++ b/src/execution/analysis_cache.rs
@@ -20,8 +20,8 @@ impl AnalysisCache {
         }
     }
 
-    pub fn get(&mut self, code_hash: H256) -> Option<&AnalyzedCode> {
-        self.inner.get(&code_hash)
+    pub fn get(&mut self, code_hash: &H256) -> Option<&AnalyzedCode> {
+        self.inner.get(code_hash)
     }
 
     pub fn put(&mut self, code_hash: H256, code: AnalyzedCode) {
diff --git a/src/execution/evm/benches/bench.rs b/src/execution/evm/benches/bench.rs
new file mode 100644
index 0000000..a8572bd
--- /dev/null
+++ b/src/execution/evm/benches/bench.rs
@@ -0,0 +1,570 @@
+use akula::{
+    execution::evm::{
+        instructions::{instruction_table::get_instruction_table, PROPERTIES},
+        util::{mocked_host::MockedHost, Bytecode},
+        AnalyzedCode, CallKind, InterpreterMessage, OpCode, Output, StatusCode,
+    },
+    models::Revision,
+};
+use bytes::Bytes;
+use criterion::{criterion_group, criterion_main, profiler::Profiler, BatchSize, Criterion};
+use ethereum_types::Address;
+use ethnum::*;
+use hex_literal::hex;
+use pprof::{flamegraph::Options, ProfilerGuard};
+use serde::Deserialize;
+use std::{fmt::Display, fs::File, os::raw::c_int, path::Path};
+
+/// Small custom profiler that can be used with Criterion to create a flamegraph for benchmarks.
+/// Also see [the Criterion documentation on this][custom-profiler].
+///
+/// ## Example on how to enable the custom profiler:
+///
+/// ```
+/// mod perf;
+/// use perf::FlamegraphProfiler;
+///
+/// fn fibonacci_profiled(criterion: &mut Criterion) {
+///     // Use the criterion struct as normal here.
+/// }
+///
+/// fn custom() -> Criterion {
+///     Criterion::default().with_profiler(FlamegraphProfiler::new())
+/// }
+///
+/// criterion_group! {
+///     name = benches;
+///     config = custom();
+///     targets = fibonacci_profiled
+/// }
+/// ```
+///
+/// The neat thing about this is that it will sample _only_ the benchmark, and not other stuff like
+/// the setup process.
+///
+/// Further, it will only kick in if `--profile-time <time>` is passed to the benchmark binary.
+/// A flamegraph will be created for each individual benchmark in its report directory under
+/// `profile/flamegraph.svg`.
+///
+/// [custom-profiler]: https://bheisler.github.io/criterion.rs/book/user_guide/profiling.html#implementing-in-process-profiling-hooks
+pub struct FlamegraphProfiler<'a> {
+    frequency: c_int,
+    active_profiler: Option<ProfilerGuard<'a>>,
+}
+
+impl<'a> FlamegraphProfiler<'a> {
+    #[allow(dead_code)]
+    pub fn new(frequency: c_int) -> Self {
+        FlamegraphProfiler {
+            frequency,
+            active_profiler: None,
+        }
+    }
+}
+
+impl<'a> Profiler for FlamegraphProfiler<'a> {
+    fn start_profiling(&mut self, _benchmark_id: &str, _benchmark_dir: &Path) {
+        self.active_profiler = Some(ProfilerGuard::new(self.frequency).unwrap());
+    }
+
+    fn stop_profiling(&mut self, _benchmark_id: &str, benchmark_dir: &Path) {
+        std::fs::create_dir_all(benchmark_dir).unwrap();
+        let flamegraph_path = benchmark_dir.join("flamegraph.svg");
+        let flamegraph_file = File::create(&flamegraph_path)
+            .expect("File system error while creating flamegraph.svg");
+        if let Some(profiler) = self.active_profiler.take() {
+            let mut options = Options::default();
+            options.reverse_stack_order = true;
+            profiler
+                .report()
+                .build()
+                .unwrap()
+                .flamegraph_with_options(flamegraph_file, &mut options)
+                .expect("Error writing flamegraph");
+        }
+    }
+}
+
+/// Stack limit inside the EVM benchmark loop (one stack item is used for the loop counter).
+const STACK_LIMIT: usize = 1023;
+
+#[derive(Clone, Copy, Debug)]
+enum Mode {
+    /// The code uses as minimal stack as possible.
+    MinStack = 0,
+    /// The code fills the stack up to its limit.
+    FullStack = 1,
+}
+
+/// The instruction grouping by EVM stack requirements.
+#[derive(Clone, Copy, Debug)]
+enum InstructionCategory {
+    /// No-op instruction.
+    Nop,
+    /// Nullary operator - produces a result without any stack input.
+    Nullop,
+    /// Unary operator.
+    Unop,
+    /// Binary operator.
+    Binop,
+    /// PUSH instruction.
+    Push,
+    /// DUP instruction.
+    Dup,
+    /// SWAP instruction.
+    Swap,
+    /// Not any of the categories above.
+    Other,
+}
+
+impl InstructionCategory {
+    fn from_opcode(opcode: OpCode) -> Self {
+        let t = PROPERTIES[opcode.to_usize()].unwrap();
+        if opcode.to_u8() >= OpCode::PUSH1.to_u8() && opcode.to_u8() <= OpCode::PUSH32.to_u8() {
+            Self::Push
+        } else if opcode.to_u8() >= OpCode::SWAP1.to_u8()
+            && opcode.to_u8() <= OpCode::SWAP16.to_u8()
+        {
+            Self::Swap
+        } else if opcode.to_u8() >= OpCode::DUP1.to_u8() && opcode.to_u8() <= OpCode::DUP16.to_u8()
+        {
+            Self::Dup
+        } else if t.stack_height_required == 0 && t.stack_height_change == 0 {
+            Self::Nop
+        } else if t.stack_height_required == 0 && t.stack_height_change == 1 {
+            Self::Nullop
+        } else if t.stack_height_required == 1 && t.stack_height_change == 0 {
+            Self::Unop
+        } else if t.stack_height_required == 2 && t.stack_height_change == -1 {
+            Self::Binop
+        } else {
+            Self::Other
+        }
+    }
+}
+
+impl Display for InstructionCategory {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                Self::Nop => 'n',
+                Self::Nullop => 'a',
+                Self::Unop => 'u',
+                Self::Binop => 'b',
+                Self::Push => 'p',
+                Self::Dup => 'd',
+                Self::Swap => 's',
+                Self::Other => 'X',
+            }
+        )
+    }
+}
+
+struct CodeParams {
+    opcode: OpCode,
+    mode: Mode,
+}
+
+impl Display for CodeParams {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}/{}{}",
+            self.opcode.name(),
+            self.opcode,
+            self.mode as u8
+        )
+    }
+}
+
+fn generate_loop_inner_code(params: &CodeParams) -> Bytecode {
+    let &CodeParams { opcode, mode } = params;
+
+    let category = InstructionCategory::from_opcode(opcode);
+
+    match (mode, category) {
+        (Mode::MinStack, InstructionCategory::Nop) => {
+            // JUMPDEST JUMPDEST ...
+            STACK_LIMIT * Bytecode::new().opcode(opcode).opcode(opcode)
+        }
+        (Mode::MinStack, InstructionCategory::Nullop) => {
+            // CALLER POP CALLER POP ...
+            STACK_LIMIT * Bytecode::new().opcode(opcode).opcode(OpCode::POP)
+        }
+        (Mode::MinStack, InstructionCategory::Unop) => {
+            // DUP1 NOT NOT ... POP
+            Bytecode::new()
+                .opcode(OpCode::DUP1)
+                .append_bc(STACK_LIMIT * Bytecode::new().opcode(opcode).opcode(opcode))
+                .opcode(OpCode::POP)
+        }
+        (Mode::MinStack, InstructionCategory::Binop) => {
+            // DUP1 DUP1 ADD DUP1 ADD DUP1 ADD ... POP
+            Bytecode::new()
+                .opcode(OpCode::DUP1)
+                .append_bc((STACK_LIMIT - 1) * Bytecode::new().opcode(OpCode::DUP1).opcode(opcode))
+                .opcode(OpCode::POP)
+        }
+        (Mode::MinStack, InstructionCategory::Push) => {
+            // PUSH1 POP PUSH1 POP ...
+            STACK_LIMIT
+                * (Bytecode::new()
+                    .pushb(vec![0; (opcode.0 - OpCode::PUSH1.0) as usize + 1])
+                    .opcode(OpCode::POP))
+        }
+        (Mode::MinStack, InstructionCategory::Dup) => {
+            // The required n stack height for DUPn is provided by
+            // duplicating the loop counter n-1 times with DUP1.
+            let n = opcode.to_usize() - OpCode::DUP1.to_usize() + 1;
+            // DUP1 ...  DUPn POP DUPn POP ...  POP ...
+            // \ n-1  /                         \ n-1 /
+            (n - 1) * Bytecode::from(OpCode::DUP1) +     // Required n stack height.
+                (STACK_LIMIT - (n - 1)) *                //
+                (Bytecode::from(opcode) + OpCode::POP) + // Multiple DUPn POP pairs.
+                (n - 1) * Bytecode::from(OpCode::POP) // Pop initially duplicated values.
+        }
+        (Mode::MinStack, InstructionCategory::Swap) => {
+            // The required n+1 stack height for SWAPn is provided by duplicating the loop counter
+            // n times with DUP1. This also guarantees the loop counter remains unchanged because
+            // it is always going to be swapped to the same value.
+            let n = opcode.to_usize() - OpCode::SWAP1.to_usize() + 1;
+            // DUP1 ...  SWAPn SWAPn ...  POP ...
+            // \  n   /                   \  n  /
+            n * Bytecode::from(OpCode::DUP1) +                // Required n+1 stack height.
+                   STACK_LIMIT * 2 * Bytecode::from(opcode) + // Multiple SWAPns.
+                   n * Bytecode::from(OpCode::POP) // Pop initially duplicated values.
+        }
+        (Mode::FullStack, InstructionCategory::Nullop) => {
+            // CALLER CALLER ... POP POP ...
+            STACK_LIMIT * Bytecode::from(opcode) + STACK_LIMIT * Bytecode::from(OpCode::POP)
+        }
+        (Mode::FullStack, InstructionCategory::Binop) => {
+            // DUP1 DUP1 DUP1 ... ADD ADD ADD ... POP
+            STACK_LIMIT * Bytecode::from(OpCode::DUP1)
+                + (STACK_LIMIT - 1) * Bytecode::new().opcode(opcode).opcode(OpCode::POP)
+        }
+        (Mode::FullStack, InstructionCategory::Push) => {
+            // PUSH1 PUSH1 PUSH1 ... POP POP POP ...
+            STACK_LIMIT * Bytecode::new().pushb(vec![0; (opcode.0 - OpCode::PUSH1.0) as usize + 1])
+                + STACK_LIMIT * Bytecode::from(OpCode::POP)
+        }
+        (Mode::FullStack, InstructionCategory::Dup) => {
+            // The required initial n stack height for DUPn is provided by
+            // duplicating the loop counter n-1 times with DUP1.
+            let n = opcode.to_usize() - OpCode::DUP1.to_usize() + 1;
+            // DUP1 ...  DUPn DUPn ...  POP POP ...
+            // \ n-1  /  \  S-(n-1)  /  \    S    /
+            (n - 1) * Bytecode::from(OpCode::DUP1) +                   // Required n stack height.
+                   (STACK_LIMIT - (n - 1)) * Bytecode::from(opcode) +  // Fill the stack with DUPn.
+                   STACK_LIMIT * Bytecode::from(OpCode::POP) // Clear whole stack.
+        }
+        _ => Bytecode::new(),
+    }
+}
+
+/// Generates a benchmark loop with given inner code.
+///
+/// This generates do-while loop with 255 iterations and it starts with PUSH1 of 255 as the loop
+/// counter. The while check is done as `(counter += -1) != 0`. The SUB is avoided because it
+/// consumes arguments in unnatural order and additional SWAP would be required.
+///
+/// The loop counter stays on the stack top. The inner code is allowed to duplicate it, but must not
+/// modify it.
+fn generate_loop_v1(inner_code: Bytecode) -> Bytecode {
+    let counter = Bytecode::new().pushv(255);
+    let jumpdest_offset = counter.len();
+    Bytecode::new()
+        .append_bc(counter)
+        // loop label + inner code
+        .opcode(OpCode::JUMPDEST)
+        .append_bc(inner_code)
+        // -1
+        .pushb(hex!(
+            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        ))
+        // counter += (-1)
+        .opcode(OpCode::ADD)
+        .opcode(OpCode::DUP1)
+        .pushv(jumpdest_offset)
+        // jump to jumpdest_offset if counter != 0
+        .opcode(OpCode::JUMPI)
+}
+
+/// Generates a benchmark loop with given inner code.
+///
+/// This is improved variant of v1. It has exactly the same instructions and consumes the same
+/// amount of gas, but according to performed benchmarks (see "loop_v1" and "loop_v2") it runs
+/// faster. And we want the lowest possible loop overhead.
+/// The change is to set the loop counter to -255 and check `(counter += 1) != 0`.
+fn generate_loop_v2(inner_code: Bytecode) -> Bytecode {
+    // -255
+    let counter = Bytecode::new().pushb(hex!(
+        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01"
+    ));
+    let jumpdest_offset = counter.len();
+    Bytecode::new()
+        .append_bc(counter)
+        // loop label + inner code
+        .opcode(OpCode::JUMPDEST)
+        .append_bc(inner_code)
+        // counter += 1
+        .pushv(1)
+        .opcode(OpCode::ADD)
+        .opcode(OpCode::DUP1)
+        // jump to jumpdest_offset if counter != 0
+        .pushv(jumpdest_offset)
+        .opcode(OpCode::JUMPI)
+}
+
+fn generate_code(params: &CodeParams) -> Bytecode {
+    generate_loop_v2(generate_loop_inner_code(params))
+}
+
+#[inline]
+fn execute(
+    (code, mut host, msg, rev): (AnalyzedCode, MockedHost, InterpreterMessage, Revision),
+) -> Output {
+    code.execute(&mut host, &msg, rev)
+}
+
+fn synthetic_benchmarks(c: &mut Criterion) {
+    let mut params_list = vec![];
+
+    // Nops & unops.
+    for opcode in [OpCode::JUMPDEST, OpCode::ISZERO, OpCode::NOT] {
+        params_list.push(CodeParams {
+            opcode,
+            mode: Mode::MinStack,
+        });
+    }
+
+    // Binops.
+    for opcode in [
+        OpCode::ADD,
+        OpCode::MUL,
+        OpCode::SUB,
+        OpCode::SIGNEXTEND,
+        OpCode::LT,
+        OpCode::GT,
+        OpCode::SLT,
+        OpCode::SGT,
+        OpCode::EQ,
+        OpCode::AND,
+        OpCode::OR,
+        OpCode::XOR,
+        OpCode::BYTE,
+        OpCode::SHL,
+        OpCode::SHR,
+        OpCode::SAR,
+    ] {
+        for mode in [Mode::MinStack, Mode::FullStack] {
+            params_list.push(CodeParams { opcode, mode });
+        }
+    }
+
+    // Nullops.
+    for opcode in [
+        OpCode::ADDRESS,
+        OpCode::CALLER,
+        OpCode::CALLVALUE,
+        OpCode::CALLDATASIZE,
+        OpCode::CODESIZE,
+        OpCode::RETURNDATASIZE,
+        OpCode::PC,
+        OpCode::MSIZE,
+        OpCode::GAS,
+    ] {
+        for mode in [Mode::MinStack, Mode::FullStack] {
+            params_list.push(CodeParams { opcode, mode });
+        }
+    }
+
+    // PUSH.
+    for opcode in OpCode::PUSH1.to_u8()..OpCode::PUSH32.to_u8() {
+        for mode in [Mode::MinStack, Mode::FullStack] {
+            params_list.push(CodeParams {
+                opcode: OpCode(opcode),
+                mode,
+            });
+        }
+    }
+
+    // SWAP.
+    for opcode in OpCode::SWAP1.to_u8()..OpCode::SWAP16.to_u8() {
+        params_list.push(CodeParams {
+            opcode: OpCode(opcode),
+            mode: Mode::MinStack,
+        });
+    }
+
+    // DUP.
+    for opcode in OpCode::DUP1.to_u8()..OpCode::DUP16.to_u8() {
+        for mode in [Mode::MinStack, Mode::FullStack] {
+            params_list.push(CodeParams {
+                opcode: OpCode(opcode),
+                mode,
+            });
+        }
+    }
+
+    c.bench_function("/total/synth/loop_v1", |b| {
+        b.iter_batched(
+            || {
+                prepare(
+                    AnalyzedCode::analyze(&generate_loop_v1(Bytecode::new()).build()),
+                    Bytes::new(),
+                )
+            },
+            execute,
+            BatchSize::SmallInput,
+        )
+    });
+    c.bench_function("/total/synth/loop_v2", |b| {
+        b.iter_batched(
+            || {
+                prepare(
+                    AnalyzedCode::analyze(&generate_loop_v2(Bytecode::new()).build()),
+                    Bytes::new(),
+                )
+            },
+            execute,
+            BatchSize::SmallInput,
+        )
+    });
+
+    for params in params_list {
+        c.bench_function(
+            &format!(
+                "/total/synth/{}/{}{}",
+                params.opcode,
+                InstructionCategory::from_opcode(params.opcode),
+                params.mode as usize
+            ),
+            |b| {
+                b.iter_batched(
+                    || {
+                        prepare(
+                            AnalyzedCode::analyze(&generate_code(&params).build()),
+                            Bytes::new(),
+                        )
+                    },
+                    execute,
+                    BatchSize::SmallInput,
+                )
+            },
+        );
+    }
+}
+
+fn prepare(
+    code: AnalyzedCode,
+    input_data: Bytes,
+) -> (AnalyzedCode, MockedHost, InterpreterMessage, Revision) {
+    get_instruction_table(Revision::Istanbul);
+    (
+        code,
+        MockedHost::default(),
+        InterpreterMessage {
+            kind: CallKind::Call,
+            gas: i64::MAX,
+            is_static: false,
+            depth: 0,
+            recipient: Address::zero(),
+            code_address: Address::zero(),
+            sender: Address::zero(),
+            input_data,
+            value: U256::ZERO,
+        },
+        Revision::Istanbul,
+    )
+}
+
+fn main_benchmarks(c: &mut Criterion) {
+    #[derive(Deserialize)]
+    struct Input {
+        x: Option<usize>,
+        c: String,
+    }
+
+    #[derive(Deserialize)]
+    struct BenchParams {
+        args: Vec<Input>,
+        out: String,
+    }
+
+    for (name, code, args) in [
+        (
+            "snailtracer",
+            include_str!("inputs/benchmarks/main/snailtracer.evm"),
+            include_str!("inputs/benchmarks/main/snailtracer.toml"),
+        ),
+        (
+            "blake2b_huff",
+            include_str!("inputs/benchmarks/main/blake2b_huff.evm"),
+            include_str!("inputs/benchmarks/main/blake2b_huff.toml"),
+        ),
+        (
+            "blake2b_shifts",
+            include_str!("inputs/benchmarks/main/blake2b_shifts.evm"),
+            include_str!("inputs/benchmarks/main/blake2b_shifts.toml"),
+        ),
+        (
+            "sha1_divs",
+            include_str!("inputs/benchmarks/main/sha1_divs.evm"),
+            include_str!("inputs/benchmarks/main/sha1_divs.toml"),
+        ),
+        (
+            "sha1_shifts",
+            include_str!("inputs/benchmarks/main/sha1_shifts.evm"),
+            include_str!("inputs/benchmarks/main/sha1_shifts.toml"),
+        ),
+        (
+            "weierstrudel",
+            include_str!("inputs/benchmarks/main/weierstrudel.evm"),
+            include_str!("inputs/benchmarks/main/weierstrudel.toml"),
+        ),
+    ] {
+        let code = hex::decode(code).unwrap();
+
+        let bench_vars = toml::from_str::<toml::value::Table>(args).unwrap();
+        for (bench, params) in bench_vars {
+            let params = params.try_into::<BenchParams>().unwrap();
+            let mut input_data = Vec::new();
+            for arg in params.args {
+                let b = hex::decode(arg.c).unwrap();
+                for _ in 0..arg.x.unwrap_or(1) {
+                    input_data.extend_from_slice(&b);
+                }
+            }
+
+            let expected_output = hex::decode(&params.out).unwrap();
+            let analyzed_code = AnalyzedCode::analyze(&*code);
+            let input_data = Bytes::from(input_data);
+
+            let res = execute(prepare(analyzed_code.clone(), input_data.clone()));
+
+            assert_eq!(res.status_code, StatusCode::Success);
+            assert_eq!(res.output_data, expected_output);
+
+            c.bench_function(&format!("{}/{}", name, bench), move |b| {
+                let analyzed_code = analyzed_code.clone();
+                let input_data = input_data.clone();
+                b.iter_batched(
+                    move || prepare(analyzed_code.clone(), input_data.clone()),
+                    execute,
+                    BatchSize::SmallInput,
+                )
+            });
+        }
+    }
+}
+
+criterion_group!(
+    name = benches;
+    config = Criterion::default().with_profiler(FlamegraphProfiler::new(100));
+    targets = main_benchmarks, synthetic_benchmarks
+);
+
+criterion_main!(benches);
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.evm b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.evm
new file mode 100644
index 0000000..beca846
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.evm
@@ -0,0 +1 @@
+60003560411161000f5760006000fd5b603f601060186020680100000000000000017f0000000000000000ffffffffffffffff0000000000000000ffffffffffffffff7f00000000000000006a09e667f3bcc9080000000000000000bb67ae8584caa73b60003560801b1873010100000000000000000000000000000000000018610240527f00000000000000003c6ef372fe94f82b0000000000000000a54ff53a5f1d36f1610260527f0000000000000000510e527fade682d100000000000000009b05688c2b3e6c1f610280527f00000000000000001f83d9abfb41bd6b00000000000000005be0cd19137e21796102a052602036036000611ac9565b6080816020016020376080017fffffffffffffffff0000000000000000000000000000000000000000000000007f0000000000000000ffffffffffffffff000000000000000000000000000000007f00000000000000000000000000000000ffffffffffffffff00000000000000007f000000000000000000000000000000000000000000000000ffffffffffffffff602051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17604051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17606051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17608051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b178088166101a05280871660401b6101c05280861660801b6101e052841660c01b610200528087166101205280861660401b6101405280851660801b61016052831660c01b6101805280861660a05280851660401b60c05280841660801b60e052821660c01b6101005280851660205280841660401b60405280831660801b606052811660c01b608052505050507f0000000000000000510e527fade682d100000000000000009b05688c2b3e6c1f8160801b18610330527f00000000000000001f83d9abfb41bd6b00000000000000005be0cd19137e2179610350527f00000000000000003c6ef372fe94f82b0000000000000000a54ff53a5f1d36f1610310527f00000000000000006a09e667f3bcc9080000000000000000bb67ae8584caa73b6102f052610240516103a052610260516103c052610280516103e0526102a0516104005261028051610240518160185160485117010184166103305181188602871c85166102f051810186169283188702891c8616918260385160685117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160985160c85117010184166103505181188602871c851661031051810186169283188702891c8616918260b85160e85117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610118516101485117010184166103605181188602871c851661031051810186169283188702891c86169182610138516101685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610198516101c85117010184166103405181188602871c85166102f051810186169283188702891c861691826101b8516101e851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101d85160885117010184166103305181188602871c85166102f051810186169283188702891c86169182610158516101085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a0516102605181610138516101a85117010184166103505181188602871c851661031051810186169283188702891c861691826101f85160c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160385160085117010184166103605181188602871c851661031051810186169283188702891c861691826101985160485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101785160a85117010184166103405181188602871c85166102f051810186169283188702891c8616918260f851606851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610280516102405181610178516101885117010184166103305181188602871c85166102f051810186169283188702891c861691826101185160085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160b8516101e85117010184166103505181188602871c851661031051810186169283188702891c861691826058516101a85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101585160685117010184166103605181188602871c851661031051810186169283188702891c861691826101d85160c85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b051610260518160f8516101285117010184166103405181188602871c85166102f051810186169283188702891c86169182603851608851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160f85160685117010184166103305181188602871c85166102f051810186169283188702891c861691826101385160285117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101b8516101685117010184166103505181188602871c851661031051810186169283188702891c86169182610198516101c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160585160a85117010184166103605181188602871c851661031051810186169283188702891c8616918260d8516101485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816098516101e85117010184166103405181188602871c85166102f051810186169283188702891c8616918260185161010851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101385160a85117010184166103305181188602871c85166102f051810186169283188702891c8616918260185160e85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816058516101485117010184166103505181188602871c851661031051810186169283188702891c861691826098516101e85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101d8516101685117010184166103605181188602871c851661031051810186169283188702891c861691826038516101885117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b051610260518160d85160685117010184166103405181188602871c85166102f051810186169283188702891c86169182610118516101a851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160585160c85117010184166103305181188602871c85166102f051810186169283188702891c86169182610198516101485117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816018516101085117010184166103505181188602871c851661031051810186169283188702891c861691826101785160685117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160985160e85117010184166103605181188602871c851661031051810186169283188702891c861691826101b85160a85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101f85160285117010184166103405181188602871c85166102f051810186169283188702891c861691826101d85161012851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101985160285117010184166103305181188602871c85166102f051810186169283188702891c8616918260b8516101e85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101d85160885117010184166103505181188602871c851661031051810186169283188702891c861691826101b8516101485117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160185160c85117010184166103605181188602871c851661031051810186169283188702891c8616918260f85160685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610138516101085117010184166103405181188602871c85166102f051810186169283188702891c8616918260585161016851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101b85160e85117010184166103305181188602871c85166102f051810186169283188702891c86169182610178516101c85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101985160685117010184166103505181188602871c851661031051810186169283188702891c861691826038516101285117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160b8516101e85117010184166103605181188602871c851661031051810186169283188702891c8616918260185160885117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101185160485117010184166103405181188602871c85166102f051810186169283188702891c8616918260d85161014851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160d8516101c85117010184166103305181188602871c85166102f051810186169283188702891c861691826101f8516101285117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101785160085117010184166103505181188602871c851661031051810186169283188702891c861691826078516101085117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610198516101a85117010184166103605181188602871c851661031051810186169283188702891c8616918260585160e85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816038516101485117010184166103405181188602871c85166102f051810186169283188702891c8616918260985160a851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610280516102405181610158516101085117010184166103305181188602871c85166102f051810186169283188702891c8616918260585160885117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160f85160285117010184166103505181188602871c851661031051810186169283188702891c8616918260d85160a85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101f8516101285117010184166103605181188602871c851661031051810186169283188702891c86169182610178516101c85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816078516101a85117010184166103405181188602871c85166102f051810186169283188702891c8616918261019851600851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160185160485117010184166103305181188602871c85166102f051810186169283188702891c8616918260385160685117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160985160c85117010184166103505181188602871c851661031051810186169283188702891c8616918260b85160e85117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610118516101485117010184166103605181188602871c851661031051810186169283188702891c86169182610138516101685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610198516101c85117010184166103405181188602871c85166102f051810186169283188702891c861691826101b8516101e851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101d85160885117010184166103305181188602871c85166102f051810186169283188702891c86169182610158516101085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a0516102605181610138516101a85117010184166103505181188602871c851661031051810186169283188702891c861691826101f85160c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160385160085117010184166103605181188602871c851661031051810186169283188702891c861691826101985160485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101785160a85117010184166103405181188602871c85166102f051810186169283188702891c8616918260f851606851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610400516102a0511861035051186102a0526103e05161028051186103305118610280526103c05161026051186103105118610260526103a05161024051186102f05118610240525b8181608001106100fe57600060205260006040526000606052600060805280820381602001602037907fffffffffffffffff0000000000000000000000000000000000000000000000007f0000000000000000ffffffffffffffff000000000000000000000000000000007f00000000000000000000000000000000ffffffffffffffff00000000000000007f000000000000000000000000000000000000000000000000ffffffffffffffff602051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17604051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17606051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b17608051807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b178088166101a05280871660401b6101c05280861660801b6101e052841660c01b610200528087166101205280861660401b6101405280851660801b61016052831660c01b6101805280861660a05280851660401b60c05280841660801b60e052821660c01b6101005280851660205280841660401b60405280831660801b606052811660c01b608052505050507f0000000000000000510e527fade682d100000000000000009b05688c2b3e6c1f8160801b18610330527f00000000000000001f83d9abfb41bd6b00000000000000005be0cd19137e217980197f0000000000000000ffffffffffffffff0000000000000000000000000000000016907f000000000000000000000000000000000000000000000000ffffffffffffffff1617610350527f00000000000000003c6ef372fe94f82b0000000000000000a54ff53a5f1d36f1610310527f00000000000000006a09e667f3bcc9080000000000000000bb67ae8584caa73b6102f052610240516103a052610260516103c052610280516103e0526102a0516104005261028051610240518160185160485117010184166103305181188602871c85166102f051810186169283188702891c8616918260385160685117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160985160c85117010184166103505181188602871c851661031051810186169283188702891c8616918260b85160e85117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610118516101485117010184166103605181188602871c851661031051810186169283188702891c86169182610138516101685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610198516101c85117010184166103405181188602871c85166102f051810186169283188702891c861691826101b8516101e851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101d85160885117010184166103305181188602871c85166102f051810186169283188702891c86169182610158516101085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a0516102605181610138516101a85117010184166103505181188602871c851661031051810186169283188702891c861691826101f85160c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160385160085117010184166103605181188602871c851661031051810186169283188702891c861691826101985160485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101785160a85117010184166103405181188602871c85166102f051810186169283188702891c8616918260f851606851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610280516102405181610178516101885117010184166103305181188602871c85166102f051810186169283188702891c861691826101185160085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160b8516101e85117010184166103505181188602871c851661031051810186169283188702891c861691826058516101a85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101585160685117010184166103605181188602871c851661031051810186169283188702891c861691826101d85160c85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b051610260518160f8516101285117010184166103405181188602871c85166102f051810186169283188702891c86169182603851608851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160f85160685117010184166103305181188602871c85166102f051810186169283188702891c861691826101385160285117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101b8516101685117010184166103505181188602871c851661031051810186169283188702891c86169182610198516101c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160585160a85117010184166103605181188602871c851661031051810186169283188702891c8616918260d8516101485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816098516101e85117010184166103405181188602871c85166102f051810186169283188702891c8616918260185161010851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101385160a85117010184166103305181188602871c85166102f051810186169283188702891c8616918260185160e85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816058516101485117010184166103505181188602871c851661031051810186169283188702891c861691826098516101e85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101d8516101685117010184166103605181188602871c851661031051810186169283188702891c861691826038516101885117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b051610260518160d85160685117010184166103405181188602871c85166102f051810186169283188702891c86169182610118516101a851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160585160c85117010184166103305181188602871c85166102f051810186169283188702891c86169182610198516101485117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816018516101085117010184166103505181188602871c851661031051810186169283188702891c861691826101785160685117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160985160e85117010184166103605181188602871c851661031051810186169283188702891c861691826101b85160a85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101f85160285117010184166103405181188602871c85166102f051810186169283188702891c861691826101d85161012851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101985160285117010184166103305181188602871c85166102f051810186169283188702891c8616918260b8516101e85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101d85160885117010184166103505181188602871c851661031051810186169283188702891c861691826101b8516101485117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160185160c85117010184166103605181188602871c851661031051810186169283188702891c8616918260f85160685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610138516101085117010184166103405181188602871c85166102f051810186169283188702891c8616918260585161016851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101b85160e85117010184166103305181188602871c85166102f051810186169283188702891c86169182610178516101c85117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101985160685117010184166103505181188602871c851661031051810186169283188702891c861691826038516101285117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160b8516101e85117010184166103605181188602871c851661031051810186169283188702891c8616918260185160885117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101185160485117010184166103405181188602871c85166102f051810186169283188702891c8616918260d85161014851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160d8516101c85117010184166103305181188602871c85166102f051810186169283188702891c861691826101f8516101285117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a05161026051816101785160085117010184166103505181188602871c851661031051810186169283188702891c861691826078516101085117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610198516101a85117010184166103605181188602871c851661031051810186169283188702891c8616918260585160e85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816038516101485117010184166103405181188602871c85166102f051810186169283188702891c8616918260985160a851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610280516102405181610158516101085117010184166103305181188602871c85166102f051810186169283188702891c8616918260585160885117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160f85160285117010184166103505181188602871c851661031051810186169283188702891c8616918260d85160a85117010186168061026052188602891c851691820185168061031052188502891c84166102a052610350526102905161024051816101f8516101285117010184166103605181188602871c851661031051810186169283188702891c86169182610178516101c85117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816078516101a85117010184166103405181188602871c85166102f051810186169283188702891c8616918261019851600851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f0526103405261028051610240518160185160485117010184166103305181188602871c85166102f051810186169283188702891c8616918260385160685117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a051610260518160985160c85117010184166103505181188602871c851661031051810186169283188702891c8616918260b85160e85117010186168061026052188602891c851691820185168061031052188502891c84166102a05261035052610290516102405181610118516101485117010184166103605181188602871c851661031051810186169283188702891c86169182610138516101685117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b0516102605181610198516101c85117010184166103405181188602871c85166102f051810186169283188702891c861691826101b8516101e851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f052610340526102805161024051816101d85160885117010184166103305181188602871c85166102f051810186169283188702891c86169182610158516101085117010186168061024052188602891c85169182018516806102f052188502891c8416806102c052610280528061037052610330526102a0516102605181610138516101a85117010184166103505181188602871c851661031051810186169283188702891c861691826101f85160c85117010186168061026052188602891c851691820185168061031052188502891c84166102a0526103505261029051610240518160385160085117010184166103605181188602871c851661031051810186169283188702891c861691826101985160485117010186168061024052188602891c8516918201851690811886028a1c851682610320526102905261031052610360526102b05161026051816101785160a85117010184166103405181188602871c85166102f051810186169283188702891c8616918260f851606851170101861690811887028a1c8616928301861691821887028b1c861680610270526102b052610260526102f05261034052610400516102a0511861035051186102a0526103e05161028051186103305118610280526103c05161026051186103105118610260526103a05161024051186102f051186102405261024051807f0000000000000000ffffffffffffffff000000000000000000000000000000001660401b907f000000000000000000000000000000000000000000000000ffffffffffffffff1660801b1761026051807f0000000000000000ffffffffffffffff000000000000000000000000000000001660401c907f000000000000000000000000000000000000000000000000ffffffffffffffff161717807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b1760005261028051807f0000000000000000ffffffffffffffff000000000000000000000000000000001660401b907f000000000000000000000000000000000000000000000000ffffffffffffffff1660801b176102a051807f0000000000000000ffffffffffffffff000000000000000000000000000000001660401c907f000000000000000000000000000000000000000000000000ffffffffffffffff161717807fffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001660201c907f00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff1660201b17807fffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff00001660101c907f0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff1660101b17807fff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff001660081c907f00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff1660081b1760205250505050505050506000356000f3
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.toml b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.toml
new file mode 100644
index 0000000..bf85abf
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_huff.toml
@@ -0,0 +1,33 @@
+[empty]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" },
+]
+out = "9ab7a73a97a1a3031406b6c169634a9c06cfb81dec3323bb4de5ce6f4b7ca107de534442a7eaeafbaf366ccfdde1cb97d7c884e4344cd0a23039de71a56d630a"
+
+[2805nulls]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000af5" },
+    { c = "00", x = 2805 },
+]
+out = "2a715625dd8e3b86dc5c3f88d229968e8db4ce2e2c257cf40c6cabbc9aa3e17dddf22739fd79e4bef38c8c2166ff374e407ab25000cba307dc160b6cbd49f1c5"
+
+[5610nulls]
+args = [
+    { c = "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000015ea" },
+    { c = "00", x = 5610 },
+]
+out = "f6f72a7f2dfc944429a4a6ec4d1a1c7998c5dd1de8a0c6d21918787ff6651c979bc0d35e4b66d7005f0417b37a13f8669ecdd2897b2f30d85cd91a307e247825"
+
+[8415nulls]
+args = [
+    { c = "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000020df" },
+    { c = "00", x = 8415 },
+]
+out = "ee058d30512191b6ddbf27cef0b8e582fb25c4f9cb0f5b87ae321e0487566d9a32f7e4a94af0578cecf7d5b976dccc7fa74214262aae14094216158957b81002"
+
+[65536nulls]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000" },
+    { c = "00", x = 65536 },
+]
+out = "528b404cf7d409a0656aba45a037eb685a5e1c58c28dae8b15d8f29edea2d896928a5b0df2e72b9a8e6133f72002cb9e0a79407d0a28b857b1b0ad8e68774b14"
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.evm b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.evm
new file mode 100644
index 0000000..b833dd0
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.evm
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b50600436106100365760003560e01c80631e0924231461003b578063d299dac0146102bb575b600080fd5b610282600480360360a081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b91908080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092959493602081019350359150506401000000008111156100f357600080fd5b82018360208201111561010557600080fd5b8035906020019184600183028401116401000000008311171561012757600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561017a57600080fd5b82018360208201111561018c57600080fd5b803590602001918460018302840111640100000000831117156101ae57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561020157600080fd5b82018360208201111561021357600080fd5b8035906020019184600183028401116401000000008311171561023557600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505050903567ffffffffffffffff1691506103f49050565b604051808261010080838360005b838110156102a8578181015183820152602001610290565b5050505090500191505060405180910390f35b610282600480360360608110156102d157600080fd5b8101906020810181356401000000008111156102ec57600080fd5b8201836020820111156102fe57600080fd5b8035906020019184600183028401116401000000008311171561032057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561037357600080fd5b82018360208201111561038557600080fd5b803590602001918460018302840111640100000000831117156103a757600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505050903567ffffffffffffffff1691506104489050565b6103fc61156d565b61040461158d565b61040c61156d565b61042982858961041b8a610485565b6104248a610485565b610538565b61043382896106dc565b61043d828261079b565b979650505050505050565b61045061156d565b61047d848460206040519081016040528060008152506020604051908101604052806000815250866103f4565b949350505050565b61048d6115ca565b60005b82518110156104fb5760088184018101519067ffffffffffffffff82166007841660010182026040031b9084908404600281106104c957fe5b6020020151188360088404600281106104de57fe5b67ffffffffffffffff909216602092909202015250600101610490565b5061050d8160005b60200201516108cd565b67ffffffffffffffff168152610524816001610503565b67ffffffffffffffff166020820152919050565b67ffffffffffffffff84161580610559575060408467ffffffffffffffff16115b80610565575060408351115b1561056f57600080fd5b61057761156d565b506040805161010081018252676a09e667f3bcc908815267bb67ae8584caa73b6020820152673c6ef372fe94f82b9181019190915267a54ff53a5f1d36f1606082015267510e527fade682d16080820152679b05688c2b3e6c1f60a0820152671f83d9abfb41bd6b60c0820152675be0cd19137e217960e082015260005b600881101561063d5781816008811061060a57fe5b602002015187602001518260088110151561062157fe5b67ffffffffffffffff90921660209290920201526001016105f5565b50835160208781018051805167ffffffffffffffff94851660081b188918630101000018841690528551815160809081018051909218851690915286830151825160a0018051909118851690528551825160c00180519091188516905291850151905160e00180519091188316905286821690880152845190600090821611156106d3576106cb87866106dc565b608060608801525b50505050505050565b60005b815181101561079657826060015167ffffffffffffffff166080141561074057606083015160408401805167ffffffffffffffff9092169091016fffffffffffffffffffffffffffffffff16905261073883600061094f565b600060608401525b60608301805167ffffffffffffffff600182018116909252166107616115e5565b508351835160009085908590811061077557fe5b90602001015160f81c60f81b60f81c905080838301535050506001016106df565b505050565b60608201805160408401805167ffffffffffffffff8084169182016fffffffffffffffffffffffffffffffff1690925260019092011690915260006107de6115e5565b508351825b60808110156107f95782818301536001016107e3565b5061080585600161094f565b60005b60808601516008900481101561085457602086015161082c90826008811061050357fe5b85826008811061083857fe5b67ffffffffffffffff9092166020929092020152600101610808565b506040856080015110156108c65760808501516020860151600860078316810260400392610889929190046008811061050357fe5b67ffffffffffffffff16901c84600887608001518115156108a657fe5b04600881106108b157fe5b67ffffffffffffffff90921660209290920201525b5050505050565b600067010000000000000060ff8316026501000000000061ff00841602630100000062ff000085160261010063ff000000861681029064ff00000000871604630100000065ff00000000008816046501000000000066ff00000000000089160467010000000000000067ff000000000000008a16041818181818181892915050565b610957611604565b61095f611604565b61096761156d565b506040805161010081018252676a09e667f3bcc908815267bb67ae8584caa73b6020820152673c6ef372fe94f82b9181019190915267a54ff53a5f1d36f1606082015267510e527fade682d16080820152679b05688c2b3e6c1f60a0820152671f83d9abfb41bd6b60c0820152675be0cd19137e217960e082015260005b6008811015610a5f57602086015181600881106109fe57fe5b6020020151848260108110610a0f57fe5b67ffffffffffffffff9092166020929092020152818160088110610a2f57fe5b6020020151846008830160108110610a4357fe5b67ffffffffffffffff90921660209290920201526001016109e5565b506040850180516101808501805167ffffffffffffffff928316188216905290516101a085018051680100000000000000006fffffffffffffffffffffffffffffffff9093169290920490911890911690528315610acc576101c0830180511967ffffffffffffffff1690525b600080805b60108160ff161015610b56576000925060038116801515610b0c578851600460ff84160460ff16600481101515610b0457fe5b602002015192505b67ffffffffffffffff83826003036040021c169350610b2a846108cd565b8660ff841660108110610b3957fe5b67ffffffffffffffff909216602092909202015250600101610ad1565b50610b7985600060046008600c89845b60200201518a60015b60200201516113e8565b610b9685600160056009600d8960025b60200201518a6003610b6f565b610bb38560026006600a600e8960045b60200201518a6005610b6f565b610bd08560036007600b600f8960065b60200201518a6007610b6f565b610bed8560006005600a600f8960085b60200201518a6009610b6f565b610c0a8560016006600b600c89600a5b60200201518a600b610b6f565b610c2785600260076008600d89600c5b60200201518a600d610b6f565b610c4385600360046009600e89815b60200201518a600f610b6f565b610c6085600060046008600c89600e5b60200201518a600a610b6f565b610c7d85600160056009600d8960045b60200201518a6008610b6f565b610c918560026006600a600e896009610c36565b610cae8560036007600b600f89600d5b60200201518a6006610b6f565b610ccb8560006005600a600f8960015b60200201518a600c610b6f565b610ce88560016006600b600c8960005b60200201518a6002610b6f565b610cfc85600260076008600d89600b610bc3565b610d1085600360046009600e896005610b89565b610d2485600060046008600c89600b610c70565b610d4185600160056009600d89600c5b60200201518a6000610b6f565b610d558560026006600a600e896005610cdb565b610d688560036007600b600f8981610c1a565b610d848560006005600a600f89825b60200201518a600e610b6f565b610d988560016006600b600c896003610ca1565b610dab85600260076008600d8983610b66565b610dc785600360046009600e89825b60200201518a6004610b6f565b610ddb85600060046008600c896007610be0565b610def85600160056009600d896003610b66565b610e038560026006600a600e89600d610cbe565b610e168560036007600b600f8982610d77565b610e2a8560006005600a600f896002610ca1565b610e3e8560016006600b600c896005610c53565b610e5285600260076008600d896004610d34565b610e6685600360046009600e89600f610c70565b610e7a85600060046008600c896009610d34565b610e8d85600160056009600d8983610bc3565b610ea08560026006600a600e8984610dba565b610eb48560036007600b600f89600a610c36565b610ec88560006005600a600f89600e610b66565b610edb8560016006600b600c8982610cbe565b610eef85600260076008600d896006610c70565b610f0285600360046009600e8984610c1a565b610f1685600060046008600c896002610cbe565b610f2a85600160056009600d896006610c53565b610f3e8560026006600a600e896000610bfd565b610f528560036007600b600f896008610b89565b610f668560006005600a600f896004610c1a565b610f7a8560016006600b600c896007610ba6565b610f8e85600260076008600d89600f610d77565b610fa285600360046009600e896001610be0565b610fb585600060046008600c8981610ba6565b610fc885600160056009600d8984610c36565b610fdb8560026006600a600e8981610c1a565b610fef8560036007600b600f896004610c53565b6110028560006005600a600f8984610bc3565b6110158560016006600b600c8983610b89565b61102985600260076008600d896009610cdb565b61103d85600360046009600e896008610bfd565b61105185600060046008600c89600d610bfd565b61106585600160056009600d896007610d77565b6110798560026006600a600e89600c610b66565b61108c8560036007600b600f8984610be0565b61109f8560006005600a600f8983610d34565b6110b38560016006600b600c89600f610dba565b6110c685600260076008600d8982610ca1565b6110da85600360046009600e896002610c53565b6110ee85600060046008600c896006610c36565b61110285600160056009600d89600e610be0565b6111168560026006600a600e89600b610b89565b61112a8560036007600b600f896000610c70565b61113e8560006005600a600f89600c610cdb565b6111528560016006600b600c89600d610bc3565b61116685600260076008600d896001610dba565b61117a85600360046009600e89600a610ba6565b61118e85600060046008600c89600a610cdb565b6111a285600160056009600d896008610dba565b6111b68560026006600a600e896007610ca1565b6111ca8560036007600b600f896001610ba6565b6111dd8560006005600a600f8981610bfd565b6111f18560016006600b600c896009610d77565b61120585600260076008600d896003610cbe565b61121985600360046009600e89600d610d34565b61122c85600060046008600c8984610b66565b61124085600160056009600d896002610b89565b6112548560026006600a600e896004610ba6565b6112688560036007600b600f896006610bc3565b61127c8560006005600a600f896008610be0565b6112908560016006600b600c89600a610bfd565b6112a485600260076008600d89600c610c1a565b6112b785600360046009600e8981610c36565b6112cb85600060046008600c89600e610c53565b6112df85600160056009600d896004610c70565b6112f38560026006600a600e896009610c36565b6113078560036007600b600f89600d610ca1565b61131b8560006005600a600f896001610cbe565b61132f8560016006600b600c896000610cdb565b61134385600260076008600d89600b610bc3565b61135785600360046009600e896005610b89565b60005b60088160ff1610156113de578560ff60088301166010811061137857fe5b60200201518660ff83166010811061138c57fe5b602002015189602001518360ff166008811015156113a657fe5b6020020151181888602001518260ff166008811015156113c257fe5b67ffffffffffffffff909216602092909202015260010161135a565b5050505050505050565b60008787601081106113f657fe5b60200201519050600088876010811061140b57fe5b60200201519050600089876010811061142057fe5b6020020151905060008a876010811061143557fe5b6020020151905068010000000000000000868486010893508318602081811c91901b67ffffffffffffffff161868010000000000000000818308915067ffffffffffffffff82841860281b1682841860181c18925068010000000000000000858486010893508318601081901c60309190911b67ffffffffffffffff161868010000000000000000818308928318603f81901c60019190911b67ffffffffffffffff1618929150838b8b601081106114e957fe5b67ffffffffffffffff9092166020929092020152828b8a6010811061150a57fe5b67ffffffffffffffff9092166020929092020152818b896010811061152b57fe5b67ffffffffffffffff9092166020929092020152808b886010811061154c57fe5b67ffffffffffffffff90921660209290920201525050505050505050505050565b610100604051908101604052806008906020820280388339509192915050565b6101e0604051908101604052806115a26115e5565b81526020016115af61156d565b81526000602082018190526040820181905260609091015290565b60408051808201825290600290829080388339509192915050565b6080604051908101604052806004906020820280388339509192915050565b61020060405190810160405280601090602082028038833950919291505056fea165627a7a72305820a59dc9d098d29bacdd88cb50c25c96ed4ba3047fd46a5c6ecf57e447a3c699100029
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.toml b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.toml
new file mode 100644
index 0000000..d98ed92
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/blake2b_shifts.toml
@@ -0,0 +1,27 @@
+[2805nulls]
+args = [
+    { c = "d299dac00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000af5" },
+    { c = "00", x = 2805 },
+]
+out = "000000000000000000000000000000000000000000000000610f78eb767b35d60000000000000000000000000000000000000000000000008acb88982dd67191000000000000000000000000000000000000000000000000d96d8b16cbf058cb00000000000000000000000000000000000000000000000075e58196f211891e000000000000000000000000000000000000000000000000b86aeafcaeb2344600000000000000000000000000000000000000000000000088074269d31f0c89000000000000000000000000000000000000000000000000b8d0461382136a330000000000000000000000000000000000000000000000005246a9d5610d58c2"
+
+[5610nulls]
+args = [
+    { c = "d299dac000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000015ea" },
+    { c = "00", x = 5610 },
+]
+out = "000000000000000000000000000000000000000000000000e24b661901100a9f000000000000000000000000000000000000000000000000e86c19106fc93aa3000000000000000000000000000000000000000000000000f3f772ede793c73c000000000000000000000000000000000000000000000000e2a620fb9c2542ce00000000000000000000000000000000000000000000000027dd4f1b786e9b6a00000000000000000000000000000000000000000000000072ee3bd30df788c4000000000000000000000000000000000000000000000000bbfdee69798ce72e0000000000000000000000000000000000000000000000001d2c903a1d9e92c7"
+
+[8415nulls]
+args = [
+    { c = "d299dac000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000020df" },
+    { c = "00", x = 8415 },
+]
+out = "000000000000000000000000000000000000000000000000ff7720faeac09953000000000000000000000000000000000000000000000000a5ebd368781c3ddb000000000000000000000000000000000000000000000000626c172d3892a6dc000000000000000000000000000000000000000000000000768456d18531f95e000000000000000000000000000000000000000000000000e5504c9f0fa9a153000000000000000000000000000000000000000000000000a5f665b4bee1301f0000000000000000000000000000000000000000000000009358198b0f89274200000000000000000000000000000000000000000000000074b191b954d547e1"
+
+[65536nulls]
+args = [
+    { c = "d299dac00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000" },
+    { c = "00", x = 65536 },
+]
+out = "000000000000000000000000000000000000000000000000224bf59a700688ba000000000000000000000000000000000000000000000000a36d6ae418d9314d000000000000000000000000000000000000000000000000880adeb791ab854e000000000000000000000000000000000000000000000000bb697bc853d6f4c2000000000000000000000000000000000000000000000000faf9797b9902103f000000000000000000000000000000000000000000000000f8aa7b92b7340ec900000000000000000000000000000000000000000000000095e64259dcdb2be7000000000000000000000000000000000000000000000000ab45d93d04b14cd5"
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.evm b/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.evm
new file mode 100644
index 0000000..72e54be
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.evm
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b5060043610610047577c010000000000000000000000000000000000000000000000000000000060003504631605782b811461004c575b600080fd5b6100f26004803603602081101561006257600080fd5b81019060208101813564010000000081111561007d57600080fd5b82018360208201111561008f57600080fd5b803590602001918460018302840111640100000000831117156100b157600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610127945050505050565b604080517fffffffffffffffffffffffffffffffffffffffff0000000000000000000000009092168252519081900360200190f35b60006040518251602084019350604067ffffffffffffffc0600183011601600982820310600181146101585761015f565b6040820191505b50776745230100efcdab890098badcfe001032547600c3d2e1f06101d0565b6000838310156101c9575080820151928290039260208410156101c9577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60208590036101000a0119165b9392505050565b60005b82811015610686576101e684828961017e565b85526101f684602083018961017e565b60208601526040818503106001811461020e57610217565b60808286038701535b506040830381146001811461022b57610239565b602086018051600887021790525b5060405b6080811015610339578581017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08101517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc88201517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08301517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff48401516002911891909218189081027ffffffffefffffffefffffffefffffffefffffffefffffffefffffffefffffffe1663800000009091047c010000000100000001000000010000000100000001000000010000000116179052600c0161023d565b5060805b61014081101561043a578581017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808101517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff908201517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08301517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe88401516004911891909218189081027ffffffffcfffffffcfffffffcfffffffcfffffffcfffffffcfffffffcfffffffc1663400000009091047c03000000030000000300000003000000030000000300000003000000031617905260180161033d565b508160008060005b605081101561065c5760148104801561047257600181146104ae57600281146104e857600381146105275761055d565b6501000000000085046a0100000000000000000000860481186f01000000000000000000000000000000870416189350635a827999925061055d565b6501000000000085046f0100000000000000000000000000000086046a0100000000000000000000870418189350636ed9eba1925061055d565b6a010000000000000000000085046f010000000000000000000000000000008604818117650100000000008804169116179350638f1bbcdc925061055d565b6501000000000085046f0100000000000000000000000000000086046a010000000000000000000087041818935063ca62c1d692505b50601f770800000000000000000000000000000000000000000000008504168063ffffffe073080000000000000000000000000000000000000087041617905080840190508063ffffffff86160190508083019050807c0100000000000000000000000000000000000000000000000000000000600484028c0151040190507401000000000000000000000000000000000000000081026501000000000086041794506a0100000000000000000000633fffffff6a040000000000000000000087041663c00000006604000000000000880416170277ffffffff00ffffffff000000000000ffffffff00ffffffff861617945050600181019050610442565b5050509190910177ffffffff00ffffffff00ffffffff00ffffffff00ffffffff16906040016101d3565b506c0100000000000000000000000063ffffffff821667ffffffff000000006101008404166bffffffff0000000000000000620100008504166fffffffff000000000000000000000000630100000086041673ffffffff00000000000000000000000000000000640100000000870416171717170294505050505091905056fea165627a7a7230582083396642a98f6018c81ca24dc0c2af8e842bd33a6b8d7f08632dc1bc372e466a0029
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.toml b/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.toml
new file mode 100644
index 0000000..b456fd5
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/sha1_divs.toml
@@ -0,0 +1,33 @@
+[empty]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" },
+]
+out = "da39a3ee5e6b4b0d3255bfef95601890afd80709000000000000000000000000"
+
+[1351]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000547" },
+    { c = "00", x = 1351 },
+]
+out = "c150bb7410841ea9231d01f36b504c7484c46317000000000000000000000000"
+
+[2737]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000ab1" },
+    { c = "00", x = 2737 },
+]
+out = "22170b5185363658b8f74d5f4409064df25c2efa000000000000000000000000"
+
+[5311]
+args = [
+    { c = "1605782b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000014bf" },
+    { c = "00", x = 5311 },
+]
+out = "86c9614de84df44ba01bfd1dd68e869dc730af09000000000000000000000000"
+
+[65536]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010000" },
+    { c = "00", x = 65536 },
+]
+out = "1adc95bebe9eea8c112d40cd04ab7a8d75c4f961000000000000000000000000"
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.evm b/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.evm
new file mode 100644
index 0000000..9085c6e
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.evm
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b506004361061002b5760003560e01c80631605782b14610030575b600080fd5b6100d66004803603602081101561004657600080fd5b81019060208101813564010000000081111561006157600080fd5b82018360208201111561007357600080fd5b8035906020019184600183028401116401000000008311171561009557600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506100f8945050505050565b604080516bffffffffffffffffffffffff199092168252519081900360200190f35b60006040518251602084019350604067ffffffffffffffc06001830116016009828203106001811461012957610130565b6040820191505b50776745230100efcdab890098badcfe001032547600c3d2e1f0610183565b60008383101561017c5750808201519282900392602084101561017c5760001960208590036101000a0119165b9392505050565b60005b8281101561045c5761019984828961014f565b85526101a984602083018961014f565b6020860152604081850310600181146101c1576101ca565b60808286038701535b50604083038114600181146101de576101ee565b8460031b60208701511760208701525b5060405b608081101561027157858101603f19810151603719820151601f19830151600b1984015118911818600181901b7ffffffffefffffffefffffffefffffffefffffffefffffffefffffffefffffffe16601f9190911c7c010000000100000001000000010000000100000001000000010000000116179052600c016101f2565b5060805b6101408110156102f557858101607f19810151606f19820151603f1983015160171984015118911818600281901b7ffffffffcfffffffcfffffffcfffffffcfffffffcfffffffcfffffffcfffffffc16601e9190911c7c030000000300000003000000030000000300000003000000030000000316179052601801610275565b508160008060005b60508110156104325760148104801561032d576001811461034e576002811461036d5760038114610391576103ac565b602885901c605086901c8118607887901c16189350635a82799992506103ac565b8460501c8560781c189350838560281c189350636ed9eba192506103ac565b605085901c607886901c818117602888901c169116179350638f1bbcdc92506103ac565b8460501c8560781c189350838560281c18935063ca62c1d692505b50601f8460bb1c168063ffffffe086609b1c1617905080840190508063ffffffff86160190508083019050808260021b8b015160e01c0190508060a01b8560281c179450633fffffff8560521c1663c00000008660321c161760501b77ffffffff00ffffffff000000000000ffffffff00ffffffff8616179450506001810190506102fd565b5050509190910177ffffffff00ffffffff00ffffffff00ffffffff00ffffffff1690604001610186565b5063ffffffff811667ffffffff000000008260081c166bffffffff00000000000000008360101c166fffffffff0000000000000000000000008460181c1673ffffffff000000000000000000000000000000008560201c161717171760601b94505050505091905056fea165627a7a72305820227af8b272b9b0e3d345f580ebcde55f50e3e8b7ecafabffcadb92e55e4de68e0029
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.toml b/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.toml
new file mode 100644
index 0000000..b456fd5
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/sha1_shifts.toml
@@ -0,0 +1,33 @@
+[empty]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" },
+]
+out = "da39a3ee5e6b4b0d3255bfef95601890afd80709000000000000000000000000"
+
+[1351]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000547" },
+    { c = "00", x = 1351 },
+]
+out = "c150bb7410841ea9231d01f36b504c7484c46317000000000000000000000000"
+
+[2737]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000ab1" },
+    { c = "00", x = 2737 },
+]
+out = "22170b5185363658b8f74d5f4409064df25c2efa000000000000000000000000"
+
+[5311]
+args = [
+    { c = "1605782b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000014bf" },
+    { c = "00", x = 5311 },
+]
+out = "86c9614de84df44ba01bfd1dd68e869dc730af09000000000000000000000000"
+
+[65536]
+args = [
+    { c = "1605782b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010000" },
+    { c = "00", x = 65536 },
+]
+out = "1adc95bebe9eea8c112d40cd04ab7a8d75c4f961000000000000000000000000"
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.evm b/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.evm
new file mode 100644
index 0000000..9546187
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.evm
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b506004361061004c5760003560e01c806330627b7c1461005157806375ac892a14610085578063784f13661461011d578063c294360114610146575b600080fd5b610059610163565b604080516001600160f81b03199485168152928416602084015292168183015290519081900360600190f35b6100a86004803603604081101561009b57600080fd5b50803590602001356102d1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100e25781810151838201526020016100ca565b50505050905090810190601f16801561010f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6100596004803603606081101561013357600080fd5b508035906020810135906040013561055b565b6100a86004803603602081101561015c57600080fd5b5035610590565b6000806000610176610400610300610834565b60405180606001604052806001546000546207d5dc028161019357fe5b058152600060208083018290526040928301919091528251600b81905583820151600c81905593830151600d819055835160608082018652928152808401959095528484015282519081018352600654815260075491810191909152600854918101919091526102259161021c916102139161020e91612ef7565b612f64565b6207d5dc612feb565b620f424061301e565b8051600e556020810151600f55604001516010556102416142dd565b61025a816102556102006101806008613064565b613212565b90506102708161025561014561021c6008613064565b905061028481610255610258806008613064565b905061029a8161025561020a61020c6008613064565b90506102a781600461301e565b90506102b1613250565b8051602082015160409092015160f891821b9692821b9550901b92509050565b606060005b6000548112156104c95760006102ed828686613064565b90506002816000015160f81b90808054603f811680603e811461032a576002830184556001831661031c578192505b600160028404019350610342565b600084815260209081902060ff198516905560419094555b505050600190038154600116156103685790600052602060002090602091828204019190065b909190919091601f036101000a81548160ff02191690600160f81b840402179055506002816020015160f81b90808054603f811680603e81146103c557600283018455600183166103b7578192505b6001600284040193506103dd565b600084815260209081902060ff198516905560419094555b505050600190038154600116156104035790600052602060002090602091828204019190065b909190919091601f036101000a81548160ff02191690600160f81b840402179055506002816040015160f81b90808054603f811680603e81146104605760028301845560018316610452578192505b600160028404019350610478565b600084815260209081902060ff198516905560419094555b5050506001900381546001161561049e5790600052602060002090602091828204019190065b815460ff601f929092036101000a9182021916600160f81b90930402919091179055506001016102d6565b506002805460408051602060018416156101000260001901909316849004601f8101849004840282018401909252818152929183018282801561054d5780601f106105225761010080835404028352916020019161054d565b820191906000526020600020905b81548152906001019060200180831161053057829003601f168201915b505050505090505b92915050565b60008060008061056c878787613064565b8051602082015160409092015160f891821b9a92821b9950901b9650945050505050565b600154606090600019015b600081126107a35760005b6000548112156107995760006105bd828487613064565b90506002816000015160f81b90808054603f811680603e81146105fa57600283018455600183166105ec578192505b600160028404019350610612565b600084815260209081902060ff198516905560419094555b505050600190038154600116156106385790600052602060002090602091828204019190065b909190919091601f036101000a81548160ff02191690600160f81b840402179055506002816020015160f81b90808054603f811680603e81146106955760028301845560018316610687578192505b6001600284040193506106ad565b600084815260209081902060ff198516905560419094555b505050600190038154600116156106d35790600052602060002090602091828204019190065b909190919091601f036101000a81548160ff02191690600160f81b840402179055506002816040015160f81b90808054603f811680603e81146107305760028301845560018316610722578192505b600160028404019350610748565b600084815260209081902060ff198516905560419094555b5050506001900381546001161561076e5790600052602060002090602091828204019190065b815460ff601f929092036101000a9182021916600160f81b90930402919091179055506001016105a6565b506000190161059b565b506002805460408051602060018416156101000260001901909316849004601f810184900484028201840190925281815292918301828280156108275780601f106107fc57610100808354040283529160200191610827565b820191906000526020600020905b81548152906001019060200180831161080a57829003601f168201915b505050505090505b919050565b8160008190555080600181905550604051806080016040528060405180606001604052806302faf08081526020016303197500815260200163119e7f8081525081526020016108a460405180606001604052806000815260200161a673198152602001620f423f19815250612f64565b815260006020808301829052604092830182905283518051600355808201516004558301516005558381015180516006559081015160075582015160085582820151600955606092830151600a805460ff1916911515919091179055815192830190915260015490548291906207d5dc028161091c57fe5b058152600060208083018290526040928301919091528251600b81905583820151600c81905593830151600d819055835160608082018652928152808401959095528484015282519081018352600654815260075491810191909152600854918101919091526109979161021c916102139161020e91612ef7565b8051600e55602080820151600f55604091820151601055815160a08101835264174876e8008152825160608082018552641748862a40825263026e8f00828501526304dd1e008286015282840191825284518082018652600080825281860181905281870181905284870191825286518084018852620b71b081526203d09081880181905281890152928501928352608085018181526011805460018082018355919093528651600b9093027f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c688101938455955180517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c69880155808901517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6a8801558901517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6b870155925180517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6c870155808801517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6d8701558801517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6e860155925180517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6f860155958601517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c7085015594909501517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c71830155517f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c72909101805492949192909160ff1990911690836002811115610c1057fe5b0217905550505060116040518060a0016040528064174876e8008152602001604051806060016040528064174290493f19815260200163026e8f0081526020016304dd1e008152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806203d09081526020016203d0908152602001620b71b0815250815260200160006002811115610cb657fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff1990921691908490811115610d5857fe5b0217905550505060116040518060a0016040528064174876e800815260200160405180606001604052806302faf080815260200163026e8f00815260200164174876e800815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620b71b08152602001620b71b08152602001620b71b0815250815260200160006002811115610dfd57fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff1990921691908490811115610e9f57fe5b0217905550505060116040518060a0016040528064174876e800815260200160405180606001604052806302faf080815260200163026e8f00815260200164173e54e97f1981525081526020016040518060600160405280600081526020016000815260200160008152508152602001604051806060016040528060008152602001600081526020016000815250815260200160006002811115610f3f57fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff1990921691908490811115610fe157fe5b0217905550505060116040518060a0016040528064174876e800815260200160405180606001604052806302faf080815260200164174876e80081526020016304dd1e00815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620b71b08152602001620b71b08152602001620b71b081525081526020016000600281111561108657fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff199092169190849081111561112857fe5b0217905550505060116040518060a0016040528064174876e800815260200160405180606001604052806302faf080815260200164174399c9ff1981526020016304dd1e00815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620b71b08152602001620b71b08152602001620b71b08152508152602001600060028111156111ce57fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff199092169190849081111561127057fe5b0217905550505060116040518060a0016040528062fbc5208152602001604051806060016040528063019bfcc0815260200162fbc52081526020016302cd29c0815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561131157fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff19909216919084908111156113b357fe5b0217905550505060116040518060a001604052806323c34600815260200160405180606001604052806302faf080815260200163289c455081526020016304dd1e008152508152602001604051806060016040528062b71b00815260200162b71b00815260200162b71b00815250815260200160405180606001604052806000815260200160008152602001600081525081526020016000600281111561145657fe5b905281546001818101845560009384526020938490208351600b90930201918255838301518051838301558085015160028085019190915560409182015160038501558185015180516004860155808701516005860155820151600685015560608501518051600786015595860151600885015594015160098301556080830151600a83018054949593949193909260ff19909216919084908111156114f857fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f208152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016305a1f4a081525081526020016040518060600160405280630459e44081526020016302f34f6081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561160c57fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff19909216919084908111156116fd57fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f20815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001600081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016305a1f4a08152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561180e57fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff19909216919084908111156118ff57fe5b0217905550505060126040518060e001604052806040518060600160405280630555a9608152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e44081526020016302f34f6081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016305a1f4a08152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e58815250815260200160016002811115611a1357fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff1990921691908490811115611b0457fe5b0217905550505060126040518060e001604052806040518060600160405280630555a960815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016305a1f4a081525081526020016040518060600160405280630459e4408152602001600081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e58815250815260200160016002811115611c1557fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff1990921691908490811115611d0657fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f208152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e44081526020016302f34f6081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016303aa6a608152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e58815250815260200160016002811115611e1a57fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff1990921691908490811115611f0b57fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f20815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016303aa6a6081525081526020016040518060600160405280630459e4408152602001600081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561201c57fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff199092169190849081111561210d57fe5b0217905550505060126040518060e001604052806040518060600160405280630555a9608152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016303aa6a6081525081526020016040518060600160405280630459e44081526020016302f34f6081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561222157fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff199092169190849081111561231257fe5b0217905550505060126040518060e001604052806040518060600160405280630555a960815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001600081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016303aa6a608152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561242357fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff199092169190849081111561251457fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f208152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016303aa6a6081525081526020016040518060600160405280630555a9608152602001630188c2e081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561262857fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff199092169190849081111561271957fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f208152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630555a9608152602001630188c2e081526020016304a62f8081525081526020016040518060600160405280630459e4408152602001630188c2e081526020016305a1f4a08152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e5881525081526020016001600281111561282d57fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff199092169190849081111561291e57fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f20815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630555a960815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016303aa6a608152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e58815250815260200160016002811115612a3257fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff1990921691908490811115612b2357fe5b0217905550505060126040518060e00160405280604051806060016040528063035e1f20815260200163016a8c8081526020016304a62f8081525081526020016040518060600160405280630459e440815260200163016a8c8081526020016305a1f4a081525081526020016040518060600160405280630555a960815260200163016a8c8081526020016304a62f808152508152602001604051806060016040528060008152602001600081526020016000815250815260200160405180606001604052806000815260200160008152602001600081525081526020016040518060600160405280620f3e588152602001620f3e588152602001620f3e58815250815260200160016002811115612c3757fe5b905281546001818101845560009384526020938490208351805160139094029091019283558085015183830155604090810151600280850191909155858501518051600386015580870151600486015582015160058501558185015180516006860155808701516007860155820151600885015560608501518051600986015580870151600a860155820151600b85015560808501518051600c86015580870151600d860155820151600e85015560a08501518051600f860155958601516010850155940151601183015560c0830151601283018054949593949193909260ff1990921691908490811115612d2857fe5b0217905550505060005b601254811015612ef257600060128281548110612d4b57fe5b600091825260209182902060408051610140810182526013909302909101805460e08401908152600182015461010085015260028083015461012086015290845282516060818101855260038401548252600484015482880152600584015482860152858701919091528351808201855260068401548152600784015481880152600884015481860152858501528351808201855260098401548152600a84015481880152600b840154818601528186015283518082018552600c8401548152600d84015481880152600e84015481860152608086015283519081018452600f830154815260108301549581019590955260118201549285019290925260a0830193909352601283015491929160c084019160ff90911690811115612e6c57fe5b6002811115612e7757fe5b815250509050612eac61020e612e95836020015184600001516132cd565b612ea7846040015185600001516132cd565b612ef7565b60128381548110612eb957fe5b60009182526020918290208351600960139093029091019182015590820151600a820155604090910151600b9091015550600101612d32565b505050565b612eff6142dd565b604051806060016040528083602001518560400151028460400151866020015102038152602001836040015185600001510284600001518660400151020381526020018360000151856020015102846020015186600001510203815250905092915050565b612f6c6142dd565b604082015160208301518351600092612f9292918002918002919091019080020161330c565b90506040518060600160405280828560000151620f42400281612fb157fe5b058152602001828560200151620f42400281612fc957fe5b058152602001828560400151620f42400281612fe157fe5b0590529392505050565b612ff36142dd565b5060408051606081018252835183028152602080850151840290820152928101519091029082015290565b6130266142dd565b60405180606001604052808385600001518161303e57fe5b0581526020018385602001518161305157fe5b05815260200183856040015181612fe157fe5b61306c6142dd565b6000546013805463ffffffff1916918502860163ffffffff169190911790556130936142dd565b905060005b828112156131f157600061317261314c61021c613115600b60405180606001604052908160008201548152602001600182015481526020016002820154815250506207a1206000546207a1206130ec613343565b63ffffffff16816130f957fe5b0663ffffffff168d620f424002018161310e57fe5b0503612feb565b60408051606081018252600e548152600f5460208201526010549181019190915260015461025591906207a12090816130ec613343565b604080516060810182526006548152600754602082015260085491810191909152613212565b6040805160e081019091526003546080820190815260045460a083015260055460c083015291925060009181906131ae9061025586608c612feb565b81526020016131bc84612f64565b815260006020820181905260409091015290506131e5846102556131df8461336c565b8861301e565b93505050600101613098565b5061320861021c61320183613753565b60ff612feb565b90505b9392505050565b61321a6142dd565b50604080516060810182528251845101815260208084015181860151019082015291810151928101519092019181019190915290565b60008080556001819055613266906002906142fe565b60006003819055600481905560058190556006819055600781905560088190556009819055600a805460ff19169055600b819055600c819055600d819055600e819055600f81905560108190556132bf90601190614345565b6132cb60126000614366565b565b6132d56142dd565b5060408051606081018252825184510381526020808401518186015103908201528282015184830151039181019190915292915050565b80600260018201055b8181121561333d5780915060028182858161332c57fe5b05018161333557fe5b059050613315565b50919050565b6013805463ffffffff19811663ffffffff9182166341c64e6d0261303901821617918290551690565b6133746142dd565b600a826040015113156133a657604051806060016040528060008152602001600081526020016000815250905061082f565b60008060006133b48561379f565b91945092509050826133e857604051806060016040528060008152602001600081526020016000815250935050505061082f565b6133f0614387565b6133f86143c7565b6134006142dd565b6134086142dd565b600086600181111561341657fe5b1415613505576011858154811061342957fe5b60009182526020918290206040805160a081018252600b90930290910180548352815160608082018452600183015482526002808401548388015260038401548386015285870192909252835180820185526004840154815260058401548188015260068401548186015285850152835180820185526007840154815260088401549681019690965260098301549386019390935291830193909352600a830154919291608084019160ff909116908111156134e157fe5b60028111156134ec57fe5b8152505093508360600151915083604001519050613653565b6012858154811061351257fe5b600091825260209182902060408051610140810182526013909302909101805460e08401908152600182015461010085015260028083015461012086015290845282516060818101855260038401548252600484015482880152600584015482860152858701919091528351808201855260068401548152600784015481880152600884015481860152858501528351808201855260098401548152600a84015481880152600b840154818601528186015283518082018552600c8401548152600d84015481880152600e84015481860152608086015283519081018452600f830154815260108301549581019590955260118201549285019290925260a0830193909352601283015491929160c084019160ff9091169081111561363357fe5b600281111561363e57fe5b8152505092508260a001519150826080015190505b6040820151600190811215613669575060408201515b808360200151131561367c575060208201515b808360400151131561368f575060408201515b60408a01805160010190819052600512156136f75780620f42406136b1613343565b63ffffffff16816136be57fe5b0663ffffffff1612156136e8576136e16136db84620f4240612feb565b8261301e565b92506136f7565b50965061082f95505050505050565b6136ff6142dd565b600088600181111561370d57fe5b14156137255761371e8b878b613a57565b9050613733565b6137308b868b613aec565b90505b6137448361025561021c8785613baa565b9b9a5050505050505050505050565b61375b6142dd565b60405180606001604052806137738460000151613be8565b81526020016137858460200151613be8565b81526020016137978460400151613be8565b905292915050565b60008080808080805b6011548110156138c2576000613890601183815481106137c457fe5b60009182526020918290206040805160a081018252600b90930290910180548352815160608082018452600183015482526002808401548388015260038401548386015285870192909252835180820185526004840154815260058401548188015260068401548186015285850152835180820185526007840154815260088401549681019690965260098301549386019390935291830193909352600a830154919291608084019160ff9091169081111561387c57fe5b600281111561388757fe5b9052508a613c13565b90506000811380156138a957508415806138a957508481125b156138b957809450600093508192505b506001016137a8565b5060005b601254811015613a49576000613a17601283815481106138e257fe5b600091825260209182902060408051610140810182526013909302909101805460e08401908152600182015461010085015260028083015461012086015290845282516060818101855260038401548252600484015482880152600584015482860152858701919091528351808201855260068401548152600784015481880152600884015481860152858501528351808201855260098401548152600a84015481880152600b840154818601528186015283518082018552600c8401548152600d84015481880152600e84015481860152608086015283519081018452600f830154815260108301549581019590955260118201549285019290925260a0830193909352601283015491929160c084019160ff90911690811115613a0357fe5b6002811115613a0e57fe5b9052508a613cbb565b9050600081138015613a305750841580613a3057508481125b15613a4057809450600193508192505b506001016138c6565b509196909550909350915050565b613a5f6142dd565b6000613a7a856000015161025561021c886020015187612feb565b90506000613a8f61020e8387602001516132cd565b9050600085608001516002811115613aa357fe5b1415613ae1576000613ab9828860200151613e0c565b12613acd57613aca81600019612feb565b90505b613ad8868383613e31565b9250505061320b565b613ad8868383613fc1565b613af46142dd565b6000613b0f856000015161025561021c886020015187612feb565b6060860151909150620a2c2a9015613b2757506216e3605b6000620f4240613b3f87606001518960200151613e0c565b81613b4657fe5b05905060008112613b55576000035b64e8d4a5100081800281038380020281900590036000811215613b8c57613b8188858960600151613fc1565b94505050505061320b565b613b9e88858960600151868686614039565b98975050505050505050565b613bb26142dd565b50604080516060810182528251845102815260208084015181860151029082015291810151928101519092029181019190915290565b600080821215613bfa5750600061082f565b620f4240821315613c0f5750620f424061082f565b5090565b600080613c28846020015184600001516132cd565b90506000620f4240613c3e838660200151613e0c565b81613c4557fe5b865191900591506000908002613c5b8480613e0c565b838402030190506000811215613c775760009350505050610555565b613c808161330c565b90506103e88183031315613c9957900391506105559050565b6103e88183011315613caf570191506105559050565b50600095945050505050565b600080613cd0846020015185600001516132cd565b90506000613ce6856040015186600001516132cd565b90506000613cf8856020015183612ef7565b90506000620f4240613d0a8584613e0c565b81613d1157fe5b0590506103e71981138015613d2757506103e881125b15613d39576000945050505050610555565b85518751600091613d49916132cd565b9050600082613d588386613e0c565b81613d5f57fe5b0590506000811280613d735750620f424081135b15613d875760009650505050505050610555565b6000613d938388612ef7565b9050600084613da68b6020015184613e0c565b81613dad57fe5b0590506000811280613dc35750620f4240818401135b15613dd957600098505050505050505050610555565b600085613de68985613e0c565b81613ded57fe5b0590506103e88112156137445760009950505050505050505050610555565b6040808201519083015160208084015190850151845186510291020191020192915050565b613e396142dd565b6000620f424080613e48613343565b63ffffffff1681613e5557fe5b0663ffffffff16625fdfb00281613e6857fe5b0590506000620f4240613e79613343565b63ffffffff1681613e8657fe5b0663ffffffff1690506000613e9a8261330c565b6103e8029050613ea86142dd565b620186a0613eb98760000151614216565b1315613ee657604051806060016040528060008152602001620f4240815260200160008152509050613f09565b6040518060600160405280620f4240815260200160008152602001600081525090505b613f1661020e8288612ef7565b90506000613f2761020e8884612ef7565b9050613f7f61020e613f64613f5285620f424088613f448c61422e565b0281613f4c57fe5b05612feb565b61025585620f424089613f448d61424e565b6102558a613f7689620f42400361330c565b6103e802612feb565b9150613fb460405180608001604052808a81526020018481526020018b6040015181526020018b60600151151581525061336c565b9998505050505050505050565b613fc96142dd565b6000613ffb61020e8660200151613ff686620f4240613fec898c60200151613e0c565b60020281613f4c57fe5b6132cd565b90506140306040518060800160405280868152602001838152602001876040015181526020018760600151151581525061336c565b95945050505050565b6140416142dd565b60608701516000199015614053575060015b600061408961020e61021c61406c8c602001518a612feb565b613ff68b6140798a61330c565b620f42408c8e0205018802612feb565b60608a0151909150620f42408601906140ba57620f42406140aa838a613e0c565b816140b157fe5b05620f42400390505b60408a0151619c406c0c9f2c9cd04674edea40000000620ea6008480028502850285020205019060021261415e5761412a61411f60405180608001604052808d81526020018681526020018e6040015181526020018e6060015115151581525061336c565b82620f424003612feb565b92506141448361025561413e8e8e8e613fc1565b84612feb565b925061415383620f424061301e565b94505050505061420c565b600281056203d09001620f4240614173613343565b63ffffffff168161418057fe5b0663ffffffff1612156141b2576141536141a461419e8d8d8d613fc1565b83612feb565b600283056203d0900161301e565b6142056141f76141ec60405180608001604052808e81526020018781526020018f6040015181526020018f6060015115151581525061336c565b83620f424003612feb565b60028305620b71b00361301e565b9450505050505b9695505050505050565b60008082131561422757508061082f565b5060000390565b60008061423a8361424e565b905061320b81820264e8d4a510000361330c565b60005b600082121561426757625fdfb082019150614251565b5b625fdfb0821261427f57625fdfb082039150614268565b6001828160025b818313156142d457818385028161429957fe5b0585019450620f4240808788860202816142af57fe5b05816142b757fe5b600095909503940592506001810181029190910290600201614286565b50505050919050565b60405180606001604052806000815260200160008152602001600081525090565b50805460018160011615610100020316600290046000825580601f106143245750614342565b601f0160209004906000526020600020908101906143429190614401565b50565b50805460008255600b02906000526020600020908101906143429190614416565b50805460008255601302906000526020600020908101906143429190614475565b6040518060a00160405280600081526020016143a16142dd565b81526020016143ae6142dd565b81526020016143bb6142dd565b81526020016000905290565b6040518060e001604052806143da6142dd565b81526020016143e76142dd565b81526020016143f46142dd565b81526020016143a16142dd565b5b80821115613c0f5760008155600101614402565b5b80821115613c0f57600080825560018201819055600282018190556003820181905560048201819055600582018190556006820181905560078201819055600882018190556009820155600a8101805460ff19169055600b01614417565b5b80821115613c0f576000808255600182018190556002820181905560038201819055600482018190556005820181905560068201819055600782018190556008820181905560098201819055600a8201819055600b8201819055600c8201819055600d8201819055600e8201819055600f820181905560108201819055601182015560128101805460ff1916905560130161447656fea2646970667358221220037024f5647853879c58fbcc61ac3616455f6f731cc6e84f91eb5a3b4e06c00464736f6c63430007060033
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.toml b/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.toml
new file mode 100644
index 0000000..7e22897
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/snailtracer.toml
@@ -0,0 +1,3 @@
+[benchmark]
+args = [{ c = "30627b7c" }]
+out = "190000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000"
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.evm b/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.evm
new file mode 100644
index 0000000..5edddc8
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.evm
@@ -0,0 +1 @@
+346060600036030617156100195761019060005260206000fd5b6060600036030460021b603e016102006136c66000396004810281600302826005020182601e01810383820384820385820386820387820388820360606000360304808001600a1b60e0019060061b6000015b60017f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000018235067f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000190067f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000180807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff70024ccef014a773d2cf7a7bd9d4391eb18d850970024ccef014a773d2cf7a7bd9d4391eb18d85028082109103036789d3256894d213e3097f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6802d91d232ec7e0b3d786096802d91d232ec7e0b3d786028082109103037f30644e72e131a029b85045b68181585cb8e665ff8b011694c1d039a872b0eed9090891818377b3c4d79d41a917585bfc41088d8daaa78b17ea66b99c90dd090860051b9060051b5b937ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0001938e6005026060600036030461080002610200010390806101e01651565b908e019060041c806101e01651565b8060031c6103e0168601828f019283516002018085528f03015260081c601001806101e01651565b8060021c6103e0168601828d019283516002018085528d03015260071c601001806101e01651565b8060011c6103e0168601828b019283516002018085528b03015260061c601001806101e01651565b806103e01686018289019283516002018085528903015260051c601001806101e01651565b601f811161021b57509060018303926101da5750505060200180360361006c5750505050505050505050506000037f912CEB58A394E07D28F0D12384840918C6843FB439555FA7B461A4448976F7D57f60C89CE5C263405370A08B6D0302B0BB2F02D522D0E3951A7841182DB0F9FA8E7f30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD477759e26bcea0d48bacd4f263f1acdb5c4f5763473177fffffe60c0528260a052816080526000604003600360003603048001038060605280359060200135828080848009840960030883828009146103b65761019060005260206000fd5b82818009838160021b818080838809968009600302818180098783038001018a03806000528701099209840380019180016040528101602052826020518201600051840182808280098061040a5760006000fd5b818184099382828909830383808084800983800101880891820181930982878a09018b03829561052a565b604060605103606052808480808380098093098160605135819006606051602001358290068280808480098409600308838280091461047a5761019060005260206000fd5b9409920985818009868160021b81808287098103818780096003029082828009818001018060a051036000520109920980010160a051036020528583800182098060405290919286808084800993840994830987809486098403849283818009848080838509602051098401916000510984018580828009806104fd5760006000fd5b818184099382828909830383808084800983800101880891820181930982878a0901608051038280968199095b83818009848080838509602051098401916000510984018580828009806105515760006000fd5b818184099382828909830383808084800983800101880891820181930982878a09016080510382809681990983818009848080838509602051098401916000510984018580828009806105a45760006000fd5b818184099382828909830383808084800983800101880891820181930982878a09016080510382809681990983818009848080838509602051098401916000510984018580828009806105f75760006000fd5b818184099382828909830383808084800983800101880891820181930982878a090160805103828096819909838180098480808385096020510984019160005109840185808280098061064a5760006000fd5b818184099382828909830383808084800983800101880891820181930982878a090160805103828096819909838180098480808385096020510984019160005109840185808280098061069d5760006000fd5b818184099382828909830383808084800983800101880891820181930982878a09016080510382809681990983818009848080838509602051098401916000510984018580828009806106f05760006000fd5b818184099382828909830383808084800983800101880891820181930982878a09016080510382808097819a0960405109600060605103610435573d526001600160606000360304600f036101cd0261074501565b91849083098061732052806176e0528403806172e0526177205291839083098303838160c05109806176c05261770052806172c05261730052920993099384098061736052806176a0528203806172a0526177605292830983038360c051820980617680526177405280617280526173405292099309938409806173a0528061766052820380617260526177a05292830983038360c051820980617640526177805280617240526173805292099309938409806173e0528061762052820380617220526177e05292830983038360c051820980617600526177c05280617200526173c052920993099384098061742052806175e0528203806171e0526178205292830983038360c0518209806175c05261780052806171c05261740052920993099384098061746052806175a0528203806171a0526178605292830983038360c051820980617580526178405280617180526174405292099309938409806174a0528061756052820380617160526178a05292830983038360c051820980617540526178805280617140526174805292099309938409806174e0528061752052820380617120526178e05292830985038560c051820980617500526178c05280617100526174c052920992095b918490830980616b205280616ee052840380616ae052616f205291839083098303838160c0510980616ec052616f005280616ac052616b00529209930993840980616b605280616ea052820380616aa052616f605292830983038360c051820980616e8052616f405280616a8052616b40529209930993840980616ba05280616e6052820380616a6052616fa05292830983038360c051820980616e4052616f805280616a4052616b80529209930993840980616be05280616e2052820380616a2052616fe05292830983038360c051820980616e0052616fc05280616a0052616bc0529209930993840980616c205280616de0528203806169e0526170205292830983038360c051820980616dc05261700052806169c052616c00529209930993840980616c605280616da0528203806169a0526170605292830983038360c051820980616d8052617040528061698052616c40529209930993840980616ca05280616d6052820380616960526170a05292830983038360c051820980616d4052617080528061694052616c80529209930993840980616ce05280616d2052820380616920526170e05292830985038560c051820980616d00526170c0528061690052616cc052920992095b91849083098061632052806166e0528403806162e0526167205291839083098303838160c05109806166c05261670052806162c05261630052920993099384098061636052806166a0528203806162a0526167605292830983038360c051820980616680526167405280616280526163405292099309938409806163a0528061666052820380616260526167a05292830983038360c051820980616640526167805280616240526163805292099309938409806163e0528061662052820380616220526167e05292830983038360c051820980616600526167c05280616200526163c052920993099384098061642052806165e0528203806161e0526168205292830983038360c0518209806165c05261680052806161c05261640052920993099384098061646052806165a0528203806161a0526168605292830983038360c051820980616580526168405280616180526164405292099309938409806164a0528061656052820380616160526168a05292830983038360c051820980616540526168805280616140526164805292099309938409806164e0528061652052820380616120526168e05292830985038560c051820980616500526168c05280616100526164c052920992095b918490830980615b205280615ee052840380615ae052615f205291839083098303838160c0510980615ec052615f005280615ac052615b00529209930993840980615b605280615ea052820380615aa052615f605292830983038360c051820980615e8052615f405280615a8052615b40529209930993840980615ba05280615e6052820380615a6052615fa05292830983038360c051820980615e4052615f805280615a4052615b80529209930993840980615be05280615e2052820380615a2052615fe05292830983038360c051820980615e0052615fc05280615a0052615bc0529209930993840980615c205280615de0528203806159e0526160205292830983038360c051820980615dc05261600052806159c052615c00529209930993840980615c605280615da0528203806159a0526160605292830983038360c051820980615d8052616040528061598052615c40529209930993840980615ca05280615d6052820380615960526160a05292830983038360c051820980615d4052616080528061594052615c80529209930993840980615ce05280615d2052820380615920526160e05292830985038560c051820980615d00526160c0528061590052615cc052920992095b91849083098061532052806156e0528403806152e0526157205291839083098303838160c05109806156c05261570052806152c05261530052920993099384098061536052806156a0528203806152a0526157605292830983038360c051820980615680526157405280615280526153405292099309938409806153a0528061566052820380615260526157a05292830983038360c051820980615640526157805280615240526153805292099309938409806153e0528061562052820380615220526157e05292830983038360c051820980615600526157c05280615200526153c052920993099384098061542052806155e0528203806151e0526158205292830983038360c0518209806155c05261580052806151c05261540052920993099384098061546052806155a0528203806151a0526158605292830983038360c051820980615580526158405280615180526154405292099309938409806154a0528061556052820380615160526158a05292830983038360c051820980615540526158805280615140526154805292099309938409806154e0528061552052820380615120526158e05292830985038560c051820980615500526158c05280615100526154c052920992095b918490830980614b205280614ee052840380614ae052614f205291839083098303838160c0510980614ec052614f005280614ac052614b00529209930993840980614b605280614ea052820380614aa052614f605292830983038360c051820980614e8052614f405280614a8052614b40529209930993840980614ba05280614e6052820380614a6052614fa05292830983038360c051820980614e4052614f805280614a4052614b80529209930993840980614be05280614e2052820380614a2052614fe05292830983038360c051820980614e0052614fc05280614a0052614bc0529209930993840980614c205280614de0528203806149e0526150205292830983038360c051820980614dc05261500052806149c052614c00529209930993840980614c605280614da0528203806149a0526150605292830983038360c051820980614d8052615040528061498052614c40529209930993840980614ca05280614d6052820380614960526150a05292830983038360c051820980614d4052615080528061494052614c80529209930993840980614ce05280614d2052820380614920526150e05292830985038560c051820980614d00526150c0528061490052614cc052920992095b91849083098061432052806146e0528403806142e0526147205291839083098303838160c05109806146c05261470052806142c05261430052920993099384098061436052806146a0528203806142a0526147605292830983038360c051820980614680526147405280614280526143405292099309938409806143a0528061466052820380614260526147a05292830983038360c051820980614640526147805280614240526143805292099309938409806143e0528061462052820380614220526147e05292830983038360c051820980614600526147c05280614200526143c052920993099384098061442052806145e0528203806141e0526148205292830983038360c0518209806145c05261480052806141c05261440052920993099384098061446052806145a0528203806141a0526148605292830983038360c051820980614580526148405280614180526144405292099309938409806144a0528061456052820380614160526148a05292830983038360c051820980614540526148805280614140526144805292099309938409806144e0528061452052820380614120526148e05292830985038560c051820980614500526148c05280614100526144c052920992095b918490830980613b205280613ee052840380613ae052613f205291839083098303838160c0510980613ec052613f005280613ac052613b00529209930993840980613b605280613ea052820380613aa052613f605292830983038360c051820980613e8052613f405280613a8052613b40529209930993840980613ba05280613e6052820380613a6052613fa05292830983038360c051820980613e4052613f805280613a4052613b80529209930993840980613be05280613e2052820380613a2052613fe05292830983038360c051820980613e0052613fc05280613a0052613bc0529209930993840980613c205280613de0528203806139e0526140205292830983038360c051820980613dc05261400052806139c052613c00529209930993840980613c605280613da0528203806139a0526140605292830983038360c051820980613d8052614040528061398052613c40529209930993840980613ca05280613d6052820380613960526140a05292830983038360c051820980613d4052614080528061394052613c80529209930993840980613ce05280613d2052820380613920526140e05292830985038560c051820980613d00526140c0528061390052613cc052920992095b91849083098061332052806136e0528403806132e0526137205291839083098303838160c05109806136c05261370052806132c05261330052920993099384098061336052806136a0528203806132a0526137605292830983038360c051820980613680526137405280613280526133405292099309938409806133a0528061366052820380613260526137a05292830983038360c051820980613640526137805280613240526133805292099309938409806133e0528061362052820380613220526137e05292830983038360c051820980613600526137c05280613200526133c052920993099384098061342052806135e0528203806131e0526138205292830983038360c0518209806135c05261380052806131c05261340052920993099384098061346052806135a0528203806131a0526138605292830983038360c051820980613580526138405280613180526134405292099309938409806134a0528061356052820380613160526138a05292830983038360c051820980613540526138805280613140526134805292099309938409806134e0528061352052820380613120526138e05292830985038560c051820980613500526138c05280613100526134c052920992095b918490830980612b205280612ee052840380612ae052612f205291839083098303838160c0510980612ec052612f005280612ac052612b00529209930993840980612b605280612ea052820380612aa052612f605292830983038360c051820980612e8052612f405280612a8052612b40529209930993840980612ba05280612e6052820380612a6052612fa05292830983038360c051820980612e4052612f805280612a4052612b80529209930993840980612be05280612e2052820380612a2052612fe05292830983038360c051820980612e0052612fc05280612a0052612bc0529209930993840980612c205280612de0528203806129e0526130205292830983038360c051820980612dc05261300052806129c052612c00529209930993840980612c605280612da0528203806129a0526130605292830983038360c051820980612d8052613040528061298052612c40529209930993840980612ca05280612d6052820380612960526130a05292830983038360c051820980612d4052613080528061294052612c80529209930993840980612ce05280612d2052820380612920526130e05292830985038560c051820980612d00526130c0528061290052612cc052920992095b91849083098061232052806126e0528403806122e0526127205291839083098303838160c05109806126c05261270052806122c05261230052920993099384098061236052806126a0528203806122a0526127605292830983038360c051820980612680526127405280612280526123405292099309938409806123a0528061266052820380612260526127a05292830983038360c051820980612640526127805280612240526123805292099309938409806123e0528061262052820380612220526127e05292830983038360c051820980612600526127c05280612200526123c052920993099384098061242052806125e0528203806121e0526128205292830983038360c0518209806125c05261280052806121c05261240052920993099384098061246052806125a0528203806121a0526128605292830983038360c051820980612580526128405280612180526124405292099309938409806124a0528061256052820380612160526128a05292830983038360c051820980612540526128805280612140526124805292099309938409806124e0528061252052820380612120526128e05292830985038560c051820980612500526128c05280612100526124c052920992095b918490830980611b205280611ee052840380611ae052611f205291839083098303838160c0510980611ec052611f005280611ac052611b00529209930993840980611b605280611ea052820380611aa052611f605292830983038360c051820980611e8052611f405280611a8052611b40529209930993840980611ba05280611e6052820380611a6052611fa05292830983038360c051820980611e4052611f805280611a4052611b80529209930993840980611be05280611e2052820380611a2052611fe05292830983038360c051820980611e0052611fc05280611a0052611bc0529209930993840980611c205280611de0528203806119e0526120205292830983038360c051820980611dc05261200052806119c052611c00529209930993840980611c605280611da0528203806119a0526120605292830983038360c051820980611d8052612040528061198052611c40529209930993840980611ca05280611d6052820380611960526120a05292830983038360c051820980611d4052612080528061194052611c80529209930993840980611ce05280611d2052820380611920526120e05292830985038560c051820980611d00526120c0528061190052611cc052920992095b91849083098061132052806116e0528403806112e0526117205291839083098303838160c05109806116c05261170052806112c05261130052920993099384098061136052806116a0528203806112a0526117605292830983038360c051820980611680526117405280611280526113405292099309938409806113a0528061166052820380611260526117a05292830983038360c051820980611640526117805280611240526113805292099309938409806113e0528061162052820380611220526117e05292830983038360c051820980611600526117c05280611200526113c052920993099384098061142052806115e0528203806111e0526118205292830983038360c0518209806115c05261180052806111c05261140052920993099384098061146052806115a0528203806111a0526118605292830983038360c051820980611580526118405280611180526114405292099309938409806114a0528061156052820380611160526118a05292830983038360c051820980611540526118805280611140526114805292099309938409806114e0528061152052820380611120526118e05292830985038560c051820980611500526118c05280611100526114c052920992095b918490830980610b205280610ee052840380610ae052610f205291839083098303838160c0510980610ec052610f005280610ac052610b00529209930993840980610b605280610ea052820380610aa052610f605292830983038360c051820980610e8052610f405280610a8052610b40529209930993840980610ba05280610e6052820380610a6052610fa05292830983038360c051820980610e4052610f805280610a4052610b80529209930993840980610be05280610e2052820380610a2052610fe05292830983038360c051820980610e0052610fc05280610a0052610bc0529209930993840980610c205280610de0528203806109e0526110205292830983038360c051820980610dc05261100052806109c052610c00529209930993840980610c605280610da0528203806109a0526110605292830983038360c051820980610d8052611040528061098052610c40529209930993840980610ca05280610d6052820380610960526110a05292830983038360c051820980610d4052611080528061094052610c80529209930993840980610ce05280610d2052820380610920526110e05292830985038560c051820980610d00526110c0528061090052610cc052920992095b91849083098061032052806106e0528403806102e0526107205291839083098303838160c05109806106c05261070052806102c05261030052920993099384098061036052806106a0528203806102a0526107605292830983038360c051820980610680526107405280610280526103405292099309938409806103a0528061066052820380610260526107a05292830983038360c051820980610640526107805280610240526103805292099309938409806103e0528061062052820380610220526107e05292830983038360c051820980610600526107c05280610200526103c052920993099384098061042052806105e0528203806101e0526108205292830983038360c0518209806105c05261080052806101c05261040052920993099384098061046052806105a0528203806101a0526108605292830983038360c051820980610580526108405280610180526104405292099309938409806104a0528061056052820380610160526108a05292830983038360c051820980610540526108805280610140526104805298090981038160c051820980610500526108c05280610100526104c052930909806104e0528061052052810380610120526108e0523d518460071b606060003603046108000261020001035b850180511561225657607c6138c6601e3980518103601e870301516202ffe0168051840390602001518403600160606000360304610800026102000151603e01606060003603046108000261020001526002848a019451035161ffff16565b858082800981605a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160588703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160568703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160548703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160528703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160508703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160488703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160468703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160448703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160428703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160408703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160388703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160368703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160348703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160328703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160308703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160288703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160268703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160248703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160228703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160208703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b8582800192830986818001818080838909810397800960030281818009888001019788010992090191869109850388840193515161ffff16565b858082800981605a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160588703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160568703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160548703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160528703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160508703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981604a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160488703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160468703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160448703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160428703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160408703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981603a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160388703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160368703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160348703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160328703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160308703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602e8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602c8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b858082800981602a8703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160288703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160268703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160248703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160228703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b85808280098160208703516202ffe0168060200151828685098391098601928291510986018180808380098184820999098103968189818780098a800101089809940993850109018603905b806136a757505050508460071b606060003603046108000261020001035b85018051156134dd57603e60606000360304610800026102000151036060600036030461080002610200015280518103601e870301516202ffe0168051840390602001518403600160028451038452835161353757613627565b85808280098186516002810388528703601e8d0301516202ffe016806020015182868509839109860192829151098601818080838009806135ff57876135a8575050505086516002810388528703601e8d0301516202ffe01680602001518203955051900394505050506001613620565b818680096135ea575050505050505085828001928309868180018180808389098103978009600302818180098880010197880109920901918691098503613620565b50505050505050505050600060016000613620565b8184820999098103968189818780098a800101089809940993850109018603905b8351613537575b836060600036030461080002610200011461367a57858280019283098681800181808083890981039780096003028181800988800101978801099209019186910985039288019283511561362757613537565b806136a757801582600114841516166136935760006000fd5b60405260205260005250505050505060603df35b8486910960405284900684036020528390063d5250505050505060603df300000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000027a00000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000025200000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000027a00000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000022a00000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000027a00000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000025200000000000000000000000000000000000000000000000000000000000002a2000000000000000000000000000000000000000000000000000000000000027a00000000000000000000000000000000000000000000000000000000000002a22b9d2b512b052ab92a6d2a2129d52989293d28f128a52859280d27c12775272926dd2691264525f925ad2561251524c9247d243123e52399234d230122b534bf3473342733db338f334332f732ab325f321331c7317b312f30e33097304b2fff2fb32f672f1b2ecf2e832e372deb2d9f2d532d072cbb2c6f2c232bd7
\ No newline at end of file
diff --git a/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.toml b/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.toml
new file mode 100644
index 0000000..0e60fae
--- /dev/null
+++ b/src/execution/evm/benches/inputs/benchmarks/main/weierstrudel.toml
@@ -0,0 +1,34 @@
+[0]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002" },
+    { c = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+]
+out = "0267044364fafcc4179b3d9841976c5f9751085391a8d62ea2d85f3add49df212fd05e78e4d6069841dca813b82c477c70ff014564c72add2f3258355ae3900e1b237dbf02109b56a5d2e9bd7ac6d5613b4b685f39689ba531cc4383128a151f"
+
+[1]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002", x = 2 },
+    { c = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", x = 2 },
+]
+out = "23386b694c363dc9e2e2eee49aa5bf940e847fc66a54058e42b780c97d7e53630dbf2d60869bd617de2578e9ccd52c903ec669efd4219228e91c72407568ae2618b263f94f331dfebd495772e61d3517b404ce327c504b23f3b15af8f44bdfad"
+
+[3]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002", x = 4 },
+    { c = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", x = 4 },
+]
+out = "124f4bf2511c4ae2770b50b1ab956174bf87260d6ce8255c36ac44d8c354ceb3251e057af103a5b54eef7986550787979eb30384b77dffd8e57891c771553f4400c87e7d58a5ffc110788895ed1569b8b21bfac97502da2f38bd273c5046250a"
+
+[9]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002", x = 10 },
+    { c = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", x = 10 },
+]
+out = "1c895346881918d3b79f69a13cf38ba4f4377b3225edb88a93135f3b0ec986c20dc6f1ddba9b2573209c7f1165bf5eb03786ecadc30e130ff67c17fda6c4fb700fe7b15aad333f3b985a54c2aa523c9e9c4a2e4f53eb8abaa49668289b43147b"
+
+[14]
+args = [
+    { c = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002", x = 15 },
+    { c = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", x = 15 },
+]
+out = "0f7f8f15d02f4e47ac51fe38826c20f511253fe504557da98f0aa915cb21db9b1fbfa0a8ccd10005eba9e5f7d575e530baa14c9711e9dbedca27a79f01c0ddac16989a70b325764d40bb22072b810f8606c35e6af9116fbdac4bc53c081109d3"
diff --git a/src/execution/evm/common.rs b/src/execution/evm/common.rs
index a8311ed..97185a4 100644
--- a/src/execution/evm/common.rs
+++ b/src/execution/evm/common.rs
@@ -6,7 +6,7 @@ use strum_macros::Display;
 
 /// Message status code.
 #[must_use]
-#[derive(Clone, Debug, Display, PartialEq)]
+#[derive(Clone, Copy, Debug, Display, PartialEq)]
 pub enum StatusCode {
     /// Execution finished with success.
     #[strum(serialize = "success")]
@@ -88,7 +88,7 @@ pub enum StatusCode {
 
     /// EVM implementation generic internal error.
     #[strum(serialize = "internal error")]
-    InternalError(String),
+    InternalError(&'static str),
 }
 
 /// The kind of call-like instruction.
@@ -211,17 +211,17 @@ impl From<SuccessfulOutput> for Output {
     }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn u256_to_address(v: U256) -> Address {
     H256(v.to_be_bytes()).into()
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn address_to_u256(v: Address) -> U256 {
     U256::from_be_bytes(H256::from(v).0)
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn u256_from_slice(v: &[u8]) -> U256 {
     debug_assert!(v.len() <= 32, "invalid len");
     match v.len() {
diff --git a/src/execution/evm/continuation/interrupt.rs b/src/execution/evm/continuation/interrupt.rs
deleted file mode 100644
index d2e0a2d..0000000
--- a/src/execution/evm/continuation/interrupt.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use super::*;
-
-macro_rules! interrupt {
-    ( $(#[$outer:meta])* $name:ident => $resume_with:ty) => {
-		$(#[$outer])*
-        pub struct $name {
-            pub(crate) inner: InnerCoroutine,
-        }
-
-        impl $name {
-            pub fn resume(self, resume_data: $resume_with) -> Interrupt {
-                resume_interrupt(self.inner, resume_data.into())
-            }
-        }
-    };
-}
-
-interrupt! {
-    /// EVM has just been created. Resume this interrupt to start execution.
-    StartedInterrupt => ()
-}
-interrupt! {
-    /// New instruction has been encountered.
-    InstructionStartInterrupt => StateModifier
-}
-interrupt! {
-    /// Does this account exist?
-    AccountExistsInterrupt => AccountExistsStatus
-}
-interrupt! {
-    /// Need this storage key.
-    GetStorageInterrupt => StorageValue
-}
-interrupt! {
-    /// Set this storage key.
-    SetStorageInterrupt => StorageStatusInfo
-}
-interrupt! {
-    /// Get balance of this account.
-    GetBalanceInterrupt => Balance
-}
-interrupt! {
-    /// Get code size of this account.
-    GetCodeSizeInterrupt => CodeSize
-}
-interrupt! {
-    /// Get code hash of this account.
-    GetCodeHashInterrupt => CodeHash
-}
-interrupt! {
-    /// Get code of this account.
-    CopyCodeInterrupt  => Code
-}
-interrupt! {
-    /// Selfdestruct this account.
-    SelfdestructInterrupt  => ()
-}
-interrupt! {
-    /// Execute this message as a new call.
-    CallInterrupt => CallOutput
-}
-interrupt! {
-    /// Get `TxContext` for this call.
-    GetTxContextInterrupt => TxContextData
-}
-interrupt! {
-    /// Get block hash for this account.
-    GetBlockHashInterrupt => BlockHash
-}
-interrupt! {
-    /// Emit log message.
-    EmitLogInterrupt => ()
-}
-interrupt! {
-    /// Access this account and return its status.
-    AccessAccountInterrupt => AccessAccountStatus
-}
-interrupt! {
-    /// Access this storage key and return its status.
-    AccessStorageInterrupt => AccessStorageStatus
-}
-
-/// Execution complete, this interrupt cannot be resumed.
-pub struct ExecutionComplete(pub(crate) InnerCoroutine);
-
-/// Collection of all possible interrupts. Match on this to get the specific interrupt returned.
-#[derive(From)]
-pub enum Interrupt {
-    InstructionStart {
-        interrupt: InstructionStartInterrupt,
-        pc: usize,
-        opcode: OpCode,
-        state: Box<ExecutionState>,
-    },
-    AccountExists {
-        interrupt: AccountExistsInterrupt,
-        address: Address,
-    },
-    GetStorage {
-        interrupt: GetStorageInterrupt,
-        address: Address,
-        location: U256,
-    },
-    SetStorage {
-        interrupt: SetStorageInterrupt,
-        address: Address,
-        location: U256,
-        value: U256,
-    },
-    GetBalance {
-        interrupt: GetBalanceInterrupt,
-        address: Address,
-    },
-    GetCodeSize {
-        interrupt: GetCodeSizeInterrupt,
-        address: Address,
-    },
-    GetCodeHash {
-        interrupt: GetCodeHashInterrupt,
-        address: Address,
-    },
-    CopyCode {
-        interrupt: CopyCodeInterrupt,
-        address: Address,
-        offset: usize,
-        max_size: usize,
-    },
-    Selfdestruct {
-        interrupt: SelfdestructInterrupt,
-        address: Address,
-        beneficiary: Address,
-    },
-    Call {
-        interrupt: CallInterrupt,
-        call_data: Call,
-    },
-    GetTxContext {
-        interrupt: GetTxContextInterrupt,
-    },
-    GetBlockHash {
-        interrupt: GetBlockHashInterrupt,
-        block_number: u64,
-    },
-    EmitLog {
-        interrupt: EmitLogInterrupt,
-        address: Address,
-        data: Bytes,
-        topics: ArrayVec<U256, 4>,
-    },
-    AccessAccount {
-        interrupt: AccessAccountInterrupt,
-        address: Address,
-    },
-    AccessStorage {
-        interrupt: AccessStorageInterrupt,
-        address: Address,
-        location: U256,
-    },
-    Complete {
-        interrupt: ExecutionComplete,
-        result: Result<SuccessfulOutput, StatusCode>,
-    },
-}
diff --git a/src/execution/evm/continuation/interrupt_data.rs b/src/execution/evm/continuation/interrupt_data.rs
deleted file mode 100644
index 49803fe..0000000
--- a/src/execution/evm/continuation/interrupt_data.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use super::*;
-
-#[derive(Debug)]
-pub enum Call {
-    Call(InterpreterMessage),
-    Create(CreateMessage),
-}
-
-#[derive(Debug)]
-pub enum InterruptData {
-    InstructionStart {
-        pc: usize,
-        opcode: OpCode,
-        state: Box<ExecutionState>,
-    },
-    AccountExists {
-        address: Address,
-    },
-    GetStorage {
-        address: Address,
-        location: U256,
-    },
-    SetStorage {
-        address: Address,
-        location: U256,
-        value: U256,
-    },
-    GetBalance {
-        address: Address,
-    },
-    GetCodeSize {
-        address: Address,
-    },
-    GetCodeHash {
-        address: Address,
-    },
-    CopyCode {
-        address: Address,
-        offset: usize,
-        max_size: usize,
-    },
-    Selfdestruct {
-        address: Address,
-        beneficiary: Address,
-    },
-    Call(Call),
-    GetTxContext,
-    GetBlockHash {
-        block_number: u64,
-    },
-    EmitLog {
-        address: Address,
-        data: Bytes,
-        topics: ArrayVec<U256, 4>,
-    },
-    AccessAccount {
-        address: Address,
-    },
-    AccessStorage {
-        address: Address,
-        location: U256,
-    },
-}
diff --git a/src/execution/evm/continuation/mod.rs b/src/execution/evm/continuation/mod.rs
deleted file mode 100644
index a5b581b..0000000
--- a/src/execution/evm/continuation/mod.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use self::{interrupt::*, interrupt_data::*, resume_data::*};
-use super::{
-    common::*,
-    host::{AccessStatus, StorageStatus, TxContext},
-    state::ExecutionState,
-    *,
-};
-use arrayvec::ArrayVec;
-use derive_more::From;
-use enum_as_inner::EnumAsInner;
-use ethereum_types::Address;
-use ethnum::U256;
-use std::{
-    convert::Infallible,
-    ops::{Generator, GeneratorState},
-    pin::Pin,
-};
-
-/// Interrupts.
-pub mod interrupt;
-/// Data attached to interrupts.
-pub mod interrupt_data;
-/// Data required for resume.
-pub mod resume_data;
-
-pub(crate) type InnerCoroutine = Pin<
-    Box<
-        dyn Generator<
-                ResumeData,
-                Yield = InterruptData,
-                Return = Result<SuccessfulOutput, StatusCode>,
-            > + Send
-            + Sync,
-    >,
->;
-
-fn resume_interrupt(mut inner: InnerCoroutine, resume_data: ResumeData) -> Interrupt {
-    match inner.as_mut().resume(resume_data) {
-        GeneratorState::Yielded(interrupt) => match interrupt {
-            InterruptData::InstructionStart { pc, opcode, state } => Interrupt::InstructionStart {
-                interrupt: InstructionStartInterrupt { inner },
-                pc,
-                opcode,
-                state,
-            },
-            InterruptData::AccountExists { address } => Interrupt::AccountExists {
-                interrupt: AccountExistsInterrupt { inner },
-                address,
-            },
-            InterruptData::GetStorage { address, location } => Interrupt::GetStorage {
-                interrupt: GetStorageInterrupt { inner },
-                address,
-                location,
-            },
-            InterruptData::SetStorage {
-                address,
-                location,
-                value,
-            } => Interrupt::SetStorage {
-                interrupt: SetStorageInterrupt { inner },
-                address,
-                location,
-                value,
-            },
-            InterruptData::GetBalance { address } => Interrupt::GetBalance {
-                interrupt: GetBalanceInterrupt { inner },
-                address,
-            },
-            InterruptData::GetCodeSize { address } => Interrupt::GetCodeSize {
-                interrupt: GetCodeSizeInterrupt { inner },
-                address,
-            },
-            InterruptData::GetCodeHash { address } => Interrupt::GetCodeHash {
-                interrupt: GetCodeHashInterrupt { inner },
-                address,
-            },
-            InterruptData::CopyCode {
-                address,
-                offset,
-                max_size,
-            } => Interrupt::CopyCode {
-                interrupt: CopyCodeInterrupt { inner },
-                address,
-                offset,
-                max_size,
-            },
-            InterruptData::Selfdestruct {
-                address,
-                beneficiary,
-            } => Interrupt::Selfdestruct {
-                interrupt: SelfdestructInterrupt { inner },
-                address,
-                beneficiary,
-            },
-            InterruptData::Call(call_data) => Interrupt::Call {
-                interrupt: CallInterrupt { inner },
-                call_data,
-            },
-            InterruptData::GetTxContext => Interrupt::GetTxContext {
-                interrupt: GetTxContextInterrupt { inner },
-            },
-            InterruptData::GetBlockHash { block_number } => Interrupt::GetBlockHash {
-                interrupt: GetBlockHashInterrupt { inner },
-                block_number,
-            },
-            InterruptData::EmitLog {
-                address,
-                data,
-                topics,
-            } => Interrupt::EmitLog {
-                interrupt: EmitLogInterrupt { inner },
-                address,
-                data,
-                topics,
-            },
-            InterruptData::AccessAccount { address } => Interrupt::AccessAccount {
-                interrupt: AccessAccountInterrupt { inner },
-                address,
-            },
-            InterruptData::AccessStorage { address, location } => Interrupt::AccessStorage {
-                interrupt: AccessStorageInterrupt { inner },
-                address,
-                location,
-            },
-        },
-        GeneratorState::Complete(result) => Interrupt::Complete {
-            interrupt: ExecutionComplete(inner),
-            result,
-        },
-    }
-}
diff --git a/src/execution/evm/continuation/resume_data.rs b/src/execution/evm/continuation/resume_data.rs
deleted file mode 100644
index b43c018..0000000
--- a/src/execution/evm/continuation/resume_data.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use super::*;
-use educe::Educe;
-use std::sync::Arc;
-
-pub type StateModifier = Option<Arc<dyn Fn(&mut ExecutionState) + Send + Sync>>;
-
-#[derive(Debug)]
-pub struct AccountExistsStatus {
-    pub exists: bool,
-}
-
-#[derive(Debug)]
-pub struct Balance {
-    pub balance: U256,
-}
-
-#[derive(Debug)]
-pub struct CodeSize {
-    pub code_size: U256,
-}
-
-#[derive(Debug)]
-pub struct StorageValue {
-    pub value: U256,
-}
-
-#[derive(Debug)]
-pub struct StorageStatusInfo {
-    pub status: StorageStatus,
-}
-
-#[derive(Debug)]
-pub struct CodeHash {
-    pub hash: U256,
-}
-
-#[derive(Debug)]
-pub struct BlockHash {
-    pub hash: U256,
-}
-
-#[derive(Debug)]
-pub struct TxContextData {
-    pub context: TxContext,
-}
-
-#[derive(Debug)]
-pub struct Code {
-    pub code: Bytes,
-}
-
-#[derive(Debug)]
-pub struct CallOutput {
-    pub output: Output,
-}
-
-#[derive(Debug)]
-pub struct AccessAccountStatus {
-    pub status: AccessStatus,
-}
-
-#[derive(Debug)]
-pub struct AccessStorageStatus {
-    pub status: AccessStatus,
-}
-
-/// All resumed data variants.
-#[derive(Educe, EnumAsInner, From)]
-#[educe(Debug)]
-pub(crate) enum ResumeData {
-    #[from(ignore)]
-    Empty,
-    StateModifier(#[educe(Debug(false))] StateModifier),
-    AccountExistsStatus(AccountExistsStatus),
-    Balance(Balance),
-    CodeSize(CodeSize),
-    StorageValue(StorageValue),
-    StorageStatusInfo(StorageStatusInfo),
-    CodeHash(CodeHash),
-    BlockHash(BlockHash),
-    TxContextData(TxContextData),
-    Code(Code),
-    CallOutput(CallOutput),
-    AccessAccountStatus(AccessAccountStatus),
-    AccessStorageStatus(AccessStorageStatus),
-    Done(Infallible),
-}
-
-impl From<()> for ResumeData {
-    fn from(_: ()) -> Self {
-        Self::Empty
-    }
-}
diff --git a/src/execution/evm/host.rs b/src/execution/evm/host.rs
index 956d89c..f6179d5 100644
--- a/src/execution/evm/host.rs
+++ b/src/execution/evm/host.rs
@@ -1,4 +1,10 @@
-use super::common::{InterpreterMessage, Output};
+use crate::execution::tracer::{NoopTracer, Tracer};
+
+use super::{
+    common::{InterpreterMessage, Output},
+    CreateMessage,
+};
+use bytes::Bytes;
 use ethereum_types::Address;
 use ethnum::U256;
 
@@ -52,44 +58,56 @@ pub struct TxContext {
     pub block_base_fee: U256,
 }
 
+#[derive(Clone, Debug, PartialEq)]
+pub enum Call<'a> {
+    Call(&'a InterpreterMessage),
+    Create(&'a CreateMessage),
+}
+
 /// Abstraction that exposes host context to EVM.
 pub trait Host {
+    fn trace_instructions(&self) -> bool {
+        false
+    }
+    fn tracer(&mut self, mut f: impl FnMut(&mut dyn Tracer)) {
+        (f)(&mut NoopTracer)
+    }
     /// Check if an account exists.
-    fn account_exists(&self, address: Address) -> bool;
+    fn account_exists(&mut self, address: Address) -> bool;
     /// Get value of a storage key.
     ///
     /// Returns `Ok(U256::zero())` if does not exist.
-    fn get_storage(&self, address: Address, key: U256) -> U256;
+    fn get_storage(&mut self, address: Address, key: U256) -> U256;
     /// Set value of a storage key.
     fn set_storage(&mut self, address: Address, key: U256, value: U256) -> StorageStatus;
     /// Get balance of an account.
     ///
     /// Returns `Ok(0)` if account does not exist.
-    fn get_balance(&self, address: Address) -> U256;
+    fn get_balance(&mut self, address: Address) -> U256;
     /// Get code size of an account.
     ///
     /// Returns `Ok(0)` if account does not exist.
-    fn get_code_size(&self, address: Address) -> U256;
+    fn get_code_size(&mut self, address: Address) -> U256;
     /// Get code hash of an account.
     ///
     /// Returns `Ok(0)` if account does not exist.
-    fn get_code_hash(&self, address: Address) -> U256;
+    fn get_code_hash(&mut self, address: Address) -> U256;
     /// Copy code of an account.
     ///
     /// Returns `Ok(0)` if offset is invalid.
-    fn copy_code(&self, address: Address, offset: usize, buffer: &mut [u8]) -> usize;
+    fn copy_code(&mut self, address: Address, offset: usize, buffer: &mut [u8]) -> usize;
     /// Self-destruct account.
     fn selfdestruct(&mut self, address: Address, beneficiary: Address);
     /// Call to another account.
-    fn call(&mut self, msg: &InterpreterMessage) -> Output;
+    fn call(&mut self, msg: Call) -> Output;
     /// Retrieve transaction context.
-    fn get_tx_context(&self) -> TxContext;
+    fn get_tx_context(&mut self) -> TxContext;
     /// Get block hash.
     ///
     /// Returns `Ok(U256::zero())` if block does not exist.
-    fn get_block_hash(&self, block_number: u64) -> U256;
+    fn get_block_hash(&mut self, block_number: u64) -> U256;
     /// Emit a log.
-    fn emit_log(&mut self, address: Address, data: &[u8], topics: &[U256]);
+    fn emit_log(&mut self, address: Address, data: Bytes, topics: &[U256]);
     /// Mark account as warm, return previous access status.
     ///
     /// Returns `Ok(AccessStatus::Cold)` if account does not exist.
@@ -104,11 +122,11 @@ pub trait Host {
 pub struct DummyHost;
 
 impl Host for DummyHost {
-    fn account_exists(&self, _: Address) -> bool {
+    fn account_exists(&mut self, _: Address) -> bool {
         todo!()
     }
 
-    fn get_storage(&self, _: Address, _: U256) -> U256 {
+    fn get_storage(&mut self, _: Address, _: U256) -> U256 {
         todo!()
     }
 
@@ -116,19 +134,19 @@ impl Host for DummyHost {
         todo!()
     }
 
-    fn get_balance(&self, _: Address) -> U256 {
+    fn get_balance(&mut self, _: Address) -> U256 {
         todo!()
     }
 
-    fn get_code_size(&self, _: Address) -> U256 {
+    fn get_code_size(&mut self, _: Address) -> U256 {
         todo!()
     }
 
-    fn get_code_hash(&self, _: Address) -> U256 {
+    fn get_code_hash(&mut self, _: Address) -> U256 {
         todo!()
     }
 
-    fn copy_code(&self, _: Address, _: usize, _: &mut [u8]) -> usize {
+    fn copy_code(&mut self, _: Address, _: usize, _: &mut [u8]) -> usize {
         todo!()
     }
 
@@ -136,19 +154,19 @@ impl Host for DummyHost {
         todo!()
     }
 
-    fn call(&mut self, _: &InterpreterMessage) -> Output {
+    fn call(&mut self, _: Call) -> Output {
         todo!()
     }
 
-    fn get_tx_context(&self) -> TxContext {
+    fn get_tx_context(&mut self) -> TxContext {
         todo!()
     }
 
-    fn get_block_hash(&self, _: u64) -> U256 {
+    fn get_block_hash(&mut self, _: u64) -> U256 {
         todo!()
     }
 
-    fn emit_log(&mut self, _: Address, _: &[u8], _: &[U256]) {
+    fn emit_log(&mut self, _: Address, _: Bytes, _: &[U256]) {
         todo!()
     }
 
diff --git a/src/execution/evm/instructions/arithmetic.rs b/src/execution/evm/instructions/arithmetic.rs
index d043f3f..4921188 100644
--- a/src/execution/evm/instructions/arithmetic.rs
+++ b/src/execution/evm/instructions/arithmetic.rs
@@ -4,52 +4,52 @@ use crate::{
 };
 use ethereum_types::U512;
 use ethnum::U256;
-use i256::I256;
+use i256::{i256_div, i256_mod};
 
-#[inline(always)]
+#[inline]
 pub(crate) fn add(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
     stack.push(a.overflowing_add(b).0);
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn mul(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
     stack.push(a.overflowing_mul(b).0);
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn sub(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
     stack.push(a.overflowing_sub(b).0);
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn div(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
     *b = if *b == 0 { U256::ZERO } else { a / *b };
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn sdiv(stack: &mut Stack) {
-    let a = I256::from(stack.pop());
-    let b = I256::from(stack.pop());
-    let v = a / b;
-    stack.push(v.into());
+    let a = stack.pop();
+    let b = stack.pop();
+    let v = i256_div(a, b);
+    stack.push(v);
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn modulo(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
     *b = if *b == 0 { U256::ZERO } else { a % *b };
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn smod(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
@@ -57,11 +57,11 @@ pub(crate) fn smod(stack: &mut Stack) {
     if *b == 0 {
         *b = U256::ZERO
     } else {
-        let v = I256::from(a) % I256::from(*b);
-        *b = v.into();
+        *b = i256_mod(a, *b);
     };
 }
 
+#[inline]
 pub(crate) fn addmod(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
@@ -83,6 +83,7 @@ pub(crate) fn addmod(stack: &mut Stack) {
     stack.push(v);
 }
 
+#[inline]
 pub(crate) fn mulmod(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
@@ -104,6 +105,7 @@ pub(crate) fn mulmod(stack: &mut Stack) {
     stack.push(v);
 }
 
+#[inline]
 fn log2floor(value: U256) -> u64 {
     debug_assert!(value != 0);
     let mut l: u64 = 256;
@@ -122,6 +124,7 @@ fn log2floor(value: U256) -> u64 {
     l
 }
 
+#[inline]
 pub(crate) fn exp<const REVISION: Revision>(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let mut base = state.stack.pop();
     let mut power = state.stack.pop();
@@ -156,6 +159,7 @@ pub(crate) fn exp<const REVISION: Revision>(state: &mut ExecutionState) -> Resul
     Ok(())
 }
 
+#[inline]
 pub(crate) fn signextend(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
diff --git a/src/execution/evm/instructions/bitwise.rs b/src/execution/evm/instructions/bitwise.rs
index f30cbf7..d5af579 100644
--- a/src/execution/evm/instructions/bitwise.rs
+++ b/src/execution/evm/instructions/bitwise.rs
@@ -1,7 +1,8 @@
 use crate::execution::evm::state::Stack;
 use ethnum::U256;
-use i256::{Sign, I256};
+use i256::{i256_sign, two_compl, Sign};
 
+#[inline]
 pub(crate) fn byte(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.pop();
@@ -21,7 +22,7 @@ pub(crate) fn byte(stack: &mut Stack) {
     stack.push(ret)
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn shl(stack: &mut Stack) {
     let shift = stack.pop();
     let value = stack.get_mut(0);
@@ -33,7 +34,7 @@ pub(crate) fn shl(stack: &mut Stack) {
     };
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn shr(stack: &mut Stack) {
     let shift = stack.pop();
     let value = stack.get_mut(0);
@@ -45,30 +46,31 @@ pub(crate) fn shr(stack: &mut Stack) {
     };
 }
 
+#[inline]
 pub(crate) fn sar(stack: &mut Stack) {
     let shift = stack.pop();
-    let value = I256::from(stack.pop());
+    let mut value = stack.pop();
 
-    let ret = if value == I256::zero() || shift >= 256 {
-        match value.0 {
+    let value_sign = i256_sign::<true>(&mut value);
+
+    stack.push(if value == U256::ZERO || shift >= 256 {
+        match value_sign {
             // value is 0 or >=1, pushing 0
-            Sign::Plus | Sign::NoSign => U256::ZERO,
+            Sign::Plus | Sign::Zero => U256::ZERO,
             // value is <0, pushing -1
-            Sign::Minus => I256(Sign::Minus, U256::ONE).into(),
+            Sign::Minus => two_compl(U256::ONE),
         }
     } else {
-        let shift = shift.as_u8();
+        let shift = shift.as_u128();
 
-        match value.0 {
-            Sign::Plus | Sign::NoSign => value.1 >> shift,
+        match value_sign {
+            Sign::Plus | Sign::Zero => value >> shift,
             Sign::Minus => {
-                let shifted = ((value.1.overflowing_sub(U256::ONE).0) >> shift)
+                let shifted = ((value.overflowing_sub(U256::ONE).0) >> shift)
                     .overflowing_add(U256::ONE)
                     .0;
-                I256(Sign::Minus, shifted).into()
+                two_compl(shifted)
             }
         }
-    };
-
-    stack.push(ret)
+    });
 }
diff --git a/src/execution/evm/instructions/boolean.rs b/src/execution/evm/instructions/boolean.rs
index 2c56115..c2c331f 100644
--- a/src/execution/evm/instructions/boolean.rs
+++ b/src/execution/evm/instructions/boolean.rs
@@ -1,8 +1,9 @@
 use crate::execution::evm::state::*;
 use ethnum::U256;
-use i256::I256;
+use i256::i256_cmp;
+use std::cmp::Ordering;
 
-#[inline(always)]
+#[inline]
 pub(crate) fn lt(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
@@ -10,7 +11,7 @@ pub(crate) fn lt(stack: &mut Stack) {
     *b = if a.lt(b) { U256::ONE } else { U256::ZERO }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn gt(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
@@ -18,23 +19,31 @@ pub(crate) fn gt(stack: &mut Stack) {
     *b = if a.gt(b) { U256::ONE } else { U256::ZERO }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn slt(stack: &mut Stack) {
-    let a: I256 = stack.pop().into();
-    let b: I256 = stack.pop().into();
+    let a = stack.pop();
+    let b = stack.get_mut(0);
 
-    stack.push(if a.lt(&b) { U256::ONE } else { U256::ZERO })
+    *b = if i256_cmp(a, *b) == Ordering::Less {
+        U256::ONE
+    } else {
+        U256::ZERO
+    }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn sgt(stack: &mut Stack) {
-    let a: I256 = stack.pop().into();
-    let b: I256 = stack.pop().into();
+    let a = stack.pop();
+    let b = stack.get_mut(0);
 
-    stack.push(if a.gt(&b) { U256::ONE } else { U256::ZERO })
+    *b = if i256_cmp(a, *b) == Ordering::Greater {
+        U256::ONE
+    } else {
+        U256::ZERO
+    }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn eq(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
@@ -42,34 +51,34 @@ pub(crate) fn eq(stack: &mut Stack) {
     *b = if a.eq(b) { U256::ONE } else { U256::ZERO }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn iszero(stack: &mut Stack) {
     let a = stack.get_mut(0);
     *a = if *a == 0 { U256::ONE } else { U256::ZERO }
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn and(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
     *b = a & *b;
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn or(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
     *b = a | *b;
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn xor(stack: &mut Stack) {
     let a = stack.pop();
     let b = stack.get_mut(0);
     *b = a ^ *b;
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn not(stack: &mut Stack) {
     let v = stack.get_mut(0);
     *v = !*v;
diff --git a/src/execution/evm/instructions/call.rs b/src/execution/evm/instructions/call.rs
index 6d1b6bc..61108f2 100644
--- a/src/execution/evm/instructions/call.rs
+++ b/src/execution/evm/instructions/call.rs
@@ -1,246 +1,223 @@
-#[doc(hidden)]
-#[macro_export]
-macro_rules! do_call {
-    ($state:expr, $rev:expr, $kind:expr, $is_static:expr) => {{
-        use std::cmp::min;
-        use $crate::{
-            execution::evm::{
-                common::u256_to_address,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::AccessStatus,
-                instructions::{memory::MemoryRegion, properties::*},
-                CallKind, InterpreterMessage,
-            },
-            models::*,
-        };
+use crate::{
+    execution::evm::{instructions::memory, CallKind, ExecutionState, Host, StatusCode},
+    models::Revision,
+};
+use bytes::Bytes;
 
-        let gas = $state.stack.pop();
-        let dst = u256_to_address($state.stack.pop());
-        let value = if $is_static || matches!($kind, CallKind::DelegateCall) {
-            U256::ZERO
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn do_call<
+    H: Host,
+    const REVISION: Revision,
+    const KIND: CallKind,
+    const IS_STATIC: bool,
+>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{
+            common::u256_to_address,
+            host::*,
+            instructions::{memory::MemoryRegion, properties::*},
+            InterpreterMessage,
+        },
+        models::*,
+    };
+    use std::cmp::min;
+
+    let gas = state.stack.pop();
+    let dst = u256_to_address(state.stack.pop());
+    let value = if IS_STATIC || matches!(KIND, CallKind::DelegateCall) {
+        U256::ZERO
+    } else {
+        state.stack.pop()
+    };
+    let has_value = value != 0;
+    let input_offset = state.stack.pop();
+    let input_size = state.stack.pop();
+    let output_offset = state.stack.pop();
+    let output_size = state.stack.pop();
+
+    state.stack.push(U256::ZERO); // Assume failure.
+
+    if REVISION >= Revision::Berlin {
+        if host.access_account(dst) == AccessStatus::Cold {
+            state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
+            }
+        }
+    }
+
+    let input_region = memory::get_memory_region(state, input_offset, input_size)
+        .map_err(|_| StatusCode::OutOfGas)?;
+    let output_region = memory::get_memory_region(state, output_offset, output_size)
+        .map_err(|_| StatusCode::OutOfGas)?;
+
+    let mut msg = InterpreterMessage {
+        kind: KIND,
+        is_static: IS_STATIC || state.message.is_static,
+        depth: state.message.depth + 1,
+        recipient: if matches!(KIND, CallKind::Call) {
+            dst
         } else {
-            $state.stack.pop()
-        };
-        let has_value = value != 0;
-        let input_offset = $state.stack.pop();
-        let input_size = $state.stack.pop();
-        let output_offset = $state.stack.pop();
-        let output_size = $state.stack.pop();
+            state.message.recipient
+        },
+        code_address: dst,
+        sender: if matches!(KIND, CallKind::DelegateCall) {
+            state.message.sender
+        } else {
+            state.message.recipient
+        },
+        gas: i64::MAX,
+        value: if matches!(KIND, CallKind::DelegateCall) {
+            state.message.value
+        } else {
+            value
+        },
+        input_data: input_region
+            .map(|MemoryRegion { offset, size }| {
+                state.memory[offset..offset + size.get()].to_vec().into()
+            })
+            .unwrap_or_default(),
+    };
 
-        $state.stack.push(U256::ZERO); // Assume failure.
+    let mut cost = if has_value { 9000 } else { 0 };
 
-        if $rev >= Revision::Berlin {
-            if ResumeData::into_access_account_status(
-                yield InterruptData::AccessAccount { address: dst },
-            )
-            .unwrap()
-            .status
-                == AccessStatus::Cold
-            {
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
-            }
-        }
-
-        let input_region = memory::get_memory_region($state, input_offset, input_size)
-            .map_err(|_| StatusCode::OutOfGas)?;
-        let output_region = memory::get_memory_region($state, output_offset, output_size)
-            .map_err(|_| StatusCode::OutOfGas)?;
-
-        let mut msg = InterpreterMessage {
-            kind: $kind,
-            is_static: $is_static || $state.message.is_static,
-            depth: $state.message.depth + 1,
-            recipient: if matches!($kind, CallKind::Call) {
-                dst
-            } else {
-                $state.message.recipient
-            },
-            code_address: dst,
-            sender: if matches!($kind, CallKind::DelegateCall) {
-                $state.message.sender
-            } else {
-                $state.message.recipient
-            },
-            gas: i64::MAX,
-            value: if matches!($kind, CallKind::DelegateCall) {
-                $state.message.value
-            } else {
-                value
-            },
-            input_data: input_region
-                .map(|MemoryRegion { offset, size }| {
-                    $state.memory[offset..offset + size.get()].to_vec().into()
-                })
-                .unwrap_or_default(),
-        };
-
-        let mut cost = if has_value { 9000 } else { 0 };
-
-        if matches!($kind, CallKind::Call) {
-            if has_value && $state.message.is_static {
-                return Err(StatusCode::StaticModeViolation);
-            }
-
-            if (has_value || $rev < Revision::Spurious)
-                && !ResumeData::into_account_exists_status({
-                    yield InterruptData::AccountExists { address: dst }
-                })
-                .unwrap()
-                .exists
-            {
-                cost += 25000;
-            }
-        }
-        $state.gas_left -= cost;
-        if $state.gas_left < 0 {
-            return Err(StatusCode::OutOfGas);
-        }
-
-        if gas < u128::try_from(msg.gas).unwrap() {
-            msg.gas = gas.as_usize() as i64;
-        }
-
-        if $rev >= Revision::Tangerine {
-            // TODO: Always true for STATICCALL.
-            msg.gas = min(msg.gas, $state.gas_left - $state.gas_left / 64);
-        } else if msg.gas > $state.gas_left {
-            return Err(StatusCode::OutOfGas);
-        }
-
-        if has_value {
-            msg.gas += 2300; // Add stipend.
-            $state.gas_left += 2300;
-        }
-
-        $state.return_data.clear();
-
-        if $state.message.depth < 1024
-            && !(has_value
-                && ResumeData::into_balance({
-                    yield InterruptData::GetBalance {
-                        address: $state.message.recipient,
-                    }
-                })
-                .unwrap()
-                .balance
-                    < value)
-        {
-            let msg_gas = msg.gas;
-            let result =
-                ResumeData::into_call_output({ yield InterruptData::Call(Call::Call(msg)) })
-                    .unwrap()
-                    .output;
-            $state.return_data = result.output_data.clone();
-            *$state.stack.get_mut(0) = if matches!(result.status_code, StatusCode::Success) {
-                U256::ONE
-            } else {
-                U256::ZERO
-            };
-
-            if let Some(MemoryRegion { offset, size }) = output_region {
-                let copy_size = min(size.get(), result.output_data.len());
-                if copy_size > 0 {
-                    $state.memory[offset..offset + copy_size]
-                        .copy_from_slice(&result.output_data[..copy_size]);
-                }
-            }
-
-            let gas_used = msg_gas - result.gas_left;
-            $state.gas_left -= gas_used;
-        }
-    }};
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! do_create {
-    ($state:expr, $rev:expr, $create2:expr) => {{
-        use ethnum::U256;
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                CreateMessage,
-            },
-            models::*,
-        };
-
-        if $state.message.is_static {
+    if matches!(KIND, CallKind::Call) {
+        if has_value && state.message.is_static {
             return Err(StatusCode::StaticModeViolation);
         }
 
-        let endowment = $state.stack.pop();
-        let init_code_offset = $state.stack.pop();
-        let init_code_size = $state.stack.pop();
+        if (has_value || REVISION < Revision::Spurious) && !host.account_exists(dst) {
+            cost += 25000;
+        }
+    }
+    state.gas_left -= cost;
+    if state.gas_left < 0 {
+        return Err(StatusCode::OutOfGas);
+    }
 
-        let region = memory::get_memory_region($state, init_code_offset, init_code_size)
-            .map_err(|_| StatusCode::OutOfGas)?;
+    if gas < u128::try_from(msg.gas).unwrap() {
+        msg.gas = gas.as_usize() as i64;
+    }
 
-        let salt = if $create2 {
-            let salt = $state.stack.pop();
+    if REVISION >= Revision::Tangerine {
+        // TODO: Always true for STATICCALL.
+        msg.gas = min(msg.gas, state.gas_left - state.gas_left / 64);
+    } else if msg.gas > state.gas_left {
+        return Err(StatusCode::OutOfGas);
+    }
 
-            if let Some(region) = &region {
-                let salt_cost = memory::num_words(region.size.get()) * 6;
-                $state.gas_left -= salt_cost;
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
-            }
+    if has_value {
+        msg.gas += 2300; // Add stipend.
+        state.gas_left += 2300;
+    }
 
-            Some(salt)
+    state.return_data.clear();
+
+    if state.message.depth < 1024
+        && !(has_value && host.get_balance(state.message.recipient) < value)
+    {
+        let msg_gas = msg.gas;
+        let result = host.call(Call::Call(&msg));
+        state.return_data = result.output_data.clone();
+        *state.stack.get_mut(0) = if matches!(result.status_code, StatusCode::Success) {
+            U256::ONE
         } else {
-            None
+            U256::ZERO
         };
 
-        $state.stack.push(U256::ZERO);
-        $state.return_data.clear();
-
-        if $state.message.depth < 1024
-            && !(endowment != 0
-                && ResumeData::into_balance({
-                    yield InterruptData::GetBalance {
-                        address: $state.message.recipient,
-                    }
-                })
-                .unwrap()
-                .balance
-                    < endowment)
-        {
-            let msg = CreateMessage {
-                gas: if $rev >= Revision::Tangerine {
-                    $state.gas_left - $state.gas_left / 64
-                } else {
-                    $state.gas_left
-                },
-
-                salt,
-                initcode: if init_code_size != 0 {
-                    $state.memory[init_code_offset.as_usize()
-                        ..init_code_offset.as_usize() + init_code_size.as_usize()]
-                        .to_vec()
-                        .into()
-                } else {
-                    Bytes::new()
-                },
-                sender: $state.message.recipient,
-                depth: $state.message.depth + 1,
-                endowment,
-            };
-            let msg_gas = msg.gas;
-            let result =
-                ResumeData::into_call_output({ yield InterruptData::Call(Call::Create(msg)) })
-                    .unwrap()
-                    .output;
-            $state.gas_left -= msg_gas - result.gas_left;
-
-            $state.return_data = result.output_data;
-            if result.status_code == StatusCode::Success {
-                *$state.stack.get_mut(0) =
-                    address_to_u256(result.create_address.expect("expected create address"));
+        if let Some(MemoryRegion { offset, size }) = output_region {
+            let copy_size = min(size.get(), result.output_data.len());
+            if copy_size > 0 {
+                state.memory[offset..offset + copy_size]
+                    .copy_from_slice(&result.output_data[..copy_size]);
             }
         }
-    }};
+
+        let gas_used = msg_gas - result.gas_left;
+        state.gas_left -= gas_used;
+    }
+
+    Ok(())
+}
+
+#[inline]
+pub(crate) fn do_create<H: Host, const REVISION: Revision, const CREATE2: bool>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{common::*, host::*, CreateMessage},
+        models::*,
+    };
+    use ethnum::U256;
+
+    if state.message.is_static {
+        return Err(StatusCode::StaticModeViolation);
+    }
+
+    let endowment = state.stack.pop();
+    let init_code_offset = state.stack.pop();
+    let init_code_size = state.stack.pop();
+
+    let region = memory::get_memory_region(state, init_code_offset, init_code_size)
+        .map_err(|_| StatusCode::OutOfGas)?;
+
+    let salt = if CREATE2 {
+        let salt = state.stack.pop();
+
+        if let Some(region) = &region {
+            let salt_cost = memory::num_words(region.size.get()) * 6;
+            state.gas_left -= salt_cost;
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
+            }
+        }
+
+        Some(salt)
+    } else {
+        None
+    };
+
+    state.stack.push(U256::ZERO);
+    state.return_data.clear();
+
+    if state.message.depth < 1024
+        && !(endowment != 0 && host.get_balance(state.message.recipient) < endowment)
+    {
+        let msg = CreateMessage {
+            gas: if REVISION >= Revision::Tangerine {
+                state.gas_left - state.gas_left / 64
+            } else {
+                state.gas_left
+            },
+
+            salt,
+            initcode: if init_code_size != 0 {
+                state.memory[init_code_offset.as_usize()
+                    ..init_code_offset.as_usize() + init_code_size.as_usize()]
+                    .to_vec()
+                    .into()
+            } else {
+                Bytes::new()
+            },
+            sender: state.message.recipient,
+            depth: state.message.depth + 1,
+            endowment,
+        };
+        let msg_gas = msg.gas;
+        let result = host.call(Call::Create(&msg));
+        state.gas_left -= msg_gas - result.gas_left;
+
+        state.return_data = result.output_data;
+        if result.status_code == StatusCode::Success {
+            *state.stack.get_mut(0) =
+                address_to_u256(result.create_address.expect("expected create address"));
+        }
+    }
+
+    Ok(())
 }
diff --git a/src/execution/evm/instructions/control.rs b/src/execution/evm/instructions/control.rs
index b182f8c..933fec0 100644
--- a/src/execution/evm/instructions/control.rs
+++ b/src/execution/evm/instructions/control.rs
@@ -1,7 +1,7 @@
 use crate::execution::evm::{interpreter::JumpdestMap, state::ExecutionState, StatusCode};
 use ethnum::U256;
 
-#[inline(always)]
+#[inline]
 pub(crate) fn ret(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let offset = *state.stack.get(0);
     let size = *state.stack.get(1);
@@ -17,7 +17,7 @@ pub(crate) fn ret(state: &mut ExecutionState) -> Result<(), StatusCode> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn op_jump(
     state: &mut ExecutionState,
     jumpdest_map: &JumpdestMap,
@@ -30,7 +30,7 @@ pub(crate) fn op_jump(
     Ok(dst.as_usize())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn calldataload(state: &mut ExecutionState) {
     let index = state.stack.pop();
 
@@ -51,7 +51,7 @@ pub(crate) fn calldataload(state: &mut ExecutionState) {
     });
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn calldatasize(state: &mut ExecutionState) {
     state.stack.push(
         u128::try_from(state.message.input_data.len())
diff --git a/src/execution/evm/instructions/external.rs b/src/execution/evm/instructions/external.rs
index bf25811..9a92273 100644
--- a/src/execution/evm/instructions/external.rs
+++ b/src/execution/evm/instructions/external.rs
@@ -1,442 +1,337 @@
-use crate::execution::evm::{common::address_to_u256, host::*, state::ExecutionState};
+use crate::{
+    execution::evm::{
+        common::address_to_u256, host::*, instructions::memory, state::ExecutionState, StatusCode,
+    },
+    models::Revision,
+};
 use ethnum::U256;
 
+#[inline]
 pub(crate) fn address(state: &mut ExecutionState) {
     state.stack.push(address_to_u256(state.message.recipient));
 }
 
+#[inline]
 pub(crate) fn caller(state: &mut ExecutionState) {
     state.stack.push(address_to_u256(state.message.sender));
 }
 
+#[inline]
 pub(crate) fn callvalue(state: &mut ExecutionState) {
     state.stack.push(state.message.value);
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! balance {
-    ($state:expr,$rev:expr) => {
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::*,
-            },
-            models::*,
-        };
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn balance<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{common::*, host::*, instructions::properties::*},
+        models::*,
+    };
 
-        let address = u256_to_address($state.stack.pop());
+    let address = u256_to_address(state.stack.pop());
 
-        if $rev >= Revision::Berlin {
-            let access_status = ResumeData::into_access_account_status({
-                yield InterruptData::AccessAccount { address }
-            })
-            .unwrap()
-            .status;
-            if access_status == AccessStatus::Cold {
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
+    if REVISION >= Revision::Berlin {
+        if host.access_account(address) == AccessStatus::Cold {
+            state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
             }
         }
+    }
 
-        let balance = ResumeData::into_balance({ yield InterruptData::GetBalance { address } })
-            .unwrap()
-            .balance;
+    state.stack.push(host.get_balance(address));
 
-        $state.stack.push(balance);
-    };
+    Ok(())
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! extcodesize {
-    ($state:expr,$rev:expr) => {
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::*,
-            },
-            models::*,
-        };
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn extcodesize<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{common::*, host::*, instructions::properties::*},
+        models::*,
+    };
 
-        let address = u256_to_address($state.stack.pop());
+    let address = u256_to_address(state.stack.pop());
 
-        if $rev >= Revision::Berlin {
-            let access_account = ResumeData::into_access_account_status({
-                yield InterruptData::AccessAccount { address }
-            })
-            .unwrap()
-            .status;
-            if access_account == AccessStatus::Cold {
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
+    if REVISION >= Revision::Berlin {
+        if host.access_account(address) == AccessStatus::Cold {
+            state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
             }
         }
+    }
 
-        let code_size =
-            ResumeData::into_code_size({ yield InterruptData::GetCodeSize { address } })
-                .unwrap()
-                .code_size;
-        $state.stack.push(code_size);
-    };
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! push_txcontext {
-    ($state:expr, $accessor:expr) => {
-        use $crate::execution::evm::continuation::{interrupt_data::*, resume_data::*};
-
-        let tx_context = ResumeData::into_tx_context_data({ yield InterruptData::GetTxContext })
-            .unwrap()
-            .context;
-
-        $state.stack.push($accessor(tx_context));
-    };
+    state.stack.push(host.get_code_size(address));
+
+    Ok(())
 }
 
+#[inline]
 pub(crate) fn origin_accessor(tx_context: TxContext) -> U256 {
     address_to_u256(tx_context.tx_origin)
 }
 
+#[inline]
 pub(crate) fn coinbase_accessor(tx_context: TxContext) -> U256 {
     address_to_u256(tx_context.block_coinbase)
 }
 
+#[inline]
 pub(crate) fn gasprice_accessor(tx_context: TxContext) -> U256 {
     tx_context.tx_gas_price
 }
 
+#[inline]
 pub(crate) fn timestamp_accessor(tx_context: TxContext) -> U256 {
     tx_context.block_timestamp.into()
 }
 
+#[inline]
 pub(crate) fn number_accessor(tx_context: TxContext) -> U256 {
     tx_context.block_number.into()
 }
 
+#[inline]
 pub(crate) fn gaslimit_accessor(tx_context: TxContext) -> U256 {
     tx_context.block_gas_limit.into()
 }
 
+#[inline]
 pub(crate) fn difficulty_accessor(tx_context: TxContext) -> U256 {
     tx_context.block_difficulty
 }
 
+#[inline]
 pub(crate) fn chainid_accessor(tx_context: TxContext) -> U256 {
     tx_context.chain_id
 }
 
+#[inline]
 pub(crate) fn basefee_accessor(tx_context: TxContext) -> U256 {
     tx_context.block_base_fee
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! selfbalance {
-    ($state:expr) => {{
-        use $crate::execution::evm::continuation::{interrupt_data::*, resume_data::*};
-
-        let balance = ResumeData::into_balance({
-            yield InterruptData::GetBalance {
-                address: $state.message.recipient,
-            }
-        })
-        .unwrap()
-        .balance;
-
-        $state.stack.push(balance);
-    }};
+#[inline]
+pub(crate) fn selfbalance<H: Host>(state: &mut ExecutionState, host: &mut H) {
+    state.stack.push(host.get_balance(state.message.recipient));
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! blockhash {
-    ($state:expr) => {
-        use $crate::execution::evm::continuation::{interrupt_data::*, resume_data::*};
+#[inline]
+pub(crate) fn blockhash<H: Host>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    let number = state.stack.pop();
 
-        let number = $state.stack.pop();
+    let upper_bound = host.get_tx_context().block_number;
+    let lower_bound = upper_bound.saturating_sub(256);
 
-        let upper_bound = ResumeData::into_tx_context_data({ yield InterruptData::GetTxContext })
-            .unwrap()
-            .context
-            .block_number;
-        let lower_bound = upper_bound.saturating_sub(256);
-
-        let mut header = U256::ZERO;
-        if number <= u128::from(u64::MAX) {
-            let n = number.as_u64();
-            if (lower_bound..upper_bound).contains(&n) {
-                header = ResumeData::into_block_hash({
-                    yield InterruptData::GetBlockHash { block_number: n }
-                })
-                .unwrap()
-                .hash;
-            }
+    let mut header = U256::ZERO;
+    if number <= u128::from(u64::MAX) {
+        let n = number.as_u64();
+        if (lower_bound..upper_bound).contains(&n) {
+            header = host.get_block_hash(n);
         }
+    }
 
-        $state.stack.push(header);
-    };
+    state.stack.push(header);
+
+    Ok(())
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! do_log {
-    ($state:expr, $num_topics:expr) => {{
-        use arrayvec::ArrayVec;
-        use $crate::execution::evm::continuation::{interrupt_data::*, resume_data::*};
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn do_log<H: Host, const NUM_TOPICS: usize>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use arrayvec::ArrayVec;
 
-        if $state.message.is_static {
-            return Err(StatusCode::StaticModeViolation);
-        }
+    if state.message.is_static {
+        return Err(StatusCode::StaticModeViolation);
+    }
 
-        let offset = $state.stack.pop();
-        let size = $state.stack.pop();
+    let offset = state.stack.pop();
+    let size = state.stack.pop();
 
-        let region =
-            memory::get_memory_region($state, offset, size).map_err(|_| StatusCode::OutOfGas)?;
+    let region =
+        memory::get_memory_region(state, offset, size).map_err(|_| StatusCode::OutOfGas)?;
 
-        if let Some(region) = &region {
-            let cost = region.size.get() as i64 * 8;
-            $state.gas_left -= cost;
-            if $state.gas_left < 0 {
-                return Err(StatusCode::OutOfGas);
-            }
-        }
-
-        let mut topics = ArrayVec::new();
-        for _ in 0..$num_topics {
-            topics.push($state.stack.pop());
-        }
-
-        let data = if let Some(region) = region {
-            &$state.memory[region.offset..region.offset + region.size.get()]
-        } else {
-            &[]
-        };
-
-        let data = data.to_vec().into();
-        let r = {
-            yield InterruptData::EmitLog {
-                address: $state.message.recipient,
-                data,
-                topics,
-            }
-        };
-
-        debug_assert!(matches!(r, ResumeData::Empty));
-    }};
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! sload {
-    ($state:expr,$rev:expr) => {{
-        use $crate::{
-            execution::evm::{
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::{COLD_SLOAD_COST, WARM_STORAGE_READ_COST},
-            },
-            models::*,
-        };
-
-        let location = $state.stack.pop();
-
-        if $rev >= Revision::Berlin {
-            let access_status = ResumeData::into_access_storage_status({
-                yield InterruptData::AccessStorage {
-                    address: $state.message.recipient,
-                    location,
-                }
-            })
-            .unwrap()
-            .status;
-            if access_status == AccessStatus::Cold {
-                // The warm storage access cost is already applied (from the cost table).
-                // Here we need to apply additional cold storage access cost.
-                const ADDITIONAL_COLD_SLOAD_COST: u16 = COLD_SLOAD_COST - WARM_STORAGE_READ_COST;
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_SLOAD_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
-            }
-        }
-
-        let storage = ResumeData::into_storage_value({
-            yield InterruptData::GetStorage {
-                address: $state.message.recipient,
-                location,
-            }
-        })
-        .unwrap()
-        .value;
-
-        $state.stack.push(storage);
-    }};
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! sstore {
-    ($state:expr,$rev:expr) => {{
-        use $crate::{
-            execution::evm::{
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::{COLD_SLOAD_COST, WARM_STORAGE_READ_COST},
-            },
-            models::*,
-        };
-
-        if $state.message.is_static {
-            return Err(StatusCode::StaticModeViolation);
-        }
-
-        if $rev >= Revision::Istanbul {
-            if $state.gas_left <= 2300 {
-                return Err(StatusCode::OutOfGas);
-            }
-        }
-
-        let location = $state.stack.pop();
-        let value = $state.stack.pop();
-
-        let mut cost = 0;
-        if $rev >= Revision::Berlin {
-            let access_status = ResumeData::into_access_storage_status({
-                yield InterruptData::AccessStorage {
-                    address: $state.message.recipient,
-                    location,
-                }
-            })
-            .unwrap()
-            .status;
-
-            if access_status == AccessStatus::Cold {
-                cost = COLD_SLOAD_COST;
-            }
-        }
-
-        let status = ResumeData::into_storage_status_info({
-            yield InterruptData::SetStorage {
-                address: $state.message.recipient,
-                location,
-                value,
-            }
-        })
-        .unwrap()
-        .status;
-
-        cost = match status {
-            StorageStatus::Unchanged | StorageStatus::ModifiedAgain => {
-                if $rev >= Revision::Berlin {
-                    cost + WARM_STORAGE_READ_COST
-                } else if $rev == Revision::Istanbul {
-                    800
-                } else if $rev == Revision::Constantinople {
-                    200
-                } else {
-                    5000
-                }
-            }
-            StorageStatus::Modified | StorageStatus::Deleted => {
-                if $rev >= Revision::Berlin {
-                    cost + 5000 - COLD_SLOAD_COST
-                } else {
-                    5000
-                }
-            }
-            StorageStatus::Added => cost + 20000,
-        };
-        $state.gas_left -= i64::from(cost);
-        if $state.gas_left < 0 {
+    if let Some(region) = &region {
+        let cost = region.size.get() as i64 * 8;
+        state.gas_left -= cost;
+        if state.gas_left < 0 {
             return Err(StatusCode::OutOfGas);
         }
-    }};
+    }
+
+    let mut topics = ArrayVec::<U256, 4>::new();
+    for _ in 0..NUM_TOPICS {
+        topics.push(state.stack.pop());
+    }
+
+    let data = if let Some(region) = region {
+        &state.memory[region.offset..region.offset + region.size.get()]
+    } else {
+        &[]
+    }
+    .to_vec()
+    .into();
+
+    host.emit_log(state.message.recipient, data, &*topics);
+
+    Ok(())
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! selfdestruct {
-    ($state:expr,$rev:expr) => {{
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::*,
-            },
-            models::*,
-        };
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn sload<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{
+            host::*,
+            instructions::properties::{COLD_SLOAD_COST, WARM_STORAGE_READ_COST},
+        },
+        models::*,
+    };
 
-        if $state.message.is_static {
-            return Err(StatusCode::StaticModeViolation);
+    let location = state.stack.pop();
+
+    if REVISION >= Revision::Berlin {
+        if host.access_storage(state.message.recipient, location) == AccessStatus::Cold {
+            // The warm storage access cost is already applied (from the cost table).
+            // Here we need to apply additional cold storage access cost.
+            const ADDITIONAL_COLD_SLOAD_COST: u16 = COLD_SLOAD_COST - WARM_STORAGE_READ_COST;
+            state.gas_left -= i64::from(ADDITIONAL_COLD_SLOAD_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
+            }
         }
+    }
 
-        let beneficiary = u256_to_address($state.stack.pop());
+    state
+        .stack
+        .push(host.get_storage(state.message.recipient, location));
 
-        if $rev >= Revision::Berlin {
-            let access_status = ResumeData::into_access_account_status({
-                yield InterruptData::AccessAccount {
-                    address: beneficiary,
-                }
-            })
-            .unwrap()
-            .status;
-            if access_status == AccessStatus::Cold {
-                $state.gas_left -= i64::from(COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
+    Ok(())
+}
+
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn sstore<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{
+            host::*,
+            instructions::properties::{COLD_SLOAD_COST, WARM_STORAGE_READ_COST},
+        },
+        models::*,
+    };
+
+    if state.message.is_static {
+        return Err(StatusCode::StaticModeViolation);
+    }
+
+    if REVISION >= Revision::Istanbul {
+        if state.gas_left <= 2300 {
+            return Err(StatusCode::OutOfGas);
+        }
+    }
+
+    let location = state.stack.pop();
+    let value = state.stack.pop();
+
+    let mut cost = 0;
+    if REVISION >= Revision::Berlin {
+        if host.access_storage(state.message.recipient, location) == AccessStatus::Cold {
+            cost = COLD_SLOAD_COST;
+        }
+    }
+
+    cost = match host.set_storage(state.message.recipient, location, value) {
+        StorageStatus::Unchanged | StorageStatus::ModifiedAgain => {
+            if REVISION >= Revision::Berlin {
+                cost + WARM_STORAGE_READ_COST
+            } else if REVISION == Revision::Istanbul {
+                800
+            } else if REVISION == Revision::Constantinople {
+                200
+            } else {
+                5000
+            }
+        }
+        StorageStatus::Modified | StorageStatus::Deleted => {
+            if REVISION >= Revision::Berlin {
+                cost + 5000 - COLD_SLOAD_COST
+            } else {
+                5000
+            }
+        }
+        StorageStatus::Added => cost + 20000,
+    };
+    state.gas_left -= i64::from(cost);
+    if state.gas_left < 0 {
+        return Err(StatusCode::OutOfGas);
+    }
+
+    Ok(())
+}
+
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn selfdestruct<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{common::*, host::*, instructions::properties::*},
+        models::*,
+    };
+
+    if state.message.is_static {
+        return Err(StatusCode::StaticModeViolation);
+    }
+
+    let beneficiary = u256_to_address(state.stack.pop());
+
+    if REVISION >= Revision::Berlin {
+        if host.access_account(beneficiary) == AccessStatus::Cold {
+            state.gas_left -= i64::from(COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
+            }
+        }
+    }
+
+    if REVISION >= Revision::Tangerine {
+        if REVISION == Revision::Tangerine || host.get_balance(state.message.recipient) != 0 {
+            // After TANGERINE_WHISTLE apply additional cost of
+            // sending value to a non-existing account.
+            if !host.account_exists(beneficiary) {
+                state.gas_left -= 25000;
+                if state.gas_left < 0 {
                     return Err(StatusCode::OutOfGas);
                 }
             }
         }
+    }
 
-        if $rev >= Revision::Tangerine {
-            if ($rev == Revision::Tangerine
-                || !{
-                    ResumeData::into_balance({
-                        yield InterruptData::GetBalance {
-                            address: $state.message.recipient,
-                        }
-                    })
-                    .unwrap()
-                    .balance
-                        == 0
-                })
-            {
-                // After TANGERINE_WHISTLE apply additional cost of
-                // sending value to a non-existing account.
-                if !ResumeData::into_account_exists_status({
-                    yield InterruptData::AccountExists {
-                        address: beneficiary,
-                    }
-                })
-                .unwrap()
-                .exists
-                {
-                    $state.gas_left -= 25000;
-                    if $state.gas_left < 0 {
-                        return Err(StatusCode::OutOfGas);
-                    }
-                }
-            }
-        }
+    host.selfdestruct(state.message.recipient, beneficiary);
 
-        let r = yield InterruptData::Selfdestruct {
-            address: $state.message.recipient,
-            beneficiary,
-        };
-        debug_assert!(matches!(r, ResumeData::Empty));
-    }};
+    Ok(())
 }
 
 #[cfg(test)]
diff --git a/src/execution/evm/instructions/instruction_table.rs b/src/execution/evm/instructions/instruction_table.rs
index d9ce04a..47ec4ed 100644
--- a/src/execution/evm/instructions/instruction_table.rs
+++ b/src/execution/evm/instructions/instruction_table.rs
@@ -1,42 +1,64 @@
+use super::properties::GAS_COSTS;
 use crate::{execution::evm::instructions::properties, models::*};
-use once_cell::sync::Lazy;
 
 #[derive(Clone, Copy, Debug)]
 pub struct InstructionTableEntry {
-    pub gas_cost: u16,
+    pub gas_cost: i16,
     pub stack_height_required: u8,
     pub can_overflow_stack: bool,
 }
 
-pub type InstructionTable = [Option<InstructionTableEntry>; 256];
+pub type InstructionTable = [InstructionTableEntry; 256];
 pub type InstructionTables = [InstructionTable; Revision::len()];
 
-pub static INSTRUCTION_TABLES: Lazy<InstructionTables> = Lazy::new(|| {
-    let mut table = [[None; 256]; Revision::len()];
+const fn instruction_tables() -> InstructionTables {
+    let mut table = [[InstructionTableEntry {
+        gas_cost: -1,
+        stack_height_required: 0,
+        can_overflow_stack: false,
+    }; 256]; Revision::len()];
 
-    for revision in Revision::iter() {
-        for (opcode, &cost) in properties::gas_costs(revision).iter().enumerate() {
-            if let Some(cost) = cost {
-                let stack_height_required = properties::PROPERTIES[opcode]
-                    .unwrap()
-                    .stack_height_required;
+    const LATEST: Revision = Revision::latest();
 
-                // Because any instruction can increase stack height at most of 1,
-                // stack overflow can only happen if stack height is already at the limit.
-                debug_assert!(properties::PROPERTIES[opcode].unwrap().stack_height_change <= 1);
+    let revtable = Revision::iter();
+    let mut reviter = 0_usize;
+    loop {
+        let revision = revtable[reviter];
 
-                table[revision as usize][opcode] = Some(InstructionTableEntry {
-                    gas_cost: cost,
-                    stack_height_required,
-                    can_overflow_stack: properties::PROPERTIES[opcode].unwrap().stack_height_change
-                        > 0,
-                });
+        let mut opcode = 0;
+        loop {
+            let (stack_height_required, can_overflow_stack) =
+                if let Some(p) = &properties::PROPERTIES[opcode] {
+                    (p.stack_height_required, p.stack_height_change > 0)
+                } else {
+                    (0, false)
+                };
+
+            table[revision as usize][opcode] = InstructionTableEntry {
+                gas_cost: GAS_COSTS[revision as usize][opcode],
+                stack_height_required,
+                can_overflow_stack,
+            };
+
+            if opcode == u8::MAX as usize {
+                break;
+            } else {
+                opcode += 1;
             }
         }
+
+        if matches!(revision, LATEST) {
+            break;
+        } else {
+            reviter += 1;
+        }
     }
     table
-});
+}
 
+pub const INSTRUCTION_TABLES: InstructionTables = instruction_tables();
+
+#[inline]
 pub fn get_instruction_table(revision: Revision) -> &'static InstructionTable {
     &INSTRUCTION_TABLES[revision as usize]
 }
diff --git a/src/execution/evm/instructions/memory.rs b/src/execution/evm/instructions/memory.rs
index 84c09ae..9e2e6bf 100644
--- a/src/execution/evm/instructions/memory.rs
+++ b/src/execution/evm/instructions/memory.rs
@@ -1,4 +1,7 @@
-use crate::execution::evm::{common::*, state::*};
+use crate::{
+    execution::evm::{common::*, state::*, Host},
+    models::Revision,
+};
 use ethnum::U256;
 use sha3::{Digest, Keccak256};
 use std::{cmp::min, num::NonZeroUsize};
@@ -10,12 +13,12 @@ const WORD_SIZE: i64 = 32;
 
 /// Returns number of words what would fit to provided number of bytes,
 /// i.e. it rounds up the number bytes to number of words.
-#[inline(always)]
+#[inline]
 pub(crate) fn num_words(size_in_bytes: usize) -> i64 {
     ((size_in_bytes as i64) + (WORD_SIZE - 1)) / WORD_SIZE
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn mload(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let index = state.stack.pop();
 
@@ -29,7 +32,7 @@ pub(crate) fn mload(state: &mut ExecutionState) -> Result<(), StatusCode> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn mstore(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let index = state.stack.pop();
     let value = state.stack.pop();
@@ -42,7 +45,7 @@ pub(crate) fn mstore(state: &mut ExecutionState) -> Result<(), StatusCode> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn mstore8(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let index = state.stack.pop();
     let value = state.stack.pop();
@@ -57,14 +60,14 @@ pub(crate) fn mstore8(state: &mut ExecutionState) -> Result<(), StatusCode> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn msize(state: &mut ExecutionState) {
     state
         .stack
         .push(u64::try_from(state.memory.len()).unwrap().into());
 }
 
-#[inline(never)]
+#[inline]
 fn grow_memory(state: &mut ExecutionState, new_size: usize) -> Result<(), ()> {
     let new_words = num_words(new_size);
     let current_words = (state.memory.len() / 32) as i64;
@@ -83,7 +86,7 @@ fn grow_memory(state: &mut ExecutionState, new_size: usize) -> Result<(), ()> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn get_memory_region_u64(
     state: &mut ExecutionState,
     offset: U256,
@@ -110,7 +113,7 @@ pub(crate) struct MemoryRegion {
     pub size: NonZeroUsize,
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn get_memory_region(
     state: &mut ExecutionState,
     offset: U256,
@@ -127,6 +130,7 @@ pub(crate) fn get_memory_region(
     get_memory_region_u64(state, offset, NonZeroUsize::new(size.as_usize()).unwrap()).map(Some)
 }
 
+#[inline]
 pub(crate) fn calldatacopy(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let mem_index = state.stack.pop();
     let input_index = state.stack.pop();
@@ -186,11 +190,12 @@ pub(crate) fn keccak256(state: &mut ExecutionState) -> Result<(), StatusCode> {
     Ok(())
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn codesize(stack: &mut Stack, code: &[u8]) {
     stack.push(u128::try_from(code.len()).unwrap().into())
 }
 
+#[inline]
 pub(crate) fn codecopy(state: &mut ExecutionState, code: &[u8]) -> Result<(), StatusCode> {
     // TODO: Similar to calldatacopy().
 
@@ -224,80 +229,70 @@ pub(crate) fn codecopy(state: &mut ExecutionState, code: &[u8]) -> Result<(), St
     Ok(())
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! extcodecopy {
-    ($state:expr,$rev:expr) => {
-        use core::cmp::min;
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::{memory::*, properties::*},
-            },
-            models::*,
-        };
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn extcodecopy<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{
+            common::*,
+            host::*,
+            instructions::{memory::*, properties::*},
+        },
+        models::*,
+    };
 
-        let addr = u256_to_address($state.stack.pop());
-        let mem_index = $state.stack.pop();
-        let input_index = $state.stack.pop();
-        let size = $state.stack.pop();
+    let addr = u256_to_address(state.stack.pop());
+    let mem_index = state.stack.pop();
+    let input_index = state.stack.pop();
+    let size = state.stack.pop();
 
-        let region =
-            get_memory_region(&mut $state, mem_index, size).map_err(|_| StatusCode::OutOfGas)?;
+    let region = get_memory_region(state, mem_index, size).map_err(|_| StatusCode::OutOfGas)?;
 
-        if let Some(region) = &region {
-            let copy_cost = num_words(region.size.get()) * 3;
-            $state.gas_left -= copy_cost;
-            if $state.gas_left < 0 {
+    if let Some(region) = &region {
+        let copy_cost = num_words(region.size.get()) * 3;
+        state.gas_left -= copy_cost;
+        if state.gas_left < 0 {
+            return Err(StatusCode::OutOfGas);
+        }
+    }
+
+    if REVISION >= Revision::Berlin {
+        if host.access_account(addr) == AccessStatus::Cold {
+            state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
                 return Err(StatusCode::OutOfGas);
             }
         }
+    }
 
-        if $rev >= Revision::Berlin {
-            if ResumeData::into_access_account_status({
-                yield InterruptData::AccessAccount { address: addr }
-            })
-            .unwrap()
-            .status
-                == AccessStatus::Cold
-            {
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
-            }
+    if let Some(region) = region {
+        let src = min(U256::from(MAX_BUFFER_SIZE), input_index).as_usize();
+
+        let mut code = vec![0; region.size.get()];
+        let copied = host.copy_code(addr, src, &mut code[..]);
+        debug_assert!(copied <= code.len());
+        code.truncate(copied);
+
+        state.memory[region.offset..region.offset + code.len()].copy_from_slice(&code);
+        if region.size.get() > code.len() {
+            state.memory[region.offset + code.len()..region.offset + region.size.get()].fill(0);
         }
+    }
 
-        if let Some(region) = region {
-            let src = min(U256::from(MAX_BUFFER_SIZE), input_index).as_usize();
-
-            let code = ResumeData::into_code({
-                yield InterruptData::CopyCode {
-                    address: addr,
-                    offset: src,
-                    max_size: region.size.get(),
-                }
-            })
-            .unwrap()
-            .code;
-
-            $state.memory[region.offset..region.offset + code.len()].copy_from_slice(&code);
-            if region.size.get() > code.len() {
-                $state.memory[region.offset + code.len()..region.offset + region.size.get()]
-                    .fill(0);
-            }
-        }
-    };
+    Ok(())
 }
 
+#[inline]
 pub(crate) fn returndatasize(state: &mut ExecutionState) {
     state
         .stack
         .push(u128::try_from(state.return_data.len()).unwrap().into());
 }
 
+#[inline]
 pub(crate) fn returndatacopy(state: &mut ExecutionState) -> Result<(), StatusCode> {
     let mem_index = state.stack.pop();
     let input_index = state.stack.pop();
@@ -305,7 +300,7 @@ pub(crate) fn returndatacopy(state: &mut ExecutionState) -> Result<(), StatusCod
 
     let region = get_memory_region(state, mem_index, size).map_err(|_| StatusCode::OutOfGas)?;
 
-    if input_index > u128::try_from(state.return_data.len()).unwrap() {
+    if input_index > state.return_data.len() as u128 {
         return Err(StatusCode::InvalidMemoryAccess);
     }
     let src = input_index.as_usize();
@@ -328,41 +323,29 @@ pub(crate) fn returndatacopy(state: &mut ExecutionState) -> Result<(), StatusCod
     Ok(())
 }
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! extcodehash {
-    ($state:expr,$rev:expr) => {
-        use $crate::{
-            execution::evm::{
-                common::*,
-                continuation::{interrupt_data::*, resume_data::*},
-                host::*,
-                instructions::properties::*,
-            },
-            models::*,
-        };
+#[inline]
+#[allow(clippy::collapsible_if)]
+pub(crate) fn extcodehash<H: Host, const REVISION: Revision>(
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<(), StatusCode> {
+    use crate::{
+        execution::evm::{common::*, host::*, instructions::properties::*},
+        models::*,
+    };
 
-        let addr = u256_to_address($state.stack.pop());
+    let addr = u256_to_address(state.stack.pop());
 
-        if $rev >= Revision::Berlin {
-            if ResumeData::into_access_account_status({
-                yield InterruptData::AccessAccount { address: addr }
-            })
-            .unwrap()
-            .status
-                == AccessStatus::Cold
-            {
-                $state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
-                if $state.gas_left < 0 {
-                    return Err(StatusCode::OutOfGas);
-                }
+    if REVISION >= Revision::Berlin {
+        if host.access_account(addr) == AccessStatus::Cold {
+            state.gas_left -= i64::from(ADDITIONAL_COLD_ACCOUNT_ACCESS_COST);
+            if state.gas_left < 0 {
+                return Err(StatusCode::OutOfGas);
             }
         }
+    }
 
-        let code_hash =
-            ResumeData::into_code_hash({ yield InterruptData::GetCodeHash { address: addr } })
-                .unwrap()
-                .hash;
-        $state.stack.push(code_hash);
-    };
+    state.stack.push(host.get_code_hash(addr));
+
+    Ok(())
 }
diff --git a/src/execution/evm/instructions/properties.rs b/src/execution/evm/instructions/properties.rs
index 69340f3..3948553 100644
--- a/src/execution/evm/instructions/properties.rs
+++ b/src/execution/evm/instructions/properties.rs
@@ -1,5 +1,4 @@
 use crate::{execution::evm::opcode::*, models::*};
-use once_cell::sync::Lazy;
 
 pub(crate) const COLD_SLOAD_COST: u16 = 2100;
 pub(crate) const COLD_ACCOUNT_ACCESS_COST: u16 = 2600;
@@ -22,7 +21,7 @@ pub struct Properties {
 }
 
 impl Properties {
-    fn new(stack_height_required: u8, stack_height_change: i8) -> Self {
+    const fn new(stack_height_required: u8, stack_height_change: i8) -> Self {
         Self {
             stack_height_required,
             stack_height_change,
@@ -30,7 +29,395 @@ impl Properties {
     }
 }
 
-pub static PROPERTIES: Lazy<[Option<Properties>; 256]> = Lazy::new(|| {
+pub const fn properties<const OPCODE: OpCode>() -> Properties {
+    match OPCODE {
+        OpCode::STOP => Properties::new(0, 0),
+        OpCode::ADD => Properties::new(2, -1),
+        OpCode::MUL => Properties::new(2, -1),
+        OpCode::SUB => Properties::new(2, -1),
+        OpCode::DIV => Properties::new(2, -1),
+        OpCode::SDIV => Properties::new(2, -1),
+        OpCode::MOD => Properties::new(2, -1),
+        OpCode::SMOD => Properties::new(2, -1),
+        OpCode::ADDMOD => Properties::new(3, -2),
+        OpCode::MULMOD => Properties::new(3, -2),
+        OpCode::EXP => Properties::new(2, -1),
+        OpCode::SIGNEXTEND => Properties::new(2, -1),
+
+        OpCode::LT => Properties::new(2, -1),
+        OpCode::GT => Properties::new(2, -1),
+        OpCode::SLT => Properties::new(2, -1),
+        OpCode::SGT => Properties::new(2, -1),
+        OpCode::EQ => Properties::new(2, -1),
+        OpCode::ISZERO => Properties::new(1, 0),
+        OpCode::AND => Properties::new(2, -1),
+        OpCode::OR => Properties::new(2, -1),
+        OpCode::XOR => Properties::new(2, -1),
+        OpCode::NOT => Properties::new(1, 0),
+        OpCode::BYTE => Properties::new(2, -1),
+        OpCode::SHL => Properties::new(2, -1),
+        OpCode::SHR => Properties::new(2, -1),
+        OpCode::SAR => Properties::new(2, -1),
+
+        OpCode::KECCAK256 => Properties::new(2, -1),
+
+        OpCode::ADDRESS => Properties::new(0, 1),
+        OpCode::BALANCE => Properties::new(1, 0),
+        OpCode::ORIGIN => Properties::new(0, 1),
+        OpCode::CALLER => Properties::new(0, 1),
+        OpCode::CALLVALUE => Properties::new(0, 1),
+        OpCode::CALLDATALOAD => Properties::new(1, 0),
+        OpCode::CALLDATASIZE => Properties::new(0, 1),
+        OpCode::CALLDATACOPY => Properties::new(3, -3),
+        OpCode::CODESIZE => Properties::new(0, 1),
+        OpCode::CODECOPY => Properties::new(3, -3),
+        OpCode::GASPRICE => Properties::new(0, 1),
+        OpCode::EXTCODESIZE => Properties::new(1, 0),
+        OpCode::EXTCODECOPY => Properties::new(4, -4),
+        OpCode::RETURNDATASIZE => Properties::new(0, 1),
+        OpCode::RETURNDATACOPY => Properties::new(3, -3),
+        OpCode::EXTCODEHASH => Properties::new(1, 0),
+
+        OpCode::BLOCKHASH => Properties::new(1, 0),
+        OpCode::COINBASE => Properties::new(0, 1),
+        OpCode::TIMESTAMP => Properties::new(0, 1),
+        OpCode::NUMBER => Properties::new(0, 1),
+        OpCode::DIFFICULTY => Properties::new(0, 1),
+        OpCode::GASLIMIT => Properties::new(0, 1),
+        OpCode::CHAINID => Properties::new(0, 1),
+        OpCode::SELFBALANCE => Properties::new(0, 1),
+        OpCode::BASEFEE => Properties::new(0, 1),
+
+        OpCode::POP => Properties::new(1, -1),
+        OpCode::MLOAD => Properties::new(1, 0),
+        OpCode::MSTORE => Properties::new(2, -2),
+        OpCode::MSTORE8 => Properties::new(2, -2),
+        OpCode::SLOAD => Properties::new(1, 0),
+        OpCode::SSTORE => Properties::new(2, -2),
+        OpCode::JUMP => Properties::new(1, -1),
+        OpCode::JUMPI => Properties::new(2, -2),
+        OpCode::PC => Properties::new(0, 1),
+        OpCode::MSIZE => Properties::new(0, 1),
+        OpCode::GAS => Properties::new(0, 1),
+        OpCode::JUMPDEST => Properties::new(0, 0),
+
+        OpCode::PUSH1 => Properties::new(0, 1),
+        OpCode::PUSH2 => Properties::new(0, 1),
+        OpCode::PUSH3 => Properties::new(0, 1),
+        OpCode::PUSH4 => Properties::new(0, 1),
+        OpCode::PUSH5 => Properties::new(0, 1),
+        OpCode::PUSH6 => Properties::new(0, 1),
+        OpCode::PUSH7 => Properties::new(0, 1),
+        OpCode::PUSH8 => Properties::new(0, 1),
+        OpCode::PUSH9 => Properties::new(0, 1),
+        OpCode::PUSH10 => Properties::new(0, 1),
+        OpCode::PUSH11 => Properties::new(0, 1),
+        OpCode::PUSH12 => Properties::new(0, 1),
+        OpCode::PUSH13 => Properties::new(0, 1),
+        OpCode::PUSH14 => Properties::new(0, 1),
+        OpCode::PUSH15 => Properties::new(0, 1),
+        OpCode::PUSH16 => Properties::new(0, 1),
+        OpCode::PUSH17 => Properties::new(0, 1),
+        OpCode::PUSH18 => Properties::new(0, 1),
+        OpCode::PUSH19 => Properties::new(0, 1),
+        OpCode::PUSH20 => Properties::new(0, 1),
+        OpCode::PUSH21 => Properties::new(0, 1),
+        OpCode::PUSH22 => Properties::new(0, 1),
+        OpCode::PUSH23 => Properties::new(0, 1),
+        OpCode::PUSH24 => Properties::new(0, 1),
+        OpCode::PUSH25 => Properties::new(0, 1),
+        OpCode::PUSH26 => Properties::new(0, 1),
+        OpCode::PUSH27 => Properties::new(0, 1),
+        OpCode::PUSH28 => Properties::new(0, 1),
+        OpCode::PUSH29 => Properties::new(0, 1),
+        OpCode::PUSH30 => Properties::new(0, 1),
+        OpCode::PUSH31 => Properties::new(0, 1),
+        OpCode::PUSH32 => Properties::new(0, 1),
+
+        OpCode::DUP1 => Properties::new(1, 1),
+        OpCode::DUP2 => Properties::new(2, 1),
+        OpCode::DUP3 => Properties::new(3, 1),
+        OpCode::DUP4 => Properties::new(4, 1),
+        OpCode::DUP5 => Properties::new(5, 1),
+        OpCode::DUP6 => Properties::new(6, 1),
+        OpCode::DUP7 => Properties::new(7, 1),
+        OpCode::DUP8 => Properties::new(8, 1),
+        OpCode::DUP9 => Properties::new(9, 1),
+        OpCode::DUP10 => Properties::new(10, 1),
+        OpCode::DUP11 => Properties::new(11, 1),
+        OpCode::DUP12 => Properties::new(12, 1),
+        OpCode::DUP13 => Properties::new(13, 1),
+        OpCode::DUP14 => Properties::new(14, 1),
+        OpCode::DUP15 => Properties::new(15, 1),
+        OpCode::DUP16 => Properties::new(16, 1),
+
+        OpCode::SWAP1 => Properties::new(2, 0),
+        OpCode::SWAP2 => Properties::new(3, 0),
+        OpCode::SWAP3 => Properties::new(4, 0),
+        OpCode::SWAP4 => Properties::new(5, 0),
+        OpCode::SWAP5 => Properties::new(6, 0),
+        OpCode::SWAP6 => Properties::new(7, 0),
+        OpCode::SWAP7 => Properties::new(8, 0),
+        OpCode::SWAP8 => Properties::new(9, 0),
+        OpCode::SWAP9 => Properties::new(10, 0),
+        OpCode::SWAP10 => Properties::new(11, 0),
+        OpCode::SWAP11 => Properties::new(12, 0),
+        OpCode::SWAP12 => Properties::new(13, 0),
+        OpCode::SWAP13 => Properties::new(14, 0),
+        OpCode::SWAP14 => Properties::new(15, 0),
+        OpCode::SWAP15 => Properties::new(16, 0),
+        OpCode::SWAP16 => Properties::new(17, 0),
+
+        OpCode::LOG0 => Properties::new(2, -2),
+        OpCode::LOG1 => Properties::new(3, -3),
+        OpCode::LOG2 => Properties::new(4, -4),
+        OpCode::LOG3 => Properties::new(5, -5),
+        OpCode::LOG4 => Properties::new(6, -6),
+
+        OpCode::CREATE => Properties::new(3, -2),
+        OpCode::CALL => Properties::new(7, -6),
+        OpCode::CALLCODE => Properties::new(7, -6),
+        OpCode::RETURN => Properties::new(2, -2),
+        OpCode::DELEGATECALL => Properties::new(6, -5),
+        OpCode::CREATE2 => Properties::new(4, -3),
+        OpCode::STATICCALL => Properties::new(6, -5),
+        OpCode::REVERT => Properties::new(2, -2),
+        OpCode::INVALID => Properties::new(0, 0),
+        OpCode::SELFDESTRUCT => Properties::new(1, -1),
+        _ => unreachable!(),
+    }
+}
+
+pub type GasCostTable = [[i16; 256]; Revision::len()];
+
+const fn gas_costs() -> GasCostTable {
+    let mut table = [[-1; 256]; Revision::len()];
+
+    table[Revision::Frontier as usize][OpCode::STOP.to_usize()] = 0;
+    table[Revision::Frontier as usize][OpCode::ADD.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::MUL.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::SUB.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DIV.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::SDIV.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::MOD.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::SMOD.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::ADDMOD.to_usize()] = 8;
+    table[Revision::Frontier as usize][OpCode::MULMOD.to_usize()] = 8;
+    table[Revision::Frontier as usize][OpCode::EXP.to_usize()] = 10;
+    table[Revision::Frontier as usize][OpCode::SIGNEXTEND.to_usize()] = 5;
+    table[Revision::Frontier as usize][OpCode::LT.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::GT.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SLT.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SGT.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::EQ.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::ISZERO.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::AND.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::OR.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::XOR.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::NOT.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::BYTE.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::KECCAK256.to_usize()] = 30;
+    table[Revision::Frontier as usize][OpCode::ADDRESS.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::BALANCE.to_usize()] = 20;
+    table[Revision::Frontier as usize][OpCode::ORIGIN.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::CALLER.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::CALLVALUE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::CALLDATALOAD.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::CALLDATASIZE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::CALLDATACOPY.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::CODESIZE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::CODECOPY.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::GASPRICE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::EXTCODESIZE.to_usize()] = 20;
+    table[Revision::Frontier as usize][OpCode::EXTCODECOPY.to_usize()] = 20;
+    table[Revision::Frontier as usize][OpCode::BLOCKHASH.to_usize()] = 20;
+    table[Revision::Frontier as usize][OpCode::COINBASE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::TIMESTAMP.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::NUMBER.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::DIFFICULTY.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::GASLIMIT.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::POP.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::MLOAD.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::MSTORE.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::MSTORE8.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SLOAD.to_usize()] = 50;
+    table[Revision::Frontier as usize][OpCode::SSTORE.to_usize()] = 0;
+    table[Revision::Frontier as usize][OpCode::JUMP.to_usize()] = 8;
+    table[Revision::Frontier as usize][OpCode::JUMPI.to_usize()] = 10;
+    table[Revision::Frontier as usize][OpCode::PC.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::MSIZE.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::GAS.to_usize()] = 2;
+    table[Revision::Frontier as usize][OpCode::JUMPDEST.to_usize()] = 1;
+
+    table[Revision::Frontier as usize][OpCode::PUSH1.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH2.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH3.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH4.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH5.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH6.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH7.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH8.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH9.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH10.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH11.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH12.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH13.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH14.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH15.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH16.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH17.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH18.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH19.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH20.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH21.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH22.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH23.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH24.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH25.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH26.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH27.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH28.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH29.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH30.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH31.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::PUSH32.to_usize()] = 3;
+
+    table[Revision::Frontier as usize][OpCode::DUP1.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP2.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP3.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP4.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP5.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP6.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP7.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP8.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP9.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP10.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP11.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP12.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP13.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP14.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP15.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::DUP16.to_usize()] = 3;
+
+    table[Revision::Frontier as usize][OpCode::SWAP1.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP2.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP3.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP4.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP5.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP6.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP7.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP8.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP9.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP10.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP11.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP12.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP13.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP14.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP15.to_usize()] = 3;
+    table[Revision::Frontier as usize][OpCode::SWAP16.to_usize()] = 3;
+
+    table[Revision::Frontier as usize][OpCode::LOG0.to_usize()] = 375;
+    table[Revision::Frontier as usize][OpCode::LOG1.to_usize()] = 2 * 375;
+    table[Revision::Frontier as usize][OpCode::LOG2.to_usize()] = 3 * 375;
+    table[Revision::Frontier as usize][OpCode::LOG3.to_usize()] = 4 * 375;
+    table[Revision::Frontier as usize][OpCode::LOG4.to_usize()] = 5 * 375;
+
+    table[Revision::Frontier as usize][OpCode::CREATE.to_usize()] = 32000;
+    table[Revision::Frontier as usize][OpCode::CALL.to_usize()] = 40;
+    table[Revision::Frontier as usize][OpCode::CALLCODE.to_usize()] = 40;
+    table[Revision::Frontier as usize][OpCode::RETURN.to_usize()] = 0;
+    table[Revision::Frontier as usize][OpCode::INVALID.to_usize()] = 0;
+    table[Revision::Frontier as usize][OpCode::SELFDESTRUCT.to_usize()] = 0;
+
+    table[Revision::Homestead as usize] = table[Revision::Frontier as usize];
+    table[Revision::Homestead as usize][OpCode::DELEGATECALL.to_usize()] = 40;
+
+    table[Revision::Tangerine as usize] = table[Revision::Homestead as usize];
+    table[Revision::Tangerine as usize][OpCode::BALANCE.to_usize()] = 400;
+    table[Revision::Tangerine as usize][OpCode::EXTCODESIZE.to_usize()] = 700;
+    table[Revision::Tangerine as usize][OpCode::EXTCODECOPY.to_usize()] = 700;
+    table[Revision::Tangerine as usize][OpCode::SLOAD.to_usize()] = 200;
+    table[Revision::Tangerine as usize][OpCode::CALL.to_usize()] = 700;
+    table[Revision::Tangerine as usize][OpCode::CALLCODE.to_usize()] = 700;
+    table[Revision::Tangerine as usize][OpCode::DELEGATECALL.to_usize()] = 700;
+    table[Revision::Tangerine as usize][OpCode::SELFDESTRUCT.to_usize()] = 5000;
+
+    table[Revision::Spurious as usize] = table[Revision::Tangerine as usize];
+
+    table[Revision::Byzantium as usize] = table[Revision::Spurious as usize];
+    table[Revision::Byzantium as usize][OpCode::RETURNDATASIZE.to_usize()] = 2;
+    table[Revision::Byzantium as usize][OpCode::RETURNDATACOPY.to_usize()] = 3;
+    table[Revision::Byzantium as usize][OpCode::STATICCALL.to_usize()] = 700;
+    table[Revision::Byzantium as usize][OpCode::REVERT.to_usize()] = 0;
+
+    table[Revision::Constantinople as usize] = table[Revision::Byzantium as usize];
+    table[Revision::Constantinople as usize][OpCode::SHL.to_usize()] = 3;
+    table[Revision::Constantinople as usize][OpCode::SHR.to_usize()] = 3;
+    table[Revision::Constantinople as usize][OpCode::SAR.to_usize()] = 3;
+    table[Revision::Constantinople as usize][OpCode::EXTCODEHASH.to_usize()] = 400;
+    table[Revision::Constantinople as usize][OpCode::CREATE2.to_usize()] = 32000;
+
+    table[Revision::Petersburg as usize] = table[Revision::Constantinople as usize];
+
+    table[Revision::Istanbul as usize] = table[Revision::Petersburg as usize];
+    table[Revision::Istanbul as usize][OpCode::BALANCE.to_usize()] = 700;
+    table[Revision::Istanbul as usize][OpCode::CHAINID.to_usize()] = 2;
+    table[Revision::Istanbul as usize][OpCode::EXTCODEHASH.to_usize()] = 700;
+    table[Revision::Istanbul as usize][OpCode::SELFBALANCE.to_usize()] = 5;
+    table[Revision::Istanbul as usize][OpCode::SLOAD.to_usize()] = 800;
+
+    table[Revision::Berlin as usize] = table[Revision::Istanbul as usize];
+    table[Revision::Berlin as usize][OpCode::EXTCODESIZE.to_usize()] =
+        WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::EXTCODECOPY.to_usize()] =
+        WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::EXTCODEHASH.to_usize()] =
+        WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::BALANCE.to_usize()] = WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::CALL.to_usize()] = WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::CALLCODE.to_usize()] = WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::DELEGATECALL.to_usize()] =
+        WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::STATICCALL.to_usize()] = WARM_STORAGE_READ_COST as i16;
+    table[Revision::Berlin as usize][OpCode::SLOAD.to_usize()] = WARM_STORAGE_READ_COST as i16;
+
+    table[Revision::London as usize] = table[Revision::Berlin as usize];
+    table[Revision::London as usize][OpCode::BASEFEE.to_usize()] = 2;
+
+    table[Revision::Shanghai as usize] = table[Revision::London as usize];
+
+    table
+}
+
+pub const GAS_COSTS: GasCostTable = gas_costs();
+
+pub const fn has_const_gas_cost<const OPCODE: OpCode>() -> bool {
+    const LATEST: Revision = Revision::latest();
+
+    let g = GAS_COSTS[Revision::Frontier as usize][OPCODE.to_usize()];
+    let revtable = Revision::iter();
+    let mut iter = 0;
+    loop {
+        let rev = revtable[iter];
+
+        if GAS_COSTS[rev as usize][OPCODE.to_usize()] != g {
+            return false;
+        }
+
+        if matches!(rev, LATEST) {
+            break;
+        } else {
+            iter += 1;
+        }
+    }
+    true
+}
+
+pub const fn opcode_gas_cost<const REVISION: Revision, const OPCODE: OpCode>() -> i16 {
+    GAS_COSTS[REVISION as usize][OPCODE.to_usize()]
+}
+
+const fn property_table() -> [Option<Properties>; 256] {
     let mut table = [None; 256];
 
     table[OpCode::STOP.to_usize()] = Some(Properties::new(0, 0));
@@ -188,184 +575,21 @@ pub static PROPERTIES: Lazy<[Option<Properties>; 256]> = Lazy::new(|| {
     table[OpCode::SELFDESTRUCT.to_usize()] = Some(Properties::new(1, -1));
 
     table
-});
+}
 
-#[allow(clippy::needless_range_loop)]
-static FRONTIER_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = [None; 256];
+pub const PROPERTIES: [Option<Properties>; 256] = property_table();
 
-    table[OpCode::STOP.to_usize()] = Some(0);
-    table[OpCode::ADD.to_usize()] = Some(3);
-    table[OpCode::MUL.to_usize()] = Some(5);
-    table[OpCode::SUB.to_usize()] = Some(3);
-    table[OpCode::DIV.to_usize()] = Some(5);
-    table[OpCode::SDIV.to_usize()] = Some(5);
-    table[OpCode::MOD.to_usize()] = Some(5);
-    table[OpCode::SMOD.to_usize()] = Some(5);
-    table[OpCode::ADDMOD.to_usize()] = Some(8);
-    table[OpCode::MULMOD.to_usize()] = Some(8);
-    table[OpCode::EXP.to_usize()] = Some(10);
-    table[OpCode::SIGNEXTEND.to_usize()] = Some(5);
-    table[OpCode::LT.to_usize()] = Some(3);
-    table[OpCode::GT.to_usize()] = Some(3);
-    table[OpCode::SLT.to_usize()] = Some(3);
-    table[OpCode::SGT.to_usize()] = Some(3);
-    table[OpCode::EQ.to_usize()] = Some(3);
-    table[OpCode::ISZERO.to_usize()] = Some(3);
-    table[OpCode::AND.to_usize()] = Some(3);
-    table[OpCode::OR.to_usize()] = Some(3);
-    table[OpCode::XOR.to_usize()] = Some(3);
-    table[OpCode::NOT.to_usize()] = Some(3);
-    table[OpCode::BYTE.to_usize()] = Some(3);
-    table[OpCode::KECCAK256.to_usize()] = Some(30);
-    table[OpCode::ADDRESS.to_usize()] = Some(2);
-    table[OpCode::BALANCE.to_usize()] = Some(20);
-    table[OpCode::ORIGIN.to_usize()] = Some(2);
-    table[OpCode::CALLER.to_usize()] = Some(2);
-    table[OpCode::CALLVALUE.to_usize()] = Some(2);
-    table[OpCode::CALLDATALOAD.to_usize()] = Some(3);
-    table[OpCode::CALLDATASIZE.to_usize()] = Some(2);
-    table[OpCode::CALLDATACOPY.to_usize()] = Some(3);
-    table[OpCode::CODESIZE.to_usize()] = Some(2);
-    table[OpCode::CODECOPY.to_usize()] = Some(3);
-    table[OpCode::GASPRICE.to_usize()] = Some(2);
-    table[OpCode::EXTCODESIZE.to_usize()] = Some(20);
-    table[OpCode::EXTCODECOPY.to_usize()] = Some(20);
-    table[OpCode::BLOCKHASH.to_usize()] = Some(20);
-    table[OpCode::COINBASE.to_usize()] = Some(2);
-    table[OpCode::TIMESTAMP.to_usize()] = Some(2);
-    table[OpCode::NUMBER.to_usize()] = Some(2);
-    table[OpCode::DIFFICULTY.to_usize()] = Some(2);
-    table[OpCode::GASLIMIT.to_usize()] = Some(2);
-    table[OpCode::POP.to_usize()] = Some(2);
-    table[OpCode::MLOAD.to_usize()] = Some(3);
-    table[OpCode::MSTORE.to_usize()] = Some(3);
-    table[OpCode::MSTORE8.to_usize()] = Some(3);
-    table[OpCode::SLOAD.to_usize()] = Some(50);
-    table[OpCode::SSTORE.to_usize()] = Some(0);
-    table[OpCode::JUMP.to_usize()] = Some(8);
-    table[OpCode::JUMPI.to_usize()] = Some(10);
-    table[OpCode::PC.to_usize()] = Some(2);
-    table[OpCode::MSIZE.to_usize()] = Some(2);
+#[cfg(test)]
+mod tests {
+    use super::*;
 
-    table[OpCode::GAS.to_usize()] = Some(2);
-    table[OpCode::JUMPDEST.to_usize()] = Some(1);
-
-    for op in OpCode::PUSH1.to_usize()..=OpCode::PUSH32.to_usize() {
-        table[op] = Some(3);
-    }
-
-    for op in OpCode::DUP1.to_usize()..=OpCode::DUP16.to_usize() {
-        table[op] = Some(3);
-    }
-
-    for op in OpCode::SWAP1.to_usize()..=OpCode::SWAP16.to_usize() {
-        table[op] = Some(3);
-    }
-
-    for (i, op) in (OpCode::LOG0.to_usize()..=OpCode::LOG4.to_usize())
-        .into_iter()
-        .enumerate()
-    {
-        table[op] = Some((1 + i as u16) * 375);
-    }
-
-    table[OpCode::CREATE.to_usize()] = Some(32000);
-    table[OpCode::CALL.to_usize()] = Some(40);
-    table[OpCode::CALLCODE.to_usize()] = Some(40);
-    table[OpCode::RETURN.to_usize()] = Some(0);
-    table[OpCode::INVALID.to_usize()] = Some(0);
-    table[OpCode::SELFDESTRUCT.to_usize()] = Some(0);
-
-    table
-});
-
-static HOMESTEAD_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *FRONTIER_GAS_COSTS;
-    table[OpCode::DELEGATECALL.to_usize()] = Some(40);
-    table
-});
-
-static TANGERINE_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *HOMESTEAD_GAS_COSTS;
-    table[OpCode::BALANCE.to_usize()] = Some(400);
-    table[OpCode::EXTCODESIZE.to_usize()] = Some(700);
-    table[OpCode::EXTCODECOPY.to_usize()] = Some(700);
-    table[OpCode::SLOAD.to_usize()] = Some(200);
-    table[OpCode::CALL.to_usize()] = Some(700);
-    table[OpCode::CALLCODE.to_usize()] = Some(700);
-    table[OpCode::DELEGATECALL.to_usize()] = Some(700);
-    table[OpCode::SELFDESTRUCT.to_usize()] = Some(5000);
-    table
-});
-
-static SPURIOUS_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| *TANGERINE_GAS_COSTS);
-
-static BYZANTIUM_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *SPURIOUS_GAS_COSTS;
-    table[OpCode::RETURNDATASIZE.to_usize()] = Some(2);
-    table[OpCode::RETURNDATACOPY.to_usize()] = Some(3);
-    table[OpCode::STATICCALL.to_usize()] = Some(700);
-    table[OpCode::REVERT.to_usize()] = Some(0);
-    table
-});
-
-static CONSTANTINOPLE_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *BYZANTIUM_GAS_COSTS;
-    table[OpCode::SHL.to_usize()] = Some(3);
-    table[OpCode::SHR.to_usize()] = Some(3);
-    table[OpCode::SAR.to_usize()] = Some(3);
-    table[OpCode::EXTCODEHASH.to_usize()] = Some(400);
-    table[OpCode::CREATE2.to_usize()] = Some(32000);
-    table
-});
-
-static PETERSBURG_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| *CONSTANTINOPLE_GAS_COSTS);
-
-static ISTANBUL_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *PETERSBURG_GAS_COSTS;
-    table[OpCode::BALANCE.to_usize()] = Some(700);
-    table[OpCode::CHAINID.to_usize()] = Some(2);
-    table[OpCode::EXTCODEHASH.to_usize()] = Some(700);
-    table[OpCode::SELFBALANCE.to_usize()] = Some(5);
-    table[OpCode::SLOAD.to_usize()] = Some(800);
-    table
-});
-
-static BERLIN_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *ISTANBUL_GAS_COSTS;
-    table[OpCode::EXTCODESIZE.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::EXTCODECOPY.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::EXTCODEHASH.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::BALANCE.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::CALL.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::CALLCODE.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::DELEGATECALL.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::STATICCALL.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table[OpCode::SLOAD.to_usize()] = Some(WARM_STORAGE_READ_COST);
-    table
-});
-
-static LONDON_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| {
-    let mut table = *BERLIN_GAS_COSTS;
-    table[OpCode::BASEFEE.to_usize()] = Some(2);
-    table
-});
-
-static SHANGHAI_GAS_COSTS: Lazy<[Option<u16>; 256]> = Lazy::new(|| *LONDON_GAS_COSTS);
-
-pub fn gas_costs(revision: Revision) -> &'static [Option<u16>; 256] {
-    match revision {
-        Revision::Frontier => &FRONTIER_GAS_COSTS,
-        Revision::Homestead => &HOMESTEAD_GAS_COSTS,
-        Revision::Tangerine => &TANGERINE_GAS_COSTS,
-        Revision::Spurious => &SPURIOUS_GAS_COSTS,
-        Revision::Byzantium => &BYZANTIUM_GAS_COSTS,
-        Revision::Constantinople => &CONSTANTINOPLE_GAS_COSTS,
-        Revision::Petersburg => &PETERSBURG_GAS_COSTS,
-        Revision::Istanbul => &ISTANBUL_GAS_COSTS,
-        Revision::Berlin => &BERLIN_GAS_COSTS,
-        Revision::London => &LONDON_GAS_COSTS,
-        Revision::Shanghai => &SHANGHAI_GAS_COSTS,
+    #[test]
+    fn const_gas_cost() {
+        assert!(has_const_gas_cost::<{ OpCode::STOP }>());
+        assert!(has_const_gas_cost::<{ OpCode::ADD }>());
+        assert!(has_const_gas_cost::<{ OpCode::PUSH1 }>());
+        assert!(!has_const_gas_cost::<{ OpCode::SHL }>());
+        assert!(!has_const_gas_cost::<{ OpCode::BALANCE }>());
+        assert!(!has_const_gas_cost::<{ OpCode::SLOAD }>());
     }
 }
diff --git a/src/execution/evm/instructions/stack_manip.rs b/src/execution/evm/instructions/stack_manip.rs
index b6f691d..3674324 100644
--- a/src/execution/evm/instructions/stack_manip.rs
+++ b/src/execution/evm/instructions/stack_manip.rs
@@ -2,33 +2,33 @@ use crate::execution::evm::{common::*, state::*};
 use arrayref::array_ref;
 use ethnum::U256;
 
-#[inline(always)]
+#[inline]
 pub(crate) fn push<const LEN: usize>(stack: &mut Stack, code: &[u8]) -> usize {
     stack.push(u256_from_slice(&code[..LEN]));
     LEN
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn push1(stack: &mut Stack, v: u8) {
     stack.push(v.into());
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn push32(stack: &mut Stack, code: &[u8]) {
     stack.push(U256::from_be_bytes(*array_ref!(code, 0, 32)));
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn dup<const HEIGHT: usize>(stack: &mut Stack) {
     stack.push(*stack.get(HEIGHT - 1));
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn swap<const HEIGHT: usize>(stack: &mut Stack) {
     stack.swap_top(HEIGHT);
 }
 
-#[inline(always)]
+#[inline]
 pub(crate) fn pop(stack: &mut Stack) {
     stack.pop();
 }
diff --git a/src/execution/evm/interpreter.rs b/src/execution/evm/interpreter.rs
index b4a647e..f32cb9e 100644
--- a/src/execution/evm/interpreter.rs
+++ b/src/execution/evm/interpreter.rs
@@ -1,25 +1,19 @@
 use self::instruction_table::*;
 use super::{
     common::{InterpreterMessage, *},
-    continuation::{interrupt::*, interrupt_data::*, resume_data::*, InnerCoroutine},
     instructions::{control::*, stack_manip::*, *},
     state::*,
-    tracing::Tracer,
     *,
 };
 use crate::models::*;
 use ethnum::U256;
 use std::sync::Arc;
 
+#[inline]
 fn check_requirements(
-    instruction_table: &InstructionTable,
+    metrics: &InstructionTableEntry,
     state: &mut ExecutionState,
-    op: OpCode,
 ) -> Result<(), StatusCode> {
-    let metrics = instruction_table[op.to_usize()]
-        .as_ref()
-        .ok_or(StatusCode::UndefinedInstruction)?;
-
     state.gas_left -= metrics.gas_cost as i64;
     if state.gas_left < 0 {
         return Err(StatusCode::OutOfGas);
@@ -41,8 +35,9 @@ fn check_requirements(
 pub struct JumpdestMap(Arc<[bool]>);
 
 impl JumpdestMap {
+    #[inline]
     pub fn contains(&self, dst: U256) -> bool {
-        dst < u128::try_from(self.0.len()).unwrap() && self.0[dst.as_usize()]
+        dst < self.0.len() as u128 && self.0[dst.as_usize()]
     }
 }
 
@@ -98,7 +93,7 @@ impl AnalyzedCode {
                 | OpCode::PUSH29
                 | OpCode::PUSH30
                 | OpCode::PUSH31
-                | OpCode::PUSH32 => opcode.to_usize() - OpCode::PUSH1.to_usize() + 2,
+                | OpCode::PUSH32 => (opcode.0 - OpCode::PUSH1.0 + 2) as usize,
                 _ => 1,
             }
         }
@@ -120,549 +115,434 @@ impl AnalyzedCode {
         }
     }
 
-    /// Execute analyzed EVM bytecode using provided `Host` context. Optionally modify the state after each instruction using provided closure.
-    pub fn execute<H: Host, T: Tracer>(
+    /// Execute analyzed EVM bytecode using provided `Host` context.
+    pub fn execute<H>(
         &self,
         host: &mut H,
-        tracer: &mut T,
-        state_modifier: StateModifier,
-        message: InterpreterMessage,
+        message: &InterpreterMessage,
         revision: Revision,
-    ) -> Output {
-        if !T::DUMMY {
-            tracer.notify_execution_start(revision, message.clone(), self.code.clone());
-        }
-
-        let output = self
-            .execute_resumable(!T::DUMMY || state_modifier.is_some(), message, revision)
-            .run_to_completion_with_host(host, tracer, state_modifier);
-
-        if !T::DUMMY {
-            tracer.notify_execution_end(&output);
-        }
-
-        output
-    }
-
-    /// Execute in resumable EVM.
-    pub fn execute_resumable(
-        &self,
-        trace: bool,
-        message: InterpreterMessage,
-        revision: Revision,
-    ) -> StartedInterrupt {
-        let code = self.clone();
-        let state = ExecutionState::new(message);
-        let f = match (trace, revision) {
-            (true, Revision::Frontier) => gen_interpreter::<true, { Revision::Frontier }>,
-            (true, Revision::Homestead) => gen_interpreter::<true, { Revision::Homestead }>,
-            (true, Revision::Tangerine) => gen_interpreter::<true, { Revision::Tangerine }>,
-            (true, Revision::Spurious) => gen_interpreter::<true, { Revision::Spurious }>,
-            (true, Revision::Byzantium) => gen_interpreter::<true, { Revision::Byzantium }>,
+    ) -> Output
+    where
+        H: Host,
+    {
+        let mut state = ExecutionState::new(message);
+        let res = match (host.trace_instructions(), revision) {
+            (true, Revision::Frontier) => {
+                execute_message::<H, true, { Revision::Frontier }>(self, &mut state, host)
+            }
+            (true, Revision::Homestead) => {
+                execute_message::<H, true, { Revision::Homestead }>(self, &mut state, host)
+            }
+            (true, Revision::Tangerine) => {
+                execute_message::<H, true, { Revision::Tangerine }>(self, &mut state, host)
+            }
+            (true, Revision::Spurious) => {
+                execute_message::<H, true, { Revision::Spurious }>(self, &mut state, host)
+            }
+            (true, Revision::Byzantium) => {
+                execute_message::<H, true, { Revision::Byzantium }>(self, &mut state, host)
+            }
             (true, Revision::Constantinople) => {
-                gen_interpreter::<true, { Revision::Constantinople }>
+                execute_message::<H, true, { Revision::Constantinople }>(self, &mut state, host)
+            }
+            (true, Revision::Petersburg) => {
+                execute_message::<H, true, { Revision::Petersburg }>(self, &mut state, host)
+            }
+            (true, Revision::Istanbul) => {
+                execute_message::<H, true, { Revision::Istanbul }>(self, &mut state, host)
+            }
+            (true, Revision::Berlin) => {
+                execute_message::<H, true, { Revision::Berlin }>(self, &mut state, host)
+            }
+            (true, Revision::London) => {
+                execute_message::<H, true, { Revision::London }>(self, &mut state, host)
+            }
+            (true, Revision::Shanghai) => {
+                execute_message::<H, true, { Revision::Shanghai }>(self, &mut state, host)
+            }
+            (false, Revision::Frontier) => {
+                execute_message::<H, false, { Revision::Frontier }>(self, &mut state, host)
+            }
+            (false, Revision::Homestead) => {
+                execute_message::<H, false, { Revision::Homestead }>(self, &mut state, host)
+            }
+            (false, Revision::Tangerine) => {
+                execute_message::<H, false, { Revision::Tangerine }>(self, &mut state, host)
+            }
+            (false, Revision::Spurious) => {
+                execute_message::<H, false, { Revision::Spurious }>(self, &mut state, host)
+            }
+            (false, Revision::Byzantium) => {
+                execute_message::<H, false, { Revision::Byzantium }>(self, &mut state, host)
             }
-            (true, Revision::Petersburg) => gen_interpreter::<true, { Revision::Petersburg }>,
-            (true, Revision::Istanbul) => gen_interpreter::<true, { Revision::Istanbul }>,
-            (true, Revision::Berlin) => gen_interpreter::<true, { Revision::Berlin }>,
-            (true, Revision::London) => gen_interpreter::<true, { Revision::London }>,
-            (true, Revision::Shanghai) => gen_interpreter::<true, { Revision::Shanghai }>,
-            (false, Revision::Frontier) => gen_interpreter::<false, { Revision::Frontier }>,
-            (false, Revision::Homestead) => gen_interpreter::<false, { Revision::Homestead }>,
-            (false, Revision::Tangerine) => gen_interpreter::<false, { Revision::Tangerine }>,
-            (false, Revision::Spurious) => gen_interpreter::<false, { Revision::Spurious }>,
-            (false, Revision::Byzantium) => gen_interpreter::<false, { Revision::Byzantium }>,
             (false, Revision::Constantinople) => {
-                gen_interpreter::<false, { Revision::Constantinople }>
+                execute_message::<H, false, { Revision::Constantinople }>(self, &mut state, host)
+            }
+            (false, Revision::Petersburg) => {
+                execute_message::<H, false, { Revision::Petersburg }>(self, &mut state, host)
+            }
+            (false, Revision::Istanbul) => {
+                execute_message::<H, false, { Revision::Istanbul }>(self, &mut state, host)
+            }
+            (false, Revision::Berlin) => {
+                execute_message::<H, false, { Revision::Berlin }>(self, &mut state, host)
+            }
+            (false, Revision::London) => {
+                execute_message::<H, false, { Revision::London }>(self, &mut state, host)
+            }
+            (false, Revision::Shanghai) => {
+                execute_message::<H, false, { Revision::Shanghai }>(self, &mut state, host)
             }
-            (false, Revision::Petersburg) => gen_interpreter::<false, { Revision::Petersburg }>,
-            (false, Revision::Istanbul) => gen_interpreter::<false, { Revision::Istanbul }>,
-            (false, Revision::Berlin) => gen_interpreter::<false, { Revision::Berlin }>,
-            (false, Revision::London) => gen_interpreter::<false, { Revision::London }>,
-            (false, Revision::Shanghai) => gen_interpreter::<false, { Revision::Shanghai }>,
         };
-        let inner = (f)(code, state);
 
-        StartedInterrupt { inner }
-    }
-}
-
-impl StartedInterrupt {
-    pub fn run_to_completion_with_host<H: Host, T: Tracer>(
-        self,
-        host: &mut H,
-        tracer: &mut T,
-        state_modifier: StateModifier,
-    ) -> Output {
-        let mut interrupt = self.resume(());
-
-        loop {
-            interrupt = match interrupt {
-                Interrupt::InstructionStart {
-                    interrupt,
-                    pc,
-                    opcode,
-                    state,
-                } => {
-                    tracer.notify_instruction_start(pc, opcode, &state);
-                    interrupt.resume(state_modifier.clone())
-                }
-                Interrupt::AccountExists { interrupt, address } => {
-                    let exists = host.account_exists(address);
-                    interrupt.resume(AccountExistsStatus { exists })
-                }
-                Interrupt::GetBalance { interrupt, address } => {
-                    let balance = host.get_balance(address);
-                    interrupt.resume(Balance { balance })
-                }
-                Interrupt::GetCodeSize { interrupt, address } => {
-                    let code_size = host.get_code_size(address);
-                    interrupt.resume(CodeSize { code_size })
-                }
-                Interrupt::GetStorage {
-                    interrupt,
-                    address,
-                    location,
-                } => {
-                    let value = host.get_storage(address, location);
-                    interrupt.resume(StorageValue { value })
-                }
-                Interrupt::SetStorage {
-                    interrupt,
-                    address,
-                    location,
-                    value,
-                } => {
-                    let status = host.set_storage(address, location, value);
-                    interrupt.resume(StorageStatusInfo { status })
-                }
-                Interrupt::GetCodeHash { interrupt, address } => {
-                    let hash = host.get_code_hash(address);
-                    interrupt.resume(CodeHash { hash })
-                }
-                Interrupt::CopyCode {
-                    interrupt,
-                    address,
-                    offset,
-                    max_size,
-                } => {
-                    let mut code = vec![0; max_size];
-                    let copied = host.copy_code(address, offset, &mut code[..]);
-                    debug_assert!(copied <= code.len());
-                    code.truncate(copied);
-                    let code = code.into();
-                    interrupt.resume(Code { code })
-                }
-                Interrupt::Selfdestruct {
-                    interrupt,
-                    address,
-                    beneficiary,
-                } => {
-                    host.selfdestruct(address, beneficiary);
-                    interrupt.resume(())
-                }
-                Interrupt::Call {
-                    interrupt,
-                    call_data,
-                } => {
-                    let message = match call_data {
-                        Call::Call(message) => message,
-                        Call::Create(message) => message.into(),
-                    };
-                    let output = host.call(&message);
-                    interrupt.resume(CallOutput { output })
-                }
-                Interrupt::GetTxContext { interrupt } => {
-                    let context = host.get_tx_context();
-                    interrupt.resume(TxContextData { context })
-                }
-                Interrupt::GetBlockHash {
-                    interrupt,
-                    block_number,
-                } => {
-                    let hash = host.get_block_hash(block_number);
-                    interrupt.resume(BlockHash { hash })
-                }
-                Interrupt::EmitLog {
-                    interrupt,
-                    address,
-                    data,
-                    topics,
-                } => {
-                    host.emit_log(address, &*data, topics.as_slice());
-                    interrupt.resume(())
-                }
-                Interrupt::AccessAccount { interrupt, address } => {
-                    let status = host.access_account(address);
-                    interrupt.resume(AccessAccountStatus { status })
-                }
-                Interrupt::AccessStorage {
-                    interrupt,
-                    address,
-                    location,
-                } => {
-                    let status = host.access_storage(address, location);
-                    interrupt.resume(AccessStorageStatus { status })
-                }
-                Interrupt::Complete { result, .. } => {
-                    let output = match result {
-                        Ok(output) => output.into(),
-                        Err(status_code) => Output {
-                            status_code,
-                            gas_left: 0,
-                            output_data: Bytes::new(),
-                            create_address: None,
-                        },
-                    };
-
-                    return output;
-                }
-            };
+        match res {
+            Ok(output) => output.into(),
+            Err(status_code) => Output {
+                status_code,
+                gas_left: 0,
+                output_data: Bytes::new(),
+                create_address: None,
+            },
         }
     }
 }
 
 #[allow(clippy::needless_borrow)]
-fn gen_interpreter<const TRACE: bool, const REVISION: Revision>(
-    s: AnalyzedCode,
-    mut state: ExecutionState,
-) -> InnerCoroutine {
-    Box::pin(move |_: ResumeData| {
-        let instruction_table = get_instruction_table(REVISION);
+fn execute_message<H, const TRACE: bool, const REVISION: Revision>(
+    s: &AnalyzedCode,
+    state: &mut ExecutionState,
+    host: &mut H,
+) -> Result<SuccessfulOutput, StatusCode>
+where
+    H: Host,
+{
+    let instruction_table = get_instruction_table(REVISION);
 
-        let mut reverted = false;
+    let mut reverted = false;
 
-        let mut pc = 0;
+    let mut pc = 0;
 
-        loop {
-            let op = OpCode(s.padded_code[pc]);
+    loop {
+        let op = OpCode(s.padded_code[pc]);
 
-            if TRACE {
-                // Do not print stop on the final STOP
-                if pc < s.code.len() {
-                    if let Some(modifier) = {
-                        yield InterruptData::InstructionStart {
-                            pc,
-                            opcode: op,
-                            state: Box::new(state.clone()),
-                        }
-                    }
-                    .as_state_modifier()
-                    .unwrap()
-                    {
-                        (modifier)(&mut state)
-                    }
-                }
-            }
+        let metrics = &instruction_table[op.to_usize()];
 
-            check_requirements(instruction_table, &mut state, op)?;
-
-            match op {
-                OpCode::STOP => {
-                    break;
-                }
-                OpCode::ADD => {
-                    arithmetic::add(&mut state.stack);
-                }
-                OpCode::MUL => {
-                    arithmetic::mul(&mut state.stack);
-                }
-                OpCode::SUB => {
-                    arithmetic::sub(&mut state.stack);
-                }
-                OpCode::DIV => {
-                    arithmetic::div(&mut state.stack);
-                }
-                OpCode::SDIV => {
-                    arithmetic::sdiv(&mut state.stack);
-                }
-                OpCode::MOD => {
-                    arithmetic::modulo(&mut state.stack);
-                }
-                OpCode::SMOD => {
-                    arithmetic::smod(&mut state.stack);
-                }
-                OpCode::ADDMOD => {
-                    arithmetic::addmod(&mut state.stack);
-                }
-                OpCode::MULMOD => {
-                    arithmetic::mulmod(&mut state.stack);
-                }
-                OpCode::EXP => {
-                    arithmetic::exp::<REVISION>(&mut state)?;
-                }
-                OpCode::SIGNEXTEND => {
-                    arithmetic::signextend(&mut state.stack);
-                }
-                OpCode::LT => {
-                    boolean::lt(&mut state.stack);
-                }
-                OpCode::GT => {
-                    boolean::gt(&mut state.stack);
-                }
-                OpCode::SLT => {
-                    boolean::slt(&mut state.stack);
-                }
-                OpCode::SGT => {
-                    boolean::sgt(&mut state.stack);
-                }
-                OpCode::EQ => {
-                    boolean::eq(&mut state.stack);
-                }
-                OpCode::ISZERO => {
-                    boolean::iszero(&mut state.stack);
-                }
-                OpCode::AND => {
-                    boolean::and(&mut state.stack);
-                }
-                OpCode::OR => {
-                    boolean::or(&mut state.stack);
-                }
-                OpCode::XOR => {
-                    boolean::xor(&mut state.stack);
-                }
-                OpCode::NOT => {
-                    boolean::not(&mut state.stack);
-                }
-                OpCode::BYTE => {
-                    bitwise::byte(&mut state.stack);
-                }
-                OpCode::SHL => {
-                    bitwise::shl(&mut state.stack);
-                }
-                OpCode::SHR => {
-                    bitwise::shr(&mut state.stack);
-                }
-                OpCode::SAR => {
-                    bitwise::sar(&mut state.stack);
-                }
-
-                OpCode::KECCAK256 => {
-                    memory::keccak256(&mut state)?;
-                }
-                OpCode::ADDRESS => {
-                    external::address(&mut state);
-                }
-                OpCode::BALANCE => {
-                    balance!(&mut state, REVISION);
-                }
-                OpCode::CALLER => {
-                    external::caller(&mut state);
-                }
-                OpCode::CALLVALUE => {
-                    external::callvalue(&mut state);
-                }
-                OpCode::CALLDATALOAD => {
-                    calldataload(&mut state);
-                }
-                OpCode::CALLDATASIZE => {
-                    calldatasize(&mut state);
-                }
-                OpCode::CALLDATACOPY => {
-                    memory::calldatacopy(&mut state)?;
-                }
-                OpCode::CODESIZE => {
-                    memory::codesize(&mut state.stack, &s.code[..]);
-                }
-                OpCode::CODECOPY => {
-                    memory::codecopy(&mut state, &s.code[..])?;
-                }
-                OpCode::EXTCODESIZE => {
-                    extcodesize!(&mut state, REVISION);
-                }
-                OpCode::EXTCODECOPY => {
-                    extcodecopy!(state, REVISION);
-                }
-                OpCode::RETURNDATASIZE => {
-                    memory::returndatasize(&mut state);
-                }
-                OpCode::RETURNDATACOPY => {
-                    memory::returndatacopy(&mut state)?;
-                }
-                OpCode::EXTCODEHASH => {
-                    extcodehash!(state, REVISION);
-                }
-                OpCode::BLOCKHASH => {
-                    blockhash!(state);
-                }
-                OpCode::ORIGIN
-                | OpCode::COINBASE
-                | OpCode::GASPRICE
-                | OpCode::TIMESTAMP
-                | OpCode::NUMBER
-                | OpCode::DIFFICULTY
-                | OpCode::GASLIMIT
-                | OpCode::CHAINID
-                | OpCode::BASEFEE => {
-                    push_txcontext!(
-                        state,
-                        match op {
-                            OpCode::ORIGIN => external::origin_accessor,
-                            OpCode::COINBASE => external::coinbase_accessor,
-                            OpCode::GASPRICE => external::gasprice_accessor,
-                            OpCode::TIMESTAMP => external::timestamp_accessor,
-                            OpCode::NUMBER => external::number_accessor,
-                            OpCode::DIFFICULTY => external::difficulty_accessor,
-                            OpCode::GASLIMIT => external::gaslimit_accessor,
-                            OpCode::CHAINID => external::chainid_accessor,
-                            OpCode::BASEFEE => external::basefee_accessor,
-                            _ => unreachable!(),
-                        }
-                    );
-                }
-                OpCode::SELFBALANCE => {
-                    selfbalance!(state);
-                }
-                OpCode::POP => pop(&mut state.stack),
-                OpCode::MLOAD => memory::mload(&mut state)?,
-                OpCode::MSTORE => memory::mstore(&mut state)?,
-                OpCode::MSTORE8 => memory::mstore8(&mut state)?,
-                OpCode::JUMP => {
-                    pc = op_jump(&mut state, &s.jumpdest_map)?;
-
-                    continue;
-                }
-                OpCode::JUMPI => {
-                    if *state.stack.get(1) != 0 {
-                        pc = op_jump(&mut state, &s.jumpdest_map)?;
-                        state.stack.pop();
-
-                        continue;
-                    } else {
-                        state.stack.pop();
-                        state.stack.pop();
-                    }
-                }
-                OpCode::PC => state.stack.push(u128::try_from(pc).unwrap().into()),
-                OpCode::MSIZE => memory::msize(&mut state),
-                OpCode::SLOAD => {
-                    sload!(state, REVISION);
-                }
-                OpCode::SSTORE => {
-                    sstore!(state, REVISION);
-                }
-                OpCode::GAS => state
-                    .stack
-                    .push(u128::try_from(state.gas_left).unwrap().into()),
-                OpCode::JUMPDEST => {}
-                OpCode::PUSH1 => {
-                    push1(&mut state.stack, s.padded_code[pc + 1]);
-                    pc += 1;
-                }
-                OpCode::PUSH2 => pc += push::<2>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH3 => pc += push::<3>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH4 => pc += push::<4>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH5 => pc += push::<5>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH6 => pc += push::<6>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH7 => pc += push::<7>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH8 => pc += push::<8>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH9 => pc += push::<9>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH10 => pc += push::<10>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH11 => pc += push::<11>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH12 => pc += push::<12>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH13 => pc += push::<13>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH14 => pc += push::<14>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH15 => pc += push::<15>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH16 => pc += push::<16>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH17 => pc += push::<17>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH18 => pc += push::<18>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH19 => pc += push::<19>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH20 => pc += push::<20>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH21 => pc += push::<21>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH22 => pc += push::<22>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH23 => pc += push::<23>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH24 => pc += push::<24>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH25 => pc += push::<25>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH26 => pc += push::<26>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH27 => pc += push::<27>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH28 => pc += push::<28>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH29 => pc += push::<29>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH30 => pc += push::<30>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH31 => pc += push::<31>(&mut state.stack, &s.padded_code[pc + 1..]),
-                OpCode::PUSH32 => {
-                    push32(&mut state.stack, &s.padded_code[pc + 1..]);
-                    pc += 32;
-                }
-
-                OpCode::DUP1 => dup::<1>(&mut state.stack),
-                OpCode::DUP2 => dup::<2>(&mut state.stack),
-                OpCode::DUP3 => dup::<3>(&mut state.stack),
-                OpCode::DUP4 => dup::<4>(&mut state.stack),
-                OpCode::DUP5 => dup::<5>(&mut state.stack),
-                OpCode::DUP6 => dup::<6>(&mut state.stack),
-                OpCode::DUP7 => dup::<7>(&mut state.stack),
-                OpCode::DUP8 => dup::<8>(&mut state.stack),
-                OpCode::DUP9 => dup::<9>(&mut state.stack),
-                OpCode::DUP10 => dup::<10>(&mut state.stack),
-                OpCode::DUP11 => dup::<11>(&mut state.stack),
-                OpCode::DUP12 => dup::<12>(&mut state.stack),
-                OpCode::DUP13 => dup::<13>(&mut state.stack),
-                OpCode::DUP14 => dup::<14>(&mut state.stack),
-                OpCode::DUP15 => dup::<15>(&mut state.stack),
-                OpCode::DUP16 => dup::<16>(&mut state.stack),
-
-                OpCode::SWAP1 => swap::<1>(&mut state.stack),
-                OpCode::SWAP2 => swap::<2>(&mut state.stack),
-                OpCode::SWAP3 => swap::<3>(&mut state.stack),
-                OpCode::SWAP4 => swap::<4>(&mut state.stack),
-                OpCode::SWAP5 => swap::<5>(&mut state.stack),
-                OpCode::SWAP6 => swap::<6>(&mut state.stack),
-                OpCode::SWAP7 => swap::<7>(&mut state.stack),
-                OpCode::SWAP8 => swap::<8>(&mut state.stack),
-                OpCode::SWAP9 => swap::<9>(&mut state.stack),
-                OpCode::SWAP10 => swap::<10>(&mut state.stack),
-                OpCode::SWAP11 => swap::<11>(&mut state.stack),
-                OpCode::SWAP12 => swap::<12>(&mut state.stack),
-                OpCode::SWAP13 => swap::<13>(&mut state.stack),
-                OpCode::SWAP14 => swap::<14>(&mut state.stack),
-                OpCode::SWAP15 => swap::<15>(&mut state.stack),
-                OpCode::SWAP16 => swap::<16>(&mut state.stack),
-
-                OpCode::LOG0 | OpCode::LOG1 | OpCode::LOG2 | OpCode::LOG3 | OpCode::LOG4 => {
-                    do_log!(&mut state, op.0 - OpCode::LOG0.0);
-                }
-                OpCode::CREATE | OpCode::CREATE2 => {
-                    do_create!(&mut state, REVISION, op == OpCode::CREATE2);
-                }
-                OpCode::CALL | OpCode::CALLCODE | OpCode::DELEGATECALL | OpCode::STATICCALL => {
-                    do_call!(
-                        &mut state,
-                        REVISION,
-                        match op {
-                            OpCode::CALL | OpCode::STATICCALL => CallKind::Call,
-                            OpCode::CALLCODE => CallKind::CallCode,
-                            OpCode::DELEGATECALL => CallKind::DelegateCall,
-                            _ => unreachable!(),
-                        },
-                        op == OpCode::STATICCALL
-                    );
-                }
-                OpCode::RETURN | OpCode::REVERT => {
-                    ret(&mut state)?;
-                    reverted = op == OpCode::REVERT;
-                    break;
-                }
-                OpCode::INVALID => {
-                    return Err(StatusCode::InvalidInstruction);
-                }
-                OpCode::SELFDESTRUCT => {
-                    selfdestruct!(state, REVISION);
-                    break;
-                }
-                other => {
-                    unreachable!("reached unhandled opcode: {}", other);
-                }
-            }
-
-            pc += 1;
+        if metrics.gas_cost < 0 {
+            return Err(StatusCode::UndefinedInstruction);
         }
 
-        let output = SuccessfulOutput {
-            reverted,
-            gas_left: state.gas_left,
-            output_data: state.output_data.clone(),
-        };
+        if TRACE {
+            // Do not print stop on the final STOP
+            if pc < s.code.len() {
+                host.tracer(|t| {
+                    t.capture_state(
+                        &state,
+                        pc,
+                        op,
+                        metrics.gas_cost as u64,
+                        state.message.depth as u16,
+                    )
+                });
+            }
+        }
 
-        Ok(output)
-    })
+        check_requirements(metrics, state)?;
+
+        match op {
+            OpCode::STOP => {
+                break;
+            }
+            OpCode::ADD => {
+                arithmetic::add(&mut state.stack);
+            }
+            OpCode::MUL => {
+                arithmetic::mul(&mut state.stack);
+            }
+            OpCode::SUB => {
+                arithmetic::sub(&mut state.stack);
+            }
+            OpCode::DIV => {
+                arithmetic::div(&mut state.stack);
+            }
+            OpCode::SDIV => {
+                arithmetic::sdiv(&mut state.stack);
+            }
+            OpCode::MOD => {
+                arithmetic::modulo(&mut state.stack);
+            }
+            OpCode::SMOD => {
+                arithmetic::smod(&mut state.stack);
+            }
+            OpCode::ADDMOD => {
+                arithmetic::addmod(&mut state.stack);
+            }
+            OpCode::MULMOD => {
+                arithmetic::mulmod(&mut state.stack);
+            }
+            OpCode::EXP => {
+                arithmetic::exp::<REVISION>(state)?;
+            }
+            OpCode::SIGNEXTEND => {
+                arithmetic::signextend(&mut state.stack);
+            }
+            OpCode::LT => {
+                boolean::lt(&mut state.stack);
+            }
+            OpCode::GT => {
+                boolean::gt(&mut state.stack);
+            }
+            OpCode::SLT => {
+                boolean::slt(&mut state.stack);
+            }
+            OpCode::SGT => {
+                boolean::sgt(&mut state.stack);
+            }
+            OpCode::EQ => {
+                boolean::eq(&mut state.stack);
+            }
+            OpCode::ISZERO => {
+                boolean::iszero(&mut state.stack);
+            }
+            OpCode::AND => {
+                boolean::and(&mut state.stack);
+            }
+            OpCode::OR => {
+                boolean::or(&mut state.stack);
+            }
+            OpCode::XOR => {
+                boolean::xor(&mut state.stack);
+            }
+            OpCode::NOT => {
+                boolean::not(&mut state.stack);
+            }
+            OpCode::BYTE => {
+                bitwise::byte(&mut state.stack);
+            }
+            OpCode::SHL => {
+                bitwise::shl(&mut state.stack);
+            }
+            OpCode::SHR => {
+                bitwise::shr(&mut state.stack);
+            }
+            OpCode::SAR => {
+                bitwise::sar(&mut state.stack);
+            }
+
+            OpCode::KECCAK256 => {
+                memory::keccak256(state)?;
+            }
+            OpCode::ADDRESS => {
+                external::address(state);
+            }
+            OpCode::BALANCE => {
+                external::balance::<_, REVISION>(state, host)?;
+            }
+            OpCode::CALLER => {
+                external::caller(state);
+            }
+            OpCode::CALLVALUE => {
+                external::callvalue(state);
+            }
+            OpCode::CALLDATALOAD => {
+                calldataload(state);
+            }
+            OpCode::CALLDATASIZE => {
+                calldatasize(state);
+            }
+            OpCode::CALLDATACOPY => {
+                memory::calldatacopy(state)?;
+            }
+            OpCode::CODESIZE => {
+                memory::codesize(&mut state.stack, &s.code[..]);
+            }
+            OpCode::CODECOPY => {
+                memory::codecopy(state, &s.code[..])?;
+            }
+            OpCode::EXTCODESIZE => {
+                external::extcodesize::<_, REVISION>(state, host)?;
+            }
+            OpCode::EXTCODECOPY => {
+                memory::extcodecopy::<_, REVISION>(state, host)?;
+            }
+            OpCode::RETURNDATASIZE => {
+                memory::returndatasize(state);
+            }
+            OpCode::RETURNDATACOPY => {
+                memory::returndatacopy(state)?;
+            }
+            OpCode::EXTCODEHASH => {
+                memory::extcodehash::<_, REVISION>(state, host)?;
+            }
+            OpCode::BLOCKHASH => {
+                external::blockhash(state, host)?;
+            }
+            OpCode::ORIGIN => state
+                .stack
+                .push(address_to_u256(host.get_tx_context().tx_origin)),
+            OpCode::COINBASE => state
+                .stack
+                .push(address_to_u256(host.get_tx_context().block_coinbase)),
+            OpCode::GASPRICE => state.stack.push(host.get_tx_context().tx_gas_price),
+            OpCode::TIMESTAMP => state
+                .stack
+                .push(host.get_tx_context().block_timestamp.into()),
+            OpCode::NUMBER => state.stack.push(host.get_tx_context().block_number.into()),
+            OpCode::DIFFICULTY => state.stack.push(host.get_tx_context().block_difficulty),
+            OpCode::GASLIMIT => state
+                .stack
+                .push(host.get_tx_context().block_gas_limit.into()),
+            OpCode::CHAINID => state.stack.push(host.get_tx_context().chain_id),
+            OpCode::BASEFEE => state.stack.push(host.get_tx_context().block_base_fee),
+            OpCode::SELFBALANCE => {
+                external::selfbalance(state, host);
+            }
+            OpCode::POP => pop(&mut state.stack),
+            OpCode::MLOAD => memory::mload(state)?,
+            OpCode::MSTORE => memory::mstore(state)?,
+            OpCode::MSTORE8 => memory::mstore8(state)?,
+            OpCode::JUMP => {
+                pc = op_jump(state, &s.jumpdest_map)?;
+
+                continue;
+            }
+            OpCode::JUMPI => {
+                if *state.stack.get(1) != 0 {
+                    pc = op_jump(state, &s.jumpdest_map)?;
+                    state.stack.pop();
+
+                    continue;
+                } else {
+                    state.stack.pop();
+                    state.stack.pop();
+                }
+            }
+            OpCode::PC => state.stack.push(u128::try_from(pc).unwrap().into()),
+            OpCode::MSIZE => memory::msize(state),
+            OpCode::SLOAD => {
+                external::sload::<_, REVISION>(state, host)?;
+            }
+            OpCode::SSTORE => {
+                external::sstore::<_, REVISION>(state, host)?;
+            }
+            OpCode::GAS => state
+                .stack
+                .push(u128::try_from(state.gas_left).unwrap().into()),
+            OpCode::JUMPDEST => {}
+            OpCode::PUSH1 => {
+                push1(&mut state.stack, s.padded_code[pc + 1]);
+                pc += 1;
+            }
+            OpCode::PUSH2 => pc += push::<2>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH3 => pc += push::<3>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH4 => pc += push::<4>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH5 => pc += push::<5>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH6 => pc += push::<6>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH7 => pc += push::<7>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH8 => pc += push::<8>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH9 => pc += push::<9>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH10 => pc += push::<10>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH11 => pc += push::<11>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH12 => pc += push::<12>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH13 => pc += push::<13>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH14 => pc += push::<14>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH15 => pc += push::<15>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH16 => pc += push::<16>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH17 => pc += push::<17>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH18 => pc += push::<18>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH19 => pc += push::<19>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH20 => pc += push::<20>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH21 => pc += push::<21>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH22 => pc += push::<22>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH23 => pc += push::<23>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH24 => pc += push::<24>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH25 => pc += push::<25>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH26 => pc += push::<26>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH27 => pc += push::<27>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH28 => pc += push::<28>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH29 => pc += push::<29>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH30 => pc += push::<30>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH31 => pc += push::<31>(&mut state.stack, &s.padded_code[pc + 1..]),
+            OpCode::PUSH32 => {
+                push32(&mut state.stack, &s.padded_code[pc + 1..]);
+                pc += 32;
+            }
+
+            OpCode::DUP1 => dup::<1>(&mut state.stack),
+            OpCode::DUP2 => dup::<2>(&mut state.stack),
+            OpCode::DUP3 => dup::<3>(&mut state.stack),
+            OpCode::DUP4 => dup::<4>(&mut state.stack),
+            OpCode::DUP5 => dup::<5>(&mut state.stack),
+            OpCode::DUP6 => dup::<6>(&mut state.stack),
+            OpCode::DUP7 => dup::<7>(&mut state.stack),
+            OpCode::DUP8 => dup::<8>(&mut state.stack),
+            OpCode::DUP9 => dup::<9>(&mut state.stack),
+            OpCode::DUP10 => dup::<10>(&mut state.stack),
+            OpCode::DUP11 => dup::<11>(&mut state.stack),
+            OpCode::DUP12 => dup::<12>(&mut state.stack),
+            OpCode::DUP13 => dup::<13>(&mut state.stack),
+            OpCode::DUP14 => dup::<14>(&mut state.stack),
+            OpCode::DUP15 => dup::<15>(&mut state.stack),
+            OpCode::DUP16 => dup::<16>(&mut state.stack),
+
+            OpCode::SWAP1 => swap::<1>(&mut state.stack),
+            OpCode::SWAP2 => swap::<2>(&mut state.stack),
+            OpCode::SWAP3 => swap::<3>(&mut state.stack),
+            OpCode::SWAP4 => swap::<4>(&mut state.stack),
+            OpCode::SWAP5 => swap::<5>(&mut state.stack),
+            OpCode::SWAP6 => swap::<6>(&mut state.stack),
+            OpCode::SWAP7 => swap::<7>(&mut state.stack),
+            OpCode::SWAP8 => swap::<8>(&mut state.stack),
+            OpCode::SWAP9 => swap::<9>(&mut state.stack),
+            OpCode::SWAP10 => swap::<10>(&mut state.stack),
+            OpCode::SWAP11 => swap::<11>(&mut state.stack),
+            OpCode::SWAP12 => swap::<12>(&mut state.stack),
+            OpCode::SWAP13 => swap::<13>(&mut state.stack),
+            OpCode::SWAP14 => swap::<14>(&mut state.stack),
+            OpCode::SWAP15 => swap::<15>(&mut state.stack),
+            OpCode::SWAP16 => swap::<16>(&mut state.stack),
+
+            OpCode::LOG0 => external::do_log::<_, 0>(state, host)?,
+            OpCode::LOG1 => external::do_log::<_, 1>(state, host)?,
+            OpCode::LOG2 => external::do_log::<_, 2>(state, host)?,
+            OpCode::LOG3 => external::do_log::<_, 3>(state, host)?,
+            OpCode::LOG4 => external::do_log::<_, 4>(state, host)?,
+            OpCode::CREATE => call::do_create::<_, REVISION, false>(state, host)?,
+            OpCode::CREATE2 => call::do_create::<_, REVISION, true>(state, host)?,
+            OpCode::CALL => call::do_call::<_, REVISION, { CallKind::Call }, false>(state, host)?,
+            OpCode::CALLCODE => {
+                call::do_call::<_, REVISION, { CallKind::CallCode }, false>(state, host)?
+            }
+            OpCode::DELEGATECALL => {
+                call::do_call::<_, REVISION, { CallKind::DelegateCall }, false>(state, host)?
+            }
+            OpCode::STATICCALL => {
+                call::do_call::<_, REVISION, { CallKind::Call }, true>(state, host)?
+            }
+            OpCode::RETURN | OpCode::REVERT => {
+                ret(state)?;
+                reverted = op == OpCode::REVERT;
+                break;
+            }
+            OpCode::INVALID => {
+                return Err(StatusCode::InvalidInstruction);
+            }
+            OpCode::SELFDESTRUCT => {
+                external::selfdestruct::<_, REVISION>(state, host)?;
+                break;
+            }
+            other => {
+                unreachable!("reached unhandled opcode: {}", other);
+            }
+        }
+
+        pc += 1;
+    }
+
+    let output = SuccessfulOutput {
+        reverted,
+        gas_left: state.gas_left,
+        output_data: state.output_data.clone(),
+    };
+
+    Ok(output)
 }
diff --git a/src/execution/evm/mod.rs b/src/execution/evm/mod.rs
index 8a471a5..4ce3607 100644
--- a/src/execution/evm/mod.rs
+++ b/src/execution/evm/mod.rs
@@ -11,14 +11,12 @@ pub use state::{ExecutionState, Stack};
 pub const MAX_CODE_SIZE: usize = 0x6000;
 
 mod common;
-pub mod continuation;
 pub mod host;
 #[macro_use]
 pub mod instructions;
 mod interpreter;
 pub mod opcode;
 mod state;
-pub mod tracing;
 pub mod util;
 
 #[cfg(test)]
diff --git a/src/execution/evm/opcode.rs b/src/execution/evm/opcode.rs
index 2b03544..bb9f08c 100644
--- a/src/execution/evm/opcode.rs
+++ b/src/execution/evm/opcode.rs
@@ -5,12 +5,12 @@ use std::{borrow::Cow, fmt::Display};
 pub struct OpCode(pub u8);
 
 impl OpCode {
-    #[inline(always)]
+    #[inline]
     pub const fn to_u8(self) -> u8 {
         self.0
     }
 
-    #[inline(always)]
+    #[inline]
     pub const fn to_usize(self) -> usize {
         self.to_u8() as usize
     }
@@ -322,7 +322,7 @@ impl OpCode {
     }
 
     #[cfg(feature = "util")]
-    #[inline(always)]
+    #[inline]
     pub fn push_size(self) -> Option<u8> {
         (self.to_u8() >= OpCode::PUSH1.to_u8() && self.to_u8() <= OpCode::PUSH32.to_u8())
             .then(|| self.to_u8() - OpCode::PUSH1.to_u8() + 1)
diff --git a/src/execution/evm/state.rs b/src/execution/evm/state.rs
index 358ec38..e1e786f 100644
--- a/src/execution/evm/state.rs
+++ b/src/execution/evm/state.rs
@@ -13,29 +13,29 @@ pub const STACK_SIZE: usize = 1024;
 pub struct Stack(pub ArrayVec<U256, STACK_SIZE>);
 
 impl Stack {
-    #[inline(always)]
+    #[inline]
     pub const fn new() -> Self {
         Self(ArrayVec::new_const())
     }
 
-    #[inline(always)]
-    fn get_pos(&self, pos: usize) -> usize {
+    #[inline]
+    const fn get_pos(&self, pos: usize) -> usize {
         self.len() - 1 - pos
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn get(&self, pos: usize) -> &U256 {
         &self.0[self.get_pos(pos)]
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn get_mut(&mut self, pos: usize) -> &mut U256 {
         let pos = self.get_pos(pos);
         &mut self.0[pos]
     }
 
     #[inline(always)]
-    pub fn len(&self) -> usize {
+    pub const fn len(&self) -> usize {
         self.0.len()
     }
 
@@ -44,17 +44,17 @@ impl Stack {
         self.len() == 0
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn push(&mut self, v: U256) {
         unsafe { self.0.push_unchecked(v) }
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn pop(&mut self) -> U256 {
-        self.0.pop().expect("underflow")
+        unsafe { self.0.pop_unchecked() }
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn swap_top(&mut self, pos: usize) {
         let top = self.0.len() - 1;
         let pos = self.get_pos(pos);
@@ -68,17 +68,17 @@ const PAGE_SIZE: usize = 4 * 1024;
 pub struct Memory(BytesMut);
 
 impl Memory {
-    #[inline(always)]
+    #[inline]
     pub fn new() -> Self {
         Self(BytesMut::with_capacity(PAGE_SIZE))
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn grow(&mut self, size: usize) {
         let cap = self.0.capacity();
         if size > cap {
-            let additional_pages = ((size - cap) + PAGE_SIZE - 1) / PAGE_SIZE;
-            self.0.reserve(PAGE_SIZE * additional_pages);
+            let required_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+            self.0.reserve((PAGE_SIZE * required_pages) - self.0.len());
         }
         self.0.resize(size, 0);
     }
@@ -92,21 +92,21 @@ impl Default for Memory {
 
 /// EVM execution state.
 #[derive(Clone, Debug, Getters, MutGetters)]
-pub struct ExecutionState {
+pub struct ExecutionState<'m> {
     #[getset(get = "pub", get_mut = "pub")]
     pub(crate) gas_left: i64,
     #[getset(get = "pub", get_mut = "pub")]
     pub(crate) stack: Stack,
     #[getset(get = "pub", get_mut = "pub")]
     pub(crate) memory: Memory,
-    pub(crate) message: InterpreterMessage,
+    pub(crate) message: &'m InterpreterMessage,
     #[getset(get = "pub", get_mut = "pub")]
     pub(crate) return_data: Bytes,
     pub(crate) output_data: Bytes,
 }
 
-impl ExecutionState {
-    pub fn new(message: InterpreterMessage) -> Self {
+impl<'m> ExecutionState<'m> {
+    pub fn new(message: &'m InterpreterMessage) -> Self {
         Self {
             gas_left: message.gas,
             stack: Stack::default(),
@@ -139,4 +139,12 @@ mod tests {
 
         assert_eq!(*stack.get(2), 0xde);
     }
+
+    #[test]
+    fn grow() {
+        let mut mem = Memory::new();
+        mem.grow(PAGE_SIZE * 2 + 1);
+        assert_eq!(mem.len(), PAGE_SIZE * 2 + 1);
+        assert_eq!(mem.capacity(), PAGE_SIZE * 3);
+    }
 }
diff --git a/src/execution/evm/tests/call.rs b/src/execution/evm/tests/call.rs
index 19d1712..7104c80 100644
--- a/src/execution/evm/tests/call.rs
+++ b/src/execution/evm/tests/call.rs
@@ -32,10 +32,8 @@ fn delegatecall() {
         .inspect_host(move |host, _| {
             let gas_left = 1700 - 736;
 
-            let r = host.recorded.lock();
-
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = r.calls.last().unwrap();
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = host.recorded.calls.last().unwrap();
             assert_eq!(call_msg.gas, gas_left - gas_left / 64);
             assert_eq!(call_msg.input_data.len(), 3);
             assert_eq!(call_msg.value.to_be_bytes()[17], 0xfe);
@@ -52,10 +50,8 @@ fn delegatecall_static() {
         .status(StatusCode::Success)
         .gas_used(719)
         .inspect_host(|host, _| {
-            let r = host.recorded.lock();
-
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = r.calls.last().unwrap();
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = host.recorded.calls.last().unwrap();
             assert_eq!(call_msg.gas, 1);
             assert!(call_msg.is_static);
         })
@@ -108,9 +104,8 @@ fn create() {
                 0xcc
             );
 
-            let r = host.recorded.lock();
-            assert_eq!(r.calls.len(), 1);
-            assert_eq!(r.calls.last().unwrap().input_data.len(), 0x20);
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls.last().unwrap().input_data.len(), 0x20);
         })
         .check()
 }
@@ -129,10 +124,9 @@ fn create_gas() {
                 49719
             })
             .inspect_host(move |host, _| {
-                let r = host.recorded.lock();
-                assert_eq!(r.calls.len(), 1);
+                assert_eq!(host.recorded.calls.len(), 1);
                 assert_eq!(
-                    r.calls.last().unwrap().gas,
+                    host.recorded.calls.last().unwrap().gas,
                     if rev == Revision::Homestead {
                         17991
                     } else {
@@ -164,11 +158,9 @@ fn create2() {
         .gas_used(115817)
         .status(StatusCode::Success)
         .inspect_host(move |host, _| {
-            let r = host.recorded.lock();
+            assert_eq!(host.recorded.calls.len(), 1);
 
-            assert_eq!(r.calls.len(), 1);
-
-            let call_msg = r.calls.last().unwrap();
+            let call_msg = host.recorded.calls.last().unwrap();
             assert_eq!(
                 call_msg.kind,
                 CallKind::Create2 {
@@ -203,14 +195,12 @@ fn create2_salt_cost() {
         .status(StatusCode::Success)
         .gas_left(0)
         .inspect_host(|host, _| {
-            let r = host.recorded.lock();
-
-            assert_eq!(r.calls.len(), 1);
+            assert_eq!(host.recorded.calls.len(), 1);
             assert_eq!(
-                r.calls.last().unwrap().kind,
+                host.recorded.calls.last().unwrap().kind,
                 CallKind::Create2 { salt: U256::ZERO }
             );
-            assert_eq!(r.calls.last().unwrap().depth, 1);
+            assert_eq!(host.recorded.calls.last().unwrap().depth, 1);
         })
         .check();
 
@@ -219,7 +209,7 @@ fn create2_salt_cost() {
         .gas_left(0)
         .inspect_host(|host, _| {
             // No another CREATE2.
-            assert_eq!(host.recorded.lock().calls.len(), 0)
+            assert_eq!(host.recorded.calls.len(), 0)
         })
         .check()
 }
@@ -244,7 +234,7 @@ fn create_balance_too_low() {
             .status(StatusCode::Success)
             .output_value(0_u128)
             .inspect_host(|host, _| {
-                assert_eq!(host.recorded.lock().calls, []);
+                assert_eq!(host.recorded.calls, []);
             })
             .check()
     }
@@ -277,11 +267,9 @@ fn create_failure() {
             .status(StatusCode::Success)
             .output_data(H256::from(create_address).to_fixed_bytes())
             .inspect_host(move |host, _| {
-                let r = host.recorded.lock();
-
-                assert_eq!(r.calls.len(), 1);
+                assert_eq!(host.recorded.calls.len(), 1);
                 assert_eq!(
-                    r.calls.last().unwrap().kind,
+                    host.recorded.calls.last().unwrap().kind,
                     if op == OpCode::CREATE {
                         CallKind::Create
                     } else {
@@ -298,11 +286,9 @@ fn create_failure() {
             .status(StatusCode::Success)
             .output_value(0_u128)
             .inspect_host(move |host, _| {
-                let r = host.recorded.lock();
-
-                assert_eq!(r.calls.len(), 1);
+                assert_eq!(host.recorded.calls.len(), 1);
                 assert_eq!(
-                    r.calls.last().unwrap().kind,
+                    host.recorded.calls.last().unwrap().kind,
                     if op == OpCode::CREATE {
                         CallKind::Create
                     } else {
@@ -319,11 +305,9 @@ fn create_failure() {
             .status(StatusCode::Success)
             .output_value(0_u128)
             .inspect_host(move |host, _| {
-                let r = host.recorded.lock();
-
-                assert_eq!(r.calls.len(), 1);
+                assert_eq!(host.recorded.calls.len(), 1);
                 assert_eq!(
-                    r.calls.last().unwrap().kind,
+                    host.recorded.calls.last().unwrap().kind,
                     if op == OpCode::CREATE {
                         CallKind::Create
                     } else {
@@ -364,7 +348,7 @@ fn call_failing_with_value() {
             .gas_used(7447)
             .inspect_host(|host, _| {
                 // There was no call().
-                assert_eq!(host.recorded.lock().calls, []);
+                assert_eq!(host.recorded.calls, []);
             })
             .check();
 
@@ -374,7 +358,7 @@ fn call_failing_with_value() {
             .status(StatusCode::OutOfGas)
             .inspect_host(|host, _| {
                 // There was no call().
-                assert_eq!(host.recorded.lock().calls, []);
+                assert_eq!(host.recorded.calls, []);
             })
             .check();
 
@@ -384,7 +368,7 @@ fn call_failing_with_value() {
             .status(StatusCode::OutOfGas)
             .inspect_host(|host, _| {
                 // There was no call().
-                assert_eq!(host.recorded.lock().calls, []);
+                assert_eq!(host.recorded.calls, []);
             })
             .check();
     }
@@ -407,9 +391,8 @@ fn call_with_value() {
         .gas_used(7447 + 32082)
         .status(StatusCode::Success)
         .inspect_host(move |host, _| {
-            let r = host.recorded.lock();
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = &r.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.kind, CallKind::Call);
             assert_eq!(call_msg.depth, 1);
             assert_eq!(call_msg.gas, 32083);
@@ -433,7 +416,7 @@ fn call_with_value_depth_limit() {
         .gas_used(7447)
         .status(StatusCode::Success)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().calls, []);
+            assert_eq!(host.recorded.calls, []);
         })
         .check()
 }
@@ -466,7 +449,7 @@ fn call_depth_limit() {
             )
             .status(StatusCode::Success)
             .inspect_host(|host, _| {
-                assert_eq!(host.recorded.lock().calls, []);
+                assert_eq!(host.recorded.calls, []);
             })
             .output_value(U256::ZERO)
             .check()
@@ -597,9 +580,8 @@ fn call_value_zero_to_nonexistent_account() {
         .gas_used(729 + (call_gas - gas_left))
         .status(StatusCode::Success)
         .inspect_host(|host, _| {
-            let recorded = host.recorded.lock();
-            assert_eq!(recorded.calls.len(), 1);
-            let call_msg = &recorded.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.kind, CallKind::Call);
             assert_eq!(call_msg.depth, 1);
             assert_eq!(call_msg.gas, 6000);
@@ -645,7 +627,7 @@ fn call_new_account_creation_cost() {
         .output_value(U256::ONE)
         .inspect_host(move |host, _| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     call_dst, // Account exist?
                     call_dst, // Call.
@@ -664,16 +646,15 @@ fn call_new_account_creation_cost() {
         .gas_used(25000 + 9000 + 739)
         .output_value(U256::ONE)
         .inspect_host(move |host, msg| {
-            let r = host.recorded.lock();
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = &r.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.recipient, call_dst);
             assert_eq!(call_msg.gas, 2300);
             assert_eq!(call_msg.sender, destination);
             assert_eq!(call_msg.value, 1);
             assert_eq!(call_msg.input_data, Bytes::new());
             assert_eq!(
-                r.account_accesses,
+                host.recorded.account_accesses,
                 [
                     call_dst,      // Account exist?
                     msg.recipient, // Balance.
@@ -693,16 +674,15 @@ fn call_new_account_creation_cost() {
         .gas_used(739)
         .output_value(U256::ONE)
         .inspect_host(move |host, _| {
-            let r = host.recorded.lock();
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = &r.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.recipient, call_dst);
             assert_eq!(call_msg.gas, 0);
             assert_eq!(call_msg.sender, destination);
             assert_eq!(call_msg.value, 0);
             assert_eq!(call_msg.input_data, Bytes::new());
             assert_eq!(
-                r.account_accesses,
+                host.recorded.account_accesses,
                 [
                 call_dst         // Call.
             ]
@@ -719,16 +699,15 @@ fn call_new_account_creation_cost() {
         .gas_used(25000 + 9000 + 739)
         .output_value(U256::ONE)
         .inspect_host(move |host, msg| {
-            let r = host.recorded.lock();
-            assert_eq!(r.calls.len(), 1);
-            let call_msg = &r.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.recipient, call_dst);
             assert_eq!(call_msg.gas, 2300);
             assert_eq!(call_msg.sender, destination);
             assert_eq!(call_msg.value, 1);
             assert_eq!(call_msg.input_data, Bytes::new());
             assert_eq!(
-                r.account_accesses,
+                host.recorded.account_accesses,
                 [
                     call_dst,      // Account exist?
                     msg.recipient, // Balance.
@@ -755,9 +734,8 @@ fn callcode_new_account_create() {
         .gas_used(59722)
         .status(StatusCode::Success)
         .inspect_host(move |host, _| {
-            let recorded = host.recorded.lock();
-            assert_eq!(recorded.calls.len(), 1);
-            let call_msg = &recorded.calls[0];
+            assert_eq!(host.recorded.calls.len(), 1);
+            let call_msg = &host.recorded.calls[0];
             assert_eq!(call_msg.kind, CallKind::CallCode);
             assert_eq!(call_msg.depth, 1);
             assert_eq!(call_msg.gas, 52_300);
@@ -801,8 +779,8 @@ fn call_then_oog() {
         .gas_left(0)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().calls.len(), 1);
-            assert_eq!(host.recorded.lock().calls[0].gas, 254);
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls[0].gas, 254);
         })
         .check()
 }
@@ -839,8 +817,8 @@ fn callcode_then_oog() {
         .gas(825)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().calls.len(), 1);
-            assert_eq!(host.recorded.lock().calls[0].gas, 100);
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls[0].gas, 100);
         })
         .check()
 }
@@ -878,8 +856,8 @@ fn delegatecall_then_oog() {
         .gas_left(0)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().calls.len(), 1);
-            assert_eq!(host.recorded.lock().calls[0].gas, 254);
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls[0].gas, 254);
         })
         .check()
 }
@@ -917,8 +895,8 @@ fn staticcall_then_oog() {
         .gas_used(1000)
         .gas_left(0)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().calls.len(), 1);
-            assert_eq!(host.recorded.lock().calls[0].gas, 254);
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls[0].gas, 254);
         })
         .check()
 }
@@ -932,11 +910,9 @@ fn staticcall_input() {
                 .append_bc(CallInstruction::staticcall(0_u128).gas(0xee).input(32, 3)),
         )
         .inspect_host(|host, _| {
-            let r = host.recorded.lock();
-
-            assert_eq!(r.calls.len(), 1);
-            assert_eq!(r.calls[0].gas, 0xee);
-            assert_eq!(r.calls[0].input_data[..], hex!("010203"));
+            assert_eq!(host.recorded.calls.len(), 1);
+            assert_eq!(host.recorded.calls[0].gas, 0xee);
+            assert_eq!(host.recorded.calls[0].input_data[..], hex!("010203"));
         })
         .check()
 }
@@ -1113,7 +1089,7 @@ fn returndatasize() {
 
     t.apply_host_fn(|host, _| {
         host.call_result.output_data = Bytes::new();
-        host.call_result.status_code = StatusCode::InternalError(String::new());
+        host.call_result.status_code = StatusCode::InternalError("");
     })
     .gas_used(735)
     .output_data([0])
diff --git a/src/execution/evm/tests/eip2929.rs b/src/execution/evm/tests/eip2929.rs
index 59b8e51..5e099a4 100644
--- a/src/execution/evm/tests/eip2929.rs
+++ b/src/execution/evm/tests/eip2929.rs
@@ -18,7 +18,7 @@ fn eip2929_case1() {
         .output_data([])
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     msg.sender,
                     msg.recipient,
@@ -65,7 +65,7 @@ fn eip2929_case2() {
         .output_data([])
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     msg.sender,
                     msg.recipient,
@@ -355,7 +355,7 @@ fn eip2929_delegatecall_cold() {
         .gas_used(2618)
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     msg.sender,
                     msg.recipient,
@@ -371,7 +371,7 @@ fn eip2929_delegatecall_cold() {
         .gas_used(2617)
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     msg.sender,
                     msg.recipient,
diff --git a/src/execution/evm/tests/execute.rs b/src/execution/evm/tests/execute.rs
index d98e073..85b2782 100644
--- a/src/execution/evm/tests/execute.rs
+++ b/src/execution/evm/tests/execute.rs
@@ -1374,7 +1374,7 @@ fn memory_access() {
     .map(MemoryAccessParams::from)
     .collect();
 
-    let metrics = &*crate::execution::evm::instructions::PROPERTIES;
+    let metrics = &crate::execution::evm::instructions::PROPERTIES;
 
     for p in memory_access_test_cases {
         let push_size = format!("64{:0>10x}", p.size);
diff --git a/src/execution/evm/tests/state.rs b/src/execution/evm/tests/state.rs
index 7d0d251..6cd9e36 100644
--- a/src/execution/evm/tests/state.rs
+++ b/src/execution/evm/tests/state.rs
@@ -461,10 +461,8 @@ fn log() {
             .status(StatusCode::Success)
             .gas_used((421 + n * 375) as i64)
             .inspect_host(move |host, _| {
-                let r = host.recorded.lock();
-
-                assert_eq!(r.logs.len(), 1);
-                let last_log = r.logs.last().unwrap();
+                assert_eq!(host.recorded.logs.len(), 1);
+                let last_log = host.recorded.logs.last().unwrap();
                 assert_eq!(&*last_log.data, &hex!("7700") as &[u8]);
                 assert_eq!(last_log.topics.len(), n);
                 for i in 0..n {
@@ -485,9 +483,8 @@ fn log0_empty() {
                 .opcode(OpCode::LOG0),
         )
         .inspect_host(|host, _| {
-            let r = host.recorded.lock();
-            assert_eq!(r.logs.len(), 1);
-            let last_log = r.logs.last().unwrap();
+            assert_eq!(host.recorded.logs.len(), 1);
+            let last_log = host.recorded.logs.last().unwrap();
             assert_eq!(last_log.topics.len(), 0);
             assert_eq!(last_log.data.len(), 0);
         })
@@ -517,7 +514,7 @@ fn log_data_cost() {
             .gas_used(cost as i64)
             .status(StatusCode::Success)
             .inspect_host(|host, _| {
-                assert_eq!(host.recorded.lock().logs.len(), 1);
+                assert_eq!(host.recorded.logs.len(), 1);
             })
             .check()
     }
@@ -532,7 +529,7 @@ fn selfdestruct() {
         .gas_used(5003)
         .inspect_host(|host, _| {
             assert_eq!(
-                host.recorded.lock().selfdestructs,
+                host.recorded.selfdestructs,
                 [SelfdestructRecord {
                     selfdestructed: Address::zero(),
                     beneficiary: Address::from(hex!("0000000000000000000000000000000000000009"))
@@ -548,7 +545,7 @@ fn selfdestruct() {
         .gas_used(3)
         .inspect_host(|host, _| {
             assert_eq!(
-                host.recorded.lock().selfdestructs,
+                host.recorded.selfdestructs,
                 [SelfdestructRecord {
                     selfdestructed: Address::zero(),
                     beneficiary: Address::from(hex!("0000000000000000000000000000000000000007"))
@@ -564,7 +561,7 @@ fn selfdestruct() {
         .gas_used(30003)
         .inspect_host(|host, _| {
             assert_eq!(
-                host.recorded.lock().selfdestructs,
+                host.recorded.selfdestructs,
                 [SelfdestructRecord {
                     selfdestructed: Address::zero(),
                     beneficiary: Address::from(hex!("0000000000000000000000000000000000000008"))
@@ -584,7 +581,6 @@ fn selfdestruct_with_balance() {
     let mut t = EvmTester::new()
         .code(code)
         .destination(hex!("000000000000000000000000000000000000005e"))
-        .collect_traces(true)
         .apply_host_fn(|host, msg| {
             host.accounts.entry(msg.recipient).or_default().balance = U256::ZERO;
         });
@@ -594,9 +590,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .gas_used(3)
         .inspect_host(|host, msg| {
-            let r = host.recorded.lock();
-
-            assert_eq!(r.account_accesses, [msg.recipient]); // Selfdestruct.
+            assert_eq!(host.recorded.account_accesses, [msg.recipient]); // Selfdestruct.
         })
         .check();
 
@@ -606,7 +600,7 @@ fn selfdestruct_with_balance() {
         .gas_used(30003)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary,
@@ -623,7 +617,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::OutOfGas)
         .inspect_host(move |host, _| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary
@@ -638,7 +632,7 @@ fn selfdestruct_with_balance() {
         .gas_used(5003)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Balance.
                     msg.recipient,
@@ -654,7 +648,7 @@ fn selfdestruct_with_balance() {
         .gas(5002)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().account_accesses, []);
+            assert_eq!(host.recorded.account_accesses, []);
         })
         .check();
 
@@ -668,7 +662,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Selfdestruct.
                     msg.recipient
@@ -683,7 +677,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary,
@@ -700,7 +694,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::OutOfGas)
         .inspect_host(move |host, _| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary,
@@ -715,7 +709,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Balance
                     msg.recipient,
@@ -734,7 +728,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::OutOfGas)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Balance
                     msg.recipient,
@@ -756,7 +750,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Selfdestruct.
                     msg.recipient,
@@ -771,7 +765,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary,
@@ -787,7 +781,7 @@ fn selfdestruct_with_balance() {
         .gas(5002)
         .status(StatusCode::OutOfGas)
         .inspect_host(move |host, _| {
-            assert_eq!(host.recorded.lock().account_accesses, []);
+            assert_eq!(host.recorded.account_accesses, []);
         })
         .check();
 
@@ -797,7 +791,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Balance.
                     msg.recipient,
@@ -813,7 +807,7 @@ fn selfdestruct_with_balance() {
         .gas(5002)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().account_accesses, []);
+            assert_eq!(host.recorded.account_accesses, []);
         })
         .check();
 
@@ -827,7 +821,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(|host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Selfdestruct
                     msg.recipient
@@ -842,7 +836,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Exists?
                     beneficiary,
@@ -858,7 +852,7 @@ fn selfdestruct_with_balance() {
         .gas(5002)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().account_accesses, []);
+            assert_eq!(host.recorded.account_accesses, []);
         })
         .check();
 
@@ -868,7 +862,7 @@ fn selfdestruct_with_balance() {
         .status(StatusCode::Success)
         .inspect_host(move |host, msg| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [
                     // Balance
                     msg.recipient,
@@ -885,7 +879,7 @@ fn selfdestruct_with_balance() {
         .gas(5002)
         .status(StatusCode::OutOfGas)
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().account_accesses, []);
+            assert_eq!(host.recorded.account_accesses, []);
         })
         .check();
 }
@@ -911,7 +905,7 @@ fn blockhash() {
             assert_eq!(output[13], 0);
         })
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().blockhashes, [] as [u64; 0]);
+            assert_eq!(host.recorded.blockhashes, [] as [u64; 0]);
         })
         .check();
 
@@ -924,7 +918,7 @@ fn blockhash() {
             assert_eq!(output[13], 0);
         })
         .inspect_host(|host, _| {
-            assert_eq!(host.recorded.lock().blockhashes, [] as [u64; 0]);
+            assert_eq!(host.recorded.blockhashes, [] as [u64; 0]);
         })
         .check();
 
@@ -936,7 +930,7 @@ fn blockhash() {
         assert_eq!(output[13], 0x13);
     })
     .inspect_host(|host, _| {
-        assert_eq!(host.recorded.lock().blockhashes, [0]);
+        assert_eq!(host.recorded.blockhashes, [0]);
     })
     .check();
 }
@@ -961,9 +955,9 @@ fn extcode() {
             assert_eq!(output.len(), 4);
             assert_eq!(output[..3], host.accounts[&addr].code[..3]);
             assert_eq!(output[3], 0);
-            assert_eq!(host.recorded.lock().account_accesses.len(), 2);
-            assert_eq!(host.recorded.lock().account_accesses[0].0[19], 0xfe);
-            assert_eq!(host.recorded.lock().account_accesses[1].0[19], 0xfe);
+            assert_eq!(host.recorded.account_accesses.len(), 2);
+            assert_eq!(host.recorded.account_accesses[0].0[19], 0xfe);
+            assert_eq!(host.recorded.account_accesses[1].0[19], 0xfe);
         })
         .check()
 }
@@ -1124,7 +1118,7 @@ fn extcodecopy_nonzero_index() {
         .output_data(hex!("c000"))
         .inspect_host(|host, _| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [hex!("000000000000000000000000000000000000000a").into()]
             );
         })
@@ -1152,7 +1146,7 @@ fn extcodecopy_fill_tail() {
         .output_data(hex!("ff00"))
         .inspect_host(|host, _| {
             assert_eq!(
-                host.recorded.lock().account_accesses,
+                host.recorded.account_accesses,
                 [hex!("000000000000000000000000000000000000000a").into()]
             );
         })
diff --git a/src/execution/evm/tracing/mod.rs b/src/execution/evm/tracing/mod.rs
deleted file mode 100644
index 25b9144..0000000
--- a/src/execution/evm/tracing/mod.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use super::*;
-use crate::models::*;
-use serde::Serialize;
-
-/// Passed into execution context to collect metrics.
-pub trait Tracer {
-    #[doc(hidden)]
-    const DUMMY: bool = false;
-
-    /// Called when execution starts.
-    fn notify_execution_start(
-        &mut self,
-        revision: Revision,
-        message: InterpreterMessage,
-        code: Bytes,
-    );
-    /// Called on each instruction.
-    fn notify_instruction_start(&mut self, pc: usize, opcode: OpCode, state: &ExecutionState);
-    /// Called when execution ends.
-    fn notify_execution_end(&mut self, output: &Output);
-}
-
-/// Tracer which does nothing.
-pub struct NoopTracer;
-
-impl Tracer for NoopTracer {
-    const DUMMY: bool = true;
-
-    fn notify_execution_start(&mut self, _: Revision, _: InterpreterMessage, _: Bytes) {}
-
-    fn notify_instruction_start(&mut self, _: usize, _: OpCode, _: &ExecutionState) {}
-
-    fn notify_execution_end(&mut self, _: &Output) {}
-}
-
-#[derive(Serialize)]
-struct ExecutionStart {
-    pub depth: i32,
-    pub rev: Revision,
-    #[serde(rename = "static")]
-    pub is_static: bool,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct InstructionStart {
-    pub pc: usize,
-    pub op: u8,
-    pub op_name: &'static str,
-    pub gas: i64,
-    pub stack: Stack,
-    pub memory_size: usize,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct ExecutionEnd {
-    pub error: Option<String>,
-    pub gas: i64,
-    pub gas_used: i64,
-    pub output: String,
-}
-
-struct TracerContext {
-    message: InterpreterMessage,
-    code: Bytes,
-}
-
-/// Tracer which prints to stdout.
-#[derive(Default)]
-pub struct StdoutTracer {
-    execution_stack: Vec<TracerContext>,
-}
-
-impl Tracer for StdoutTracer {
-    fn notify_execution_start(
-        &mut self,
-        revision: Revision,
-        message: InterpreterMessage,
-        code: Bytes,
-    ) {
-        println!(
-            "{}",
-            serde_json::to_string(&ExecutionStart {
-                depth: message.depth,
-                rev: revision,
-                is_static: message.is_static,
-            })
-            .unwrap()
-        );
-        self.execution_stack.push(TracerContext { message, code });
-    }
-
-    fn notify_instruction_start(&mut self, pc: usize, _: OpCode, state: &ExecutionState) {
-        let context = self.execution_stack.last().unwrap();
-        let opcode = OpCode(context.code[pc]);
-        println!(
-            "{}",
-            serde_json::to_string(&InstructionStart {
-                pc,
-                op: opcode.0,
-                op_name: opcode.name(),
-                gas: state.gas_left,
-                stack: state.stack.clone(),
-                memory_size: state.memory.len()
-            })
-            .unwrap()
-        )
-    }
-
-    fn notify_execution_end(&mut self, output: &Output) {
-        let context = self.execution_stack.pop().unwrap();
-        let error = match &output.status_code {
-            StatusCode::Success => None,
-            other => Some(other.to_string()),
-        };
-        let (gas_left, gas_used) = if error.is_none() {
-            (output.gas_left, context.message.gas - output.gas_left)
-        } else {
-            (0, context.message.gas)
-        };
-
-        println!(
-            "{}",
-            serde_json::to_string(&ExecutionEnd {
-                error,
-                gas: gas_left,
-                gas_used,
-                output: hex::encode(&output.output_data),
-            })
-            .unwrap()
-        )
-    }
-}
diff --git a/src/execution/evm/util/mocked_host.rs b/src/execution/evm/util/mocked_host.rs
index 88a1072..38f286b 100644
--- a/src/execution/evm/util/mocked_host.rs
+++ b/src/execution/evm/util/mocked_host.rs
@@ -3,7 +3,6 @@ use bytes::Bytes;
 use ethereum_types::*;
 use ethnum::U256;
 use hex_literal::hex;
-use parking_lot::Mutex;
 use std::{cmp::min, collections::HashMap};
 
 /// LOG record.
@@ -64,25 +63,13 @@ pub struct Records {
     pub selfdestructs: Vec<SelfdestructRecord>,
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct MockedHost {
     pub accounts: HashMap<Address, Account>,
     pub tx_context: TxContext,
     pub block_hash: U256,
     pub call_result: Output,
-    pub recorded: Mutex<Records>,
-}
-
-impl Clone for MockedHost {
-    fn clone(&self) -> Self {
-        Self {
-            accounts: self.accounts.clone(),
-            tx_context: self.tx_context.clone(),
-            block_hash: self.block_hash,
-            call_result: self.call_result.clone(),
-            recorded: Mutex::new(self.recorded.lock().clone()),
-        }
-    }
+    pub recorded: Records,
 }
 
 impl Default for MockedHost {
@@ -121,13 +108,13 @@ impl Records {
 }
 
 impl Host for MockedHost {
-    fn account_exists(&self, address: ethereum_types::Address) -> bool {
-        self.recorded.lock().record_account_access(address);
+    fn account_exists(&mut self, address: ethereum_types::Address) -> bool {
+        self.recorded.record_account_access(address);
         self.accounts.contains_key(&address)
     }
 
-    fn get_storage(&self, address: ethereum_types::Address, key: U256) -> U256 {
-        self.recorded.lock().record_account_access(address);
+    fn get_storage(&mut self, address: ethereum_types::Address, key: U256) -> U256 {
+        self.recorded.record_account_access(address);
 
         self.accounts
             .get(&address)
@@ -141,7 +128,7 @@ impl Host for MockedHost {
         key: U256,
         value: U256,
     ) -> StorageStatus {
-        self.recorded.lock().record_account_access(address);
+        self.recorded.record_account_access(address);
 
         // Get the reference to the old value.
         // This will create the account in case it was not present.
@@ -180,8 +167,8 @@ impl Host for MockedHost {
         status
     }
 
-    fn get_balance(&self, address: ethereum_types::Address) -> ethnum::U256 {
-        self.recorded.lock().record_account_access(address);
+    fn get_balance(&mut self, address: ethereum_types::Address) -> ethnum::U256 {
+        self.recorded.record_account_access(address);
 
         self.accounts
             .get(&address)
@@ -189,8 +176,8 @@ impl Host for MockedHost {
             .unwrap_or(U256::ZERO)
     }
 
-    fn get_code_size(&self, address: ethereum_types::Address) -> ethnum::U256 {
-        self.recorded.lock().record_account_access(address);
+    fn get_code_size(&mut self, address: ethereum_types::Address) -> ethnum::U256 {
+        self.recorded.record_account_access(address);
 
         self.accounts
             .get(&address)
@@ -198,8 +185,8 @@ impl Host for MockedHost {
             .unwrap_or(U256::ZERO)
     }
 
-    fn get_code_hash(&self, address: ethereum_types::Address) -> U256 {
-        self.recorded.lock().record_account_access(address);
+    fn get_code_hash(&mut self, address: ethereum_types::Address) -> U256 {
+        self.recorded.record_account_access(address);
 
         self.accounts
             .get(&address)
@@ -207,8 +194,8 @@ impl Host for MockedHost {
             .unwrap_or(U256::ZERO)
     }
 
-    fn copy_code(&self, address: Address, code_offset: usize, buffer: &mut [u8]) -> usize {
-        self.recorded.lock().record_account_access(address);
+    fn copy_code(&mut self, address: Address, code_offset: usize, buffer: &mut [u8]) -> usize {
+        self.recorded.record_account_access(address);
 
         self.accounts
             .get(&address)
@@ -233,54 +220,52 @@ impl Host for MockedHost {
         address: ethereum_types::Address,
         beneficiary: ethereum_types::Address,
     ) {
-        let mut r = self.recorded.lock();
-
-        r.record_account_access(address);
-        r.selfdestructs.push(SelfdestructRecord {
+        self.recorded.record_account_access(address);
+        self.recorded.selfdestructs.push(SelfdestructRecord {
             selfdestructed: address,
             beneficiary,
         });
     }
 
-    fn call(&mut self, msg: &InterpreterMessage) -> Output {
-        let mut r = self.recorded.lock();
+    fn call(&mut self, msg: Call) -> Output {
+        let msg = match msg {
+            Call::Call(message) => message.clone(),
+            Call::Create(message) => message.clone().into(),
+        };
+        self.recorded.record_account_access(msg.recipient);
 
-        r.record_account_access(msg.recipient);
-
-        if r.calls.len() < MAX_RECORDED_CALLS {
-            r.calls.push(msg.clone());
+        if self.recorded.calls.len() < MAX_RECORDED_CALLS {
+            self.recorded.calls.push(msg.clone());
             let call_msg = msg;
             if !call_msg.input_data.is_empty() {
-                r.call_inputs.push(call_msg.input_data.clone());
+                self.recorded.call_inputs.push(call_msg.input_data);
             }
         }
         self.call_result.clone()
     }
 
-    fn get_tx_context(&self) -> TxContext {
+    fn get_tx_context(&mut self) -> TxContext {
         self.tx_context.clone()
     }
 
-    fn get_block_hash(&self, block_number: u64) -> U256 {
-        self.recorded.lock().blockhashes.push(block_number);
+    fn get_block_hash(&mut self, block_number: u64) -> U256 {
+        self.recorded.blockhashes.push(block_number);
         self.block_hash
     }
 
-    fn emit_log(&mut self, address: ethereum_types::Address, data: &[u8], topics: &[U256]) {
-        self.recorded.lock().logs.push(LogRecord {
+    fn emit_log(&mut self, address: ethereum_types::Address, data: Bytes, topics: &[U256]) {
+        self.recorded.logs.push(LogRecord {
             creator: address,
-            data: data.to_vec().into(),
+            data,
             topics: topics.to_vec(),
         });
     }
 
     fn access_account(&mut self, address: ethereum_types::Address) -> AccessStatus {
-        let mut r = self.recorded.lock();
-
         // Check if the address have been already accessed.
-        let already_accessed = r.account_accesses.iter().any(|&a| a == address);
+        let already_accessed = self.recorded.account_accesses.iter().any(|&a| a == address);
 
-        r.record_account_access(address);
+        self.recorded.record_account_access(address);
 
         if address.0 >= hex!("0000000000000000000000000000000000000001")
             && address.0 <= hex!("0000000000000000000000000000000000000009")
diff --git a/src/execution/evm/util/tester.rs b/src/execution/evm/util/tester.rs
index 56eabba..0fc8fb3 100644
--- a/src/execution/evm/util/tester.rs
+++ b/src/execution/evm/util/tester.rs
@@ -1,6 +1,5 @@
 use crate::{
     execution::evm::{
-        tracing::*,
         util::{mocked_host::*, *},
         *,
     },
@@ -17,7 +16,6 @@ fn exec(
     revision: Revision,
     message: InterpreterMessage,
     code: Vec<u8>,
-    collect_traces: bool,
 ) -> Output {
     // Add EIP-2929 tweak.
     if revision >= Revision::Berlin {
@@ -26,11 +24,7 @@ fn exec(
     }
     let code = AnalyzedCode::analyze(&code);
 
-    if collect_traces {
-        code.execute(host, &mut StdoutTracer::default(), None, message, revision)
-    } else {
-        code.execute(host, &mut NoopTracer, None, message, revision)
-    }
+    code.execute(host, &message, revision)
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -59,7 +53,6 @@ pub struct EvmTester {
     gas_check: Option<GasCheck>,
     expected_status_codes: Option<Vec<StatusCode>>,
     expected_output_data: Option<Vec<u8>>,
-    collect_traces: bool,
 }
 
 impl Default for EvmTester {
@@ -93,7 +86,6 @@ impl EvmTester {
             gas_check: None,
             expected_status_codes: None,
             expected_output_data: None,
-            collect_traces: false,
         }
     }
 
@@ -217,27 +209,13 @@ impl EvmTester {
         self
     }
 
-    pub fn collect_traces(mut self, doit: bool) -> Self {
-        self.collect_traces = doit;
-        self
-    }
-
     /// Execute provided code, run checks and return bytecode returned by EVM.
     pub fn check_and_get_result(self) -> Output {
-        if self.collect_traces {
-            println!("Executing code: {}", hex::encode(&self.code));
-        }
         let mut host = self.host;
         for f in self.apply_host_fns {
             (f)(&mut host, &self.message);
         }
-        let output = exec(
-            &mut host,
-            self.revision,
-            self.message.clone(),
-            self.code,
-            self.collect_traces,
-        );
+        let output = exec(&mut host, self.revision, self.message.clone(), self.code);
 
         if let Some(status_codes) = self.expected_status_codes {
             assert!(
diff --git a/src/execution/evmglue.rs b/src/execution/evmglue.rs
index 960c89e..e093b35 100644
--- a/src/execution/evmglue.rs
+++ b/src/execution/evmglue.rs
@@ -6,10 +6,9 @@ use super::{
 };
 use crate::{
     chain::protocol_param::{fee, param},
+    crypto::keccak256,
     execution::evm::{
-        continuation::{interrupt::*, interrupt_data::*, resume_data::*},
-        host::*,
-        AnalyzedCode, CallKind, CreateMessage, InterpreterMessage, Output, StatusCode,
+        host::*, AnalyzedCode, CallKind, CreateMessage, InterpreterMessage, Output, StatusCode,
     },
     h256_to_u256,
     models::*,
@@ -17,7 +16,6 @@ use crate::{
 };
 use anyhow::Context;
 use bytes::Bytes;
-use sha3::{Digest, Keccak256};
 use std::{cmp::min, convert::TryFrom};
 
 pub struct CallResult {
@@ -34,7 +32,7 @@ where
     B: State,
 {
     state: &'state mut IntraBlockState<'r, B>,
-    tracer: Option<&'tracer mut dyn Tracer>,
+    tracer: &'tracer mut dyn Tracer,
     analysis_cache: &'analysis mut AnalysisCache,
     header: &'h PartialHeader,
     block_spec: &'c BlockExecutionSpec,
@@ -42,10 +40,10 @@ where
     beneficiary: Address,
 }
 
-pub fn execute<B: State>(
-    state: &mut IntraBlockState<'_, B>,
-    tracer: Option<&mut dyn Tracer>,
-    analysis_cache: &mut AnalysisCache,
+pub fn execute<'db, 'tracer, 'analysis, B: State>(
+    state: &mut IntraBlockState<'db, B>,
+    tracer: &'tracer mut dyn Tracer,
+    analysis_cache: &'analysis mut AnalysisCache,
     header: &PartialHeader,
     block_spec: &BlockExecutionSpec,
     txn: &MessageWithSender,
@@ -62,7 +60,7 @@ pub fn execute<B: State>(
     };
 
     let res = if let TransactionAction::Call(to) = txn.action() {
-        evm.call(InterpreterMessage {
+        evm.call(&InterpreterMessage {
             kind: CallKind::Call,
             is_static: false,
             depth: 0,
@@ -74,7 +72,7 @@ pub fn execute<B: State>(
             code_address: to,
         })?
     } else {
-        evm.create(CreateMessage {
+        evm.create(&CreateMessage {
             depth: 0,
             gas: gas as i64,
             sender: txn.sender,
@@ -96,7 +94,7 @@ impl<'r, 'state, 'tracer, 'analysis, 'h, 'c, 't, B>
 where
     B: State,
 {
-    fn create(&mut self, message: CreateMessage) -> anyhow::Result<Output> {
+    fn create(&mut self, message: &CreateMessage) -> anyhow::Result<Output> {
         let mut res = Output {
             status_code: StatusCode::Success,
             gas_left: message.gas,
@@ -115,11 +113,7 @@ where
 
         let contract_addr = {
             if let Some(salt) = message.salt {
-                create2_address(
-                    message.sender,
-                    salt,
-                    H256::from_slice(&Keccak256::digest(&message.initcode[..])[..]),
-                )
+                create2_address(message.sender, salt, keccak256(&message.initcode[..]))
             } else {
                 create_address(message.sender, nonce)
             }
@@ -127,17 +121,15 @@ where
 
         self.state.access_account(contract_addr);
 
-        if let Some(tracer) = self.tracer.as_mut() {
-            tracer.capture_start(
-                message.depth.try_into().unwrap(),
-                message.sender,
-                contract_addr,
-                MessageKind::Create,
-                message.initcode.clone(),
-                message.gas.try_into().unwrap(),
-                message.endowment,
-            );
-        };
+        self.tracer.capture_start(
+            message.depth.try_into().unwrap(),
+            message.sender,
+            contract_addr,
+            MessageKind::Create,
+            message.initcode.clone(),
+            message.gas.try_into().unwrap(),
+            message.endowment,
+        );
 
         if self.state.get_nonce(contract_addr)? != 0
             || self.state.get_code_hash(contract_addr)? != EMPTY_HASH
@@ -171,7 +163,7 @@ where
             value: message.endowment,
         };
 
-        res = self.execute(deploy_message, message.initcode, None)?;
+        res = self.execute(&deploy_message, &message.initcode, None)?;
 
         if res.status_code == StatusCode::Success {
             let code_len = res.output_data.len();
@@ -209,64 +201,55 @@ where
         Ok(res)
     }
 
-    fn call(&mut self, message: InterpreterMessage) -> anyhow::Result<Output> {
-        let mut res = Output {
-            status_code: StatusCode::Success,
-            gas_left: message.gas,
-            output_data: Bytes::new(),
-            create_address: None,
-        };
-
-        let value = message.value;
-        if message.kind != CallKind::DelegateCall && self.state.get_balance(message.sender)? < value
+    fn call(&mut self, message: &InterpreterMessage) -> anyhow::Result<Output> {
+        if message.kind != CallKind::DelegateCall
+            && self.state.get_balance(message.sender)? < message.value
         {
-            res.status_code = StatusCode::InsufficientBalance;
-            return Ok(res);
+            return Ok(Output {
+                status_code: StatusCode::InsufficientBalance,
+                gas_left: message.gas,
+                output_data: Bytes::new(),
+                create_address: None,
+            });
         }
 
-        let precompiled = self.is_precompiled(message.code_address);
-
-        let code = if !precompiled {
-            self.state.get_code(message.code_address)?
+        let code_kind = if self.is_precompiled(message.code_address) {
+            CodeKind::Precompile
         } else {
-            None
+            CodeKind::Bytecode(self.state.get_code(message.code_address)?)
         };
 
-        if let Some(tracer) = &mut self.tracer {
-            let call_kind = {
-                match (message.kind, message.is_static) {
+        self.tracer.capture_start(
+            message.depth as u16,
+            message.sender,
+            message.recipient,
+            MessageKind::Call {
+                call_kind: match (message.kind, message.is_static) {
                     (CallKind::Call, true) => super::tracer::CallKind::StaticCall,
                     (CallKind::Call, false) => super::tracer::CallKind::Call,
                     (CallKind::CallCode, _) => super::tracer::CallKind::CallCode,
                     (CallKind::DelegateCall, _) => super::tracer::CallKind::DelegateCall,
                     _ => unreachable!(),
-                }
-            };
-            tracer.capture_start(
-                message.depth.try_into().unwrap(),
-                message.sender,
-                message.recipient,
-                MessageKind::Call {
-                    call_kind,
-                    code_kind: if precompiled {
-                        CodeKind::Precompile
-                    } else {
-                        CodeKind::Bytecode(None)
-                    },
                 },
-                message.input_data.clone(),
-                message.gas.try_into().unwrap(),
-                value,
-            )
-        }
+                code_kind: code_kind.clone(),
+            },
+            message.input_data.clone(),
+            message.gas as u64,
+            message.value,
+        );
 
         // https://eips.ethereum.org/EIPS/eip-161
-        if value == 0
+        if message.value == 0
             && self.block_spec.revision >= Revision::Spurious
-            && !precompiled
+            && matches!(code_kind, CodeKind::Bytecode(_))
             && !self.state.exists(message.code_address)?
         {
-            return Ok(res);
+            return Ok(Output {
+                status_code: StatusCode::Success,
+                gas_left: message.gas,
+                output_data: Bytes::new(),
+                create_address: None,
+            });
         }
 
         let snapshot = self.state.take_snapshot();
@@ -277,40 +260,57 @@ where
                 // https://github.com/ethereum/go-ethereum/blob/v1.9.25/core/vm/evm.go#L391
                 self.state.touch(message.recipient);
             } else {
-                self.state.subtract_from_balance(message.sender, value)?;
-                self.state.add_to_balance(message.recipient, value)?;
+                self.state
+                    .subtract_from_balance(message.sender, message.value)?;
+                self.state
+                    .add_to_balance(message.recipient, message.value)?;
             }
         }
 
-        if precompiled {
-            let num = message.code_address.0[ADDRESS_LENGTH - 1] as usize;
-            let contract = &precompiled::CONTRACTS[num - 1];
-            let input = message.input_data;
-            if let Some(gas) = (contract.gas)(input.clone(), self.block_spec.revision)
-                .and_then(|g| i64::try_from(g).ok())
-            {
-                if gas > message.gas {
-                    res.status_code = StatusCode::OutOfGas;
-                } else if let Some(output) = (contract.run)(input) {
-                    res.status_code = StatusCode::Success;
-                    res.gas_left = message.gas - gas;
-                    res.output_data = output;
-                } else {
-                    res.status_code = StatusCode::PrecompileFailure;
+        let mut res = match &code_kind {
+            CodeKind::Bytecode(code) => {
+                let code = code.as_ref().map(|v| v as &[u8]).unwrap_or(&[]);
+                if code.is_empty() {
+                    return Ok(Output {
+                        status_code: StatusCode::Success,
+                        gas_left: message.gas,
+                        output_data: Bytes::new(),
+                        create_address: None,
+                    });
                 }
-            } else {
-                res.status_code = StatusCode::OutOfGas;
-            }
-        } else {
-            let code = code.unwrap_or_default();
-            if code.is_empty() {
-                return Ok(res);
-            }
 
-            let code_hash = self.state.get_code_hash(message.code_address)?;
+                let code_hash = self.state.get_code_hash(message.code_address)?;
 
-            res = self.execute(message, code, Some(code_hash))?;
-        }
+                self.execute(message, code, Some(&code_hash))?
+            }
+            CodeKind::Precompile => {
+                let num = message.code_address.0[ADDRESS_LENGTH - 1] as usize;
+                let contract = &precompiled::CONTRACTS[num - 1];
+                let input = message.input_data.clone();
+                let mut res = Output {
+                    status_code: StatusCode::Success,
+                    gas_left: message.gas,
+                    output_data: Bytes::new(),
+                    create_address: None,
+                };
+                if let Some(gas) = (contract.gas)(input.clone(), self.block_spec.revision)
+                    .and_then(|g| i64::try_from(g).ok())
+                {
+                    if gas > message.gas {
+                        res.status_code = StatusCode::OutOfGas;
+                    } else if let Some(output) = (contract.run)(input) {
+                        res.status_code = StatusCode::Success;
+                        res.gas_left = message.gas - gas;
+                        res.output_data = output;
+                    } else {
+                        res.status_code = StatusCode::PrecompileFailure;
+                    }
+                } else {
+                    res.status_code = StatusCode::OutOfGas;
+                }
+                res
+            }
+        };
 
         if res.status_code != StatusCode::Success {
             self.state.revert_to_snapshot(snapshot);
@@ -324,307 +324,29 @@ where
 
     fn execute(
         &mut self,
-        msg: InterpreterMessage,
-        code: Bytes,
-        code_hash: Option<H256>,
+        msg: &InterpreterMessage,
+        code: &[u8],
+        code_hash: Option<&H256>,
     ) -> anyhow::Result<Output> {
-        let a;
         let analysis = if let Some(code_hash) = code_hash {
-            if let Some(cache) = self.analysis_cache.get(code_hash) {
+            if let Some(cache) = self.analysis_cache.get(code_hash).cloned() {
                 cache
             } else {
-                let analysis = AnalyzedCode::analyze(&code);
-                self.analysis_cache.put(code_hash, analysis);
-                self.analysis_cache.get(code_hash).unwrap()
+                let analysis = AnalyzedCode::analyze(code);
+                self.analysis_cache.put(*code_hash, analysis.clone());
+                analysis
             }
         } else {
-            a = AnalyzedCode::analyze(&code);
-            &a
+            AnalyzedCode::analyze(code)
         };
 
-        let mut interrupt = analysis
-            .execute_resumable(false, msg, self.block_spec.revision)
-            .resume(());
+        let revision = self.block_spec.revision;
 
-        let output = loop {
-            interrupt = match interrupt {
-                Interrupt::InstructionStart { .. } => unreachable!("tracing is disabled"),
-                Interrupt::AccountExists { interrupt, address } => {
-                    let exists = if self.block_spec.revision >= Revision::Spurious {
-                        !self.state.is_dead(address)?
-                    } else {
-                        self.state.exists(address)?
-                    };
-                    interrupt.resume(AccountExistsStatus { exists })
-                }
-                Interrupt::GetBalance { interrupt, address } => {
-                    let balance = self.state.get_balance(address)?;
-                    interrupt.resume(Balance { balance })
-                }
-                Interrupt::GetCodeSize { interrupt, address } => {
-                    let code_size =
-                        u64::try_from(self.state.get_code(address)?.map(|c| c.len()).unwrap_or(0))?
-                            .into();
-                    interrupt.resume(CodeSize { code_size })
-                }
-                Interrupt::GetStorage {
-                    interrupt,
-                    address,
-                    location,
-                } => {
-                    let value = self.state.get_current_storage(address, location)?;
-                    interrupt.resume(StorageValue { value })
-                }
-                Interrupt::SetStorage {
-                    interrupt,
-                    address,
-                    location,
-                    value: new_val,
-                } => {
-                    let current_val = self.state.get_current_storage(address, location)?;
+        let mut host = EvmHost { inner: self };
 
-                    let status = if current_val == new_val {
-                        StorageStatus::Unchanged
-                    } else {
-                        self.state.set_storage(address, location, new_val)?;
+        let output = analysis.execute(&mut host, msg, revision);
 
-                        let eip1283 = self.block_spec.revision >= Revision::Istanbul
-                            || self.block_spec.revision == Revision::Constantinople;
-
-                        if !eip1283 {
-                            if current_val == 0 {
-                                StorageStatus::Added
-                            } else if new_val == 0 {
-                                self.state.add_refund(fee::R_SCLEAR);
-                                StorageStatus::Deleted
-                            } else {
-                                StorageStatus::Modified
-                            }
-                        } else {
-                            let sload_cost = {
-                                if self.block_spec.revision >= Revision::Berlin {
-                                    fee::WARM_STORAGE_READ_COST
-                                } else if self.block_spec.revision >= Revision::Istanbul {
-                                    fee::G_SLOAD_ISTANBUL
-                                } else {
-                                    fee::G_SLOAD_TANGERINE_WHISTLE
-                                }
-                            };
-
-                            let mut sstore_reset_gas = fee::G_SRESET;
-                            if self.block_spec.revision >= Revision::Berlin {
-                                sstore_reset_gas -= fee::COLD_SLOAD_COST;
-                            }
-
-                            // https://eips.ethereum.org/EIPS/eip-1283
-                            let original_val =
-                                self.state.get_original_storage(address, location)?;
-
-                            // https://eips.ethereum.org/EIPS/eip-3529
-                            let sstore_clears_refund =
-                                if self.block_spec.revision >= Revision::London {
-                                    sstore_reset_gas + fee::ACCESS_LIST_STORAGE_KEY_COST
-                                } else {
-                                    fee::R_SCLEAR
-                                };
-
-                            if original_val == current_val {
-                                if original_val == 0 {
-                                    StorageStatus::Added
-                                } else {
-                                    if new_val == 0 {
-                                        self.state.add_refund(sstore_clears_refund);
-                                    }
-                                    StorageStatus::Modified
-                                }
-                            } else {
-                                if original_val != 0 {
-                                    if current_val == 0 {
-                                        self.state.subtract_refund(sstore_clears_refund);
-                                    }
-                                    if new_val == 0 {
-                                        self.state.add_refund(sstore_clears_refund);
-                                    }
-                                }
-                                if original_val == new_val {
-                                    let refund = {
-                                        if original_val == 0 {
-                                            fee::G_SSET - sload_cost
-                                        } else {
-                                            sstore_reset_gas - sload_cost
-                                        }
-                                    };
-
-                                    self.state.add_refund(refund);
-                                }
-                                StorageStatus::ModifiedAgain
-                            }
-                        }
-                    };
-
-                    interrupt.resume(StorageStatusInfo { status })
-                }
-                Interrupt::GetCodeHash { interrupt, address } => {
-                    let hash = h256_to_u256({
-                        if self.state.is_dead(address)? {
-                            H256::zero()
-                        } else {
-                            self.state.get_code_hash(address)?
-                        }
-                    });
-                    interrupt.resume(CodeHash { hash })
-                }
-                Interrupt::CopyCode {
-                    interrupt,
-                    address,
-                    offset,
-                    max_size,
-                } => {
-                    let mut buffer = vec![0; max_size];
-
-                    let code = self.state.get_code(address)?.unwrap_or_default();
-
-                    let mut copied = 0;
-                    if offset < code.len() {
-                        copied = min(max_size, code.len() - offset);
-                        buffer[..copied].copy_from_slice(&code[offset..offset + copied]);
-                    }
-
-                    buffer.truncate(copied);
-                    let code = buffer.into();
-
-                    interrupt.resume(Code { code })
-                }
-                Interrupt::Selfdestruct {
-                    interrupt,
-                    address,
-                    beneficiary,
-                } => {
-                    self.state.record_selfdestruct(address);
-                    let balance = self.state.get_balance(address)?;
-                    self.state.add_to_balance(beneficiary, balance)?;
-                    self.state.set_balance(address, 0)?;
-
-                    if let Some(tracer) = &mut self.tracer {
-                        tracer.capture_self_destruct(address, beneficiary);
-                    }
-
-                    interrupt.resume(())
-                }
-                Interrupt::Call {
-                    interrupt,
-                    call_data,
-                } => {
-                    let output = match call_data {
-                        Call::Create(message) => {
-                            let mut res = self.create(message)?;
-
-                            // https://eips.ethereum.org/EIPS/eip-211
-                            if res.status_code != StatusCode::Revert {
-                                // geth returns CREATE output only in case of REVERT
-                                res.output_data = Default::default();
-                            }
-
-                            res
-                        }
-                        Call::Call(message) => self.call(message)?,
-                    };
-
-                    interrupt.resume(CallOutput { output })
-                }
-                Interrupt::GetTxContext { interrupt } => {
-                    let base_fee_per_gas = self.header.base_fee_per_gas.unwrap_or(U256::ZERO);
-                    let tx_gas_price = self.txn.effective_gas_price(base_fee_per_gas);
-                    let tx_origin = self.txn.sender;
-                    let block_coinbase = self.beneficiary;
-                    let block_number = self.header.number.0;
-                    let block_timestamp = self.header.timestamp;
-                    let block_gas_limit = self.header.gas_limit;
-                    let block_difficulty = self.header.difficulty;
-                    let chain_id = self.block_spec.params.chain_id.0.into();
-                    let block_base_fee = base_fee_per_gas;
-
-                    let context = TxContext {
-                        tx_gas_price,
-                        tx_origin,
-                        block_coinbase,
-                        block_number,
-                        block_timestamp,
-                        block_gas_limit,
-                        block_difficulty,
-                        chain_id,
-                        block_base_fee,
-                    };
-
-                    interrupt.resume(TxContextData { context })
-                }
-                Interrupt::GetBlockHash {
-                    interrupt,
-                    block_number,
-                } => {
-                    let base_number = self.header.number;
-                    let distance = base_number.0 - block_number;
-                    assert!(distance <= 256);
-
-                    let mut hash = self.header.parent_hash;
-
-                    for i in 1..distance {
-                        hash = self
-                            .state
-                            .db()
-                            .read_header(BlockNumber(base_number.0 - i), hash)?
-                            .context("no header")?
-                            .parent_hash;
-                    }
-
-                    let hash = h256_to_u256(hash);
-                    interrupt.resume(BlockHash { hash })
-                }
-                Interrupt::EmitLog {
-                    interrupt,
-                    address,
-                    topics,
-                    data,
-                } => {
-                    self.state.add_log(Log {
-                        address,
-                        topics: topics.into_iter().map(u256_to_h256).collect(),
-                        data,
-                    });
-
-                    interrupt.resume(())
-                }
-                Interrupt::AccessAccount { interrupt, address } => {
-                    let status = if self.is_precompiled(address) {
-                        AccessStatus::Warm
-                    } else {
-                        self.state.access_account(address)
-                    };
-                    interrupt.resume(AccessAccountStatus { status })
-                }
-                Interrupt::AccessStorage {
-                    interrupt,
-                    address,
-                    location,
-                } => {
-                    let status = self.state.access_storage(address, location);
-                    interrupt.resume(AccessStorageStatus { status })
-                }
-                Interrupt::Complete { result, .. } => {
-                    let output = match result {
-                        Ok(output) => output.into(),
-                        Err(status_code) => Output {
-                            status_code,
-                            gas_left: 0,
-                            output_data: bytes::Bytes::new(),
-                            create_address: None,
-                        },
-                    };
-
-                    break output;
-                }
-            };
-        };
+        self.tracer.capture_end(&output);
 
         Ok(output)
     }
@@ -654,10 +376,275 @@ where
     }
 }
 
+struct EvmHost<'r, 'state, 'tracer, 'analysis, 'h, 'c, 't, 'a, B>
+where
+    B: State,
+{
+    inner: &'a mut Evm<'r, 'state, 'tracer, 'analysis, 'h, 'c, 't, B>,
+}
+
+impl<'r, 'state, 'tracer, 'analysis, 'h, 'c, 't, 'a, B: State> Host
+    for EvmHost<'r, 'state, 'tracer, 'analysis, 'h, 'c, 't, 'a, B>
+{
+    fn trace_instructions(&self) -> bool {
+        self.inner.tracer.trace_instructions()
+    }
+    fn tracer(&mut self, mut f: impl FnMut(&mut dyn Tracer)) {
+        (f)(self.inner.tracer)
+    }
+
+    fn account_exists(&mut self, address: Address) -> bool {
+        if self.inner.block_spec.revision >= Revision::Spurious {
+            !self.inner.state.is_dead(address).unwrap()
+        } else {
+            self.inner.state.exists(address).unwrap()
+        }
+    }
+
+    fn get_storage(&mut self, address: Address, location: U256) -> U256 {
+        self.inner
+            .state
+            .get_current_storage(address, location)
+            .unwrap()
+    }
+
+    fn set_storage(&mut self, address: Address, location: U256, new_val: U256) -> StorageStatus {
+        let current_val = self
+            .inner
+            .state
+            .get_current_storage(address, location)
+            .unwrap();
+
+        if current_val == new_val {
+            StorageStatus::Unchanged
+        } else {
+            self.inner
+                .state
+                .set_storage(address, location, new_val)
+                .unwrap();
+
+            let eip1283 = self.inner.block_spec.revision >= Revision::Istanbul
+                || self.inner.block_spec.revision == Revision::Constantinople;
+
+            if !eip1283 {
+                if current_val == 0 {
+                    StorageStatus::Added
+                } else if new_val == 0 {
+                    self.inner.state.add_refund(fee::R_SCLEAR);
+                    StorageStatus::Deleted
+                } else {
+                    StorageStatus::Modified
+                }
+            } else {
+                let sload_cost = {
+                    if self.inner.block_spec.revision >= Revision::Berlin {
+                        fee::WARM_STORAGE_READ_COST
+                    } else if self.inner.block_spec.revision >= Revision::Istanbul {
+                        fee::G_SLOAD_ISTANBUL
+                    } else {
+                        fee::G_SLOAD_TANGERINE_WHISTLE
+                    }
+                };
+
+                let mut sstore_reset_gas = fee::G_SRESET;
+                if self.inner.block_spec.revision >= Revision::Berlin {
+                    sstore_reset_gas -= fee::COLD_SLOAD_COST;
+                }
+
+                // https://eips.ethereum.org/EIPS/eip-1283
+                let original_val = self
+                    .inner
+                    .state
+                    .get_original_storage(address, location)
+                    .unwrap();
+
+                // https://eips.ethereum.org/EIPS/eip-3529
+                let sstore_clears_refund = if self.inner.block_spec.revision >= Revision::London {
+                    sstore_reset_gas + fee::ACCESS_LIST_STORAGE_KEY_COST
+                } else {
+                    fee::R_SCLEAR
+                };
+
+                if original_val == current_val {
+                    if original_val == 0 {
+                        StorageStatus::Added
+                    } else {
+                        if new_val == 0 {
+                            self.inner.state.add_refund(sstore_clears_refund);
+                        }
+                        StorageStatus::Modified
+                    }
+                } else {
+                    if original_val != 0 {
+                        if current_val == 0 {
+                            self.inner.state.subtract_refund(sstore_clears_refund);
+                        }
+                        if new_val == 0 {
+                            self.inner.state.add_refund(sstore_clears_refund);
+                        }
+                    }
+                    if original_val == new_val {
+                        let refund = {
+                            if original_val == 0 {
+                                fee::G_SSET - sload_cost
+                            } else {
+                                sstore_reset_gas - sload_cost
+                            }
+                        };
+
+                        self.inner.state.add_refund(refund);
+                    }
+                    StorageStatus::ModifiedAgain
+                }
+            }
+        }
+    }
+
+    fn get_balance(&mut self, address: Address) -> U256 {
+        self.inner.state.get_balance(address).unwrap()
+    }
+
+    fn get_code_size(&mut self, address: Address) -> U256 {
+        u64::try_from(
+            self.inner
+                .state
+                .get_code(address)
+                .unwrap()
+                .map(|c| c.len())
+                .unwrap_or(0),
+        )
+        .unwrap()
+        .into()
+    }
+
+    fn get_code_hash(&mut self, address: Address) -> U256 {
+        h256_to_u256({
+            if self.inner.state.is_dead(address).unwrap() {
+                H256::zero()
+            } else {
+                self.inner.state.get_code_hash(address).unwrap()
+            }
+        })
+    }
+
+    fn copy_code(&mut self, address: Address, offset: usize, buffer: &mut [u8]) -> usize {
+        let code = self
+            .inner
+            .state
+            .get_code(address)
+            .unwrap()
+            .unwrap_or_default();
+
+        let mut copied = 0;
+        if offset < code.len() {
+            copied = min(buffer.len(), code.len() - offset);
+            buffer[..copied].copy_from_slice(&code[offset..offset + copied]);
+        }
+
+        copied
+    }
+
+    fn selfdestruct(&mut self, address: Address, beneficiary: Address) {
+        self.inner.state.record_selfdestruct(address);
+        let balance = self.inner.state.get_balance(address).unwrap();
+        self.inner
+            .state
+            .add_to_balance(beneficiary, balance)
+            .unwrap();
+        self.inner.state.set_balance(address, 0).unwrap();
+
+        self.tracer(|t| t.capture_self_destruct(address, beneficiary));
+    }
+
+    fn call(&mut self, msg: Call) -> Output {
+        match msg {
+            Call::Create(message) => {
+                let mut res = self.inner.create(message).unwrap();
+
+                // https://eips.ethereum.org/EIPS/eip-211
+                if res.status_code != StatusCode::Revert {
+                    // geth returns CREATE output only in case of REVERT
+                    res.output_data = Default::default();
+                }
+
+                res
+            }
+            Call::Call(message) => self.inner.call(message).unwrap(),
+        }
+    }
+
+    fn get_tx_context(&mut self) -> TxContext {
+        let base_fee_per_gas = self.inner.header.base_fee_per_gas.unwrap_or(U256::ZERO);
+        let tx_gas_price = self.inner.txn.effective_gas_price(base_fee_per_gas);
+        let tx_origin = self.inner.txn.sender;
+        let block_coinbase = self.inner.beneficiary;
+        let block_number = self.inner.header.number.0;
+        let block_timestamp = self.inner.header.timestamp;
+        let block_gas_limit = self.inner.header.gas_limit;
+        let block_difficulty = self.inner.header.difficulty;
+        let chain_id = self.inner.block_spec.params.chain_id.0.into();
+        let block_base_fee = base_fee_per_gas;
+
+        TxContext {
+            tx_gas_price,
+            tx_origin,
+            block_coinbase,
+            block_number,
+            block_timestamp,
+            block_gas_limit,
+            block_difficulty,
+            chain_id,
+            block_base_fee,
+        }
+    }
+
+    fn get_block_hash(&mut self, block_number: u64) -> U256 {
+        let base_number = self.inner.header.number;
+        let distance = base_number.0 - block_number;
+        assert!(distance <= 256);
+
+        let mut hash = self.inner.header.parent_hash;
+
+        for i in 1..distance {
+            hash = self
+                .inner
+                .state
+                .db()
+                .read_header(BlockNumber(base_number.0 - i), hash)
+                .unwrap()
+                .context("no header")
+                .unwrap()
+                .parent_hash;
+        }
+
+        h256_to_u256(hash)
+    }
+
+    fn emit_log(&mut self, address: Address, data: Bytes, topics: &[U256]) {
+        self.inner.state.add_log(Log {
+            address,
+            topics: topics.iter().copied().map(u256_to_h256).collect(),
+            data,
+        });
+    }
+
+    fn access_account(&mut self, address: Address) -> AccessStatus {
+        if self.inner.is_precompiled(address) {
+            AccessStatus::Warm
+        } else {
+            self.inner.state.access_account(address)
+        }
+    }
+
+    fn access_storage(&mut self, address: Address, location: U256) -> AccessStatus {
+        self.inner.state.access_storage(address, location)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{res::chainspec::MAINNET, InMemoryState};
+    use crate::{execution::tracer::NoopTracer, res::chainspec::MAINNET, InMemoryState};
     use bytes_literal::bytes;
     use hex_literal::hex;
 
@@ -667,9 +654,10 @@ mod tests {
         txn: &MessageWithSender,
         gas: u64,
     ) -> CallResult {
+        let mut tracer = NoopTracer;
         super::execute(
             state,
-            None,
+            &mut tracer,
             &mut AnalysisCache::default(),
             header,
             &MAINNET.collect_block_spec(header.number),
diff --git a/src/execution/mod.rs b/src/execution/mod.rs
index e6aac4d..352e5bb 100644
--- a/src/execution/mod.rs
+++ b/src/execution/mod.rs
@@ -1,4 +1,4 @@
-use self::{analysis_cache::AnalysisCache, processor::ExecutionProcessor};
+use self::{analysis_cache::AnalysisCache, processor::ExecutionProcessor, tracer::NoopTracer};
 use crate::{consensus, crypto::*, models::*, State};
 
 pub mod address;
@@ -17,10 +17,11 @@ pub fn execute_block<S: State>(
 ) -> anyhow::Result<Vec<Receipt>> {
     let mut analysis_cache = AnalysisCache::default();
     let mut engine = consensus::engine_factory(config.clone())?;
+    let mut tracer = NoopTracer;
     let config = config.collect_block_spec(header.number);
     ExecutionProcessor::new(
         state,
-        None,
+        &mut tracer,
         &mut analysis_cache,
         &mut *engine,
         header,
diff --git a/src/execution/processor.rs b/src/execution/processor.rs
index 866fe1f..a1d3f61 100644
--- a/src/execution/processor.rs
+++ b/src/execution/processor.rs
@@ -20,7 +20,7 @@ where
     S: State,
 {
     state: IntraBlockState<'r, S>,
-    tracer: Option<&'tracer mut dyn Tracer>,
+    tracer: &'tracer mut dyn Tracer,
     analysis_cache: &'analysis mut AnalysisCache,
     engine: &'e mut dyn Consensus,
     header: &'h PartialHeader,
@@ -36,7 +36,7 @@ where
 {
     pub fn new(
         state: &'r mut S,
-        tracer: Option<&'tracer mut dyn Tracer>,
+        tracer: &'tracer mut dyn Tracer,
         analysis_cache: &'analysis mut AnalysisCache,
         engine: &'e mut dyn Consensus,
         header: &'h PartialHeader,
@@ -160,7 +160,7 @@ where
             &mut self.state,
             // https://github.com/rust-lang/rust-clippy/issues/7846
             #[allow(clippy::needless_option_as_deref)]
-            self.tracer.as_deref_mut(),
+            self.tracer,
             self.analysis_cache,
             self.header,
             self.block_spec,
@@ -304,7 +304,11 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{execution::address::create_address, res::chainspec::MAINNET, InMemoryState};
+    use crate::{
+        execution::{address::create_address, tracer::NoopTracer},
+        res::chainspec::MAINNET,
+        InMemoryState,
+    };
     use bytes::Bytes;
     use bytes_literal::bytes;
     use hex_literal::hex;
@@ -339,9 +343,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
@@ -384,9 +389,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
@@ -444,9 +450,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
@@ -562,9 +569,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
@@ -671,9 +679,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
@@ -726,9 +735,10 @@ mod tests {
         let mut analysis_cache = AnalysisCache::default();
         let mut engine = engine_factory(MAINNET.clone()).unwrap();
         let block_spec = MAINNET.collect_block_spec(header.number);
+        let mut tracer = NoopTracer;
         let mut processor = ExecutionProcessor::new(
             &mut state,
-            None,
+            &mut tracer,
             &mut analysis_cache,
             &mut *engine,
             &header,
diff --git a/src/execution/tracer/eip3155_tracer.rs b/src/execution/tracer/eip3155_tracer.rs
new file mode 100644
index 0000000..628e2f8
--- /dev/null
+++ b/src/execution/tracer/eip3155_tracer.rs
@@ -0,0 +1,103 @@
+use super::*;
+use crate::{
+    execution::evm::{ExecutionState, OpCode, Output, Stack, StatusCode},
+    models::*,
+};
+use bytes::Bytes;
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct ExecutionStart {
+    pub depth: u16,
+    pub rev: Revision,
+    #[serde(rename = "static")]
+    pub is_static: bool,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct InstructionStart {
+    pub pc: usize,
+    pub op: u8,
+    pub op_name: &'static str,
+    pub gas: u64,
+    pub stack: Stack,
+    pub memory_size: usize,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ExecutionEnd {
+    pub error: Option<String>,
+    pub gas: u64,
+    pub gas_used: u64,
+    pub output: String,
+}
+
+#[derive(Debug)]
+struct TracerContext {
+    message_gas: u64,
+}
+
+/// Tracer which prints to stdout.
+#[derive(Debug, Default)]
+pub struct StdoutTracer {
+    execution_stack: Vec<TracerContext>,
+}
+
+impl Tracer for StdoutTracer {
+    fn capture_start(
+        &mut self,
+        _: u16,
+        _: Address,
+        _: Address,
+        _: MessageKind,
+        _: Bytes,
+        gas: u64,
+        _: U256,
+    ) {
+        self.execution_stack
+            .push(TracerContext { message_gas: gas });
+    }
+
+    fn capture_state(&mut self, env: &ExecutionState, pc: usize, op: OpCode, _: u64, _: u16) {
+        println!(
+            "{}",
+            serde_json::to_string(&InstructionStart {
+                pc,
+                op: op.0,
+                op_name: op.name(),
+                gas: env.gas_left as u64,
+                stack: env.stack.clone(),
+                memory_size: env.memory.len()
+            })
+            .unwrap()
+        )
+    }
+
+    fn capture_end(&mut self, output: &Output) {
+        let context = self.execution_stack.pop().unwrap();
+        let error = match output.status_code {
+            StatusCode::Success => None,
+            other => Some(other.to_string()),
+        };
+        let (gas_left, gas_used) = match output.status_code {
+            StatusCode::Success | StatusCode::Revert => (
+                output.gas_left as u64,
+                context.message_gas - output.gas_left as u64,
+            ),
+            _ => (0, context.message_gas),
+        };
+
+        println!(
+            "{}",
+            serde_json::to_string(&ExecutionEnd {
+                error,
+                gas: gas_left,
+                gas_used,
+                output: hex::encode(&output.output_data),
+            })
+            .unwrap()
+        )
+    }
+}
diff --git a/src/execution/tracer.rs b/src/execution/tracer/mod.rs
similarity index 79%
rename from src/execution/tracer.rs
rename to src/execution/tracer/mod.rs
index 42eac79..6169472 100644
--- a/src/execution/tracer.rs
+++ b/src/execution/tracer/mod.rs
@@ -1,9 +1,19 @@
+pub mod eip3155_tracer;
+
+use auto_impl::auto_impl;
+pub use eip3155_tracer::StdoutTracer;
+
 use crate::{
-    execution::evm::{ExecutionState, OpCode, StatusCode},
+    execution::evm::{ExecutionState, OpCode},
     models::*,
 };
 use bytes::Bytes;
-use std::collections::{BTreeMap, HashMap};
+use std::{
+    collections::{BTreeMap, HashMap},
+    fmt::Debug,
+};
+
+use super::evm::Output;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum CodeKind {
@@ -29,7 +39,11 @@ pub enum MessageKind {
 }
 
 #[allow(unused, clippy::too_many_arguments)]
-pub trait Tracer: Send + 'static {
+#[auto_impl(&mut)]
+pub trait Tracer: Debug + Send {
+    fn trace_instructions(&self) -> bool {
+        false
+    }
     fn capture_start(
         &mut self,
         depth: u16,
@@ -44,20 +58,24 @@ pub trait Tracer: Send + 'static {
     fn capture_state(
         &mut self,
         env: &ExecutionState,
-        pc: u64,
+        pc: usize,
         op: OpCode,
         cost: u64,
-        return_data: Bytes,
         depth: u16,
-        err: StatusCode,
     ) {
     }
-    fn capture_end(&mut self, depth: u16, output: Bytes, gas_left: u64, err: StatusCode) {}
+    fn capture_end(&mut self, output: &Output) {}
     fn capture_self_destruct(&mut self, caller: Address, beneficiary: Address) {}
     fn capture_account_read(&mut self, account: Address) {}
     fn capture_account_write(&mut self, account: Address) {}
 }
 
+/// Tracer which does nothing.
+#[derive(Debug)]
+pub struct NoopTracer;
+
+impl Tracer for NoopTracer {}
+
 #[derive(Clone, Copy, Debug, Default)]
 pub struct CallTracerFlags {
     pub from: bool,
diff --git a/src/lib.rs b/src/lib.rs
index 6ca14ab..a977eeb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,7 @@
 #![feature(
     bool_to_option,
+    const_for,
+    const_mut_refs,
     generator_trait,
     generators,
     let_else,
diff --git a/src/models/revision.rs b/src/models/revision.rs
index 1274a4c..37b8573 100644
--- a/src/models/revision.rs
+++ b/src/models/revision.rs
@@ -40,7 +40,7 @@ pub enum Revision {
 }
 
 impl Revision {
-    pub fn iter() -> impl IntoIterator<Item = Self> {
+    pub const fn iter() -> [Revision; Revision::len()] {
         [
             Self::Frontier,
             Self::Homestead,
diff --git a/src/stages/execution.rs b/src/stages/execution.rs
index 4db93eb..f3984ef 100644
--- a/src/stages/execution.rs
+++ b/src/stages/execution.rs
@@ -79,7 +79,7 @@ fn execute_batch_of_blocks<E: EnvironmentKind>(
         let mut call_tracer = CallTracer::default();
         let receipts = ExecutionProcessor::new(
             &mut buffer,
-            Some(&mut call_tracer),
+            &mut call_tracer,
             &mut analysis_cache,
             &mut *consensus_engine,
             &header,