diff --git a/.github/workflows/contracts-near.yml b/.github/workflows/contracts-near.yml
index 5023c8f7a..a276db210 100644
--- a/.github/workflows/contracts-near.yml
+++ b/.github/workflows/contracts-near.yml
@@ -28,6 +28,12 @@ jobs:
               fi
             timeout-minutes: 40
 
+          - job-name: test eth-prover
+            cmd: |
+              cd contracts/near/eth-prover
+              ./test.sh
+            timeout-minutes: 40
+
           - job-name: test eth-client
             cmd: |
               cd contracts/near/eth-client
diff --git a/contracts/near/Cargo.lock b/contracts/near/Cargo.lock
index 8064fa9e2..f3f019c17 100644
--- a/contracts/near/Cargo.lock
+++ b/contracts/near/Cargo.lock
@@ -100,15 +100,6 @@ name = "amcl"
 version = "0.3.0"
 source = "git+https://github.com/sigp/milagro_bls?tag=v1.4.2#16655aa033175a90c10ef02aa144e2835de23aec"
 
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.58"
@@ -218,17 +209,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -304,40 +284,6 @@ dependencies = [
  "zip",
 ]
 
-[[package]]
-name = "bincode"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
-dependencies = [
- "byteorder",
- "serde",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5"
-dependencies = [
- "bitflags 1.2.1",
- "cexpr",
- "cfg-if 0.1.10",
- "clang-sys",
- "clap",
- "env_logger",
- "lazy_static",
- "lazycell",
- "log 0.4.17",
- "peeking_take_while",
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "regex",
- "rustc-hash",
- "shlex",
- "which",
-]
-
 [[package]]
 name = "bitflags"
 version = "0.9.1"
@@ -384,25 +330,13 @@ dependencies = [
  "wyz 0.5.0",
 ]
 
-[[package]]
-name = "blake2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
-dependencies = [
- "byte-tools",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "blake2"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174"
 dependencies = [
- "crypto-mac 0.8.0",
+ "crypto-mac",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -418,21 +352,6 @@ dependencies = [
  "constant_time_eq",
 ]
 
-[[package]]
-name = "blake3"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "423897d97e11b810c9da22458400b28ec866991c711409073662eb34dc44bfff"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.1",
- "cc",
- "cfg-if 0.1.10",
- "constant_time_eq",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -505,60 +424,29 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "borsh"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7769f8f6fdc6ac7617bbc8bc7ef9dc263cd459d99d21cf2ab4afc3bc8d7d70d"
-dependencies = [
- "borsh-derive 0.6.2",
-]
-
 [[package]]
 name = "borsh"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa"
 dependencies = [
- "borsh-derive 0.9.3",
+ "borsh-derive",
  "hashbrown 0.11.2",
 ]
 
-[[package]]
-name = "borsh-derive"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2689a82a5fe57f9e71997b16bea340da338c7fb8db400b8d9d55b59010540d8"
-dependencies = [
- "borsh-derive-internal 0.6.2",
- "borsh-schema-derive-internal 0.6.2",
- "syn 1.0.96",
-]
-
 [[package]]
 name = "borsh-derive"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775"
 dependencies = [
- "borsh-derive-internal 0.9.3",
- "borsh-schema-derive-internal 0.9.3",
+ "borsh-derive-internal",
+ "borsh-schema-derive-internal",
  "proc-macro-crate 0.1.5",
  "proc-macro2 1.0.39",
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "borsh-derive-internal"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b621f19e9891a34f679034fa2238260e27c0eddfe2804e9fb282061cf9b294"
-dependencies = [
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "syn 1.0.96",
-]
-
 [[package]]
 name = "borsh-derive-internal"
 version = "0.9.3"
@@ -570,17 +458,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "befebdb9e223ae4528b3d597dbbfb5c68566822d2a3de3e260f235360773ba29"
-dependencies = [
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "syn 1.0.96",
-]
-
 [[package]]
 name = "borsh-schema-derive-internal"
 version = "0.9.3"
@@ -592,12 +469,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "bs58"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
-
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -678,17 +549,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "c2-chacha"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217192c943108d8b13bac38a1d51df9ce8a407a3f5a71ab633980665e68fbd9a"
-dependencies = [
- "byteorder",
- "ppv-lite86",
- "stream-cipher",
-]
-
 [[package]]
 name = "c2-chacha"
 version = "0.3.3"
@@ -705,32 +565,11 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
-[[package]]
-name = "cached"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083dc50149e37dfaab1ffe2c3af03576b79550f1e419a5091b28a7191db1c45b"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cexpr"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
-dependencies = [
- "nom",
-]
 
 [[package]]
 name = "cfg-if"
@@ -767,32 +606,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "0.29.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "2.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.2.1",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -964,16 +777,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.3",
- "subtle 1.0.0",
-]
-
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -981,7 +784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.4",
- "subtle 2.2.3",
+ "subtle",
 ]
 
 [[package]]
@@ -1014,19 +817,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
-dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core 0.5.1",
- "subtle 2.2.3",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -1036,7 +826,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.2.3",
+ "subtle",
  "zeroize",
 ]
 
@@ -1060,7 +850,7 @@ dependencies = [
  "ident_case",
  "proc-macro2 1.0.39",
  "quote 1.0.18",
- "strsim 0.10.0",
+ "strsim",
  "syn 1.0.96",
 ]
 
@@ -1161,31 +951,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "dynasm"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a814e1edeb85dd2a3c6fc0d6bf76d02ca5695d438c70ecee3d90774f3259c5"
-dependencies = [
- "bitflags 1.2.1",
- "byteorder",
- "lazy_static",
- "owning_ref",
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "syn 1.0.96",
-]
-
-[[package]]
-name = "dynasmrt"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a393aaeb4441a48bcf47b5b6155971f82cc1eb77e22855403ccc0415ac8328d"
-dependencies = [
- "byteorder",
- "memmap",
-]
-
 [[package]]
 name = "easy-ext"
 version = "0.2.0"
@@ -1211,7 +976,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek",
  "ed25519",
  "rand 0.7.3",
  "serde",
@@ -1225,15 +990,6 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 
-[[package]]
-name = "elastic-array"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d63720ea2bc2e1b79f7aa044d9dc0b825f9ccb6930b32120f8fb9e873aa84bc"
-dependencies = [
- "heapsize",
-]
-
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -1249,40 +1005,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime",
- "log 0.4.17",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480f641ccf0faf324e20c1d3e53d81b7484c698b42ea677f6907ae4db195371"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
-dependencies = [
- "gcc",
- "libc",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.12.2"
@@ -1298,7 +1020,7 @@ version = "0.1.0"
 dependencies = [
  "admin-controlled",
  "arrutil",
- "borsh 0.9.3",
+ "borsh",
  "eth-types",
  "ethash",
  "futures",
@@ -1320,26 +1042,24 @@ name = "eth-prover"
 version = "0.1.0"
 dependencies = [
  "admin-controlled",
- "borsh 0.9.3",
+ "borsh",
  "eth-types",
  "hex 0.4.2",
  "indicatif",
  "lazy_static",
- "near-crypto 0.1.0",
- "near-primitives 0.1.0",
- "near-runtime-standalone",
+ "near-crypto 0.14.0",
+ "near-primitives 0.14.0",
  "near-sdk",
  "rlp",
  "serde",
  "serde_json",
- "wee_alloc",
 ]
 
 [[package]]
 name = "eth-types"
 version = "0.1.0"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "derive_more 0.99.17",
  "eth2_serde_utils",
  "eth2_ssz",
@@ -1363,7 +1083,7 @@ dependencies = [
  "anyhow",
  "bitvec 1.0.0",
  "bls",
- "borsh 0.9.3",
+ "borsh",
  "eth-types",
  "eth2-utility",
  "ethereum-types 0.9.2",
@@ -1383,7 +1103,7 @@ name = "eth2-utility"
 version = "0.1.0"
 dependencies = [
  "bitvec 1.0.0",
- "borsh 0.9.3",
+ "borsh",
  "eth-types",
  "ethereum-types 0.9.2",
  "hex 0.4.2",
@@ -1543,12 +1263,6 @@ dependencies = [
  "synstructure",
 ]
 
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
 [[package]]
 name = "fastrand"
 version = "1.8.0"
@@ -1648,12 +1362,6 @@ dependencies = [
  "percent-encoding 2.1.0",
 ]
 
-[[package]]
-name = "fs_extra"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
-
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -1764,12 +1472,6 @@ dependencies = [
  "pin-utils",
 ]
 
-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -1819,12 +1521,6 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
 
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
 [[package]]
 name = "h2"
 version = "0.1.26"
@@ -1892,15 +1588,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.0"
@@ -1994,15 +1681,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
 [[package]]
 name = "hyper"
 version = "0.10.16"
@@ -2130,12 +1808,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "if_chain"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
-
 [[package]]
 name = "impl-codec"
 version = "0.2.0"
@@ -2209,7 +1881,6 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg 1.1.0",
  "hashbrown 0.12.2",
- "serde",
 ]
 
 [[package]]
@@ -2269,36 +1940,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
-[[package]]
-name = "jemalloc-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
-dependencies = [
- "cc",
- "fs_extra",
- "libc",
-]
-
-[[package]]
-name = "jemallocator"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-
-[[package]]
-name = "jobserver"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.59"
@@ -2349,40 +1990,12 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
-[[package]]
-name = "lazycell"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-
 [[package]]
 name = "libc"
 version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
-[[package]]
-name = "libloading"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-dependencies = [
- "cc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "librocksdb-sys"
-version = "6.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005"
-dependencies = [
- "bindgen",
- "cc",
- "glob",
- "libc",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.8"
@@ -2459,16 +2072,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.5.4"
@@ -2609,7 +2212,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de83d74a9241be8cc4eb3055216966b58bf8c463e8e285c0dc553925acdd19fa"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "serde",
 ]
 
@@ -2619,7 +2222,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d258582a1878e6db67400b0504a5099db85718d22c2e07f747fe1706ae7150"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "serde",
 ]
 
@@ -2634,7 +2237,7 @@ dependencies = [
  "derive_more 0.99.17",
  "near-crypto 0.14.0",
  "near-primitives 0.14.0",
- "num-rational 0.3.2",
+ "num-rational",
  "serde",
  "serde_json",
  "sha2 0.10.2",
@@ -2681,34 +2284,10 @@ dependencies = [
  "near-primitives 0.14.0",
  "serde",
  "serde_json",
- "strum 0.24.1",
+ "strum",
  "thiserror",
 ]
 
-[[package]]
-name = "near-crypto"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "arrayref",
- "blake2 0.8.1",
- "borsh 0.6.2",
- "bs58 0.3.1",
- "c2-chacha 0.2.4",
- "curve25519-dalek 2.1.0",
- "digest 0.8.1",
- "ed25519-dalek",
- "lazy_static",
- "libc",
- "parity-secp256k1",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "serde",
- "serde_json",
- "sha2 0.8.2",
- "subtle 2.2.3",
-]
-
 [[package]]
 name = "near-crypto"
 version = "0.13.0"
@@ -2716,11 +2295,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8ecf0b8b31aa7f4e60f629f72213a2617ca4a5f45cd1ae9ed2cf7cecfebdbb7"
 dependencies = [
  "arrayref",
- "blake2 0.9.2",
- "borsh 0.9.3",
- "bs58 0.4.0",
- "c2-chacha 0.3.3",
- "curve25519-dalek 3.2.0",
+ "blake2",
+ "borsh",
+ "bs58",
+ "c2-chacha",
+ "curve25519-dalek",
  "derive_more 0.99.17",
  "ed25519-dalek",
  "libc",
@@ -2732,7 +2311,7 @@ dependencies = [
  "rand_core 0.5.1",
  "serde",
  "serde_json",
- "subtle 2.2.3",
+ "subtle",
  "thiserror",
 ]
 
@@ -2743,11 +2322,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e75673d69fd7365508f3d32483669fe45b03bfb34e4d9363e90adae9dfb416c"
 dependencies = [
  "arrayref",
- "blake2 0.9.2",
- "borsh 0.9.3",
- "bs58 0.4.0",
- "c2-chacha 0.3.3",
- "curve25519-dalek 3.2.0",
+ "blake2",
+ "borsh",
+ "bs58",
+ "c2-chacha",
+ "curve25519-dalek",
  "derive_more 0.99.17",
  "ed25519-dalek",
  "near-account-id 0.14.0",
@@ -2758,7 +2337,7 @@ dependencies = [
  "rand_core 0.5.1",
  "serde",
  "serde_json",
- "subtle 2.2.3",
+ "subtle",
  "thiserror",
 ]
 
@@ -2768,7 +2347,7 @@ version = "0.4.0-beta.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bba462f54bc35289a1013ed3a2ebfa67cc8b12699f81c12dd67687f200c7b871"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "lazy_static",
  "log 0.4.17",
  "near-chain-configs",
@@ -2799,16 +2378,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "near-metrics"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "lazy_static",
- "log 0.4.17",
- "prometheus",
-]
-
 [[package]]
 name = "near-network-primitives"
 version = "0.14.0"
@@ -2817,65 +2386,23 @@ checksum = "5aa998a1e70ebf8cf3efa76c4562ef36038cc88b4aee60efb708d14273910357"
 dependencies = [
  "actix",
  "anyhow",
- "borsh 0.9.3",
+ "borsh",
  "chrono",
  "near-crypto 0.14.0",
  "near-primitives 0.14.0",
  "serde",
- "strum 0.24.1",
+ "strum",
  "tokio 1.20.1",
  "tracing",
 ]
 
-[[package]]
-name = "near-pool"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "borsh 0.6.2",
- "near-crypto 0.1.0",
- "near-primitives 0.1.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "near-primitives"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "base64 0.11.0",
- "borsh 0.6.2",
- "bs58 0.3.1",
- "byteorder",
- "chrono",
- "derive_more 0.99.17",
- "easy-ext",
- "hex 0.4.2",
- "jemallocator",
- "lazy_static",
- "near-crypto 0.1.0",
- "near-rpc-error-macro 0.1.0",
- "near-vm-errors 0.9.1",
- "num-rational 0.2.4",
- "primitive-types 0.7.2",
- "rand 0.7.3",
- "reed-solomon-erasure",
- "regex",
- "serde",
- "serde_json",
- "sha2 0.8.2",
- "smart-default",
- "validator",
- "validator_derive",
-]
-
 [[package]]
 name = "near-primitives"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a2ba19282e79a4485a77736b679d276b09870bbf8042a18e0f0ae36347489c5"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "byteorder",
  "bytesize",
  "chrono",
@@ -2886,7 +2413,7 @@ dependencies = [
  "near-primitives-core 0.13.0",
  "near-rpc-error-macro 0.13.0",
  "near-vm-errors 0.13.0",
- "num-rational 0.3.2",
+ "num-rational",
  "once_cell",
  "primitive-types 0.10.1",
  "rand 0.7.3",
@@ -2894,7 +2421,7 @@ dependencies = [
  "serde",
  "serde_json",
  "smart-default",
- "strum 0.24.1",
+ "strum",
  "thiserror",
 ]
 
@@ -2904,7 +2431,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ad1a9a1640539c81f065425c31bffcfbf6b31ef1aeaade59ce905f5df6ac860"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "byteorder",
  "bytesize",
  "chrono",
@@ -2915,7 +2442,7 @@ dependencies = [
  "near-primitives-core 0.14.0",
  "near-rpc-error-macro 0.14.0",
  "near-vm-errors 0.14.0",
- "num-rational 0.3.2",
+ "num-rational",
  "once_cell",
  "primitive-types 0.10.1",
  "rand 0.7.3",
@@ -2923,7 +2450,7 @@ dependencies = [
  "serde",
  "serde_json",
  "smart-default",
- "strum 0.24.1",
+ "strum",
  "thiserror",
 ]
 
@@ -2934,14 +2461,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb561feb392bb8c4f540256073446e6689af087bf6356e8dddcf75fc279f201f"
 dependencies = [
  "base64 0.11.0",
- "borsh 0.9.3",
- "bs58 0.4.0",
+ "borsh",
+ "bs58",
  "derive_more 0.99.17",
  "near-account-id 0.13.0",
- "num-rational 0.3.2",
+ "num-rational",
  "serde",
  "sha2 0.10.2",
- "strum 0.24.1",
+ "strum",
 ]
 
 [[package]]
@@ -2951,25 +2478,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba"
 dependencies = [
  "base64 0.11.0",
- "borsh 0.9.3",
- "bs58 0.4.0",
+ "borsh",
+ "bs58",
  "derive_more 0.99.17",
  "near-account-id 0.14.0",
- "num-rational 0.3.2",
+ "num-rational",
  "serde",
  "sha2 0.10.2",
- "strum 0.24.1",
-]
-
-[[package]]
-name = "near-rpc-error-core"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "serde",
- "syn 1.0.96",
+ "strum",
 ]
 
 [[package]]
@@ -2994,19 +2510,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "near-rpc-error-macro"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "near-rpc-error-core 0.1.0",
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "serde",
- "serde_json",
- "syn 1.0.96",
-]
-
 [[package]]
 name = "near-rpc-error-macro"
 version = "0.13.0"
@@ -3029,39 +2532,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "near-runtime-configs"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "near-primitives 0.1.0",
- "near-runtime-fees",
- "near-vm-logic 0.9.1",
- "serde",
-]
-
-[[package]]
-name = "near-runtime-fees"
-version = "0.9.1"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "num-rational 0.2.4",
- "serde",
-]
-
-[[package]]
-name = "near-runtime-standalone"
-version = "0.9.1"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "near-crypto 0.1.0",
- "near-pool",
- "near-primitives 0.1.0",
- "near-runtime-configs",
- "near-store",
- "node-runtime",
-]
-
 [[package]]
 name = "near-sandbox-utils"
 version = "0.4.0"
@@ -3083,14 +2553,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda34e06e28fb9a09ac54efbdc49f0c9308780fc932aaa81c49c493fde974045"
 dependencies = [
  "base64 0.13.0",
- "borsh 0.9.3",
- "bs58 0.4.0",
+ "borsh",
+ "bs58",
  "near-crypto 0.13.0",
  "near-primitives 0.13.0",
  "near-primitives-core 0.13.0",
  "near-sdk-macros",
  "near-sys",
- "near-vm-logic 0.13.0",
+ "near-vm-logic",
  "serde",
  "serde_json",
  "wee_alloc",
@@ -3108,27 +2578,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "near-store"
-version = "0.1.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "borsh 0.6.2",
- "byteorder",
- "cached",
- "derive_more 0.99.17",
- "elastic-array",
- "near-crypto 0.1.0",
- "near-primitives 0.1.0",
- "num_cpus",
- "rand 0.7.3",
- "rocksdb",
- "serde",
- "serde_json",
- "strum 0.18.0",
- "strum_macros 0.18.0",
-]
-
 [[package]]
 name = "near-sys"
 version = "0.2.0"
@@ -3167,23 +2616,13 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "near-vm-errors"
-version = "0.9.1"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "borsh 0.6.2",
- "near-rpc-error-macro 0.1.0",
- "serde",
-]
-
 [[package]]
 name = "near-vm-errors"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e02faf2bc1f6ef82b965cfe44389808fb5594f7aca4b596766117f4ce74df20"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "near-account-id 0.13.0",
  "near-rpc-error-macro 0.13.0",
  "serde",
