From f7cf6a6e200ff0e059a27df5f95f8fea00172e9f Mon Sep 17 00:00:00 2001
From: ra0x3 <spam.rashad@protonmail.com>
Date: Mon, 11 Dec 2023 15:53:18 -0500
Subject: [PATCH] updates

---
 Cargo.lock                                    | 1194 ++++++++---------
 Cargo.toml                                    |    1 +
 .../schema/fuel_explorer.schema.graphql       |    6 -
 .../fuel-explorer/fuel-explorer/src/lib.rs    |   14 -
 packages/fuel-indexer-api-server/Cargo.toml   |    2 +-
 packages/fuel-indexer-benchmarks/Cargo.toml   |    2 +-
 packages/fuel-indexer-plugin/src/find.rs      |    2 +-
 packages/fuel-indexer-tests/src/fixtures.rs   |   54 +-
 packages/fuel-indexer-tests/tests/indexing.rs |    8 +-
 packages/fuel-indexer-types/Cargo.toml        |    1 +
 packages/fuel-indexer-types/src/fuel.rs       |   19 +-
 packages/fuel-indexer/Cargo.toml              |    8 +-
 packages/fuel-indexer/src/executor.rs         |   17 +-
 plugins/forc-index/Cargo.toml                 |    2 +-
 14 files changed, 581 insertions(+), 749 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc7eefb48..58e63e13e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -183,7 +183,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -317,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -346,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -447,13 +447,13 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
  "async-channel 2.1.1",
  "async-executor",
- "async-io 2.2.1",
+ "async-io 2.2.2",
  "async-lock 3.2.0",
  "blocking",
  "futures-lite 2.1.0",
@@ -645,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff"
+checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
 dependencies = [
  "async-lock 3.2.0",
  "cfg-if",
@@ -656,7 +656,7 @@ dependencies = [
  "futures-lite 2.1.0",
  "parking",
  "polling 3.3.1",
- "rustix 0.38.26",
+ "rustix 0.38.28",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -727,7 +727,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -744,7 +744,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -899,7 +899,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -918,40 +918,12 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "base58"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
-
-[[package]]
-name = "base58check"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee2fe4c9a0c84515f136aaae2466744a721af6d63339c18689d9e995d74d99b"
-dependencies = [
- "base58",
- "sha2 0.8.2",
-]
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -979,12 +951,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bech32"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
-
 [[package]]
 name = "bech32"
 version = "0.9.1"
@@ -1029,7 +995,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1056,16 +1022,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "bitvec"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium 0.3.0",
-]
-
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -1073,20 +1029,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
- "radium 0.7.0",
+ "radium",
  "tap",
  "wyz",
 ]
 
-[[package]]
-name = "blake2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
-dependencies = [
- "digest 0.10.7",
-]
-
 [[package]]
 name = "blake3"
 version = "1.5.0"
@@ -1100,25 +1047,13 @@ dependencies = [
  "constant_time_eq",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -1127,16 +1062,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
 ]
 
 [[package]]
@@ -1182,12 +1108,6 @@ dependencies = [
  "alloc-stdlib",
 ]
 
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
 [[package]]
 name = "bs58"
 version = "0.5.0"
@@ -1210,12 +1130,6 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "bytecheck"
 version = "0.6.11"
@@ -1377,6 +1291,21 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term 0.12.1",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim 0.8.0",
+ "textwrap 0.11.0",
+ "unicode-width",
+ "vec_map",
+]
+
 [[package]]
 name = "clap"
 version = "3.2.25"
@@ -1389,9 +1318,9 @@ dependencies = [
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
  "once_cell",
- "strsim",
+ "strsim 0.10.0",
  "termcolor",
- "textwrap",
+ "textwrap 0.16.0",
 ]
 
 [[package]]
@@ -1413,7 +1342,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex 0.6.0",
- "strsim",
+ "strsim 0.10.0",
 ]
 
 [[package]]
@@ -1438,7 +1367,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1462,66 +1391,30 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
-[[package]]
-name = "coins-bip32"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634c509653de24b439672164bbf56f5f582a2ab0e313d3b0f6af0b7345cf2560"
-dependencies = [
- "bincode",
- "bs58 0.4.0",
- "coins-core 0.7.0",
- "digest 0.10.7",
- "getrandom",
- "hmac",
- "k256 0.11.6",
- "lazy_static",
- "serde",
- "sha2 0.10.8",
- "thiserror",
-]
-
 [[package]]
 name = "coins-bip32"
 version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3"
 dependencies = [
- "bs58 0.5.0",
- "coins-core 0.8.7",
+ "bs58",
+ "coins-core",
  "digest 0.10.7",
  "hmac",
- "k256 0.13.2",
+ "k256",
  "serde",
  "sha2 0.10.8",
  "thiserror",
 ]
 
-[[package]]
-name = "coins-bip39"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a11892bcac83b4c6e95ab84b5b06c76d9d70ad73548dd07418269c5c7977171"
-dependencies = [
- "bitvec 0.17.4",
- "coins-bip32 0.7.0",
- "getrandom",
- "hex",
- "hmac",
- "pbkdf2 0.11.0",
- "rand",
- "sha2 0.10.8",
- "thiserror",
-]
-
 [[package]]
 name = "coins-bip39"
 version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528"
 dependencies = [
- "bitvec 1.0.1",
- "coins-bip32 0.8.7",
+ "bitvec",
+ "coins-bip32",
  "hmac",
  "once_cell",
  "pbkdf2 0.12.2",
@@ -1530,27 +1423,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "coins-core"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94090a6663f224feae66ab01e41a2555a8296ee07b5f20dab8888bdefc9f617"
-dependencies = [
- "base58check",
- "base64 0.12.3",
- "bech32 0.7.3",
- "blake2",
- "digest 0.10.7",
- "generic-array 0.14.7",
- "hex",
- "ripemd",
- "serde",
- "serde_derive",
- "sha2 0.10.8",
- "sha3",
- "thiserror",
-]
-
 [[package]]
 name = "coins-core"
 version = "0.8.7"
@@ -1558,10 +1430,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
 dependencies = [
  "base64 0.21.5",
- "bech32 0.9.1",
- "bs58 0.5.0",
+ "bech32",
+ "bs58",
  "digest 0.10.7",
- "generic-array 0.14.7",
+ "generic-array",
  "hex",
  "ripemd",
  "serde",
@@ -1611,7 +1483,7 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
 dependencies = [
- "encode_unicode",
+ "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
@@ -1920,25 +1792,13 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array 0.14.7",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
  "rand_core",
  "subtle",
  "zeroize",
@@ -1950,10 +1810,31 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
  "typenum",
 ]
 
+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ct-logs"
 version = "0.8.0"
@@ -1996,7 +1877,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2025,7 +1906,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.10.0",
  "syn 1.0.109",
 ]
 
@@ -2079,7 +1960,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.10.0",
  "syn 1.0.109",
 ]
 
@@ -2093,7 +1974,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.10.0",
  "syn 1.0.109",
 ]
 
@@ -2107,7 +1988,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2140,7 +2021,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2162,16 +2043,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
 [[package]]
 name = "der"
 version = "0.7.8"
@@ -2221,22 +2092,13 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -2269,6 +2131,16 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.7"
@@ -2280,6 +2152,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -2316,30 +2199,18 @@ dependencies = [
  "shared_child",
 ]
 
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der 0.6.1",
- "elliptic-curve 0.12.3",
- "rfc6979 0.3.1",
- "signature 1.6.4",
-]
-
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.8",
+ "der",
  "digest 0.10.7",