@@ -3195,27 +2634,12 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0da466a30f0446639cbd788c30865086fac3e8dcb07a79e51d2b0775ed4261e"
 dependencies = [
- "borsh 0.9.3",
+ "borsh",
  "near-account-id 0.14.0",
  "near-rpc-error-macro 0.14.0",
  "serde",
 ]
 
-[[package]]
-name = "near-vm-logic"
-version = "0.9.1"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "base64 0.11.0",
- "bs58 0.3.1",
- "byteorder",
- "near-runtime-fees",
- "near-vm-errors 0.9.1",
- "serde",
- "sha2 0.8.2",
- "sha3",
-]
-
 [[package]]
 name = "near-vm-logic"
 version = "0.13.0"
@@ -3223,8 +2647,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f024d90451cd3c24d7a0a5cabf3636b192a60eb8e3ff0456f6c18b91152c346d"
 dependencies = [
  "base64 0.13.0",
- "borsh 0.9.3",
- "bs58 0.4.0",
+ "borsh",
+ "bs58",
  "byteorder",
  "near-account-id 0.13.0",
  "near-crypto 0.13.0",
@@ -3237,21 +2661,6 @@ dependencies = [
  "sha3",
 ]
 
-[[package]]
-name = "near-vm-runner"
-version = "0.9.1"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "cached",
- "near-runtime-fees",
- "near-vm-errors 0.9.1",
- "near-vm-logic 0.9.1",
- "parity-wasm",
- "pwasm-utils",
- "wasmer-runtime",
- "wasmer-runtime-core",
-]
-
 [[package]]
 name = "net2"
 version = "0.2.37"
@@ -3264,72 +2673,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "nix"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
-dependencies = [
- "bitflags 1.2.1",
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "void",
-]
-
-[[package]]
-name = "node-runtime"
-version = "0.9.0"
-source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200"
-dependencies = [
- "borsh 0.6.2",
- "byteorder",
- "cached",
- "lazy_static",
- "log 0.4.17",
- "near-crypto 0.1.0",
- "near-metrics",
- "near-primitives 0.1.0",
- "near-runtime-configs",
- "near-runtime-fees",
- "near-store",
- "near-vm-errors 0.9.1",
- "near-vm-logic 0.9.1",
- "near-vm-runner",
- "num-rational 0.2.4",
- "rand 0.7.3",
- "rocksdb",
- "serde",
- "serde_json",
- "sha2 0.8.2",
- "sha3",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "memchr",
- "version_check 0.9.2",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg 1.1.0",
- "num-integer",
- "num-traits",
-]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "num-bigint"
@@ -3362,19 +2709,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg 1.1.0",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
- "serde",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.3.2"
@@ -3382,7 +2716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
  "autocfg 1.1.0",
- "num-bigint 0.3.2",
+ "num-bigint",
  "num-integer",
  "num-traits",
  "serde",
@@ -3473,25 +2807,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
-[[package]]
-name = "page_size"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "parity-codec"
 version = "3.5.4"