- "elliptic-curve 0.13.8",
- "rfc6979 0.4.0",
- "signature 2.2.0",
- "spki 0.7.3",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
 ]
 
 [[package]]
@@ -2348,7 +2219,7 @@ version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "signature 2.2.0",
+ "signature",
 ]
 
 [[package]]
@@ -2384,41 +2255,21 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
-dependencies = [
- "base16ct 0.1.1",
- "crypto-bigint 0.4.9",
- "der 0.6.1",
- "digest 0.10.7",
- "ff 0.12.1",
- "generic-array 0.14.7",
- "group 0.12.1",
- "pkcs8 0.9.0",
- "rand_core",
- "sec1 0.3.0",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "elliptic-curve"
 version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
- "base16ct 0.2.0",
- "crypto-bigint 0.5.5",
+ "base16ct",
+ "crypto-bigint",
  "digest 0.10.7",
- "ff 0.13.0",
- "generic-array 0.14.7",
- "group 0.13.0",
- "pkcs8 0.10.2",
+ "ff",
+ "generic-array",
+ "group",
+ "pkcs8",
  "rand_core",
- "sec1 0.7.3",
+ "sec1",
  "subtle",
  "zeroize",
 ]
@@ -2435,6 +2286,12 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.33"
@@ -2481,7 +2338,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2494,7 +2351,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2515,7 +2372,7 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -2639,15 +2496,9 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -2679,13 +2530,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
-name = "ff"
-version = "0.12.1"
+name = "fd-lock"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "b93f7a0db71c99f68398f80653ed05afb0b00e062e1a20c7ff849c4edfabbbcc"
 dependencies = [
- "rand_core",
- "subtle",
+ "cfg-if",
+ "rustix 0.38.28",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2830,9 +2682,9 @@ dependencies = [
 
 [[package]]
 name = "forc-tracing"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a5505631d4b9deff14b19823372388c861edbc6dccebabe899bbf5b08523b1"
+checksum = "713a25b050994cb3ccabbdee6122ec128d23a2b1cab82aee8a4d359bd25c7b7d"
 dependencies = [
  "ansi_term 0.12.1",
  "tracing",
@@ -2841,16 +2693,20 @@ dependencies = [
 
 [[package]]
 name = "forc-util"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87496084f753e41f48d5af3dddf9a8a1f019c8e3a5b399410aacd53680dc527"
+checksum = "18df7187d719c8da7fde281a34f28c648769bcbbb5565eb69c6c873b60134754"
 dependencies = [
  "annotate-snippets",
  "ansi_term 0.12.1",
  "anyhow",
+ "clap 3.2.25",
  "dirs 3.0.2",
- "forc-tracing 0.35.5",
+ "fd-lock",
+ "forc-tracing 0.46.1",
+ "fuel-tx 0.35.4",
  "hex",
+ "serde",
  "serde_json",
  "sway-core",
  "sway-error",
@@ -2859,6 +2715,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber 0.3.18",
  "unicode-xid",
+ "walkdir",
 ]
 
 [[package]]
@@ -2909,20 +2766,10 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "syn 2.0.39",
+ "syn 2.0.40",
  "thiserror",
 ]
 
-[[package]]
-name = "fuel-asm"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0030cc1247de0507e547d8ea33484b82420fe61221b94b985d193ec7f63587ae"
-dependencies = [
- "fuel-types 0.26.3",
- "serde",
-]
-
 [[package]]
 name = "fuel-asm"
 version = "0.35.4"
@@ -2960,16 +2807,16 @@ dependencies = [
  "derive_more",
  "enum-iterator 1.4.1",
  "fuel-core-chain-config 0.20.8",
- "fuel-core-consensus-module",
- "fuel-core-database",
- "fuel-core-executor",
- "fuel-core-importer",
+ "fuel-core-consensus-module 0.20.8",
+ "fuel-core-database 0.20.8",
+ "fuel-core-executor 0.20.8",
+ "fuel-core-importer 0.20.8",
  "fuel-core-metrics 0.20.8",
  "fuel-core-poa 0.20.8",
- "fuel-core-producer",
+ "fuel-core-producer 0.20.8",
  "fuel-core-services 0.20.8",
  "fuel-core-storage 0.20.8",
- "fuel-core-txpool",
+ "fuel-core-txpool 0.20.8",
  "fuel-core-types 0.20.8",
  "futures",
  "hex",
@@ -2979,6 +2826,50 @@ dependencies = [
  "postcard",
  "primitive-types",
  "rand",
+ "serde",
+ "serde_json",
+ "strum",
+ "strum_macros 0.24.3",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tower-http",
+ "tracing",
+]
+
+[[package]]
+name = "fuel-core"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c545fd12c8b5bbc495fd37a4fdf2548450b07b3fb26ac8ea20a10436c311e1d0"
+dependencies = [
+ "anyhow",
+ "async-graphql 4.0.16",
+ "async-trait",
+ "axum 0.5.17",
+ "clap 4.4.11",
+ "derive_more",
+ "enum-iterator 1.4.1",
+ "fuel-core-chain-config 0.21.0",
+ "fuel-core-consensus-module 0.21.0",
+ "fuel-core-database 0.21.0",
+ "fuel-core-executor 0.21.0",
+ "fuel-core-importer 0.21.0",
+ "fuel-core-metrics 0.21.0",
+ "fuel-core-poa 0.21.0",
+ "fuel-core-producer 0.21.0",
+ "fuel-core-services 0.21.0",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-txpool 0.21.0",
+ "fuel-core-types 0.21.0",
+ "futures",
+ "hex",
+ "hyper",
+ "itertools 0.10.5",
+ "parking_lot 0.12.1",
+ "postcard",
+ "primitive-types",
+ "rand",
  "rocksdb",
  "serde",
  "serde_json",
@@ -3000,7 +2891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86e8f361f44dafc02207c26b0c1929f39525dd1603418aad607dec6ca900053d"
 dependencies = [
  "anyhow",
- "bech32 0.9.1",
+ "bech32",
  "fuel-core-storage 0.20.8",
  "fuel-core-types 0.20.8",
  "hex",
@@ -3020,7 +2911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84319b8e7a3b422b0f38c6ad4abd29f48b923797b7555c3bb53151322779f9bf"
 dependencies = [
  "anyhow",
- "bech32 0.9.1",
+ "bech32",
  "fuel-core-storage 0.21.0",
  "fuel-core-types 0.21.0",
  "hex",
@@ -3092,6 +2983,19 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "fuel-core-consensus-module"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50fd6d90df194b5970bf16681bfad9f917ff3f837e00c6538a8b95d2e0a6fdf9"
+dependencies = [
+ "anyhow",
+ "fuel-core-chain-config 0.21.0",
+ "fuel-core-poa 0.21.0",
+ "fuel-core-types 0.21.0",
+ "tokio",
+]
+
 [[package]]
 name = "fuel-core-database"
 version = "0.20.8"
@@ -3104,6 +3008,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "fuel-core-database"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb7b7cd46a2de1df8c71b4541bf19e09870965cb6ac72ee564170f9bcc8df909"
+dependencies = [
+ "anyhow",
+ "derive_more",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-types 0.21.0",
+]
+
 [[package]]
 name = "fuel-core-executor"
 version = "0.20.8"
@@ -3116,6 +3032,18 @@ dependencies = [
  "fuel-core-types 0.20.8",
 ]
 
+[[package]]
+name = "fuel-core-executor"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a5ed529258ded68048806b150e190ab03dc399bdd5547096525c3419cca188"
+dependencies = [
+ "anyhow",
+ "fuel-core-chain-config 0.21.0",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-types 0.21.0",
+]
+
 [[package]]
 name = "fuel-core-importer"
 version = "0.20.8"
@@ -3131,6 +3059,21 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "fuel-core-importer"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acd700b679be3cda7561f46778aa136ba4af1048570e116d8eb1d3e0f0a316a9"
+dependencies = [
+ "anyhow",
+ "derive_more",
+ "fuel-core-metrics 0.21.0",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-types 0.21.0",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "fuel-core-metrics"
 version = "0.20.8"
@@ -3211,6 +3154,22 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "fuel-core-producer"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e85951fa8159a4698a6d523fc44fd3659b9db63800fcfd9619f4283a568296ce"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "derive_more",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-types 0.21.0",
+ "tokio",
+ "tokio-rayon",
+ "tracing",
+]
+
 [[package]]
 name = "fuel-core-services"
 version = "0.20.8"
@@ -3286,6 +3245,27 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "fuel-core-txpool"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943dec1ff13cd4fcd3c0f9ae826be09de1520bab5565916ec91cb31429c59f9a"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "fuel-core-chain-config 0.21.0",
+ "fuel-core-metrics 0.21.0",
+ "fuel-core-services 0.21.0",
+ "fuel-core-storage 0.21.0",
+ "fuel-core-types 0.21.0",
+ "futures",
+ "parking_lot 0.12.1",
+ "tokio",
+ "tokio-rayon",
+ "tokio-stream",
+ "tracing",
+]
+
 [[package]]
 name = "fuel-core-types"
 version = "0.20.8"
@@ -3318,25 +3298,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "fuel-crypto"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7356deff8ce5a9b6bc8d9e7cacc6c1d1f7abf5cdd4d729869afb401befa495"
-dependencies = [
- "borrown",
- "coins-bip32 0.7.0",
- "coins-bip39 0.7.0",
- "fuel-types 0.26.3",
- "getrandom",
- "lazy_static",
- "rand",
- "secp256k1 0.24.3",
- "serde",
- "sha2 0.10.8",
- "zeroize",
-]
-
 [[package]]
 name = "fuel-crypto"
 version = "0.35.4"
@@ -3344,15 +3305,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2b934310e10a975ae3698c54e973125345c5f77a246bb8700e1658d8c4d12cf"
 dependencies = [
  "borrown",
- "coins-bip32 0.8.7",
- "coins-bip39 0.8.7",
- "ecdsa 0.16.9",
+ "coins-bip32",
+ "coins-bip39",
+ "ecdsa",
  "ed25519-dalek",
  "fuel-types 0.35.4",
  "lazy_static",
  "p256",
  "rand",
- "secp256k1 0.26.0",
+ "secp256k1",
  "serde",
  "sha2 0.10.8",
  "zeroize",
@@ -3364,16 +3325,16 @@ version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33bea0932fec1e3c77be1fd54439ee9947d8d05870631d1c83782e5b1bd8eb0a"
 dependencies = [
- "coins-bip32 0.8.7",
- "coins-bip39 0.8.7",
- "ecdsa 0.16.9",
+ "coins-bip32",
+ "coins-bip39",
+ "ecdsa",
  "ed25519-dalek",
  "fuel-types 0.43.1",
- "k256 0.13.2",
+ "k256",
  "lazy_static",
  "p256",
  "rand",
- "secp256k1 0.26.0",
+ "secp256k1",
  "serde",
  "sha2 0.10.8",
  "zeroize",
@@ -3387,7 +3348,7 @@ checksum = "597adf13a46bdcc1e7e19fa9f9b8743106e5e5a9867a71c50e1bc6c899ba4ae8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "synstructure",
 ]
 
@@ -3473,9 +3434,9 @@ dependencies = [
  "clap 3.2.25",
  "cynic",
  "forc-postgres",
- "fuel-core",
- "fuel-core-client 0.20.8",
- "fuel-crypto 0.35.4",
+ "fuel-core 0.21.0",
+ "fuel-core-client 0.21.0",
+ "fuel-crypto 0.43.1",
  "fuel-indexer-api-server",
  "fuel-indexer-database",
  "fuel-indexer-lib",
@@ -3505,7 +3466,7 @@ dependencies = [
  "async-std",
  "axum 0.6.20",
  "clap 3.2.25",
- "fuel-crypto 0.35.4",
+ "fuel-crypto 0.43.1",
  "fuel-indexer-database",
  "fuel-indexer-graphql",
  "fuel-indexer-lib",
@@ -3538,7 +3499,7 @@ dependencies = [
  "clap 3.2.25",
  "criterion",
  "duct",
- "fuel-core-client 0.20.8",
+ "fuel-core-client 0.21.0",
  "fuel-indexer",
  "fuel-indexer-database",
  "fuel-indexer-graphql",
@@ -3629,7 +3590,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -3652,7 +3613,7 @@ dependencies = [
  "quote",
  "serde_json",
  "sha2 0.10.8",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -3780,6 +3741,7 @@ name = "fuel-indexer-types"
 version = "0.24.3"
 dependencies = [
  "bytes",
+ "fuel-crypto 0.43.1",
  "fuel-tx 0.43.1",
  "fuel-types 0.43.1",
  "fuels 0.53.0",
@@ -3797,20 +3759,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "fuel-merkle"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13103bf12f62930dd26f75f90d6a95d952fdcd677a356f57d8ef8df7ae02b84"
-dependencies = [
- "digest 0.10.7",
- "fuel-storage 0.26.3",
- "hashbrown 0.13.2",
- "hex",
- "sha2 0.10.8",
- "thiserror",
-]
-
 [[package]]
 name = "fuel-merkle"
 version = "0.35.4"
@@ -3848,14 +3796,8 @@ dependencies = [
  "fuel-indexer-tests",
  "fuel-types 0.43.1",
  "fuels 0.53.0",
- "tokio",
-]
-
-[[package]]
-name = "fuel-storage"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "998d49926c8ae3e545e348075075c2fe85caae4474e01d2da65a9a8edc3277e9"
+ "tokio",
+]
 
 [[package]]
 name = "fuel-storage"
@@ -3869,24 +3811,6 @@ version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f20bd8cac585ccd5c51478c341b7e9807942d80e1c0e00a9b2cec8a3fb3879b"
 
-[[package]]
-name = "fuel-tx"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e09bb28731979db1f5192c04f2a330a15b8c2f5ef2b47836b3282c7fd9d7703c"
-dependencies = [
- "derivative",
- "fuel-asm 0.26.3",
- "fuel-crypto 0.26.3",
- "fuel-merkle 0.26.3",
- "fuel-types 0.26.3",
- "itertools 0.10.5",
- "num-integer",
- "rand",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "fuel-tx"
 version = "0.35.4"
@@ -3929,16 +3853,6 @@ dependencies = [
  "strum_macros 0.24.3",
 ]
 
-[[package]]
-name = "fuel-types"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89fc99a9878b98135c4b05c71fe63b82f4cb3a00abac278935f8be7282f8e468"
-dependencies = [
- "hex",
- "serde",
-]
-
 [[package]]
 name = "fuel-types"
 version = "0.35.4"
@@ -3962,27 +3876,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "fuel-vm"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36aac727729b94c620265da76112e1d36a1af0c067745491c376f084f5b7b38"
-dependencies = [
- "bitflags 1.3.2",
- "derivative",
- "fuel-asm 0.26.3",
- "fuel-crypto 0.26.3",
- "fuel-merkle 0.26.3",
- "fuel-storage 0.26.3",
- "fuel-tx 0.26.3",
- "fuel-types 0.26.3",
- "itertools 0.10.5",
- "serde",
- "sha3",
- "tai64",
- "thiserror",
-]
-
 [[package]]
 name = "fuel-vm"
 version = "0.35.4"
@@ -4055,7 +3948,7 @@ version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e44490a7d415295059f37a92c6f02f060d13b0293d4dd6c27b2f24d73321a0f"
 dependencies = [
- "fuel-core",
+ "fuel-core 0.20.8",
  "fuel-core-client 0.20.8",
  "fuel-tx 0.35.4",
  "fuels-accounts 0.50.1",
@@ -4088,7 +3981,7 @@ checksum = "905e1b22d5c7b6ab01f05285ea61cb7e15cdcce762263db2019c192213b03c53"
 dependencies = [
  "async-trait",
  "chrono",
- "elliptic-curve 0.13.8",
+ "elliptic-curve",
  "eth-keystore",
  "fuel-core-client 0.20.8",
  "fuel-crypto 0.35.4",
@@ -4114,7 +4007,7 @@ checksum = "fa6f6435a6631577fa20aedbd88c4e59d9f1541a6bbb3a7b63715e40c15790f0"
 dependencies = [
  "async-trait",
  "chrono",
- "elliptic-curve 0.13.8",
+ "elliptic-curve",
  "eth-keystore",
  "fuel-core-client 0.21.0",
  "fuel-crypto 0.43.1",
@@ -4145,7 +4038,7 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4161,7 +4054,7 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4177,7 +4070,7 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4186,7 +4079,7 @@ version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8528f854c0e914445cefc3e5eefa7a494dd550f28b83ed965b8f9d94b5df8beb"
 dependencies = [
- "bech32 0.9.1",
+ "bech32",
  "chrono",
  "fuel-abi-types 0.3.0",
  "fuel-asm 0.35.4",
@@ -4214,7 +4107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9a98b3217932b1f8f639fd4c1268923f0862166fecf7a897c3c2bd5bae8706d"
 dependencies = [
  "async-trait",
- "bech32 0.9.1",
+ "bech32",
  "chrono",
  "fuel-abi-types 0.3.0",
  "fuel-asm 0.43.1",
@@ -4250,7 +4143,7 @@ dependencies = [
  "rand",
  "regex",
  "serde_json",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4264,7 +4157,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rand",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4278,7 +4171,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rand",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4327,7 +4220,7 @@ version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bff7c621bafd44735cdd5c1b3f73b7e1a153743ffcf035471fe30a63d23ddea2"
 dependencies = [
- "fuel-core",
+ "fuel-core 0.20.8",
  "fuel-core-chain-config 0.20.8",
  "fuel-core-client 0.20.8",
  "fuel-core-poa 0.20.8",
@@ -4475,7 +4368,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4526,15 +4419,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -4637,24 +4521,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff 0.12.1",
- "rand_core",
- "subtle",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
- "ff 0.13.0",
+ "ff",
  "rand_core",
  "subtle",
 ]
@@ -4874,9 +4747,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -4973,7 +4846,7 @@ dependencies = [
  "http",
  "hyper",
  "log",
- "rustls 0.21.9",
+ "rustls 0.21.10",
  "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -5157,7 +5030,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -5207,7 +5080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.3",
- "rustix 0.38.26",
+ "rustix 0.38.28",
  "windows-sys 0.48.0",
 ]
 
@@ -5240,9 +5113,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jobserver"
@@ -5276,18 +5149,6 @@ dependencies = [
  "simple_asn1",
 ]
 
-[[package]]
-name = "k256"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
-dependencies = [
- "cfg-if",
- "ecdsa 0.14.8",
- "elliptic-curve 0.12.3",
- "sha2 0.10.8",
-]
-
 [[package]]
 name = "k256"
 version = "0.13.2"
@@ -5295,11 +5156,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
 dependencies = [
  "cfg-if",
- "ecdsa 0.16.9",
- "elliptic-curve 0.13.8",
+ "ecdsa",
+ "elliptic-curve",
  "once_cell",
  "sha2 0.10.8",
- "signature 2.2.0",
+ "signature",
 ]
 
 [[package]]
@@ -5346,9 +5207,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libloading"
@@ -5672,6 +5533,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -5691,6 +5561,7 @@ dependencies = [
  "autocfg",
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -5739,9 +5610,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
@@ -5749,12 +5620,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -5784,7 +5649,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -5795,9 +5660,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.6+3.1.4"
+version = "300.2.1+3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
 dependencies = [
  "cc",
 ]
@@ -5849,12 +5714,21 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
 dependencies = [
- "ecdsa 0.16.9",
- "elliptic-curve 0.13.8",
+ "ecdsa",
+ "elliptic-curve",
  "primeorder",
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "pad"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.9"
@@ -5862,7 +5736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
 dependencies = [
  "arrayvec",
- "bitvec 1.0.1",
+ "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
@@ -5935,17 +5809,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.14"
@@ -5959,9 +5822,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest 0.10.7",
- "hmac",
- "password-hash",
- "sha2 0.10.8",
 ]
 
 [[package]]
@@ -6053,7 +5913,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -6158,7 +6018,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -6184,24 +6044,14 @@ dependencies = [
  "futures-io",
 ]
 
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "der 0.6.1",
- "spki 0.6.0",
-]
-
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.8",
- "spki 0.7.3",
+ "der",
+ "spki",
 ]
 
 [[package]]
@@ -6269,7 +6119,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.26",
+ "rustix 0.38.28",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -6323,6 +6173,18 @@ dependencies = [
  "difference",
 ]
 
+[[package]]
+name = "prettydiff"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11"
+dependencies = [
+ "ansi_term 0.12.1",
+ "pad",
+ "prettytable-rs",
+ "structopt",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.15"
@@ -6330,7 +6192,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.39",
+ "syn 2.0.40",
+]
+
+[[package]]
+name = "prettytable-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
+dependencies = [
+ "csv",
+ "encode_unicode 1.0.0",
+ "is-terminal",
+ "lazy_static",
+ "term",
+ "unicode-width",
 ]
 
 [[package]]
@@ -6339,7 +6215,7 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
- "elliptic-curve 0.13.8",
+ "elliptic-curve",
 ]
 
 [[package]]
@@ -6460,7 +6336,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -6525,12 +6401,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
-
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -6730,7 +6600,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.9",
+ "rustls 0.21.10",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -6750,17 +6620,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "rfc6979"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
-dependencies = [
- "crypto-bigint 0.4.9",
- "hmac",
- "zeroize",
-]
-
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -6815,7 +6674,7 @@ version = "0.7.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
 dependencies = [
- "bitvec 1.0.1",
+ "bitvec",
  "bytecheck",
  "hashbrown 0.12.3",
  "indexmap 1.9.3",
@@ -6901,9 +6760,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.26"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
@@ -6939,9 +6798,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.9"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
  "log",
  "ring 0.17.7",
@@ -7000,9 +6859,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "salsa20"
@@ -7101,44 +6960,20 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct 0.1.1",
- "der 0.6.1",
- "generic-array 0.14.7",
- "pkcs8 0.9.0",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "sec1"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
- "base16ct 0.2.0",
- "der 0.7.8",
- "generic-array 0.14.7",
- "pkcs8 0.10.2",
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
-dependencies = [
- "rand",
- "secp256k1-sys 0.6.1",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.26.0"
@@ -7146,16 +6981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894"
 dependencies = [
  "rand",
- "secp256k1-sys 0.8.1",
-]
-
-[[package]]
-name = "secp256k1-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
-dependencies = [
- "cc",
+ "secp256k1-sys",
 ]
 
 [[package]]
@@ -7239,7 +7065,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -7338,18 +7164,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[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.9"
@@ -7360,7 +7174,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -7428,16 +7242,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest 0.10.7",
- "rand_core",
-]
-
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -7578,16 +7382,6 @@ dependencies = [
  "lock_api",
 ]
 
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
-]
-
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -7595,7 +7389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.8",
+ "der",
 ]
 
 [[package]]
@@ -7750,12 +7544,42 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[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 = "structopt"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+dependencies = [
+ "clap 2.34.0",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "strum"
 version = "0.24.1"
@@ -7798,21 +7622,23 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "sway-ast"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4257aa4b06d9a6c4fc08562b8ca6bb30694be7f4a6f2a1183a1b89b2ff8ae990"
+checksum = "423ce7e98250c3805fb67c6992347ee9dfc468da726d3ffa164dfc45c7cb15c2"
 dependencies = [
  "extension-trait",
  "num-bigint",
  "num-traits",
+ "serde",
+ "sway-error",
  "sway-types",
 ]
 
 [[package]]
 name = "sway-core"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8751a5122f74e7bb0bdf428c7c6d3e70d1c3dde85fbaabd00ea0753495bff180"
+checksum = "b78ec44a20466cb6ed0266d911dbd586dbd1d8a224157ddf120d0c33e2b428cc"
 dependencies = [
  "clap 3.2.25",
  "derivative",
@@ -7823,9 +7649,10 @@ dependencies = [
  "fuel-etk-asm",
  "fuel-etk-dasm",
  "fuel-etk-ops",
- "fuel-vm 0.26.3",
+ "fuel-vm 0.35.4",
  "hashbrown 0.13.2",
  "im",
+ "indexmap 2.1.0",
  "itertools 0.10.5",
  "lazy_static",
  "miden-core",
@@ -7836,13 +7663,14 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.9.9",
- "smallvec",
+ "strum",
  "sway-ast",
  "sway-error",
  "sway-ir",
  "sway-parse",
  "sway-types",
  "sway-utils",
+ "sysinfo",
  "thiserror",
  "tracing",
  "uint",
@@ -7851,29 +7679,29 @@ dependencies = [
 
 [[package]]
 name = "sway-error"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804cfe1b52ad5a56c82c95248953055540740f0a409a6ccdc0b7856276d7b77a"
+checksum = "a919173d4ea7662f4498886d6c59be391e1051d4a4fcfa03f54e941c0d04cf8a"
 dependencies = [
- "extension-trait",
- "num-bigint",
+ "either",
  "num-traits",
- "sway-ast",
+ "smallvec",
  "sway-types",
  "thiserror",
 ]
 
 [[package]]
 name = "sway-ir"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "748ac045cae77885624f41bf575caa9b0f7507114b636b18ddf3bc76afb5acc2"
+checksum = "31c317b225415693962288a73e3f5bed530c01887e014697553bc4ad56facbba"
 dependencies = [
  "anyhow",
  "downcast-rs",
  "filecheck",
  "generational-arena",
  "peg",
+ "prettydiff",
  "rustc-hash",
  "sway-ir-macros",
  "sway-types",
@@ -7882,9 +7710,9 @@ dependencies = [
 
 [[package]]
 name = "sway-ir-macros"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b8414dad7e75caf6dee76df474b340c43032d4215e1c74cbd876ac0eeaae04"
+checksum = "772dfe4e47a92f0f04dfad85646524fa381a22687b308c22e60924da49a3af0a"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
@@ -7894,9 +7722,9 @@ dependencies = [
 
 [[package]]
 name = "sway-parse"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0f715b8ccb38e3e3258ee6aa7411cc16fa000e97af0b9cd58d2007608d81df"
+checksum = "738f774c5f9bbe17c8fd003782dbd3af9416384bf3c51b4c9d661e4045629e0b"
 dependencies = [
  "extension-trait",
  "num-bigint",
@@ -7906,27 +7734,34 @@ dependencies = [
  "sway-error",
  "sway-types",
  "thiserror",
+ "unicode-bidi",
  "unicode-xid",
 ]
 
 [[package]]
 name = "sway-types"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2bdf404eec83133d3b7933db40b2f823713806534aae18ee6d0fbf3a28feebb"
+checksum = "7a20288554aa256e698d8ad3446790e7ac1521b50c0244013ee3ab208fe44d2f"
 dependencies = [
- "fuel-asm 0.26.3",
- "fuel-crypto 0.26.3",
- "fuel-tx 0.26.3",
+ "fuel-asm 0.35.4",
+ "fuel-crypto 0.35.4",
+ "fuel-tx 0.35.4",
  "lazy_static",
+ "num-bigint",
+ "num-traits",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "sway-utils"
-version = "0.35.5"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61b5b46ad59932ea64298dac267267dd36fb91c99a917a151081c09b88e4e7f"
+checksum = "dab230006300db17fad46af0c6ddcc19b372b3b303be7ea76b54d386daef2d66"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "syn"
@@ -7941,9 +7776,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7964,10 +7799,25 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "unicode-xid",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.29.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "rayon",
+ "winapi",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -8030,10 +7880,21 @@ dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
  "redox_syscall 0.4.1",
- "rustix 0.38.26",
+ "rustix 0.38.28",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.4.0"
@@ -8043,6 +7904,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.16.0"
@@ -8066,7 +7936,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -8155,9 +8025,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
 dependencies = [
  "backtrace",
  "bytes",
@@ -8190,7 +8060,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -8241,7 +8111,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.9",
+ "rustls 0.21.10",
  "tokio",
 ]
 
@@ -8424,7 +8294,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -8526,9 +8396,9 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
@@ -8729,6 +8599,12 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c"
 
+[[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.9.4"
@@ -8799,7 +8675,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "wasm-bindgen-shared",
 ]
 
@@ -8833,7 +8709,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -9101,7 +8977,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.26",
+ "rustix 0.38.28",
 ]
 
 [[package]]
@@ -9113,7 +8989,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.26",
+ "rustix 0.38.28",
  "windows-sys 0.48.0",
 ]
 
@@ -9410,9 +9286,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.25"
+version = "0.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
+checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85"
 dependencies = [
  "memchr",
 ]
@@ -9465,11 +9341,13 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "d367426ae76bdfce3d8eaea6e94422afd6def7d46f9c89e2980309115b3c2c41"
 dependencies = [
  "libc",
+ "linux-raw-sys 0.4.12",
+ "rustix 0.38.28",
 ]
 
 [[package]]
@@ -9501,22 +9379,22 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.29"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e"
+checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.29"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2"
+checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -9536,7 +9414,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 05d1def7e..5c534d999 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,6 +84,7 @@ fuel-indexer-postgres = { version = "0.24.3", path = "./packages/fuel-indexer-da
 fuel-indexer-schema = { version = "0.24.3", path = "./packages/fuel-indexer-schema", default-features = false }
 fuel-indexer-types = { version = "0.24.3", path = "./packages/fuel-indexer-types" }
 fuel-indexer-utils = { version = "0.24.3", path = "./packages/fuel-indexer-utils" }
+fuel-crypto = { version = "0.43", default-features = false}
 fuel-tx = { version = "0.43", default-features = false }
 fuel-types = { version = "0.43", default-features = false, features = ["serde"] }
 fuel-vm = { version = "0.43", default-features = false }
diff --git a/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql b/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql
index 63635ad2a..5603d2701 100644
--- a/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql
+++ b/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql
@@ -45,10 +45,8 @@ enum PanicReason {
   InvalidMetadataIdentifier
   MalformedCallStructure
   ReservedRegisterNotWritable
-  ErrorFlag
   InvalidImmediateValue
   ExpectedCoinInput
-  MaxMemoryAccess
   MemoryWriteOverlap
   ContractNotInInputs
   InternalBalanceOverflow
@@ -58,7 +56,6 @@ enum PanicReason {
   TransferAmountCannotBeZero
   ExpectedOutputVariable
   ExpectedParentInternalContext
-  IllegalJump
   ContractIdAlreadyDeployed
   Unknown
 }
@@ -463,7 +460,6 @@ union Output =
 type CreateTransaction @entity {
   id: ID!
   gas_price: U64!
-  gas_limit: U64!
   maturity: U32!
   bytecode_length: U64!
   bytecode_witness_index: U8!
@@ -482,7 +478,6 @@ type CreateTransaction @entity {
 type ScriptTransaction @entity {
   id: ID!
   gas_price: U64!
-  gas_limit: U64!
   maturity: U32!
   script: Bytes!
   script_data: Bytes!
@@ -500,7 +495,6 @@ type ScriptTransaction @entity {
 type MintTransaction @entity {
   id: ID!
   tx_pointer: TxPointer!
-  outputs: [Output!]
   metadata: Json
   is_mint: Boolean!
   receipts: [Receipt!]
diff --git a/examples/fuel-explorer/fuel-explorer/src/lib.rs b/examples/fuel-explorer/fuel-explorer/src/lib.rs
index fbd94ec2e..609977277 100644
--- a/examples/fuel-explorer/fuel-explorer/src/lib.rs
+++ b/examples/fuel-explorer/fuel-explorer/src/lib.rs
@@ -57,12 +57,10 @@ impl From<fuel::ClientPanicReason> for PanicReason {
             fuel::ClientPanicReason::ReservedRegisterNotWritable => {
                 PanicReason::ReservedRegisterNotWritable
             }
-            fuel::ClientPanicReason::ErrorFlag => PanicReason::ErrorFlag,
             fuel::ClientPanicReason::InvalidImmediateValue => {
                 PanicReason::InvalidImmediateValue
             }
             fuel::ClientPanicReason::ExpectedCoinInput => PanicReason::ExpectedCoinInput,
-            fuel::ClientPanicReason::MaxMemoryAccess => PanicReason::MaxMemoryAccess,
             fuel::ClientPanicReason::MemoryWriteOverlap => {
                 PanicReason::MemoryWriteOverlap
             }
@@ -88,7 +86,6 @@ impl From<fuel::ClientPanicReason> for PanicReason {
             fuel::ClientPanicReason::ExpectedParentInternalContext => {
                 PanicReason::ExpectedParentInternalContext
             }
-            fuel::ClientPanicReason::IllegalJump => PanicReason::IllegalJump,
             fuel::ClientPanicReason::ContractIdAlreadyDeployed => {
                 PanicReason::ContractIdAlreadyDeployed
             }
@@ -728,7 +725,6 @@ impl From<fuel::TransactionData> for Transaction {
         let tx_status = TransactionStatus::from(transaction.status.clone());
         match transaction.transaction {
             fuel::Transaction::Script(fuel::Script {
-                gas_limit,
                 gas_price,
                 maturity,
                 script,
@@ -762,7 +758,6 @@ impl From<fuel::TransactionData> for Transaction {
                     .collect::<Vec<_>>();
 
                 let script_tx = ScriptTransaction::new(
-                    gas_limit,
                     gas_price,
                     *maturity,
                     script.to_owned().into(),
@@ -781,7 +776,6 @@ impl From<fuel::TransactionData> for Transaction {
                 Self::from(script_tx).get_or_create()
             }
             fuel::Transaction::Create(fuel::Create {
-                gas_limit,
                 gas_price,
                 maturity,
                 bytecode_length,
@@ -821,7 +815,6 @@ impl From<fuel::TransactionData> for Transaction {
                     .collect::<Vec<_>>();
 
                 let create_tx = CreateTransaction::new(
-                    gas_limit,
                     gas_price,
                     *maturity,
                     bytecode_length,
@@ -842,15 +835,9 @@ impl From<fuel::TransactionData> for Transaction {
             }
             fuel::Transaction::Mint(fuel::Mint {
                 tx_pointer,
-                outputs,
                 metadata,
             }) => {
                 let tx_pointer = TxPointer::from(tx_pointer.to_owned());
-                let outputs = outputs
-                    .iter()
-                    .map(|o| Output::from(o.to_owned()))
-                    .map(|o| o.id)
-                    .collect::<Vec<UID>>();
                 let receipts = transaction
                     .receipts
                     .iter()
@@ -859,7 +846,6 @@ impl From<fuel::TransactionData> for Transaction {
 
                 let mint_tx = MintTransaction::new(
                     tx_pointer.id,
-                    Some(outputs),
                     metadata.to_owned().map(|m| m.into()),
                     true,
                     Some(receipts),
diff --git a/packages/fuel-indexer-api-server/Cargo.toml b/packages/fuel-indexer-api-server/Cargo.toml
index 4bbfc1dce..da3c718f4 100644
--- a/packages/fuel-indexer-api-server/Cargo.toml
+++ b/packages/fuel-indexer-api-server/Cargo.toml
@@ -20,7 +20,7 @@ async-graphql-axum = "5.0.7"
 async-std = "1"
 axum = { version = "0.6", features = ["multipart", "macros"] }
 clap = { features = ["cargo", "derive", "env"], workspace = true }
-fuel-crypto = { version = "=0.35.4", features = ["std"] }
+fuel-crypto = { workspace = true, features = ["std"] }
 fuel-indexer-database = { workspace = true }
 fuel-indexer-graphql = { workspace = true }
 fuel-indexer-lib = { workspace = true }
diff --git a/packages/fuel-indexer-benchmarks/Cargo.toml b/packages/fuel-indexer-benchmarks/Cargo.toml
index 30bd301f9..2de97db40 100644
--- a/packages/fuel-indexer-benchmarks/Cargo.toml
+++ b/packages/fuel-indexer-benchmarks/Cargo.toml
@@ -26,7 +26,7 @@ chrono = { version = "0.4", features = ["serde"] }
 clap = { workspace = true }
 criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 duct = "0.13"
-fuel-core-client = "0.20"
+fuel-core-client = "0.21"
 fuel-indexer = { workspace = true }
 fuel-indexer-database = { workspace = true }
 fuel-indexer-graphql = { workspace = true }
diff --git a/packages/fuel-indexer-plugin/src/find.rs b/packages/fuel-indexer-plugin/src/find.rs
index e342b4ba4..51d0ef784 100644
--- a/packages/fuel-indexer-plugin/src/find.rs
+++ b/packages/fuel-indexer-plugin/src/find.rs
@@ -306,7 +306,7 @@ impl ToSQLValue for UID {
 
 impl ToSQLValue for BlockHeight {
     fn to_sql_value(self) -> sql::Value {
-        sqlparser::test_utils::number(&self.as_usize().to_string())
+        sqlparser::test_utils::number(&self.to_string())
     }
 }
 
diff --git a/packages/fuel-indexer-tests/src/fixtures.rs b/packages/fuel-indexer-tests/src/fixtures.rs
index 4c14951a6..686d74861 100644
--- a/packages/fuel-indexer-tests/src/fixtures.rs
+++ b/packages/fuel-indexer-tests/src/fixtures.rs
@@ -1,4 +1,6 @@
-use crate::{assets, defaults, TestError, WORKSPACE_ROOT};
+use crate::{
+    assets, defaults, utils::update_test_manifest_asset_paths, TestError, WORKSPACE_ROOT,
+};
 use actix_service::Service;
 use actix_web::test;
 use axum::routing::Router;
@@ -38,8 +40,8 @@ use tokio::{
 use tracing_subscriber::filter::EnvFilter;
 
 abigen!(Contract(
-    name = "FuelIndexer",
-    abi = "packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json"
+    name = "FuelIndexerTest",
+    abi = "packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json"
 ));
 
 pub struct TestPostgresDb {
@@ -91,7 +93,8 @@ pub async fn setup_indexing_test_components(
     let db = TestPostgresDb::new().await.unwrap();
     let mut service = indexer_service_postgres(Some(&db.url), config).await;
 
-    let manifest = assets::test_indexer_updated_manifest();
+    let mut manifest = Manifest::try_from(assets::FUEL_INDEXER_TEST_MANIFEST).unwrap();
+    update_test_manifest_asset_paths(&mut manifest);
 
     service
         .register_indexer_from_manifest(
@@ -116,7 +119,8 @@ pub async fn setup_web_test_components(
     let db = TestPostgresDb::new().await.unwrap();
     let mut service = indexer_service_postgres(Some(&db.url), config.clone()).await;
 
-    let manifest = assets::test_indexer_updated_manifest();
+    let mut manifest = Manifest::try_from(assets::FUEL_INDEXER_TEST_MANIFEST).unwrap();
+    update_test_manifest_asset_paths(&mut manifest);
 
     service
         .register_indexer_from_manifest(
@@ -344,22 +348,22 @@ pub async fn setup_example_test_fuel_node() -> Result<(), ()> {
     let wallet_path = Path::new(WORKSPACE_ROOT).join("test-chain-config.json");
 
     let contract_bin_path = Path::new(WORKSPACE_ROOT)
-        .join("sway")
-        .join("test-contract1")
+        .join("contracts")
+        .join("fuel-indexer-test")
         .join("out")
         .join("debug")
-        .join("test-contract1.bin");
+        .join("fuel-indexer-test.bin");
 
     setup_test_fuel_node(wallet_path, Some(contract_bin_path), None).await
 }
 
 pub fn get_test_contract_id() -> Bech32ContractId {
     let contract_bin_path = Path::new(WORKSPACE_ROOT)
-        .join("sway")
-        .join("test-contract1")
+        .join("contracts")
+        .join("fuel-indexer-test")
         .join("out")
         .join("debug")
-        .join("test-contract1.bin");
+        .join("fuel-indexer-test.bin");
 
     let loaded_contract = Contract::load_from(
         contract_bin_path.as_os_str().to_str().unwrap(),
@@ -417,7 +421,7 @@ pub async fn indexer_service_postgres(
 }
 
 pub async fn connect_to_deployed_contract(
-) -> Result<FuelIndexer<WalletUnlocked>, Box<dyn std::error::Error>> {
+) -> Result<FuelIndexerTest<WalletUnlocked>, Box<dyn std::error::Error>> {
     let wallet_path = Path::new(WORKSPACE_ROOT).join("test-chain-config.json");
     let wallet_path_str = wallet_path.as_os_str().to_str().unwrap();
     let mut wallet =
@@ -437,7 +441,7 @@ pub async fn connect_to_deployed_contract(
     let contract_id: Bech32ContractId =
         Bech32ContractId::from(fuels::types::ContractId::from(get_test_contract_id()));
 
-    let contract = FuelIndexer::new(contract_id.clone(), wallet);
+    let contract = FuelIndexerTest::new(contract_id.clone(), wallet);
 
     println!("Using contract at {contract_id}");
 
@@ -458,7 +462,7 @@ pub mod test_web {
     use fuels::types::bech32::Bech32ContractId;
     use std::path::Path;
 
-    use super::{tx_params, FuelIndexer};
+    use super::{tx_params, FuelIndexerTest};
 
     async fn fuel_indexer_test_blocks(state: web::Data<Arc<AppState>>) -> impl Responder {
         let _ = state
@@ -843,28 +847,12 @@ pub mod test_web {
         HttpResponse::Ok()
     }
 
-    async fn trigger_predicate_witness_data(
-        state: web::Data<Arc<AppState>>,
-    ) -> impl Responder {
-        let data = vec![1u8];
-        let _ = state
-            .contract
-            .methods()
-            .trigger_find()
-            .tx_params(tx_params())
-            .call()
-            .await
-            .unwrap();
-
-        HttpResponse::Ok()
-    }
-
     pub struct AppState {
-        pub contract: FuelIndexer<WalletUnlocked>,
+        pub contract: FuelIndexerTest<WalletUnlocked>,
     }
 
     pub fn app(
-        contract: FuelIndexer<WalletUnlocked>,
+        contract: FuelIndexerTest<WalletUnlocked>,
     ) -> App<
         impl ServiceFactory<
             ServiceRequest,
@@ -964,7 +952,7 @@ pub mod test_web {
         println!("Starting server at {}", defaults::WEB_API_ADDR);
 
         let _ = HttpServer::new(move || {
-            app(FuelIndexer::new(contract_id.clone(), wallet.clone()))
+            app(FuelIndexerTest::new(contract_id.clone(), wallet.clone()))
         })
         .bind(defaults::WEB_API_ADDR)
         .unwrap()
diff --git a/packages/fuel-indexer-tests/tests/indexing.rs b/packages/fuel-indexer-tests/tests/indexing.rs
index 087706a43..5d85dfd21 100644
--- a/packages/fuel-indexer-tests/tests/indexing.rs
+++ b/packages/fuel-indexer-tests/tests/indexing.rs
@@ -10,7 +10,7 @@ use std::{collections::HashSet, str::FromStr};
 
 const REVERT_VM_CODE: u64 = 0x0004;
 const EXPECTED_CONTRACT_ID: &str =
-    "60ddf75280b60e644e90fca5febaffb024882f0203b04ed8c7e9df8aa961060e";
+    "5805ad6fc1543e317cc86d4da1185b8e122c183861bf9e151a3819ac3e26103d";
 const TRANSFER_BASE_ASSET_ID: &str =
     "0000000000000000000000000000000000000000000000000000000000000000";
 
@@ -773,9 +773,3 @@ async fn test_find() {
         .get::<&str, usize>(2)
         .contains("called `Option::unwrap()` on a `None` value"));
 }
-
-
-#[actix_web::test]
-async fn test_signal_predicate_witness_data() {
-    
-}
\ No newline at end of file
diff --git a/packages/fuel-indexer-types/Cargo.toml b/packages/fuel-indexer-types/Cargo.toml
index 4a4eabe8e..925a769fc 100644
--- a/packages/fuel-indexer-types/Cargo.toml
+++ b/packages/fuel-indexer-types/Cargo.toml
@@ -11,6 +11,7 @@ description = "Fuel Indexer Types"
 
 [dependencies]
 bytes = { version = "1.4", features = ["serde"] }
+fuel-crypto = { workspace = true }
 fuel-tx = { workspace = true, features = ["serde"] }
 fuel-types = { workspace = true }
 fuels = { workspace = true }
diff --git a/packages/fuel-indexer-types/src/fuel.rs b/packages/fuel-indexer-types/src/fuel.rs
index fb4738371..283b25359 100644
--- a/packages/fuel-indexer-types/src/fuel.rs
+++ b/packages/fuel-indexer-types/src/fuel.rs
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 
 pub mod field {
     pub use fuel_tx::field::{
-        BytecodeLength, BytecodeWitnessIndex, GasLimit, GasPrice, Inputs, Maturity,
+        BytecodeLength, BytecodeWitnessIndex, GasPrice, Inputs, Maturity,
         Outputs, ReceiptsRoot, Salt as TxFieldSalt, Script as TxFieldScript, ScriptData,
         StorageSlots, TxPointer as FieldTxPointer, Witnesses,
     };
@@ -43,7 +43,6 @@ impl Default for Transaction {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Create {
     pub gas_price: Word,
-    pub gas_limit: Word,
     pub maturity: BlockHeight,
     pub bytecode_length: Word,
     pub bytecode_witness_index: u8,
@@ -86,7 +85,6 @@ impl From<Json> for CommonMetadata {
 #[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct Script {
     pub gas_price: Word,
-    pub gas_limit: Word,
     pub maturity: BlockHeight,
     pub script: Vec<u8>,
     pub script_data: Vec<u8>,
@@ -122,7 +120,6 @@ impl From<Json> for ScriptMetadata {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Mint {
     pub tx_pointer: TxPointer,
-    pub outputs: Vec<Output>,
     pub metadata: Option<MintMetadata>,
 }
 
@@ -176,7 +173,7 @@ pub struct BlockData {
     pub height: u32,
     pub id: Bytes32,
     pub header: Header,
-    pub producer: Option<Bytes32>,
+    pub producer: Option<fuel_crypto::fuel_types::Bytes32>,
     pub time: i64,
     pub consensus: Consensus,
     pub transactions: Vec<TransactionData>,
@@ -393,18 +390,14 @@ impl From<ClientOutput> for Output {
                         .expect("Could not convert asset ID to bytes"),
                 ),
             }),
-            ClientOutput::Contract {
-                input_index,
-                balance_root,
-                state_root,
-            } => Output::ContractOutput(ContractOutput {
-                input_index: input_index.into(),
+            ClientOutput::Contract(contract) => Output::ContractOutput(ContractOutput {
+                input_index: contract.input_index.into(),
                 balance_root: Bytes32::from(
-                    <[u8; 32]>::try_from(balance_root)
+                    <[u8; 32]>::try_from(contract.balance_root)
                         .expect("Could not convert balance root to bytes"),
                 ),
                 state_root: Bytes32::from(
-                    <[u8; 32]>::try_from(state_root)
+                    <[u8; 32]>::try_from(contract.state_root)
                         .expect("Could not convert state root to bytes"),
                 ),
             }),
diff --git a/packages/fuel-indexer/Cargo.toml b/packages/fuel-indexer/Cargo.toml
index c2b408f21..5fdcd236f 100644
--- a/packages/fuel-indexer/Cargo.toml
+++ b/packages/fuel-indexer/Cargo.toml
@@ -21,9 +21,9 @@ bincode = { workspace = true }
 clap = { features = ["cargo", "derive", "env"], workspace = true }
 cynic = "2.2"
 forc-postgres = { workspace = true }
-fuel-core = { version = "0.20", optional = true }
-fuel-core-client = "0.20"
-fuel-crypto = { version = "=0.35.4" }
+fuel-core = { version = "0.21", optional = true }
+fuel-core-client = "0.21"
+fuel-crypto = { sorkspace = true }
 fuel-indexer-api-server = { workspace = true, optional = true }
 fuel-indexer-database = { workspace = true }
 fuel-indexer-lib = { workspace = true }
@@ -46,7 +46,7 @@ version = "0.10.52"
 features = ["vendored"]
 
 [dev-dependencies]
-fuel-core-client = { version = "0.20", features = ["test-helpers"] }
+fuel-core-client = { version = "0.21", features = ["test-helpers"] }
 
 [features]
 default = ["api-server", "metrics"]
diff --git a/packages/fuel-indexer/src/executor.rs b/packages/fuel-indexer/src/executor.rs
index e5cb657d5..7540932b0 100644
--- a/packages/fuel-indexer/src/executor.rs
+++ b/packages/fuel-indexer/src/executor.rs
@@ -6,6 +6,7 @@ use crate::{
 use anyhow::Context;
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
+use fuel_vm::fuel_types::canonical::Deserialize;
 use fuel_core_client::client::{
     pagination::{PageDirection, PaginatedResult, PaginationRequest},
     schema::block::{Consensus as ClientConsensus, Genesis as ClientGenesis},
@@ -23,7 +24,6 @@ use fuel_indexer_types::{
     scalar::{Bytes, Bytes32},
 };
 use fuel_tx::UniqueIdentifier;
-use fuel_vm::prelude::Deserializable;
 use fuel_vm::state::ProgramState as ClientProgramState;
 use futures::Future;
 use itertools::Itertools;
@@ -367,7 +367,7 @@ pub async fn retrieve_blocks_from_node(
     } = client
         .full_blocks(PaginationRequest {
             cursor: cursor.clone(),
-            results: page_size,
+            results: page_size as i32,
             direction: PageDirection::Forward,
         })
         .await
@@ -386,7 +386,7 @@ pub async fn retrieve_blocks_from_node(
 
     let mut block_info = Vec::new();
     for block in results.into_iter() {
-        let producer: Option<Bytes32> = block.block_producer().map(|pk| pk.hash());
+        let producer = block.block_producer().map(|pk| pk.hash());
 
         let mut transactions = Vec::new();
 
@@ -482,9 +482,8 @@ pub async fn retrieve_blocks_from_node(
 
             let transaction = match transaction {
                 ClientTransaction::Create(tx) => Transaction::Create(Create {
-                    gas_price: *tx.gas_price(),
-                    gas_limit: *tx.gas_limit(),
-                    maturity: *tx.maturity(),
+                    gas_price: tx.gas_price(),
+                    maturity: tx.maturity(),
                     bytecode_length: *tx.bytecode_length(),
                     bytecode_witness_index: *tx.bytecode_witness_index(),
                     storage_slots: tx
@@ -502,9 +501,8 @@ pub async fn retrieve_blocks_from_node(
                     metadata: None,
                 }),
                 ClientTransaction::Script(tx) => Transaction::Script(Script {
-                    gas_price: *tx.gas_price(),
-                    gas_limit: *tx.gas_limit(),
-                    maturity: *tx.maturity(),
+                    gas_price: tx.gas_price(),
+                    maturity: (*tx.maturity()).into(),
                     script: (*tx.script().clone()).to_vec(),
                     script_data: (*tx.script_data().clone()).to_vec(),
                     inputs: tx.inputs().iter().map(|i| i.to_owned().into()).collect(),
@@ -515,7 +513,6 @@ pub async fn retrieve_blocks_from_node(
                 }),
                 ClientTransaction::Mint(tx) => Transaction::Mint(Mint {
                     tx_pointer: tx.tx_pointer().to_owned().into(),
-                    outputs: tx.outputs().iter().map(|o| o.to_owned().into()).collect(),
                     metadata: None,
                 }),
             };
diff --git a/plugins/forc-index/Cargo.toml b/plugins/forc-index/Cargo.toml
index b7a0bdfcb..0fc20ae60 100644
--- a/plugins/forc-index/Cargo.toml
+++ b/plugins/forc-index/Cargo.toml
@@ -18,7 +18,7 @@ colorful = "0.2.2"
 filetime = "0.2"
 forc-postgres = { workspace = true }
 forc-tracing = { version = "0.31", default-features = false }
-forc-util = { version = "0.35.0" }
+forc-util = { version = "0.46" }
 fuel-indexer-database-types = { workspace = true }
 fuel-indexer-lib = { workspace = true }
 fuel-tx = { features = ["builder"], workspace = true }