@@ -3552,12 +2867,6 @@ dependencies = [
  "rand 0.7.3",
 ]
 
-[[package]]
-name = "parity-wasm"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
-
 [[package]]
 name = "parking"
 version = "2.0.0"
@@ -3586,16 +2895,6 @@ dependencies = [
  "rustc_version 0.2.3",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.7.2",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -3637,20 +2936,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
- "libc",
- "redox_syscall 0.1.56",
- "smallvec 1.8.0",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.9.3"
@@ -3664,12 +2949,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "1.0.1"
@@ -3869,43 +3148,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "prometheus"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0575e258dab62268e7236d7307caa38848acbda7ec7ab87bd9093791e999d20"
-dependencies = [
- "cfg-if 0.1.10",
- "fnv",
- "lazy_static",
- "protobuf",
- "spin",
- "thiserror",
-]
-
-[[package]]
-name = "protobuf"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485"
-
-[[package]]
-name = "pwasm-utils"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7a12f176deee919f4ba55326ee17491c8b707d0987aed822682c821b660192"
-dependencies = [
- "byteorder",
- "log 0.4.17",
- "parity-wasm",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -4279,16 +3521,6 @@ dependencies = [
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "rocksdb"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a"
-dependencies = [
- "libc",
- "librocksdb-sys",
-]
-
 [[package]]
 name = "rust-argon2"
 version = "0.8.3"
@@ -4307,12 +3539,6 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hex"
 version = "2.1.0"
@@ -4435,16 +3661,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-bench"
-version = "0.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d733da87e79faaac25616e33d26299a41143fd4cd42746cbb0e91d8feea243fd"
-dependencies = [
- "byteorder",
- "serde",
-]
-
 [[package]]
 name = "serde-big-array"
 version = "0.4.1"
@@ -4454,15 +3670,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_bytes"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.138"
@@ -4480,7 +3687,6 @@ version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
 dependencies = [
- "indexmap",
  "itoa 1.0.2",
  "ryu",
  "serde",
@@ -4504,18 +3710,6 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
-[[package]]
-name = "sha2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha2"
 version = "0.9.3"
@@ -4553,12 +3747,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "shlex"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-
 [[package]]
 name = "signal-hook"
 version = "0.3.14"
@@ -4638,18 +3826,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-
 [[package]]
 name = "static_assertions"
 version = "0.2.5"
@@ -4662,15 +3838,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stream-cipher"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
-dependencies = [
- "generic-array 0.12.3",
-]
-
 [[package]]
 name = "string"
 version = "0.2.1"
@@ -4680,43 +3847,19 @@ dependencies = [
  "bytes 0.4.12",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
-
 [[package]]
 name = "strum"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 dependencies = [
- "strum_macros 0.24.1",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
-dependencies = [
- "heck 0.3.1",
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "syn 1.0.96",
+ "strum_macros",
 ]
 
 [[package]]
@@ -4725,19 +3868,13 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9550962e7cf70d9980392878dfaf1dcc3ece024f4cf3bf3c46b978d0bad61d6c"
 dependencies = [
- "heck 0.4.0",
+ "heck",
  "proc-macro2 1.0.39",
  "quote 1.0.18",
  "rustversion",
  "syn 1.0.96",
 ]
 
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
 [[package]]
 name = "subtle"
 version = "2.2.3"
@@ -4795,12 +3932,6 @@ dependencies = [
  "xattr",
 ]
 
-[[package]]
-name = "target-lexicon"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
-
 [[package]]
 name = "tempfile"
 version = "3.1.0"
@@ -4815,15 +3946,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "terminal_size"
 version = "0.1.12"
@@ -4843,15 +3965,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.31"
@@ -5377,12 +4490,6 @@ dependencies = [
  "smallvec 1.8.0",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@@ -5434,48 +4541,12 @@ dependencies = [
  "getrandom 0.2.7",
 ]
 
-[[package]]
-name = "validator"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e60fadf92c22236de4028ceb0b8af50ed3430d41ad43d7a7d63b6bd1a8f47c38"
-dependencies = [
- "idna 0.2.0",
- "lazy_static",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "url 2.2.2",
-]
-
-[[package]]
-name = "validator_derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d577dfb8ca9440a5c0b053d5a19b68f5c92ef57064bac87c8205c3f6072c20f"
-dependencies = [
- "if_chain",
- "lazy_static",
- "proc-macro2 1.0.39",
- "quote 1.0.18",
- "regex",
- "syn 1.0.96",
- "validator",
-]
-
 [[package]]
 name = "vcpkg"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.1.5"
@@ -5488,12 +4559,6 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "waker-fn"
 version = "1.1.0"
@@ -5599,74 +4664,6 @@ version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
 
-[[package]]
-name = "wasmer-runtime"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30259003902716aa4fb86fd66a2de555116adef545cbc5ab70afb74e74b44fc3"
-dependencies = [
- "lazy_static",
- "memmap",
- "serde",
- "serde_derive",
- "wasmer-runtime-core",
- "wasmer-singlepass-backend",
-]
-
-[[package]]
-name = "wasmer-runtime-core"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45d4253f097502423d8b19d54cb18745f61b984b9dbce32424cba7945cfef367"
-dependencies = [
- "bincode",
- "blake3",
- "cc",
- "digest 0.8.1",
- "errno",
- "hex 0.4.2",
- "indexmap",
- "lazy_static",
- "libc",
- "nix",
- "page_size",
- "parking_lot 0.10.2",
- "rustc_version 0.2.3",
- "serde",
- "serde-bench",
- "serde_bytes",
- "serde_derive",
- "smallvec 1.8.0",
- "target-lexicon",
- "wasmparser",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "wasmer-singlepass-backend"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cf84179dd5e92b784f7bc190b237f1184916a6d6d3f87d4dd94ca371a2cc25"
-dependencies = [
- "bincode",
- "byteorder",
- "dynasm",
- "dynasmrt",
- "lazy_static",
- "libc",
- "nix",
- "serde",
- "serde_derive",
- "smallvec 1.8.0",
- "wasmer-runtime-core",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.51.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
-
 [[package]]
 name = "web-sys"
 version = "0.3.59"
@@ -5749,15 +4746,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -5862,7 +4850,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.13.0",
- "borsh 0.9.3",
+ "borsh",
  "chrono",
  "dirs 3.0.2",
  "hex 0.4.2",
diff --git a/contracts/near/eth-client/src/tests.rs b/contracts/near/eth-client/src/tests.rs
index 600cbba57..b25fb1fb3 100644
--- a/contracts/near/eth-client/src/tests.rs
+++ b/contracts/near/eth-client/src/tests.rs
@@ -156,7 +156,11 @@ use near_sdk::{testing_env, VMContext};
 lazy_static! {
     static ref WEB3RS: web3::Web3<web3::transports::Http> = {
         let (eloop, transport) = web3::transports::Http::new(
-            "https://mainnet.infura.io/v3/b5f870422ee5454fb11937e947154cd2",
+            format!(
+                "https://mainnet.infura.io/v3/{}",
+                std::env::var("ETH1_INFURA_API_KEY").unwrap()
+            )
+            .as_str(),
         )
         .unwrap();
         eloop.into_remote();
diff --git a/contracts/near/eth-prover/Cargo.toml b/contracts/near/eth-prover/Cargo.toml
index 0134f7d01..d47cffa21 100644
--- a/contracts/near/eth-prover/Cargo.toml
+++ b/contracts/near/eth-prover/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wee_alloc = { version = "0.4.5", default-features = false, features = [] }
 eth-types =  { path = "../eth-types", default-features = false }
 admin-controlled =  { path = "../admin-controlled" }
 serde = { version = "1.0", features = ["derive"] }
@@ -22,9 +21,8 @@ hex = "0.4.2"
 hex = "0.4.2"
 indicatif = "0.14"
 lazy_static = "*"
-near-crypto = { git = "https://github.com/nearprotocol/nearcore.git" }
-near-primitives = { git = "https://github.com/nearprotocol/nearcore.git" }
-near-runtime-standalone = { git = "https://github.com/nearprotocol/nearcore.git" }
+near-crypto = "0.14.0"
+near-primitives = "0.14.0"
 
 [features]
 default = ["eip1559"]
diff --git a/contracts/near/eth-prover/src/tests.rs b/contracts/near/eth-prover/src/tests.rs
index 168670f29..2e909d706 100644
--- a/contracts/near/eth-prover/src/tests.rs
+++ b/contracts/near/eth-prover/src/tests.rs
@@ -29,15 +29,16 @@ mod tests {
 
     // TESTS
 
-    use near_sdk::MockedBlockchain;
     use near_sdk::{testing_env, VMContext};
 
-    fn get_context(input: Vec<u8>, is_view: bool) -> VMContext {
+    fn get_context(input: Vec<u8>) -> VMContext {
         VMContext {
-            current_account_id: "alice.near".to_string(),
-            signer_account_id: "bob.near".to_string(),
-            signer_account_pk: vec![0, 1, 2],
-            predecessor_account_id: "carol.near".to_string(),
+            current_account_id: "alice.near".parse().unwrap(),
+            signer_account_id: "bob.near".parse().unwrap(),
+            signer_account_pk: "ed25519:6E8sCci9badyRkXb3JoRpBj5p8C6Tw41ELDZoiihKEtp"
+                .parse()
+                .unwrap(),
+            predecessor_account_id: "carol.near".parse().unwrap(),
             input,
             block_index: 0,
             block_timestamp: 0,
@@ -46,16 +47,17 @@ mod tests {
             account_locked_balance: 0,
             storage_usage: 0,
             attached_deposit: 0,
-            prepaid_gas: 10u64.pow(18),
-            random_seed: vec![0, 1, 2],
-            is_view,
+            prepaid_gas: near_sdk::Gas(10u64.pow(18)),
+            random_seed: vec![1; 32].try_into().unwrap(),
+            view_config: None,
             output_data_receivers: vec![],
         }
     }
 
     #[test]
+    #[cfg_attr(feature = "eip1559", ignore)]
     fn simple_tx_res() {
-        testing_env!(get_context(vec![], false));
+        testing_env!(get_context(vec![]));
 
         let contract = EthProver::init("ethbridge".to_string());
 
@@ -96,8 +98,9 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(feature = "eip1559", ignore)]
     fn complex_tx_res() {
-        testing_env!(get_context(vec![], false));
+        testing_env!(get_context(vec![]));
 
         let contract = EthProver::init("ethbridge".to_string());
 
@@ -214,6 +217,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(feature = "eip1559", ignore)]
     fn complex_test2() {
         let log_index = 0;
         let receipt_index = 1;
@@ -266,7 +270,7 @@ mod tests {
         Vec::from_hex("f901a70183012d99b9010000000000000000000000000000000000000001000000000000000000000000000000000000000000000002000000010000000000000000000000000000000000000000000008000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000400000000000000000000000000000000000000000000000000100000000000000000000004000080000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f89df89b94dac17f958d2ee523a2206206994597c13d831ec7f863a0ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa0000000000000000000000000adb2b42f6bd96f5c65920b9ac88619dce4166f94a0000000000000000000000000658a36d8f840f73207af8df717d12046b2c75969a000000000000000000000000000000000000000000000000000000000042c1d80").unwrap(),
     ],
     ];
-        testing_env!(get_context(vec![], false));
+        testing_env!(get_context(vec![]));
 
         let contract = EthProver::init("ethbridge".to_string());
 
@@ -297,6 +301,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(feature = "eip1559", ignore)]
     fn complex_test3() {
         let log_index = 0;
         let receipt_index = 0;
@@ -365,7 +370,7 @@ mod tests {
         assert_eq!(borsh_proof, actual_borsh_proof);
         assert_eq!(borsh_skip_bridge_call, actual_borsh_skip_bridge_call);
 
-        testing_env!(get_context(vec![], false));
+        testing_env!(get_context(vec![]));
 
         let contract = EthProver::init("ethbridge".to_string());
 
@@ -394,7 +399,7 @@ mod tests {
         let mut vm_config = VMConfig::free();
         vm_config.limit_config.max_number_logs = u64::MAX;
         vm_config.limit_config.max_promises_per_function_call_action = u64::MAX;
-        testing_env!(get_context(vec![], false), vm_config, Default::default());
+        testing_env!(get_context(vec![]), vm_config, Default::default());
         let contract = EthProver::init("ethbridge".to_string());
 
         let mut proofs = fs::read_dir(env::var("ETH_PROOF_DIR").unwrap())
@@ -454,12 +459,9 @@ mod tests {
         bar.finish();
     }
 
-    use near_sdk::VMConfig;
-
     #[test]
     pub fn test_verify_proof() {
-        let vm_config = VMConfig::free();
-        testing_env!(get_context(vec![], false), vm_config, Default::default());
+        testing_env!(get_context(vec![]));
 
         let expected_value = "f902a60183af4adfb9010000000000000000000000000000000000000000000000000000000000000000000800010000000000000002000100000000000000000000000000000000000000000000000000000008000008000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000010000000040000000000000000000000000000000200000000010000000000000000000000000000000000200080000000202000000000000000000000000000004000000000000002000000000000000000000000000000000000080000000000000000000000000000000000000000000200000004000000000000000000000000000000f9019bf89b94a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48f863a0ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa0000000000000000000000000c22df065a81f6e0107e214991b9d7fb179d401b3a000000000000000000000000023ddd3e3692d1861ed57ede224608875809e127fa00000000000000000000000000000000000000000000000000000000005f5e100f8fc9423ddd3e3692d1861ed57ede224608875809e127ff863a0dd85dc56b5b4da387bf69c28ec19b1d66e793e0d51b567882fa31dc50bbd32c5a0000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48a0000000000000000000000000c22df065a81f6e0107e214991b9d7fb179d401b3b8800000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000a6d616b6b652e6e65617200000000000000000000000000000000000000000000";
         let expected_root = "73733f420161b4189ea48140489bfada55d485fd580ab7e6f0f4b6de229f5177";
diff --git a/contracts/near/eth-prover/test.sh b/contracts/near/eth-prover/test.sh
index fc6b002b1..dfe4fbc38 100755
--- a/contracts/near/eth-prover/test.sh
+++ b/contracts/near/eth-prover/test.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+RUST_BACKTRACE=1 cargo test --no-default-features --jobs 8 --package eth-prover -- --nocapture
 RUST_BACKTRACE=1 cargo test --jobs 8 --package eth-prover -- --nocapture
diff --git a/contracts/near/eth-prover/tests/spec.rs b/contracts/near/eth-prover/tests_ignore/spec.rs
similarity index 100%
rename from contracts/near/eth-prover/tests/spec.rs
rename to contracts/near/eth-prover/tests_ignore/spec.rs
diff --git a/contracts/near/eth-prover/tests/utils.rs b/contracts/near/eth-prover/tests_ignore/utils.rs
similarity index 100%
rename from contracts/near/eth-prover/tests/utils.rs
rename to contracts/near/eth-prover/tests_ignore/utils.rs
diff --git a/contracts/near/eth2-client/test.sh b/contracts/near/eth2-client/test.sh
index 6565d4d67..092e6a5d7 100755
--- a/contracts/near/eth2-client/test.sh
+++ b/contracts/near/eth2-client/test.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+rustup target add wasm32-unknown-unknown
 cargo build --target wasm32-unknown-unknown --release --no-default-features --features logs
 
 RUST_BACKTRACE=1 cargo test --jobs 8 --package eth2-client -- --nocapture
diff --git a/contracts/near/res/eth_prover.wasm b/contracts/near/res/eth_prover.wasm
index 21d76039b..40aa39ec7 100755
Binary files a/contracts/near/res/eth_prover.wasm and b/contracts/near/res/eth_prover.wasm differ