diff --git a/Cargo.lock b/Cargo.lock
index f098b22cd0d..bafb384265f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,7 +44,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "once_cell",
  "version_check",
 ]
@@ -56,10 +56,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.8.22"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c66bb6715b7499ea755bde4c96223ae8eb74e05c014ab38b9db602879ffb825"
+checksum = "8c77490fe91a0ce933a1f219029521f20fc28c2c0ca95d53fa4da9c00b8d9d4e"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -118,14 +118,14 @@ dependencies = [
  "const-hex",
  "derive_more 2.0.1",
  "foldhash",
- "hashbrown 0.15.2",
- "indexmap 2.7.1",
+ "hashbrown 0.15.3",
+ "indexmap 2.9.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
- "rand",
+ "rand 0.8.5",
  "ruint",
  "rustc-hash 2.1.1",
  "serde",
@@ -152,7 +152,7 @@ checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -247,9 +247,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "arc-swap"
@@ -368,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -378,7 +378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -417,13 +417,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -453,13 +453,13 @@ dependencies = [
 
 [[package]]
 name = "auto_impl"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -470,9 +470,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.18"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90aff65e86db5fe300752551c1b015ef72b708ac54bded8ef43d0d53cb7cb0b1"
+checksum = "b6fcc63c9860579e4cb396239570e979376e70aab79e496621748a09913f8b36"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -480,7 +480,7 @@ dependencies = [
  "aws-sdk-ssooidc",
  "aws-sdk-sts",
  "aws-smithy-async",
- "aws-smithy-http 0.61.1",
+ "aws-smithy-http",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -489,7 +489,7 @@ dependencies = [
  "bytes",
  "fastrand",
  "hex",
- "http 0.2.12",
+ "http 1.3.1",
  "ring",
  "time",
  "tokio",
@@ -500,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -510,16 +510,39 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "aws-runtime"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76dd04d39cc12844c0994f2c9c5a6f5184c22e9188ec1ff723de41910a21dcad"
+checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
+ "aws-smithy-http",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -528,29 +551,29 @@ dependencies = [
  "fastrand",
  "http 0.2.12",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "tracing",
- "uuid 1.15.1",
+ "uuid 1.16.0",
 ]
 
 [[package]]
 name = "aws-sdk-kms"
-version = "1.61.0"
+version = "1.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72054067b7b84e963ee29c3b7fdfc61f76bcfc697e38b8dc1095a3ad2e7e764a"
+checksum = "2b650cf9e1e153ab13acd3aa1f73b271dac14e019353ec0b0c176f24a21bad03"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
+ "aws-smithy-http",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -559,20 +582,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.61.0"
+version = "1.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e65ff295979977039a25f5a0bf067a64bc5e6aa38f3cef4037cf42516265553c"
+checksum = "858007b14d0f1ade2e0124473c2126b24d334dc9486ad12eb7c0ed14757be464"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.61.1",
+ "aws-smithy-http",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -581,20 +605,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.62.0"
+version = "1.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91430a60f754f235688387b75ee798ef00cfd09709a582be2b7525ebb5306d4f"
+checksum = "b83abf3ae8bd10a014933cc2383964a12ca5a3ebbe1948ad26b1b808e7d0d1f2"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.61.1",
+ "aws-smithy-http",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -603,14 +628,14 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.62.0"
+version = "1.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9276e139d39fff5a0b0c984fc2d30f970f9a202da67234f948fda02e5bea1dbe"
+checksum = "74e8e9ac4a837859c8f1d747054172e1e55933f02ed34728b0b34dea0591ec84"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.61.1",
+ "aws-smithy-http",
  "aws-smithy-json",
  "aws-smithy-query",
  "aws-smithy-runtime",
@@ -618,6 +643,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -626,32 +652,31 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.9"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe75fad52793ce6dec0dc3d4b1f388f038b5eb866c8d4d7f3a8e21b5ea5051"
+checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
 dependencies = [
  "aws-credential-types",
- "aws-smithy-http 0.60.12",
+ "aws-smithy-http",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "form_urlencoded",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "http 0.2.12",
- "http 1.2.0",
- "once_cell",
+ "http 1.3.1",
  "percent-encoding",
- "sha2 0.10.8",
+ "sha2",
  "time",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.4"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa59d1327d8b5053c54bf2eaae63bf629ba9e904434d0835a28ed3c0ed0a614e"
+checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -660,9 +685,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.12"
+version = "0.62.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc"
+checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9"
 dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -670,8 +695,8 @@ dependencies = [
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "pin-utils",
@@ -679,34 +704,51 @@ dependencies = [
 ]
 
 [[package]]
-name = "aws-smithy-http"
-version = "0.61.1"
+name = "aws-smithy-http-client"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f276f21c7921fe902826618d1423ae5bf74cf8c1b8472aee8434f3dfd31824"
+checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b"
 dependencies = [
+ "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "bytes",
- "bytes-utils",
- "futures-core",
+ "h2 0.4.10",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
- "once_cell",
- "percent-encoding",
+ "hyper 0.14.32",
+ "hyper 1.6.0",
+ "hyper-rustls 0.24.2",
+ "hyper-rustls 0.27.5",
+ "hyper-util",
  "pin-project-lite",
- "pin-utils",
+ "rustls 0.21.12",
+ "rustls 0.23.27",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "tokio",
+ "tower 0.5.2",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.61.2"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623a51127f24c30776c8b374295f2df78d92517386f77ba30773f15a30ce1422"
+checksum = "92144e45819cae7dc62af23eac5a038a58aa544432d2102609654376a900bd07"
 dependencies = [
  "aws-smithy-types",
 ]
 
+[[package]]
+name = "aws-smithy-observability"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393"
+dependencies = [
+ "aws-smithy-runtime-api",
+]
+
 [[package]]
 name = "aws-smithy-query"
 version = "0.60.7"
@@ -719,42 +761,39 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.8"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d526a12d9ed61fadefda24abe2e682892ba288c2018bcb38b1b4c111d13f6d92"
+checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e"
 dependencies = [
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
+ "aws-smithy-http",
+ "aws-smithy-http-client",
+ "aws-smithy-observability",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "fastrand",
- "h2 0.3.26",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
- "httparse",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "bytes",
  "http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -763,16 +802,16 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.13"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7b8a53819e42f10d0821f56da995e1470b199686a1809168db6ca485665f042"
+checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3"
 dependencies = [
  "base64-simd",
  "bytes",
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
  "http-body-util",
@@ -798,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "1.3.5"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbd0a668309ec1f66c0f6bda4840dd6d4796ae26d699ebc266d7cc95c6d040f"
+checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -812,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -893,6 +932,29 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.9.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn 2.0.101",
+ "which 4.4.2",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -975,15 +1037,6 @@ dependencies = [
  "wyz",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1007,9 +1060,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -1017,15 +1070,15 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1034,15 +1087,15 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.8",
+ "sha2",
  "tinyvec",
 ]
 
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
  "regex-automata 0.4.9",
@@ -1148,15 +1201,24 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
 dependencies = [
  "jobserver",
  "libc",
  "shlex",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1171,9 +1233,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -1233,11 +1295,22 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1245,9 +1318,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1258,9 +1331,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.46"
+version = "4.5.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "c91d3baa3bcd889d60e6ef28874126a0b384fd225ab83aa6d8a801c519194ce1"
 dependencies = [
  "clap",
 ]
@@ -1277,14 +1350,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1302,6 +1375,15 @@ dependencies = [
  "error-code",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "cobs"
 version = "0.2.3"
@@ -1310,26 +1392,53 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "codspeed"
-version = "2.8.1"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de4b67ff8985f3993f06167d71cf4aec178b0a1580f91a987170c59d60021103"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
 dependencies = [
  "colored",
  "libc",
  "serde",
  "serde_json",
- "uuid 1.15.1",
+ "uuid 1.16.0",
 ]
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "2.8.1"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68403d768ed1def18a87e2306676781314448393ecf0d3057c4527cabf524a3d"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
 dependencies = [
  "codspeed",
+ "codspeed-criterion-compat-walltime",
  "colored",
- "criterion",
+]
+
+[[package]]
+name = "codspeed-criterion-compat-walltime"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "codspeed",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
 ]
 
 [[package]]
@@ -1341,10 +1450,10 @@ dependencies = [
  "bs58",
  "coins-core",
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
  "k256",
  "serde",
- "sha2 0.10.8",
+ "sha2",
  "thiserror 1.0.69",
 ]
 
@@ -1356,11 +1465,11 @@ checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528"
 dependencies = [
  "bitvec",
  "coins-bip32",
- "hmac 0.12.1",
+ "hmac",
  "once_cell",
  "pbkdf2 0.12.2",
- "rand",
- "sha2 0.10.8",
+ "rand 0.8.5",
+ "sha2",
  "thiserror 1.0.69",
 ]
 
@@ -1379,7 +1488,7 @@ dependencies = [
  "ripemd",
  "serde",
  "serde_derive",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
  "thiserror 1.0.69",
 ]
@@ -1418,7 +1527,7 @@ dependencies = [
  "http 0.2.12",
  "mime",
  "mime_guess",
- "rand",
+ "rand 0.8.5",
  "thiserror 1.0.69",
 ]
 
@@ -1557,6 +1666,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1640,9 +1759,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1685,7 +1804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
@@ -1700,16 +1819,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "csv"
 version = "1.3.1"
@@ -1764,7 +1873,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1795,7 +1904,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.99",
+ "syn 2.0.101",
  "thiserror 1.0.69",
 ]
 
@@ -1805,7 +1914,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbb0f21f2f8d3134c2e887a16564c165694231f48b6ae2769193299081ecf662"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "lalrpop-util",
  "logos 0.14.4",
 ]
@@ -1819,7 +1928,7 @@ dependencies = [
  "cynic-codegen",
  "darling",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1835,9 +1944,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1845,27 +1954,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1897,15 +2006,15 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9724adfcf41f45bf652b3995837669d73c4d49a1b5ac1ff82905ac7d9b5558"
+checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1913,12 +2022,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f"
+checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
 dependencies = [
  "data-encoding",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1952,9 +2061,9 @@ checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1963,9 +2072,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
  "serde",
@@ -2000,7 +2109,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2010,20 +2119,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.19"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2052,7 +2161,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
  "unicode-xid",
 ]
 
@@ -2064,15 +2173,15 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
  "unicode-xid",
 ]
 
 [[package]]
 name = "deunicode"
-version = "1.6.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
 
 [[package]]
 name = "devault"
@@ -2119,7 +2228,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -2201,7 +2310,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2249,6 +2358,12 @@ dependencies = [
  "shared_child",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "duplicate"
 version = "2.0.0"
@@ -2300,7 +2415,7 @@ dependencies = [
  "curve25519-dalek",
  "ed25519",
  "serde",
- "sha2 0.10.8",
+ "sha2",
  "subtle",
  "zeroize",
 ]
@@ -2326,14 +2441,14 @@ dependencies = [
  "enum-ordinalize 4.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "elliptic-curve"
@@ -2349,7 +2464,7 @@ dependencies = [
  "group",
  "pem-rfc7468",
  "pkcs8",
- "rand_core",
+ "rand_core 0.6.4",
  "sec1",
  "subtle",
  "zeroize",
@@ -2411,7 +2526,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2424,7 +2539,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2444,7 +2559,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2455,7 +2570,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2470,14 +2585,14 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.6"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
 dependencies = [
  "anstream",
  "anstyle",
  "env_filter",
- "humantime",
+ "jiff",
  "log",
 ]
 
@@ -2489,9 +2604,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2511,9 +2626,9 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
 
 [[package]]
 name = "escargot"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a3ac187a16b5382fef8c69fd1bad123c67b7cf3932240a2d43dcdd32cded88"
+checksum = "83f351750780493fc33fa0ce8ba3c7d61f9736cfa3b3bb9ee2342643ffe40211"
 dependencies = [
  "log",
  "once_cell",
@@ -2531,13 +2646,13 @@ dependencies = [
  "ctr",
  "digest 0.10.7",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "pbkdf2 0.11.0",
- "rand",
+ "rand 0.8.5",
  "scrypt",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
  "thiserror 1.0.69",
  "uuid 0.8.2",
@@ -2572,9 +2687,9 @@ dependencies = [
 
 [[package]]
 name = "ethnum"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c"
+checksum = "0939f82868b77ef93ce3c3c3daf2b3c526b456741da5a1a4559e590965b6026b"
 
 [[package]]
 name = "eventsource-client"
@@ -2588,7 +2703,7 @@ dependencies = [
  "hyper-timeout",
  "log",
  "pin-project",
- "rand",
+ "rand 0.8.5",
  "tokio",
 ]
 
@@ -2610,7 +2725,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2665,22 +2780,22 @@ dependencies = [
 
 [[package]]
 name = "fd-lock"
-version = "4.0.2"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
+checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
 dependencies = [
  "cfg-if",
- "rustix",
- "windows-sys 0.52.0",
+ "rustix 1.0.7",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "ff"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -2730,7 +2845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
  "static_assertions",
 ]
@@ -2743,9 +2858,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2759,9 +2874,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "forc"
@@ -2792,7 +2907,7 @@ dependencies = [
  "sway-utils",
  "term-table",
  "tokio",
- "toml 0.8.20",
+ "toml 0.8.22",
  "toml_edit",
  "tracing",
  "url",
@@ -2819,21 +2934,21 @@ dependencies = [
  "forc-tx",
  "forc-util",
  "forc-wallet",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "fuel-core-client",
  "fuel-core-types",
  "fuel-crypto",
  "fuel-tx",
  "fuel-vm",
- "fuels",
- "fuels-accounts",
- "fuels-core",
+ "fuels 0.73.0",
+ "fuels-accounts 0.73.0",
+ "fuels-core 0.73.0",
  "futures",
  "hex",
  "k256",
  "portpicker",
  "pretty_assertions",
- "rand",
+ "rand 0.8.5",
  "regex",
  "reqwest",
  "rexpect",
@@ -2865,12 +2980,12 @@ dependencies = [
  "forc-util",
  "fuel-core-types",
  "fuel-crypto",
- "fuels-accounts",
- "fuels-core",
+ "fuels-accounts 0.73.0",
+ "fuels-core 0.73.0",
  "futures",
  "hex",
  "libp2p-identity",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "regex",
  "serde",
@@ -2896,7 +3011,7 @@ dependencies = [
  "forc-test",
  "forc-tracing 0.68.4",
  "forc-util",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "fuel-core-client",
  "fuel-tx",
  "fuel-types",
@@ -2983,7 +3098,7 @@ dependencies = [
  "forc-util",
  "itertools 0.13.0",
  "num-bigint",
- "sha2 0.10.8",
+ "sha2",
  "sway-ast",
  "sway-core",
  "sway-error",
@@ -3026,7 +3141,7 @@ dependencies = [
  "flate2",
  "forc-tracing 0.68.4",
  "forc-util",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "futures",
  "git2",
  "gix-url",
@@ -3049,7 +3164,7 @@ dependencies = [
  "sysinfo",
  "tar",
  "tempfile",
- "toml 0.8.20",
+ "toml 0.8.22",
  "tracing",
  "url",
  "vec1",
@@ -3073,10 +3188,10 @@ dependencies = [
  "tempfile",
  "thiserror 1.0.69",
  "tokio",
- "toml 0.8.20",
+ "toml 0.8.22",
  "tracing",
  "url",
- "uuid 1.15.1",
+ "uuid 1.16.0",
  "walkdir",
  "wiremock",
 ]
@@ -3087,10 +3202,10 @@ version = "0.68.4"
 dependencies = [
  "anyhow",
  "forc-pkg",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "fuel-tx",
  "fuel-vm",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "sway-core",
  "sway-features",
@@ -3099,9 +3214,9 @@ dependencies = [
 
 [[package]]
 name = "forc-tracing"
-version = "0.67.0"
+version = "0.67.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c81ec9672413a0cadedb2791aa6208c415523f7f9a430bc8516da00587439ce6"
+checksum = "af5495b9956dada79b2429d6b20c87c43db958105386221f0af206f3a123b720"
 dependencies = [
  "ansiterm",
  "tracing",
@@ -3129,7 +3244,7 @@ dependencies = [
  "forc-util",
  "fuel-tx",
  "fuel-types",
- "fuels-core",
+ "fuels-core 0.73.0",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -3146,10 +3261,10 @@ dependencies = [
  "dirs 5.0.1",
  "fd-lock",
  "forc-tracing 0.68.4",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "fuel-asm",
  "fuel-tx",
- "fuels-core",
+ "fuels-core 0.73.0",
  "hex",
  "mark-flaky-tests",
  "paste",
@@ -3157,7 +3272,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serial_test",
- "sha2 0.10.8",
+ "sha2",
  "sway-core",
  "sway-error",
  "sway-types",
@@ -3176,12 +3291,12 @@ dependencies = [
  "anyhow",
  "clap",
  "eth-keystore",
- "forc-tracing 0.67.0",
- "fuels",
+ "forc-tracing 0.67.2",
+ "fuels 0.72.0",
  "futures",
  "hex",
  "home",
- "rand",
+ "rand 0.8.5",
  "rpassword",
  "serde_json",
  "termion",
@@ -3232,7 +3347,24 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "syn 2.0.99",
+ "syn 2.0.101",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "fuel-abi-types"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94916fee0e005fe1b9581c12edb7ad9b02c5b121b939716438d69ffcdd45e855"
+dependencies = [
+ "itertools 0.10.5",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "serde",
+ "serde_json",
+ "syn 2.0.101",
  "thiserror 1.0.69",
 ]
 
@@ -3250,9 +3382,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-chain-config"
-version = "0.43.1"
+version = "0.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d62f96355cbc286ff96ad56e86fe3ba958656b9d472522c6f9d37d9e02816eae"
+checksum = "600543fab776634036af830672f47789a69669780367e15cb517f16c3e298a1c"
 dependencies = [
  "anyhow",
  "bech32",
@@ -3261,7 +3393,7 @@ dependencies = [
  "fuel-core-types",
  "itertools 0.12.1",
  "postcard",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "serde_with",
@@ -3277,7 +3409,7 @@ dependencies = [
  "anyhow",
  "base64 0.22.1",
  "cynic",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "eventsource-client",
  "fuel-core-types",
  "futures",
@@ -3295,9 +3427,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-metrics"
-version = "0.43.1"
+version = "0.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d14a8a5787c581bac3308c8b0f7251a9090be66db57326673eaa9d8c83a7c3b"
+checksum = "7ccb032e4858849074458e41bd3c24f49ce8701c610e23d5b9d3aa64c5fd5e2d"
 dependencies = [
  "once_cell",
  "parking_lot",
@@ -3311,9 +3443,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-poa"
-version = "0.43.1"
+version = "0.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eff910207209ac237233713d03347100f1266d202d5668dcd65190ac2ce1cb1"
+checksum = "abb20fe65705d6e336724eb4be3b4fef371cffcb8643a960f2363f90276c4b27"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3331,9 +3463,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-services"
-version = "0.43.1"
+version = "0.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f35feb214925153290d83dea613bf0a03a4696ae0a1b62cefef537f858e769c"
+checksum = "8437cfdcba66c94d4472216dd79d3cdf93495fb7b968214500d8b3f61a3e815a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3347,12 +3479,12 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-storage"
-version = "0.43.1"
+version = "0.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955bae792d1d5b3daa309e6131c4b72639db8c962744440a144539e514511294"
+checksum = "a1de75a9d1f94a74818b80a3e1b34c2e03438822dcb517fcce211899982f4903"
 dependencies = [
  "anyhow",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "enum-iterator",
  "fuel-core-types",
  "fuel-vm",
@@ -3375,13 +3507,13 @@ checksum = "d4b15e20116e60f626107b85ec1826a10535a3101163e67471cc66fa20f393df"
 dependencies = [
  "anyhow",
  "bs58",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "ed25519",
  "ed25519-dalek",
  "educe 0.6.0",
  "fuel-vm",
  "k256",
- "rand",
+ "rand 0.8.5",
  "secrecy",
  "serde",
  "tai64",
@@ -3402,10 +3534,10 @@ dependencies = [
  "fuel-types",
  "k256",
  "p256",
- "rand",
+ "rand 0.8.5",
  "secp256k1 0.30.0",
  "serde",
- "sha2 0.10.8",
+ "sha2",
  "zeroize",
 ]
 
@@ -3417,8 +3549,8 @@ checksum = "982cdb2e97a5831621b47562a4ed88fecb9797605b2077c7f30d1ffbb63d4958"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
- "synstructure 0.13.1",
+ "syn 2.0.101",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -3449,7 +3581,7 @@ dependencies = [
  "num-bigint",
  "pest",
  "pest_derive",
- "rand",
+ "rand 0.8.5",
  "sha3",
  "snafu",
 ]
@@ -3474,13 +3606,13 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3848d4c7d0485554eb8280b3b3da67e56dc01fb6f31af1a994f9e453989117cf"
 dependencies = [
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "digest 0.10.7",
  "fuel-storage",
  "hashbrown 0.13.2",
  "hex",
  "serde",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -3505,7 +3637,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "itertools 0.10.5",
  "postcard",
- "rand",
+ "rand 0.8.5",
  "serde",
  "strum 0.24.1",
  "strum_macros 0.24.3",
@@ -3519,7 +3651,7 @@ checksum = "da2d9bc4981b2ecf6896577dd569ce1d9a86bf88352f8c3f7618fe5c910c5176"
 dependencies = [
  "fuel-derive",
  "hex",
- "rand",
+ "rand 0.8.5",
  "serde",
 ]
 
@@ -3533,7 +3665,7 @@ dependencies = [
  "async-trait",
  "backtrace",
  "bitflags 2.9.0",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "educe 0.6.0",
  "ethnum",
  "fuel-asm",
@@ -3548,7 +3680,7 @@ dependencies = [
  "paste",
  "percent-encoding",
  "primitive-types",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_with",
  "sha3",
@@ -3567,11 +3699,27 @@ dependencies = [
  "fuel-core-client",
  "fuel-crypto",
  "fuel-tx",
- "fuels-accounts",
- "fuels-core",
- "fuels-macros",
- "fuels-programs",
- "fuels-test-helpers",
+ "fuels-accounts 0.72.0",
+ "fuels-core 0.72.0",
+ "fuels-macros 0.72.0",
+ "fuels-programs 0.72.0",
+ "fuels-test-helpers 0.72.0",
+]
+
+[[package]]
+name = "fuels"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0841be0b80599025375e15c869c7e4718d18fc08a1312a64e9d48cc3446816a0"
+dependencies = [
+ "fuel-core-client",
+ "fuel-crypto",
+ "fuel-tx",
+ "fuels-accounts 0.73.0",
+ "fuels-core 0.73.0",
+ "fuels-macros 0.73.0",
+ "fuels-programs 0.73.0",
+ "fuels-test-helpers 0.73.0",
 ]
 
 [[package]]
@@ -3588,11 +3736,37 @@ dependencies = [
  "fuel-crypto",
  "fuel-tx",
  "fuel-types",
- "fuels-core",
+ "fuels-core 0.72.0",
  "futures",
  "itertools 0.12.1",
  "k256",
- "rand",
+ "rand 0.8.5",
+ "semver 1.0.26",
+ "tai64",
+ "thiserror 1.0.69",
+ "tokio",
+ "zeroize",
+]
+
+[[package]]
+name = "fuels-accounts"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e50f17b058f649127b3d60c5ac63b0f143012388f725afa3d02fb33168ed4c4c"
+dependencies = [
+ "async-trait",
+ "chrono",
+ "cynic",
+ "fuel-core-client",
+ "fuel-core-types",
+ "fuel-crypto",
+ "fuel-tx",
+ "fuel-types",
+ "fuels-core 0.73.0",
+ "futures",
+ "itertools 0.12.1",
+ "k256",
+ "rand 0.8.5",
  "semver 1.0.26",
  "tai64",
  "thiserror 1.0.69",
@@ -3607,13 +3781,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1e891bfe1885edb6e8d132e9d50e9996a03dd4cc2f33ec533658811bedbaba1"
 dependencies = [
  "Inflector",
- "fuel-abi-types",
+ "fuel-abi-types 0.8.0",
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.99",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "fuels-code-gen"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057b5a7e903fa128767e46fa106877dfe983763c2026f18a0de3582f1dc4a472"
+dependencies = [
+ "Inflector",
+ "fuel-abi-types 0.12.0",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "serde_json",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3626,7 +3816,38 @@ dependencies = [
  "auto_impl",
  "bech32",
  "chrono",
- "fuel-abi-types",
+ "fuel-abi-types 0.8.0",
+ "fuel-asm",
+ "fuel-core-chain-config",
+ "fuel-core-client",
+ "fuel-core-types",
+ "fuel-crypto",
+ "fuel-tx",
+ "fuel-types",
+ "fuel-vm",
+ "fuels-macros 0.72.0",
+ "hex",
+ "itertools 0.12.1",
+ "postcard",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "sha2",
+ "thiserror 1.0.69",
+ "uint",
+]
+
+[[package]]
+name = "fuels-core"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4e75b09054b31683b7fe58b9b2d1558b8119a98bbff9bbb5630273942de94db"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "bech32",
+ "chrono",
+ "fuel-abi-types 0.12.0",
  "fuel-asm",
  "fuel-core-chain-config",
  "fuel-core-client",
@@ -3635,14 +3856,14 @@ dependencies = [
  "fuel-tx",
  "fuel-types",
  "fuel-vm",
- "fuels-macros",
+ "fuels-macros 0.73.0",
  "hex",
  "itertools 0.12.1",
  "postcard",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "thiserror 1.0.69",
  "uint",
 ]
@@ -3653,11 +3874,24 @@ version = "0.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e889da5754ac646bcea2de50f4bf8d823714552f3ffcfbbcceb77aeb801ec37"
 dependencies = [
- "fuels-code-gen",
+ "fuels-code-gen 0.72.0",
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "fuels-macros"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e3b6c37e12da9b3be5834f167420d2a7c54f9e7c56d226ce4ca879c7c72708"
+dependencies = [
+ "fuels-code-gen 0.73.0",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3667,14 +3901,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0bc1575119d233e5302dd0c6badb847c2e080862b23b5f8e984dffe0a3fbd2"
 dependencies = [
  "async-trait",
- "fuel-abi-types",
+ "fuel-abi-types 0.8.0",
+ "fuel-asm",
+ "fuel-tx",
+ "fuel-types",
+ "fuels-accounts 0.72.0",
+ "fuels-core 0.72.0",
+ "itertools 0.12.1",
+ "rand 0.8.5",
+ "serde_json",
+ "tokio",
+]
+
+[[package]]
+name = "fuels-programs"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b78e60f28888da4acecff2ddd07f0730cf5c4e04a0923c7f0f9db0850985350"
+dependencies = [
+ "async-trait",
+ "fuel-abi-types 0.12.0",
  "fuel-asm",
  "fuel-tx",
  "fuel-types",
- "fuels-accounts",
- "fuels-core",
+ "fuels-accounts 0.73.0",
+ "fuels-core 0.73.0",
  "itertools 0.12.1",
- "rand",
+ "rand 0.8.5",
  "serde_json",
  "tokio",
 ]
@@ -3693,14 +3946,38 @@ dependencies = [
  "fuel-crypto",
  "fuel-tx",
  "fuel-types",
- "fuels-accounts",
- "fuels-core",
+ "fuels-accounts 0.72.0",
+ "fuels-core 0.72.0",
+ "futures",
+ "portpicker",
+ "rand 0.8.5",
+ "tempfile",
+ "tokio",
+ "which 6.0.3",
+]
+
+[[package]]
+name = "fuels-test-helpers"
+version = "0.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcee4e76241696b8700c509797c2c6d0be0607c8a5191d4aa41384dccf1ab3e"
+dependencies = [
+ "fuel-core-chain-config",
+ "fuel-core-client",
+ "fuel-core-poa",
+ "fuel-core-services",
+ "fuel-core-types",
+ "fuel-crypto",
+ "fuel-tx",
+ "fuel-types",
+ "fuels-accounts 0.73.0",
+ "fuels-core 0.73.0",
  "futures",
  "portpicker",
- "rand",
+ "rand 0.8.5",
  "tempfile",
  "tokio",
- "which",
+ "which 6.0.3",
 ]
 
 [[package]]
@@ -3765,7 +4042,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3821,9 +4098,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3834,14 +4111,16 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3851,7 +4130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
  "fallible-iterator",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "stable_deref_trait",
 ]
 
@@ -3893,12 +4172,13 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.14"
+version = "0.10.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c40f12bb65a8299be0cfb90fe718e3be236b7a94b434877012980863a883a99f"
+checksum = "c091d2e887e02c3462f52252c5ea61150270c0f2657b642e8d0d6df56c16e642"
 dependencies = [
  "bstr",
  "gix-trace",
+ "gix-validate",
  "home",
  "once_cell",
  "thiserror 2.0.12",
@@ -3925,6 +4205,16 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "gix-validate"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77b9e00cacde5b51388d28ed746c493b18a6add1f19b5e01d686b3b9ece66d4d"
+dependencies = [
+ "bstr",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.2"
@@ -3962,7 +4252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3978,7 +4268,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3987,17 +4277,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.2.0",
- "indexmap 2.7.1",
+ "http 1.3.1",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4006,9 +4296,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -4016,9 +4306,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "6.3.1"
+version = "6.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d752747ddabc4c1a70dd28e72f2e3c218a816773e0d7faf67433f1acfa6cba7c"
+checksum = "759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098"
 dependencies = [
  "derive_builder",
  "log",
@@ -4070,9 +4360,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "foldhash",
 ]
@@ -4111,9 +4401,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hermit-abi"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "hex"
@@ -4139,17 +4429,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
+ "hmac",
 ]
 
 [[package]]
@@ -4161,17 +4441,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "hmac-drbg"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
-dependencies = [
- "digest 0.9.0",
- "generic-array",
- "hmac 0.8.1",
-]
-
 [[package]]
 name = "home"
 version = "0.5.11"
@@ -4200,9 +4469,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -4227,18 +4496,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.2.0",
+ "http 1.3.1",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
- "http 1.2.0",
+ "futures-core",
+ "http 1.3.1",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -4255,12 +4524,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -4294,8 +4557,8 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.8",
- "http 1.2.0",
+ "h2 0.4.10",
+ "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
@@ -4330,7 +4593,7 @@ dependencies = [
  "hyper 0.14.32",
  "log",
  "rustls 0.21.12",
- "rustls-native-certs",
+ "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.24.1",
  "webpki-roots 0.25.4",
@@ -4343,15 +4606,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
- "http 1.2.0",
+ "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.23",
+ "rustls 0.23.27",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.2",
  "tower-service",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -4384,16 +4648,17 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
+ "libc",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -4403,14 +4668,15 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -4465,9 +4731,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locid_transform_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
 
 [[package]]
 name = "icu_normalizer"
@@ -4489,9 +4755,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
 
 [[package]]
 name = "icu_properties"
@@ -4510,9 +4776,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
 
 [[package]]
 name = "icu_provider"
@@ -4539,7 +4805,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4576,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
 dependencies = [
  "bitmaps",
- "rand_core",
+ "rand_core 0.6.4",
  "rand_xoshiro",
  "sized-chunks",
  "typenum",
@@ -4619,7 +4885,7 @@ dependencies = [
  "autocfg",
  "impl-tools-lib",
  "proc-macro-error2",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4631,7 +4897,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4642,7 +4908,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4683,12 +4949,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
  "rayon",
  "serde",
 ]
@@ -4710,14 +4976,12 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.42.2"
+version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50259abbaa67d11d2bcafc7ba1d094ed7a0c70e3ce893f0d0997f73558cb3084"
+checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
 dependencies = [
  "console",
- "linked-hash-map",
  "once_cell",
- "pin-project",
  "ron",
  "serde",
  "similar",
@@ -4774,11 +5038,11 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.4.0",
+ "hermit-abi 0.5.1",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -4831,12 +5095,37 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "jiff"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.2",
  "libc",
 ]
 
@@ -4860,7 +5149,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "once_cell",
- "sha2 0.10.8",
+ "sha2",
  "signature",
 ]
 
@@ -4901,11 +5190,17 @@ dependencies = [
  "spin",
 ]
 
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libdbus-sys"
@@ -4931,26 +5226,36 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d"
+checksum = "fbb68ea10844211a59ce46230909fd0ea040e8a192454d4cc2ee0d53e12280eb"
 dependencies = [
  "asn1_der",
  "bs58",
  "hkdf",
- "libsecp256k1",
+ "k256",
  "multihash 0.19.3",
  "quick-protobuf",
- "sha2 0.10.8",
- "thiserror 1.0.69",
+ "sha2",
+ "thiserror 2.0.12",
  "tracing",
  "zeroize",
 ]
@@ -4966,54 +5271,6 @@ dependencies = [
  "redox_syscall",
 ]
 
-[[package]]
-name = "libsecp256k1"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
-dependencies = [
- "arrayref",
- "base64 0.13.1",
- "digest 0.9.0",
- "hmac-drbg",
- "libsecp256k1-core",
- "libsecp256k1-gen-ecmult",
- "libsecp256k1-gen-genmult",
- "rand",
- "serde",
- "sha2 0.9.9",
- "typenum",
-]
-
-[[package]]
-name = "libsecp256k1-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
-dependencies = [
- "crunchy",
- "digest 0.9.0",
- "subtle",
-]
-
-[[package]]
-name = "libsecp256k1-gen-ecmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
-dependencies = [
- "libsecp256k1-core",
-]
-
-[[package]]
-name = "libsecp256k1-gen-genmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
-dependencies = [
- "libsecp256k1-core",
-]
-
 [[package]]
 name = "libssh2-sys"
 version = "0.3.1"
@@ -5042,9 +5299,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.21"
+version = "1.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
 dependencies = [
  "cc",
  "libc",
@@ -5064,6 +5321,12 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
 [[package]]
 name = "litemap"
 version = "0.7.5"
@@ -5088,9 +5351,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "logos"
@@ -5122,7 +5385,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.8.5",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5180,7 +5443,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5194,9 +5457,9 @@ dependencies = [
 
 [[package]]
 name = "mdbook"
-version = "0.4.45"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07d36d96ffe1b5b16ddf2bc80b3b26bb7a498b2a6591061250bf0af8e8095ad"
+checksum = "d1daacee059634081dee4250d2814763a365b92dfe14bfdef964bc27835209d4"
 dependencies = [
  "anyhow",
  "chrono",
@@ -5204,6 +5467,7 @@ dependencies = [
  "clap_complete",
  "env_logger",
  "handlebars",
+ "hex",
  "log",
  "memchr",
  "once_cell",
@@ -5212,6 +5476,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "sha2",
  "shlex",
  "tempfile",
  "toml 0.5.11",
@@ -5270,11 +5535,17 @@ dependencies = [
  "clap",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
 ]
@@ -5367,7 +5638,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -5396,20 +5667,21 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
+ "cfg_aliases",
  "libc",
 ]
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
@@ -5417,6 +5689,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "normalize-path"
 version = "0.2.1"
@@ -5572,10 +5854,10 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5592,17 +5874,17 @@ checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "crc32fast",
  "flate2",
- "hashbrown 0.15.2",
- "indexmap 2.7.1",
+ "hashbrown 0.15.3",
+ "indexmap 2.9.0",
  "memchr",
  "ruzstd",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "onig"
@@ -5628,15 +5910,9 @@ dependencies = [
 
 [[package]]
 name = "oorandom"
-version = "11.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
+version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "opener"
@@ -5652,9 +5928,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.71"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
@@ -5673,7 +5949,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5684,18 +5960,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-src"
-version = "300.4.2+3.4.1"
+version = "300.5.0+3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2"
+checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
 dependencies = [
  "cc",
  "libc",
@@ -5741,7 +6017,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5771,7 +6047,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -5805,10 +6081,10 @@ version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5856,7 +6132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
 ]
 
 [[package]]
@@ -5903,9 +6179,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
 dependencies = [
  "memchr",
  "thiserror 2.0.12",
@@ -5914,9 +6190,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5924,26 +6200,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -5953,7 +6229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "serde",
  "serde_derive",
 ]
@@ -5975,7 +6251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -5988,7 +6264,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6017,7 +6293,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6050,12 +6326,12 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plist"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
+checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "quick-xml",
  "serde",
  "time",
@@ -6089,13 +6365,28 @@ dependencies = [
  "plotters-backend",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "portpicker"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
 dependencies = [
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -6119,11 +6410,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.8.25",
 ]
 
 [[package]]
@@ -6147,6 +6438,16 @@ dependencies = [
  "prettytable-rs",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "prettytable-rs"
 version = "0.10.0"
@@ -6195,9 +6496,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
  "toml_edit",
 ]
@@ -6249,9 +6550,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -6264,7 +6565,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
  "version_check",
  "yansi",
 ]
@@ -6289,7 +6590,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6303,8 +6604,8 @@ dependencies = [
  "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax 0.8.5",
  "rusty-fork",
@@ -6401,34 +6702,36 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012"
 dependencies = [
  "bytes",
+ "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.23",
+ "rustls 0.23.27",
  "socket2",
  "thiserror 2.0.12",
  "tokio",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.9"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b"
 dependencies = [
  "bytes",
- "getrandom 0.2.15",
- "rand",
+ "getrandom 0.3.2",
+ "rand 0.9.1",
  "ring",
  "rustc-hash 2.1.1",
- "rustls 0.23.23",
+ "rustls 0.23.27",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -6439,9 +6742,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.10"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
 dependencies = [
  "cfg_aliases",
  "libc",
@@ -6453,13 +6756,19 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.39"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -6483,8 +6792,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -6494,7 +6813,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -6503,7 +6832,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.2",
 ]
 
 [[package]]
@@ -6512,7 +6850,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -6521,7 +6859,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -6557,9 +6895,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -6576,7 +6914,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -6598,7 +6936,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6662,9 +7000,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.12"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -6673,8 +7011,8 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.8",
- "http 1.2.0",
+ "h2 0.4.10",
+ "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
@@ -6690,7 +7028,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.23",
+ "rustls 0.23.27",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
@@ -6707,7 +7045,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
  "windows-registry",
 ]
 
@@ -6751,7 +7089,7 @@ dependencies = [
  "revm-primitives",
  "ripemd",
  "secp256k1 0.29.1",
- "sha2 0.10.8",
+ "sha2",
  "substrate-bn",
 ]
 
@@ -6777,15 +7115,15 @@ dependencies = [
 
 [[package]]
 name = "rexpect"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c020234fb542618dc3e3d43724e9d93f87e1db74040a76a8c4e830220fb9b20d"
+checksum = "7fac38595028b44c3b3ac4bd87c126636a2d84d6d7c18f626779c6d5117d3cf1"
 dependencies = [
  "comma",
- "nix 0.27.1",
+ "nix 0.30.1",
  "regex",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -6794,19 +7132,19 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "subtle",
 ]
 
 [[package]]
 name = "ring"
-version = "0.17.11"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -6836,7 +7174,7 @@ dependencies = [
  "rkyv_derive",
  "seahash",
  "tinyvec",
- "uuid 1.15.1",
+ "uuid 1.16.0",
 ]
 
 [[package]]
@@ -6895,30 +7233,30 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "7.3.1"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
+checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39"
 dependencies = [
  "libc",
  "rtoolbox",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rtoolbox"
-version = "0.0.2"
+version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e"
+checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "ruint"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825df406ec217a8116bd7b06897c6cc8f65ffefc15d030ae2c9540acc9ed50b6"
+checksum = "78a46eb779843b2c4f21fac5773e25d6d5b7c8f0922876c91541790d2ca27eef"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
@@ -6932,7 +7270,8 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand",
+ "rand 0.8.5",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde",
@@ -6948,15 +7287,15 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rust_decimal"
-version = "1.36.0"
+version = "1.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
+checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
 dependencies = [
  "arrayvec",
  "borsh",
  "bytes",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rkyv",
  "serde",
  "serde_json",
@@ -7013,7 +7352,20 @@ dependencies = [
  "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
@@ -7031,14 +7383,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.23"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.103.2",
  "subtle",
  "zeroize",
 ]
@@ -7052,7 +7405,19 @@ dependencies = [
  "openssl-probe",
  "rustls-pemfile 1.0.4",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
@@ -7075,11 +7440,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
  "web-time",
+ "zeroize",
 ]
 
 [[package]]
@@ -7094,10 +7460,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -7178,9 +7545,9 @@ dependencies = [
 
 [[package]]
 name = "scc"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
+checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4"
 dependencies = [
  "sdd",
 ]
@@ -7232,10 +7599,10 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "pbkdf2 0.11.0",
  "salsa20",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -7250,9 +7617,9 @@ dependencies = [
 
 [[package]]
 name = "sdd"
-version = "3.0.7"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
+checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
 
 [[package]]
 name = "seahash"
@@ -7280,7 +7647,7 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
- "rand",
+ "rand 0.8.5",
  "secp256k1-sys",
 ]
 
@@ -7291,7 +7658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
  "bitcoin_hashes",
- "rand",
+ "rand 0.8.5",
  "secp256k1-sys",
 ]
 
@@ -7320,7 +7687,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.9.0",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+dependencies = [
+ "bitflags 2.9.0",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -7365,22 +7745,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7398,7 +7778,7 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "itoa",
  "memchr",
  "ryu",
@@ -7413,7 +7793,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7447,7 +7827,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -7464,7 +7844,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7473,7 +7853,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "itoa",
  "ryu",
  "serde",
@@ -7502,7 +7882,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7518,22 +7898,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -7571,9 +7938,9 @@ dependencies = [
 
 [[package]]
 name = "shared_child"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
+checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -7593,9 +7960,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -7607,7 +7974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -7668,9 +8035,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "smawk"
@@ -7703,9 +8070,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -7807,7 +8174,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7820,7 +8187,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7832,7 +8199,7 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
 ]
 
@@ -7861,7 +8228,7 @@ dependencies = [
  "clap",
  "dirs 5.0.1",
  "either",
- "fuel-abi-types",
+ "fuel-abi-types 0.12.0",
  "fuel-ethabi",
  "fuel-etk-asm",
  "fuel-etk-ops",
@@ -7871,7 +8238,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hex",
  "im",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "itertools 0.13.0",
  "lazy_static",
  "object",
@@ -7883,7 +8250,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "strum 0.26.3",
  "sway-ast",
  "sway-error",
@@ -7930,7 +8297,7 @@ dependencies = [
  "anyhow",
  "downcast-rs",
  "filecheck",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "itertools 0.13.0",
  "once_cell",
  "peg",
@@ -7951,7 +8318,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7961,7 +8328,6 @@ dependencies = [
  "anyhow",
  "assert-json-diff",
  "codspeed-criterion-compat",
- "criterion",
  "crossbeam-channel",
  "dashmap 6.1.0",
  "dirs 5.0.1",
@@ -7975,7 +8341,7 @@ dependencies = [
  "pretty_assertions",
  "proc-macro2",
  "quote",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "rayon-cond",
  "regex",
@@ -7990,7 +8356,7 @@ dependencies = [
  "sway-types",
  "sway-utils",
  "swayfmt",
- "syn 2.0.99",
+ "syn 2.0.101",
  "tempfile",
  "thiserror 1.0.69",
  "tikv-jemallocator",
@@ -8009,7 +8375,7 @@ dependencies = [
  "assert-json-diff",
  "futures",
  "lsp-types",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "tokio",
@@ -8043,7 +8409,7 @@ dependencies = [
  "fuel-asm",
  "fuel-crypto",
  "fuel-tx",
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "lazy_static",
  "num-bigint",
  "num-traits",
@@ -8052,6 +8418,7 @@ dependencies = [
  "serde",
  "sway-utils",
  "thiserror 1.0.69",
+ "toml 0.8.22",
 ]
 
 [[package]]
@@ -8083,7 +8450,7 @@ dependencies = [
  "sway-utils",
  "test-macros",
  "thiserror 1.0.69",
- "toml 0.8.20",
+ "toml 0.8.22",
 ]
 
 [[package]]
@@ -8099,9 +8466,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.99"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8131,13 +8498,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8185,7 +8552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.9.0",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
@@ -8248,15 +8615,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.17.1"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
- "cfg-if",
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
  "once_cell",
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -8293,19 +8659,19 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "termion"
-version = "4.0.4"
+version = "4.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f359c854fbecc1ea65bc3683f1dcb2dce78b174a1ca7fda37acd1fff81df6ff"
+checksum = "3669a69de26799d6321a5aa713f55f7e2cd37bd47be044b50f2acafc42c122bb"
 dependencies = [
  "libc",
  "libredox",
@@ -8338,7 +8704,7 @@ dependencies = [
  "libtest-mimic",
  "normalize-path",
  "prettydiff",
- "rand",
+ "rand 0.8.5",
  "regex",
  "revm",
  "serde_json",
@@ -8350,7 +8716,7 @@ dependencies = [
  "sway-utils",
  "textwrap",
  "tokio",
- "toml 0.8.20",
+ "toml 0.8.22",
  "tracing",
  "vte 0.13.1",
 ]
@@ -8406,7 +8772,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8417,7 +8783,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8461,9 +8827,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.38"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb041120f25f8fbe8fd2dbe4671c7c2ed74d83be2e7a77529bf7e0790ae3f472"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -8476,15 +8842,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -8536,9 +8902,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
  "backtrace",
  "bytes",
@@ -8570,7 +8936,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8599,7 +8965,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.23",
+ "rustls 0.23.27",
  "tokio",
 ]
 
@@ -8616,9 +8982,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -8638,9 +9004,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.20"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -8650,26 +9016,33 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
+ "toml_write",
  "winnow",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+
 [[package]]
 name = "topological-sort"
 version = "0.2.2"
@@ -8742,7 +9115,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8770,7 +9143,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8843,7 +9216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9044,17 +9417,17 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "serde",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.15.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
  "serde",
 ]
 
@@ -9168,9 +9541,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -9203,7 +9576,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
@@ -9238,7 +9611,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -9280,13 +9653,34 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.8"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
+]
+
 [[package]]
 name = "which"
 version = "6.0.3"
@@ -9295,15 +9689,15 @@ checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
 dependencies = [
  "either",
  "home",
- "rustix",
+ "rustix 0.38.44",
  "winsafe",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
 dependencies = [
  "redox_syscall",
  "wasite",
@@ -9343,47 +9737,81 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings 0.4.0",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-registry"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
  "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+dependencies = [
+ "windows-link",
 ]
 
 [[package]]
@@ -9437,13 +9865,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9456,6 +9900,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -9468,6 +9918,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -9480,12 +9936,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -9498,6 +9966,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -9510,6 +9984,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -9522,6 +10002,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -9534,11 +10020,17 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
-version = "0.7.3"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -9560,7 +10052,7 @@ dependencies = [
  "base64 0.22.1",
  "deadpool",
  "futures",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-util",
@@ -9575,9 +10067,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -9605,13 +10097,12 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909"
+checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "linux-raw-sys",
- "rustix",
+ "rustix 1.0.7",
 ]
 
 [[package]]
@@ -9661,8 +10152,8 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
- "synstructure 0.13.1",
+ "syn 2.0.101",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -9671,8 +10162,16 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+dependencies = [
+ "zerocopy-derive 0.8.25",
 ]
 
 [[package]]
@@ -9683,7 +10182,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9703,8 +10213,8 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
- "synstructure 0.13.1",
+ "syn 2.0.101",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -9724,7 +10234,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9746,5 +10256,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.101",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a719d6fa4f4..29eb2d2d275 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,21 +82,21 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros", version = "0.68.4" }
 #
 
 # Dependencies from the `fuel-abi-types` repository:
-fuel-abi-types = "0.8"
+fuel-abi-types = "0.12"
 
 # Dependencies from the `fuel-core` repository:
 #
-# Although ALL verions are "X.Y", we need the complete semver for
+# Although ALL versions are "X.Y", we need the complete semver for
 # fuel-core-client as the GitHub Actions workflow parses this value to pull down
-# the correct tarball
+# the correct tarball.
 fuel-core-client = { version = "0.43.2", default-features = false }
 fuel-core-types = { version = "0.43", default-features = false }
 
 # Dependencies from the `fuels-rs` repository:
 
-fuels = "0.72"
-fuels-core = "0.72"
-fuels-accounts = "0.72"
+fuels = "0.73"
+fuels-core = "0.73"
+fuels-accounts = "0.73"
 
 # Dependencies from the `fuel-vm` repository:
 fuel-asm = "0.60"
diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 4cb0d55bd23..fd1c4bd49dd 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -1768,9 +1768,15 @@ pub fn compile(
         metrics
     );
 
+    let mut asm = match asm_res {
+        Err(_) => return fail(handler),
+        Ok(asm) => asm,
+    };
+
     const ENCODING_V0: &str = "0";
     const ENCODING_V1: &str = "1";
     const SPEC_VERSION: &str = "1";
+    const SPEC_VERSION_ERROR_TYPE: &str = "1.1";
 
     let mut program_abi = match pkg.target {
         BuildTarget::Fuel => {
@@ -1782,6 +1788,7 @@ pub fn compile(
                     &handler,
                     &mut AbiContext {
                         program: typed_program,
+                        panic_occurrences: &asm.panic_occurrences,
                         abi_with_callpaths: true,
                         type_ids_to_full_type_str: HashMap::<String, String>::new(),
                     },
@@ -1791,7 +1798,11 @@ pub fn compile(
                     } else {
                         ENCODING_V0.into()
                     },
-                    SPEC_VERSION.into(),
+                    if experimental.error_type {
+                        SPEC_VERSION_ERROR_TYPE.into()
+                    } else {
+                        SPEC_VERSION.into()
+                    }
                 ),
                 Some(sway_build_config.clone()),
                 metrics
@@ -1805,11 +1816,8 @@ pub fn compile(
         BuildTarget::EVM => {
             // Merge the ABI output of ASM gen with ABI gen to handle internal constructors
             // generated by the ASM backend.
-            let mut ops = match &asm_res {
-                Ok(ref asm) => match &asm.0.abi {
-                    Some(ProgramABI::Evm(ops)) => ops.clone(),
-                    _ => vec![],
-                },
+            let mut ops = match &asm.finalized_asm.abi {
+                Some(ProgramABI::Evm(ops)) => ops.clone(),
                 _ => vec![],
             };
 
@@ -1828,20 +1836,13 @@ pub fn compile(
         }
     };
 
-    let entries = asm_res
-        .as_ref()
-        .map(|asm| asm.0.entries.clone())
-        .unwrap_or_default();
-    let entries = entries
+    let entries = asm
+        .finalized_asm
+        .entries
         .iter()
         .map(|finalized_entry| PkgEntry::from_finalized_entry(finalized_entry, engines))
         .collect::<anyhow::Result<_>>()?;
 
-    let mut asm = match asm_res {
-        Err(_) => return fail(handler),
-        Ok(asm) => asm,
-    };
-
     let bc_res = time_expr!(
         pkg.name,
         "compile asm to bytecode",
@@ -1976,12 +1977,16 @@ fn report_assembly_information(
         data_section: sway_core::asm_generation::DataSectionInformation {
             size: data_section_size,
             used: compiled_asm
-                .0
+                .finalized_asm
                 .data_section
                 .iter_all_entries()
                 .map(|entry| calculate_entry_size(&entry))
                 .sum(),
-            value_pairs: compiled_asm.0.data_section.iter_all_entries().collect(),
+            value_pairs: compiled_asm
+                .finalized_asm
+                .data_section
+                .iter_all_entries()
+                .collect(),
         },
     };
 
@@ -2866,6 +2871,7 @@ mod test {
                 configurables: None,
                 logged_types: None,
                 messages_types: None,
+                error_codes: None,
             }),
             storage_slots: vec![],
             warnings: vec![],
diff --git a/forc-plugins/forc-client/src/op/call/call_function.rs b/forc-plugins/forc-client/src/op/call/call_function.rs
index 2057f171649..e57a35330c7 100644
--- a/forc-plugins/forc-client/src/op/call/call_function.rs
+++ b/forc-plugins/forc-client/src/op/call/call_function.rs
@@ -19,7 +19,7 @@ use fuels::{
 use fuels_core::{
     codec::{
         encode_fn_selector, log_formatters_lookup, ABIDecoder, ABIEncoder, DecoderConfig,
-        EncoderConfig, LogDecoder,
+        EncoderConfig, ErrorDetails, LogDecoder,
     },
     types::{
         bech32::Bech32ContractId,
@@ -84,7 +84,27 @@ pub async fn call_function(
 
     // Setup variable output policy and log decoder
     let variable_output_policy = VariableOutputPolicy::Exactly(call_parameters.amount as usize);
-    let log_decoder = LogDecoder::new(log_formatters_lookup(vec![], contract_id));
+    let error_codes = unified_program_abi
+        .error_codes
+        .map_or(HashMap::new(), |error_codes| {
+            error_codes
+                .iter()
+                .map(|(revert_code, error_details)| {
+                    (
+                        *revert_code,
+                        ErrorDetails::new(
+                            error_details.pos.pkg.clone(),
+                            error_details.pos.file.clone(),
+                            error_details.pos.line,
+                            error_details.pos.column,
+                            error_details.log_id.clone(),
+                            error_details.msg.clone(),
+                        ),
+                    )
+                })
+                .collect()
+        });
+    let log_decoder = LogDecoder::new(log_formatters_lookup(vec![], contract_id), error_codes);
 
     // Get external contracts (either provided or auto-detected)
     let external_contracts = match external_contracts {
diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json b/forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json
index f38d1dbedd6..67fce6fae12 100644
--- a/forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json
+++ b/forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json
@@ -78,6 +78,7 @@
   ],
   "functions": [
     {
+      "name": "main",
       "inputs": [
         {
           "name": "switch",
@@ -96,7 +97,6 @@
           "concreteTypeId": "37cd1cba311039a851ac8bfa614cc41359b4ad95c8656fcef2e8f504fe7a1272"
         }
       ],
-      "name": "main",
       "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
       "attributes": null
     }
@@ -107,22 +107,27 @@
     {
       "name": "BOOL",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 1896
+      "offset": 1896,
+      "indirect": false
     },
     {
       "name": "U8",
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
-      "offset": 1936
+      "offset": 1936,
+      "indirect": false
     },
     {
       "name": "STRUCT",
       "concreteTypeId": "563310524b4f4447a10d0e50556310253dfb3b5eb4b29c3773222b737c8b7075",
-      "offset": 1920
+      "offset": 1920,
+      "indirect": false
     },
     {
       "name": "ENUM",
       "concreteTypeId": "37cd1cba311039a851ac8bfa614cc41359b4ad95c8656fcef2e8f504fe7a1272",
-      "offset": 1904
+      "offset": 1904,
+      "indirect": false
     }
-  ]
+  ],
+  "errorCodes": {}
 }
\ No newline at end of file
diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json
index c163ccffe66..e10376b895f 100644
--- a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json
+++ b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json
@@ -225,6 +225,7 @@
   ],
   "functions": [
     {
+      "name": "main",
       "inputs": [
         {
           "name": "a",
@@ -235,7 +236,6 @@
           "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
         }
       ],
-      "name": "main",
       "output": "25fbba860b8a1983ebcfa3f135136266a7edb7ca3a7e1f8ec988135c12a9f873",
       "attributes": null
     }
@@ -251,62 +251,75 @@
     {
       "name": "BOOL",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 7792
+      "offset": 7792,
+      "indirect": false
     },
     {
       "name": "U8",
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
-      "offset": 7904
+      "offset": 7904,
+      "indirect": false
     },
     {
       "name": "U16",
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
-      "offset": 7848
+      "offset": 7848,
+      "indirect": false
     },
     {
       "name": "U32",
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
-      "offset": 7888
+      "offset": 7888,
+      "indirect": false
     },
     {
       "name": "U64",
       "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
-      "offset": 7896
+      "offset": 7896,
+      "indirect": false
     },
     {
       "name": "U256",
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
-      "offset": 7856
+      "offset": 7856,
+      "indirect": false
     },
     {
       "name": "B256",
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
-      "offset": 7760
+      "offset": 7760,
+      "indirect": false
     },
     {
       "name": "STR_4",
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
-      "offset": 7832
+      "offset": 7832,
+      "indirect": false
     },
     {
       "name": "TUPLE",
       "concreteTypeId": "e0128f7be9902d1fe16326cafe703b52038064a7997b03ebfc1c9dd607e1536c",
-      "offset": 7840
+      "offset": 7840,
+      "indirect": false
     },
     {
       "name": "ARRAY",
       "concreteTypeId": "d9fac01ab38fe10950758ae9604da330d6406a71fda3ef1ea818121261132d56",
-      "offset": 7744
+      "offset": 7744,
+      "indirect": false
     },
     {
       "name": "STRUCT",
       "concreteTypeId": "563310524b4f4447a10d0e50556310253dfb3b5eb4b29c3773222b737c8b7075",
-      "offset": 7816
+      "offset": 7816,
+      "indirect": false
     },
     {
       "name": "ENUM",
       "concreteTypeId": "37cd1cba311039a851ac8bfa614cc41359b4ad95c8656fcef2e8f504fe7a1272",
-      "offset": 7800
+      "offset": 7800,
+      "indirect": false
     }
-  ]
+  ],
+  "errorCodes": {}
 }
\ No newline at end of file
diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
index 81b65c43cd7..82f7be34492 100644
--- a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
+++ b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
@@ -225,6 +225,7 @@
   ],
   "functions": [
     {
+      "name": "main",
       "inputs": [
         {
           "name": "a",
@@ -235,7 +236,6 @@
           "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
         }
       ],
-      "name": "main",
       "output": "25fbba860b8a1983ebcfa3f135136266a7edb7ca3a7e1f8ec988135c12a9f873",
       "attributes": null
     }
@@ -251,62 +251,75 @@
     {
       "name": "BOOL",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 136
+      "offset": 136,
+      "indirect": false
     },
     {
       "name": "U8",
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
-      "offset": 248
+      "offset": 248,
+      "indirect": false
     },
     {
       "name": "U16",
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
-      "offset": 192
+      "offset": 192,
+      "indirect": false
     },
     {
       "name": "U32",
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
-      "offset": 232
+      "offset": 232,
+      "indirect": false
     },
     {
       "name": "U64",
       "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
-      "offset": 240
+      "offset": 240,
+      "indirect": false
     },
     {
       "name": "U256",
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
-      "offset": 200
+      "offset": 200,
+      "indirect": false
     },
     {
       "name": "B256",
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
-      "offset": 104
+      "offset": 104,
+      "indirect": false
     },
     {
       "name": "STR_4",
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
-      "offset": 176
+      "offset": 176,
+      "indirect": false
     },
     {
       "name": "TUPLE",
       "concreteTypeId": "e0128f7be9902d1fe16326cafe703b52038064a7997b03ebfc1c9dd607e1536c",
-      "offset": 184
+      "offset": 184,
+      "indirect": false
     },
     {
       "name": "ARRAY",
       "concreteTypeId": "d9fac01ab38fe10950758ae9604da330d6406a71fda3ef1ea818121261132d56",
-      "offset": 88
+      "offset": 88,
+      "indirect": false
     },
     {
       "name": "STRUCT",
       "concreteTypeId": "563310524b4f4447a10d0e50556310253dfb3b5eb4b29c3773222b737c8b7075",
-      "offset": 160
+      "offset": 160,
+      "indirect": false
     },
     {
       "name": "ENUM",
       "concreteTypeId": "37cd1cba311039a851ac8bfa614cc41359b4ad95c8656fcef2e8f504fe7a1272",
-      "offset": 144
+      "offset": 144,
+      "indirect": false
     }
-  ]
+  ],
+  "errorCodes": {}
 }
\ No newline at end of file
diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs
index 55eec7c987d..cd920053826 100644
--- a/sway-core/src/abi_generation/fuel_abi.rs
+++ b/sway-core/src/abi_generation/fuel_abi.rs
@@ -1,8 +1,9 @@
 use fuel_abi_types::abi::program::{
-    self as program_abi, ConcreteTypeId, MetadataTypeId, TypeConcreteDeclaration,
+    self as program_abi, ConcreteTypeId, ErrorDetails, ErrorPosition, MetadataTypeId,
+    TypeConcreteDeclaration,
 };
 use sha2::{Digest, Sha256};
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::Span;
 
@@ -10,13 +11,14 @@ use crate::{
     ast_elements::type_parameter::GenericTypeParameter,
     language::ty::{TyFunctionDecl, TyProgram, TyProgramKind},
     transform::Attributes,
-    Engines, TypeId, TypeInfo,
+    Engines, PanicOccurrences, TypeId, TypeInfo,
 };
 
 use super::abi_str::AbiStrContext;
 
 pub struct AbiContext<'a> {
     pub program: &'a TyProgram,
+    pub panic_occurrences: &'a PanicOccurrences,
     pub abi_with_callpaths: bool,
     pub type_ids_to_full_type_str: HashMap<String, String>,
 }
@@ -106,6 +108,7 @@ pub fn generate_program_abi(
                 generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?;
             let configurables =
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
+            let error_codes = generate_error_codes(ctx.panic_occurrences);
             program_abi::ProgramABI {
                 program_type: "contract".to_string(),
                 spec_version,
@@ -116,6 +119,7 @@ pub fn generate_program_abi(
                 logged_types: Some(logged_types),
                 messages_types: Some(messages_types),
                 configurables: Some(configurables),
+                error_codes: Some(error_codes),
             }
         }
         TyProgramKind::Script { main_function, .. } => {
@@ -133,6 +137,7 @@ pub fn generate_program_abi(
                 generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?;
             let configurables =
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
+            let error_codes = generate_error_codes(ctx.panic_occurrences);
             program_abi::ProgramABI {
                 program_type: "script".to_string(),
                 spec_version,
@@ -143,6 +148,7 @@ pub fn generate_program_abi(
                 logged_types: Some(logged_types),
                 messages_types: Some(messages_types),
                 configurables: Some(configurables),
+                error_codes: Some(error_codes),
             }
         }
         TyProgramKind::Predicate { main_function, .. } => {
@@ -160,6 +166,7 @@ pub fn generate_program_abi(
                 generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?;
             let configurables =
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
+            let error_codes = generate_error_codes(ctx.panic_occurrences);
             program_abi::ProgramABI {
                 program_type: "predicate".to_string(),
                 spec_version,
@@ -170,6 +177,7 @@ pub fn generate_program_abi(
                 logged_types: Some(logged_types),
                 messages_types: Some(messages_types),
                 configurables: Some(configurables),
+                error_codes: Some(error_codes),
             }
         }
         TyProgramKind::Library { .. } => {
@@ -177,7 +185,7 @@ pub fn generate_program_abi(
                 generate_logged_types(handler, ctx, engines, metadata_types, concrete_types)?;
             let messages_types =
                 generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?;
-
+            let error_codes = generate_error_codes(ctx.panic_occurrences);
             program_abi::ProgramABI {
                 program_type: "library".to_string(),
                 spec_version,
@@ -188,6 +196,7 @@ pub fn generate_program_abi(
                 logged_types: Some(logged_types),
                 messages_types: Some(messages_types),
                 configurables: None,
+                error_codes: Some(error_codes),
             }
         }
     };
@@ -564,11 +573,35 @@ fn generate_configurables(
                     decl.type_ascription.type_id(),
                 )?,
                 offset: 0,
+                indirect: false,
             })
         })
         .collect::<Result<Vec<_>, _>>()
 }
 
+fn generate_error_codes(panic_occurrences: &PanicOccurrences) -> BTreeMap<u64, ErrorDetails> {
+    panic_occurrences
+        .iter()
+        .map(|(panic_occurrence, revert_code)| {
+            (
+                *revert_code,
+                ErrorDetails {
+                    pos: ErrorPosition {
+                        pkg: panic_occurrence.loc.pkg.clone(),
+                        file: panic_occurrence.loc.file.clone(),
+                        line: panic_occurrence.loc.loc.line as u64,
+                        column: panic_occurrence.loc.loc.col as u64,
+                    },
+                    log_id: panic_occurrence
+                        .log_id
+                        .map(|log_id| log_id.hash_id.to_string()),
+                    msg: panic_occurrence.msg.clone(),
+                },
+            )
+        })
+        .collect()
+}
+
 impl TypeId {
     /// Return the type parameters of a given (potentially generic) type while considering what it
     /// actually resolves to. These parameters are essentially of type of `usize` which are
@@ -658,6 +691,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 x.type_argument.initial_type_id().index(),
                             )),
+                            error_message: x.attributes.error_message().cloned(),
                             type_arguments: x
                                 .type_argument
                                 .initial_type_id()
@@ -710,6 +744,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 x.type_argument.initial_type_id().index(),
                             )),
+                            error_message: None,
                             type_arguments: x
                                 .type_argument
                                 .initial_type_id()
@@ -753,6 +788,7 @@ impl TypeId {
                         type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                             elem_ty.initial_type_id().index(),
                         )),
+                        error_message: None,
                         type_arguments: elem_ty.initial_type_id().get_abi_type_arguments(
                             handler,
                             ctx,
@@ -787,6 +823,7 @@ impl TypeId {
                         type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                             elem_ty.initial_type_id().index(),
                         )),
+                        error_message: None,
                         type_arguments: elem_ty.initial_type_id().get_abi_type_arguments(
                             handler,
                             ctx,
@@ -828,6 +865,7 @@ impl TypeId {
                                 type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                     x.initial_type_id().index(),
                                 )),
+                                error_message: None,
                                 type_arguments: x.initial_type_id().get_abi_type_arguments(
                                     handler,
                                     ctx,
@@ -973,6 +1011,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 arg.initial_type_id().index(),
                             )),
+                            error_message: None,
                             type_arguments: arg.initial_type_id().get_abi_type_arguments(
                                 handler,
                                 ctx,
@@ -1019,6 +1058,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 p.type_id.index(),
                             )),
+                            error_message: None,
                             type_arguments: p.type_id.get_abi_type_arguments(
                                 handler,
                                 ctx,
@@ -1073,6 +1113,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 p.type_id.index(),
                             )),
+                            error_message: None,
                             type_arguments: p.type_id.get_abi_type_arguments(
                                 handler,
                                 ctx,
diff --git a/sway-core/src/ir_generation.rs b/sway-core/src/ir_generation.rs
index 296bfbb2ef8..e69945ef3e5 100644
--- a/sway-core/src/ir_generation.rs
+++ b/sway-core/src/ir_generation.rs
@@ -24,7 +24,7 @@ use crate::{
     language::ty,
     metadata::MetadataManager,
     types::{LogId, MessageId},
-    Engines, TypeId,
+    Engines, PanicOccurrences, TypeId,
 };
 
 type FnKey = u64;
@@ -48,6 +48,7 @@ impl CompiledFunctionCache {
         decl: &ty::TyFunctionDecl,
         logged_types_map: &HashMap<TypeId, LogId>,
         messages_types_map: &HashMap<TypeId, MessageId>,
+        panic_occurrences: &mut PanicOccurrences,
     ) -> Result<Function, CompileError> {
         // The compiler inlines everything very lazily.  Function calls include the body of the
         // callee (i.e., the callee_body arg above). Library functions are provided in an initial
@@ -97,6 +98,7 @@ impl CompiledFunctionCache {
                     &decl.name,
                     logged_types_map,
                     messages_types_map,
+                    panic_occurrences,
                     is_entry,
                     is_original_entry,
                     None,
@@ -117,12 +119,13 @@ impl CompiledFunctionCache {
     }
 }
 
-pub fn compile_program<'eng>(
+pub fn compile_program<'a>(
     program: &ty::TyProgram,
+    panic_occurrences: &'a mut PanicOccurrences,
     include_tests: bool,
-    engines: &'eng Engines,
+    engines: &'a Engines,
     experimental: ExperimentalFeatures,
-) -> Result<Context<'eng>, Vec<CompileError>> {
+) -> Result<Context<'a>, Vec<CompileError>> {
     let declaration_engine = engines.de();
 
     let test_fns = match include_tests {
@@ -169,6 +172,7 @@ pub fn compile_program<'eng>(
             namespace,
             &logged_types,
             &messages_types,
+            panic_occurrences,
             &test_fns,
             &mut cache,
         ),
@@ -179,6 +183,7 @@ pub fn compile_program<'eng>(
             namespace,
             &logged_types,
             &messages_types,
+            panic_occurrences,
             &test_fns,
             &mut cache,
         ),
@@ -193,6 +198,7 @@ pub fn compile_program<'eng>(
             declarations,
             &logged_types,
             &messages_types,
+            panic_occurrences,
             &test_fns,
             engines,
             &mut cache,
@@ -203,6 +209,7 @@ pub fn compile_program<'eng>(
             namespace,
             &logged_types,
             &messages_types,
+            panic_occurrences,
             &test_fns,
             &mut cache,
         ),
diff --git a/sway-core/src/ir_generation/compile.rs b/sway-core/src/ir_generation/compile.rs
index dbb6dc39a58..104c9313248 100644
--- a/sway-core/src/ir_generation/compile.rs
+++ b/sway-core/src/ir_generation/compile.rs
@@ -6,7 +6,7 @@ use crate::{
     semantic_analysis::namespace,
     type_system::TypeId,
     types::{LogId, MessageId},
-    Engines,
+    Engines, PanicOccurrences,
 };
 
 use super::{
@@ -30,6 +30,7 @@ pub(super) fn compile_script(
     namespace: &namespace::Namespace,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
     cache: &mut CompiledFunctionCache,
 ) -> Result<Module, Vec<CompileError>> {
@@ -47,6 +48,7 @@ pub(super) fn compile_script(
         namespace.current_package_root_module(),
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         cache,
     )
     .map_err(|err| vec![err])?;
@@ -58,6 +60,7 @@ pub(super) fn compile_script(
         entry_function,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         None,
         cache,
     )?;
@@ -68,6 +71,7 @@ pub(super) fn compile_script(
         module,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         test_fns,
         cache,
     )?;
@@ -83,6 +87,7 @@ pub(super) fn compile_predicate(
     namespace: &namespace::Namespace,
     logged_types: &HashMap<TypeId, LogId>,
     messages_types: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
     cache: &mut CompiledFunctionCache,
 ) -> Result<Module, Vec<CompileError>> {
@@ -100,6 +105,7 @@ pub(super) fn compile_predicate(
         namespace.current_package_root_module(),
         logged_types,
         messages_types,
+        panic_occurrences,
         cache,
     )
     .map_err(|err| vec![err])?;
@@ -111,6 +117,7 @@ pub(super) fn compile_predicate(
         entry_function,
         &HashMap::new(),
         &HashMap::new(),
+        panic_occurrences,
         None,
         cache,
     )?;
@@ -121,6 +128,7 @@ pub(super) fn compile_predicate(
         module,
         logged_types,
         messages_types,
+        panic_occurrences,
         test_fns,
         cache,
     )?;
@@ -137,6 +145,7 @@ pub(super) fn compile_contract(
     declarations: &[ty::TyDecl],
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
     engines: &Engines,
     cache: &mut CompiledFunctionCache,
@@ -155,6 +164,7 @@ pub(super) fn compile_contract(
         namespace.current_package_root_module(),
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         cache,
     )
     .map_err(|err| vec![err])?;
@@ -177,6 +187,7 @@ pub(super) fn compile_contract(
             entry_function,
             logged_types_map,
             messages_types_map,
+            panic_occurrences,
             None,
             cache,
         )?;
@@ -191,6 +202,7 @@ pub(super) fn compile_contract(
                 decl,
                 logged_types_map,
                 messages_types_map,
+                panic_occurrences,
                 engines,
                 cache,
             )?;
@@ -208,6 +220,7 @@ pub(super) fn compile_contract(
                         &decl_id,
                         logged_types_map,
                         messages_types_map,
+                        panic_occurrences,
                         engines,
                         cache,
                     )?;
@@ -223,6 +236,7 @@ pub(super) fn compile_contract(
         module,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         test_fns,
         cache,
     )?;
@@ -237,6 +251,7 @@ pub(super) fn compile_library(
     namespace: &namespace::Namespace,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
     cache: &mut CompiledFunctionCache,
 ) -> Result<Module, Vec<CompileError>> {
@@ -253,6 +268,7 @@ pub(super) fn compile_library(
         module,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         test_fns,
         cache,
     )?;
@@ -337,6 +353,7 @@ pub(crate) fn compile_configurables(
     module_ns: &namespace::Module,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     cache: &mut CompiledFunctionCache,
 ) -> Result<(), CompileError> {
     for decl_name in module_ns.root_items().get_all_declared_symbols() {
@@ -395,6 +412,7 @@ pub(crate) fn compile_configurables(
                     &decode_fn,
                     logged_types_map,
                     messages_types_map,
+                    panic_occurrences,
                 )?;
 
                 let name = decl_name.as_str().to_string();
@@ -440,6 +458,7 @@ pub(super) fn compile_function(
     original_name: &Ident,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     is_entry: bool,
     is_original_entry: bool,
     test_decl_ref: Option<DeclRefFunction>,
@@ -462,6 +481,7 @@ pub(super) fn compile_function(
             None,
             logged_types_map,
             messages_types_map,
+            panic_occurrences,
             test_decl_ref,
             cache,
         )
@@ -478,6 +498,7 @@ pub(super) fn compile_entry_function(
     ast_fn_decl: &DeclId<ty::TyFunctionDecl>,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_decl_ref: Option<DeclRefFunction>,
     cache: &mut CompiledFunctionCache,
 ) -> Result<Function, Vec<CompileError>> {
@@ -495,6 +516,7 @@ pub(super) fn compile_entry_function(
         &ast_fn_decl.name,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         is_entry,
         is_original_entry,
         test_decl_ref,
@@ -511,6 +533,7 @@ pub(super) fn compile_tests(
     module: Module,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
     cache: &mut CompiledFunctionCache,
 ) -> Result<Vec<Function>, Vec<CompileError>> {
@@ -525,6 +548,7 @@ pub(super) fn compile_tests(
                 decl_ref.id(),
                 logged_types_map,
                 messages_types_map,
+                panic_occurrences,
                 Some(decl_ref.clone()),
                 cache,
             )
@@ -549,6 +573,7 @@ fn compile_fn(
     selector: Option<[u8; 4]>,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     test_decl_ref: Option<DeclRefFunction>,
     cache: &mut CompiledFunctionCache,
 ) -> Result<Function, Vec<CompileError>> {
@@ -658,6 +683,7 @@ fn compile_fn(
         func,
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         cache,
     );
     let mut ret_val = compiler.compile_code_block_to_value(context, md_mgr, body)?;
@@ -709,6 +735,7 @@ fn compile_encoding_v0_abi_method(
     ast_fn_decl: &DeclId<ty::TyFunctionDecl>,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
+    panic_occurrences: &mut PanicOccurrences,
     engines: &Engines,
     cache: &mut CompiledFunctionCache,
 ) -> Result<Function, Vec<CompileError>> {
@@ -754,6 +781,7 @@ fn compile_encoding_v0_abi_method(
         Some(selector),
         logged_types_map,
         messages_types_map,
+        panic_occurrences,
         None,
         cache,
     )
diff --git a/sway-core/src/ir_generation/function.rs b/sway-core/src/ir_generation/function.rs
index c722eb17cc6..9f124937077 100644
--- a/sway-core/src/ir_generation/function.rs
+++ b/sway-core/src/ir_generation/function.rs
@@ -20,6 +20,7 @@ use crate::{
     metadata::MetadataManager,
     type_system::*,
     types::*,
+    PanicOccurrence, PanicOccurrences,
 };
 
 use indexmap::IndexMap;
@@ -88,8 +89,8 @@ macro_rules! return_on_termination_or_extract {
     }};
 }
 
-pub(crate) struct FnCompiler<'eng> {
-    engines: &'eng Engines,
+pub(crate) struct FnCompiler<'a> {
+    engines: &'a Engines,
     module: Module,
     pub(super) function: Function,
     pub(super) current_block: Block,
@@ -97,11 +98,12 @@ pub(crate) struct FnCompiler<'eng> {
     block_to_continue_to: Option<Block>,
     current_fn_param: Option<ty::TyFunctionParameter>,
     lexical_map: LexicalMap,
-    cache: &'eng mut CompiledFunctionCache,
-    // This is a map from the type IDs of a logged type and the ID of the corresponding log
-    logged_types_map: HashMap<TypeId, LogId>,
-    // This is a map from the type IDs of a message data type and the ID of the corresponding smo
-    messages_types_map: HashMap<TypeId, MessageId>,
+    cache: &'a mut CompiledFunctionCache,
+    /// Maps a [TypeId] of a logged type to the [LogId] of its corresponding log.
+    logged_types_map: &'a HashMap<TypeId, LogId>,
+    /// Maps a [TypeId] of a message data type to the [MessageId] of its corresponding SMO.
+    messages_types_map: &'a HashMap<TypeId, MessageId>,
+    panic_occurrences: &'a mut PanicOccurrences,
 }
 
 fn to_constant(_s: &mut FnCompiler<'_>, context: &mut Context, value: u64) -> Value {
@@ -148,16 +150,17 @@ fn calc_addr_as_ptr(
     current_block.append(context).int_to_ptr(addr, ptr_to)
 }
 
-impl<'eng> FnCompiler<'eng> {
+impl<'a> FnCompiler<'a> {
     #[allow(clippy::too_many_arguments)]
     pub(super) fn new(
-        engines: &'eng Engines,
+        engines: &'a Engines,
         context: &mut Context,
         module: Module,
         function: Function,
-        logged_types_map: &HashMap<TypeId, LogId>,
-        messages_types_map: &HashMap<TypeId, MessageId>,
-        cache: &'eng mut CompiledFunctionCache,
+        logged_types_map: &'a HashMap<TypeId, LogId>,
+        messages_types_map: &'a HashMap<TypeId, MessageId>,
+        panic_occurrences: &'a mut PanicOccurrences,
+        cache: &'a mut CompiledFunctionCache,
     ) -> Self {
         let lexical_map = LexicalMap::from_iter(
             function
@@ -174,8 +177,9 @@ impl<'eng> FnCompiler<'eng> {
             lexical_map,
             cache,
             current_fn_param: None,
-            logged_types_map: logged_types_map.clone(),
-            messages_types_map: messages_types_map.clone(),
+            logged_types_map,
+            messages_types_map,
+            panic_occurrences,
         }
     }
 
@@ -2504,55 +2508,111 @@ impl<'eng> FnCompiler<'eng> {
         ast_expr: &ty::TyExpression,
         span_md_idx: Option<MetadataIndex>,
     ) -> Result<TerminatorValue, CompileError> {
-        // In predicates, we only revert and do not log.
-        if context.program_kind != Kind::Predicate {
-            // TODO: Currently, we log all the values.
-            //       In the next step, ABI generation, if the `ast_expr` const evaluates to
-            //       a string slice, we will neither log it, nor leave it in the generated
-            //       bytecode, but just create a "msg" entry in the ABI.
-
-            let panic_val = return_on_termination_or_extract!(
-                self.compile_expression_to_value(context, md_mgr, ast_expr)?
-            );
-            let logged_type_id =
-                TypeMetadata::get_logged_type_id(ast_expr, context.experimental.new_encoding)?;
-            let log_id = match self.logged_types_map.get(&logged_type_id) {
-                None => {
-                    return Err(CompileError::Internal(
-                        "Unable to determine log instance ID for `panic` expression.",
-                        ast_expr.span.clone(),
-                    ));
-                }
-                Some(log_id) => convert_literal_to_value(context, &Literal::U64(log_id.hash_id)),
-            };
+        // 1. Build the `PanicOccurrence` that corresponds to this `panic` call.
+        let mut panic_occurrence = PanicOccurrence::default();
 
-            match panic_val.get_type(context) {
-                None => {
-                    return Err(CompileError::Internal(
-                        "Unable to determine logged value type in the `panic` expression.",
-                        ast_expr.span.clone(),
-                    ))
-                }
-                Some(log_ty) => {
-                    let span_md_idx = md_mgr.span_to_md(context, &ast_expr.span);
+        // 1.a Define either the `msg` or `log_id` entry.
 
-                    // The `log` instruction
-                    self.current_block
-                        .append(context)
-                        .log(panic_val, log_ty, log_id)
-                        .add_metadatum(context, span_md_idx);
+        // If the `panic` argument can be const-evaluated to a string slice,
+        // we will not log it, but just create an `msg` entry in the ABI.
+        let logged_expression =
+            TypeMetadata::get_logged_expression(ast_expr, context.experimental.new_encoding)?;
+
+        let const_eval_string =
+            if logged_expression.return_type == self.engines.te().id_of_string_slice() {
+                let const_expr_val = compile_constant_expression_to_constant(
+                    self.engines,
+                    context,
+                    md_mgr,
+                    self.module,
+                    None,
+                    Some(self),
+                    logged_expression,
+                );
+
+                match const_expr_val {
+                    Ok(constant) => constant.get_content(context).as_string(),
+                    Err(_) => None,
                 }
+            } else {
+                None
             };
+
+        if let Some(const_eval_string) = const_eval_string {
+            panic_occurrence.msg = Some(const_eval_string);
         } else {
-            // TODO: Consider using `__dbg` intrinsic in predicates, once it is implemented.
+            // If the `panic` argument is not a constant string slice, we will log it.
+            // Note that the argument can still be a string slice, but we cannot
+            // const-evaluate it at compile time.
+
+            // In predicates, we only revert and do not log.
+            if context.program_kind != Kind::Predicate {
+                let panic_val = return_on_termination_or_extract!(
+                    self.compile_expression_to_value(context, md_mgr, ast_expr)?
+                );
+                let logged_type_id = logged_expression.return_type;
+                let log_id = match self.logged_types_map.get(&logged_type_id) {
+                    None => {
+                        return Err(CompileError::Internal(
+                            "Unable to determine log instance ID for `panic` expression.",
+                            ast_expr.span.clone(),
+                        ));
+                    }
+                    Some(log_id) => {
+                        panic_occurrence.log_id = Some(*log_id);
+                        convert_literal_to_value(context, &Literal::U64(log_id.hash_id))
+                    }
+                };
+
+                match panic_val.get_type(context) {
+                    None => {
+                        return Err(CompileError::Internal(
+                            "Unable to determine logged value type in the `panic` expression.",
+                            ast_expr.span.clone(),
+                        ))
+                    }
+                    Some(log_ty) => {
+                        let span_md_idx = md_mgr.span_to_md(context, &ast_expr.span);
+
+                        // Emit the `log` instruction.
+                        self.current_block
+                            .append(context)
+                            .log(panic_val, log_ty, log_id)
+                            .add_metadatum(context, span_md_idx);
+                    }
+                };
+            } else {
+                // TODO: Consider using `__dbg` intrinsic in predicates.
+            }
         }
 
-        let revert_code = context.get_next_panic_revert_code();
+        // 1.b Define the `loc` entry.
+        // Set the location to the `panic` keyword.
+        panic_occurrence.loc = self.engines.se().get_source_location(
+            md_mgr
+                .md_to_span(context, span_md_idx)
+                .as_ref()
+                .unwrap_or(&ast_expr.span),
+        );
+
+        // 2. Define the revert code for this particular panic occurrence.
+        // If we have encountered this `panic` before, we will reuse the revert code.
+        // This happen, e.g., when compiling a generic function that panics on a non-generic argument.
+        let revert_code = match self.panic_occurrences.get(&panic_occurrence) {
+            Some(revert_code) => *revert_code,
+            None => {
+                // If we have not encountered this `panic` before, we will assign a new revert code.
+                let revert_code = context.get_next_panic_revert_code();
+                self.panic_occurrences.insert(panic_occurrence, revert_code);
+                revert_code
+            }
+        };
+
         let revert_code_const = ConstantContent::new_uint(context, 64, revert_code);
         let revert_code_const = Constant::unique(context, revert_code_const);
         let revert_code_val = Value::new_constant(context, revert_code_const);
 
-        // The `revert` instruction
+        // 3. Emit the `revert` instruction.
         let val = self
             .current_block
             .append(context)
@@ -3043,8 +3103,9 @@ impl<'eng> FnCompiler<'eng> {
             self.module,
             md_mgr,
             callee,
-            &self.logged_types_map,
-            &self.messages_types_map,
+            self.logged_types_map,
+            self.messages_types_map,
+            self.panic_occurrences,
         )?;
 
         // Now actually call the new function.
diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
index ec9bc6e4f1f..5a3c72dc5d5 100644
--- a/sway-core/src/lib.rs
+++ b/sway-core/src/lib.rs
@@ -40,6 +40,7 @@ use metadata::MetadataManager;
 use query_engine::{ModuleCacheKey, ModuleCommonInfo, ParsedModuleInfo, ProgramsCacheEntry};
 use semantic_analysis::program::TypeCheckFailed;
 use std::collections::hash_map::DefaultHasher;
+use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -56,10 +57,10 @@ use sway_ir::{
     RET_DEMOTION_NAME, SIMPLIFY_CFG_NAME, SROA_NAME,
 };
 use sway_types::span::Source;
-use sway_types::{SourceEngine, Span};
+use sway_types::{SourceEngine, SourceLocation, Span};
 use sway_utils::{time_expr, PerformanceData, PerformanceMetric};
 use transform::{ArgsExpectValues, Attribute, AttributeKind, Attributes, ExpectedArgs};
-use types::{CollectTypesMetadata, CollectTypesMetadataContext, TypeMetadata};
+use types::{CollectTypesMetadata, CollectTypesMetadataContext, LogId, TypeMetadata};
 
 pub use semantic_analysis::namespace::{self, Namespace};
 pub mod types;
@@ -739,7 +740,30 @@ pub fn build_module_dep_graph(
     Ok(())
 }
 
-pub struct CompiledAsm(pub FinalizedAsm);
+/// A possible occurrence of a `panic` expression that is located in code at [PanicOccurrence::loc].
+///
+/// Note that a single `panic` expression can have multiple [PanicOccurrence]s related to it.
+///
+/// For example:
+/// - `panic "Some message.";` will have just a single occurrence, with `msg` containing the message.
+/// - `panic some_value_of_a_concrete_type;` will have just a single occurrence, with `log_id` containing the [LogId] of the concrete type.
+/// - `panic some_value_of_a_generic_type;` will have multiple occurrences, one with `log_id` for every monomorphized type.
+///
+/// **Every [PanicOccurrence] has exactly one revert code assigned to it.**
+#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PanicOccurrence {
+    pub loc: SourceLocation,
+    pub log_id: Option<LogId>,
+    pub msg: Option<String>,
+}
+
+/// [PanicOccurrence]s mapped to their corresponding revert codes.
+pub type PanicOccurrences = HashMap<PanicOccurrence, u64>;
+
+pub struct CompiledAsm {
+    pub finalized_asm: FinalizedAsm,
+    pub panic_occurrences: PanicOccurrences,
+}
 
 #[allow(clippy::too_many_arguments)]
 pub fn parsed_to_ast(
@@ -1068,6 +1092,7 @@ pub fn compile_to_asm(
         None,
         experimental,
     )?;
+
     ast_to_asm(handler, engines, &ast_res, build_config, experimental)
 }
 
@@ -1085,22 +1110,34 @@ pub fn ast_to_asm(
         Err(err) => return Err(err.error),
     };
 
-    let asm =
-        match compile_ast_to_ir_to_asm(handler, engines, typed_program, build_config, experimental)
-        {
-            Ok(res) => res,
-            Err(err) => {
-                handler.dedup();
-                return Err(err);
-            }
-        };
-    Ok(CompiledAsm(asm))
+    let mut panic_occurrences = PanicOccurrences::default();
+
+    let asm = match compile_ast_to_ir_to_asm(
+        handler,
+        engines,
+        typed_program,
+        &mut panic_occurrences,
+        build_config,
+        experimental,
+    ) {
+        Ok(res) => res,
+        Err(err) => {
+            handler.dedup();
+            return Err(err);
+        }
+    };
+
+    Ok(CompiledAsm {
+        finalized_asm: asm,
+        panic_occurrences,
+    })
 }
 
 pub(crate) fn compile_ast_to_ir_to_asm(
     handler: &Handler,
     engines: &Engines,
     program: &ty::TyProgram,
+    panic_occurrences: &mut PanicOccurrences,
     build_config: &BuildConfig,
     experimental: ExperimentalFeatures,
 ) -> Result<FinalizedAsm, ErrorEmitted> {
@@ -1117,6 +1154,7 @@ pub(crate) fn compile_ast_to_ir_to_asm(
 
     let mut ir = match ir_generation::compile_program(
         program,
+        panic_occurrences,
         build_config.include_tests,
         engines,
         experimental,
@@ -1275,7 +1313,7 @@ pub fn asm_to_bytecode(
     build_config: &BuildConfig,
 ) -> Result<CompiledBytecode, ErrorEmitted> {
     let compiled_bytecode =
-        asm.0
+        asm.finalized_asm
             .to_bytecode_mut(handler, source_map, source_engine, build_config)?;
     Ok(compiled_bytecode)
 }
diff --git a/sway-core/src/transform/attribute.rs b/sway-core/src/transform/attribute.rs
index 29d81651dc1..fcc9895c956 100644
--- a/sway-core/src/transform/attribute.rs
+++ b/sway-core/src/transform/attribute.rs
@@ -178,6 +178,10 @@ impl AttributeArg {
     pub fn is_test_should_revert(&self) -> bool {
         self.name.as_str() == TEST_SHOULD_REVERT_ARG_NAME
     }
+
+    pub fn is_error_message(&self) -> bool {
+        self.name.as_str() == ERROR_M_ARG_NAME
+    }
 }
 
 impl Spanned for AttributeArg {
@@ -1001,6 +1005,23 @@ impl Attributes {
         // Last-wins approach.
         self.of_kind(AttributeKind::Error).last()
     }
+
+    /// Returns the error message of the `#[error]` [Attribute],
+    /// or `None` if the [Attributes] does not contain any
+    /// `#[error]` attributes, or if the attribute does not
+    /// contain a message argument (`m`), or if the message
+    /// argument is not a string.
+    pub fn error_message(&self) -> Option<&String> {
+        // Last-wins approach.
+        self.error().and_then(|error_attr| {
+            error_attr
+                .args
+                .iter()
+                .filter(|arg| arg.is_error_message())
+                .next_back()
+                .and_then(|arg| arg.get_string_opt(&Handler::default()).ok().flatten())
+        })
+    }
 }
 
 pub struct AllowDeprecatedEnterToken {
diff --git a/sway-core/src/transform/to_parsed_lang/convert_parse_tree.rs b/sway-core/src/transform/to_parsed_lang/convert_parse_tree.rs
index 96ad71257fe..6bdc038a810 100644
--- a/sway-core/src/transform/to_parsed_lang/convert_parse_tree.rs
+++ b/sway-core/src/transform/to_parsed_lang/convert_parse_tree.rs
@@ -2136,32 +2136,6 @@ fn expr_func_app_to_expression_kind(
                 is_mutable: true,
             });
 
-            fn get_current_file_from_span(engines: &Engines, span: &Span) -> String {
-                let Some(source_id) = span.source_id() else {
-                    return String::new();
-                };
-                let current_file = engines.se().get_path(source_id);
-
-                // find the manifest path of the current span
-                let program_id = engines
-                    .se()
-                    .get_program_id_from_manifest_path(&current_file)
-                    .unwrap();
-                let manifest_path = engines
-                    .se()
-                    .get_manifest_path_from_program_id(&program_id)
-                    .unwrap();
-                let current_file = current_file
-                    .display()
-                    .to_string()
-                    .replace(&manifest_path.display().to_string(), "");
-                if let Some(current_file) = current_file.strip_prefix("/") {
-                    current_file.to_string()
-                } else {
-                    current_file
-                }
-            }
-
             fn ast_node_to_print_str(f_ident: BaseIdent, s: &str, span: &Span) -> AstNode {
                 AstNode {
                     content: AstNodeContent::Expression(Expression {
@@ -2195,8 +2169,7 @@ fn expr_func_app_to_expression_kind(
                 }
             }
 
-            let current_file = get_current_file_from_span(engines, &span);
-            let start_line_col = span.start_line_col_one_index();
+            let source_location = engines.se().get_source_location(&span);
 
             let arg_id: String = format!("arg_{}", context.next_for_unique_suffix());
             let arg_ident = BaseIdent::new_no_span(arg_id.to_string());
@@ -2228,9 +2201,9 @@ fn expr_func_app_to_expression_kind(
                         f_ident.clone(),
                         &format!(
                             "[{}:{}:{}] {} = ",
-                            current_file,
-                            start_line_col.line,
-                            start_line_col.col,
+                            source_location.file,
+                            source_location.loc.line,
+                            source_location.loc.col,
                             match swayfmt::parse::parse_format::<Expr>(
                                 arguments[0].span.as_str(),
                                 context.experimental
diff --git a/sway-core/src/types/collect_types_metadata.rs b/sway-core/src/types/collect_types_metadata.rs
index 05d7dfd290c..02de56ec7d4 100644
--- a/sway-core/src/types/collect_types_metadata.rs
+++ b/sway-core/src/types/collect_types_metadata.rs
@@ -81,6 +81,22 @@ impl TypeMetadata {
         logged_expr: &TyExpression,
         is_new_encoding: bool,
     ) -> Result<TypeId, CompileError> {
+        Self::get_logged_expression(logged_expr, is_new_encoding)
+            .map(|logged_expr| logged_expr.return_type)
+    }
+
+    /// Returns the [TyExpression] that is actually being logged.
+    /// When the "new_encoding" is off, this is the `logged_expr` itself.
+    /// E.g., when calling `__log(<logged_expr>)`, or `panic <logged_expr>;`
+    /// it will be the expression of the `__log` or `panic` argument,
+    /// respectively. When "new_encoding" is on, it is the expression
+    /// of the argument passed to the `encode` function.
+    /// In this case, when `is_new_encoding` is true, `logged_expr`
+    /// must represent a [TyExpressionVariant::FunctionApplication] call to `encode`.
+    pub(crate) fn get_logged_expression(
+        logged_expr: &TyExpression,
+        is_new_encoding: bool,
+    ) -> Result<&TyExpression, CompileError> {
         if is_new_encoding {
             match &logged_expr.expression {
                 TyExpressionVariant::FunctionApplication {
@@ -94,7 +110,7 @@ impl TypeMetadata {
                             logged_expr.span.clone(),
                         ))
                     } else {
-                        Ok(arguments[0].1.return_type)
+                        Ok(&arguments[0].1)
                     }
                 }
                 _ => Err(CompileError::Internal(
@@ -103,7 +119,7 @@ impl TypeMetadata {
                     ))
             }
         } else {
-            Ok(logged_expr.return_type)
+            Ok(logged_expr)
         }
     }
 
diff --git a/sway-ir/src/constant.rs b/sway-ir/src/constant.rs
index 6b5bf62550c..c91fcf5efbb 100644
--- a/sway-ir/src/constant.rs
+++ b/sway-ir/src/constant.rs
@@ -331,4 +331,14 @@ impl ConstantContent {
             _ => None,
         }
     }
+
+    pub fn as_string(&self) -> Option<String> {
+        match &self.value {
+            ConstantValue::String(v) => Some(
+                String::from_utf8(v.clone())
+                    .expect("compilation ensures that the string slice is a valid UTF-8 sequence"),
+            ),
+            _ => None,
+        }
+    }
 }
diff --git a/sway-lsp/Cargo.toml b/sway-lsp/Cargo.toml
index fb7da4f7950..67fe53a1024 100644
--- a/sway-lsp/Cargo.toml
+++ b/sway-lsp/Cargo.toml
@@ -53,7 +53,6 @@ urlencoding.workspace = true
 [dev-dependencies]
 assert-json-diff.workspace = true
 codspeed-criterion-compat.workspace = true
-criterion.workspace = true
 dirs.workspace = true
 futures = { workspace = true, default-features = false, features = [
     "std",
diff --git a/sway-types/Cargo.toml b/sway-types/Cargo.toml
index 13c53339949..aa0bbf26266 100644
--- a/sway-types/Cargo.toml
+++ b/sway-types/Cargo.toml
@@ -21,6 +21,7 @@ rustc-hash.workspace = true
 serde = { workspace = true, features = ["derive", "std", "rc"] }
 sway-utils.workspace = true
 thiserror.workspace = true
+toml.workspace = true
 
 [features]
 no-span-debug = []
diff --git a/sway-types/src/source_engine.rs b/sway-types/src/source_engine.rs
index fc5d082f071..1fa4053d8ec 100644
--- a/sway-types/src/source_engine.rs
+++ b/sway-types/src/source_engine.rs
@@ -1,10 +1,11 @@
-use crate::{ProgramId, SourceId};
+use crate::{LineCol, ProgramId, SourceId, Span};
 use parking_lot::RwLock;
 use std::{
     collections::{BTreeSet, HashMap},
-    path::PathBuf,
+    path::{Path, PathBuf},
     str::FromStr,
 };
+use toml::Table;
 
 /// The Source Engine manages a relationship between file paths and their corresponding
 /// integer-based source IDs. Additionally, it maintains the reverse - a map that traces
@@ -22,6 +23,10 @@ pub struct SourceEngine {
     source_to_path_map: RwLock<HashMap<SourceId, PathBuf>>,
     next_program_id: RwLock<u16>,
     manifest_path_to_program_map: RwLock<HashMap<PathBuf, ProgramId>>,
+    /// Stores the package name and version for manifest path,
+    /// if available in the Forc.toml file, or the fallback package name
+    /// coming from the last part of the manifest path, and an empty version string.
+    manifest_path_to_package_info: RwLock<HashMap<PathBuf, (String, String)>>,
     module_to_sources_map: RwLock<HashMap<ProgramId, BTreeSet<SourceId>>>,
 }
 
@@ -35,6 +40,9 @@ impl Clone for SourceEngine {
             manifest_path_to_program_map: RwLock::new(
                 self.manifest_path_to_program_map.read().clone(),
             ),
+            manifest_path_to_package_info: RwLock::new(
+                self.manifest_path_to_package_info.read().clone(),
+            ),
             module_to_sources_map: RwLock::new(self.module_to_sources_map.read().clone()),
         }
     }
@@ -171,4 +179,126 @@ impl SourceEngine {
         let s = self.module_to_sources_map.read();
         s.get(&program_id).cloned()
     }
+
+    // TODO: Do we want to parse Forc.toml files here, within the `SourceEngine`?
+    //       Currently, we don't have any other option to obtain the original package name and version.
+    //       But ideally, this and potentially other information should be passed to the compiler
+    //       from the tooling layer.
+    fn get_package_name_and_version(&self, manifest_path: &Path) -> (String, String) {
+        fn get_fallback_package_name_and_version(manifest_path: &Path) -> (String, String) {
+            // As a fallback, use the last part of the manifest path as the package name.
+            // This should actually never happen, because we should always have a valid
+            // Forc.toml file at the manifest path.
+            let package_dir_name = manifest_path
+                .iter()
+                .next_back()
+                .map(|p| p.to_string_lossy().to_string())
+                .unwrap_or_else(|| "<unknown>".to_string());
+            (package_dir_name, String::new())
+        }
+
+        fn get_project_field(toml: &Table, field_name: &str) -> Option<String> {
+            toml.get("project")
+                .and_then(|v| v.get(field_name))
+                .and_then(|field| field.as_str())
+                .map(|value| value.to_string())
+        }
+
+        let forc_toml_path = manifest_path.join("Forc.toml");
+        if !forc_toml_path.exists() {
+            return get_fallback_package_name_and_version(manifest_path);
+        }
+
+        let content = match std::fs::read_to_string(&forc_toml_path) {
+            Ok(content) => content,
+            Err(_) => return get_fallback_package_name_and_version(manifest_path),
+        };
+
+        let toml = match content.parse::<Table>() {
+            Ok(toml) => toml,
+            Err(_) => return get_fallback_package_name_and_version(manifest_path),
+        };
+
+        let package_name = get_project_field(&toml, "name").unwrap_or("<unknown>".to_string());
+        let package_version = get_project_field(&toml, "version").unwrap_or_default();
+
+        (package_name, package_version)
+    }
+
+    pub fn get_source_location(&self, span: &Span) -> SourceLocation {
+        let Some(source_id) = span.source_id() else {
+            return SourceLocation::unknown();
+        };
+
+        let source_file = self.get_path(source_id);
+
+        // Find the manifest path from the source file path.
+        let program_id = self
+            .get_program_id_from_manifest_path(&source_file)
+            .expect("the `source_file` is retrieved from the `SourceEngine::get_path` function so the manifest path and program id must exist");
+        let manifest_path = self.get_manifest_path_from_program_id(&program_id).expect(
+            "the `program_id` is retrieved from the `SourceEngine` so the manifest path must exist",
+        );
+
+        // TODO: Use HashSet::get_or_insert_with once it gets available (currently experimental).
+        //       See: https://doc.rust-lang.org/std/collections/struct.HashSet.html#method.get_or_insert_with
+        let mut package_infos = self.manifest_path_to_package_info.write();
+        let (package_name, package_version) = &package_infos
+            .entry(manifest_path.clone())
+            .or_insert_with(|| self.get_package_name_and_version(&manifest_path));
+
+        let pkg = if package_version.is_empty() {
+            package_name.clone()
+        } else {
+            format!("{}@{}", package_name, package_version)
+        };
+
+        // Get the relative path of the source file with respect to the manifest path.
+        let source_file = source_file
+            .strip_prefix(&manifest_path)
+            .expect("the `manifest_path` is a parent of the `source_file`")
+            .to_string_lossy();
+        let source_file = if let Some(source_file_no_leading_slash) = source_file.strip_prefix("/")
+        {
+            source_file_no_leading_slash.to_string()
+        } else {
+            source_file.to_string()
+        };
+
+        SourceLocation {
+            pkg,
+            file: source_file,
+            loc: span.start_line_col_one_index(),
+        }
+    }
+}
+
+/// A location in a source code file, represented by a package name, relative file path,
+/// and line/column within the file.
+#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
+pub struct SourceLocation {
+    /// The name and the version of the package that contains the source file,
+    /// in the format "name@version".
+    ///
+    /// E.g., "my_lib@0.1.0".
+    ///
+    /// The version is optional and may be omitted. E.g., "my_lib".
+    pub pkg: String,
+    /// The path to the source file, relative to the package root.
+    ///
+    /// E.g., "src/lib.rs".
+    pub file: String,
+    pub loc: LineCol,
+}
+
+impl SourceLocation {
+    /// Creates a new unknown `SourceLocation` instance, which has
+    /// package and file set to "<unknown>".
+    pub fn unknown() -> Self {
+        Self {
+            pkg: "<unknown>".to_string(),
+            file: "<unknown>".to_string(),
+            loc: LineCol::default(),
+        }
+    }
 }
diff --git a/sway-types/src/span.rs b/sway-types/src/span.rs
index 9c5b526bcc3..30021955b8a 100644
--- a/sway-types/src/span.rs
+++ b/sway-types/src/span.rs
@@ -348,7 +348,7 @@ impl<T: Spanned> Spanned for Box<T> {
     }
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct LineCol {
     pub line: usize,
     pub col: usize,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index 9c3e2a7a75a..cdf4bde8c7f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -61,86 +61,103 @@
   "configurables": [
     {
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
+      "indirect": false,
       "name": "BOOL",
       "offset": 5872
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "indirect": false,
       "name": "U8",
       "offset": 6064
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "indirect": false,
       "name": "ANOTHER_U8",
       "offset": 5800
     },
     {
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
+      "indirect": false,
       "name": "U16",
       "offset": 6008
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
+      "indirect": false,
       "name": "U32",
       "offset": 6048
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
+      "indirect": false,
       "name": "U64",
       "offset": 6056
     },
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
+      "indirect": false,
       "name": "U256",
       "offset": 6016
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
+      "indirect": false,
       "name": "B256",
       "offset": 5840
     },
     {
       "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
+      "indirect": false,
       "name": "CONFIGURABLE_STRUCT",
       "offset": 5960
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
+      "indirect": false,
       "name": "CONFIGURABLE_ENUM_A",
       "offset": 5880
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
+      "indirect": false,
       "name": "CONFIGURABLE_ENUM_B",
       "offset": 5920
     },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
+      "indirect": false,
       "name": "ARRAY_BOOL",
       "offset": 5808
     },
     {
       "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
+      "indirect": false,
       "name": "ARRAY_U64",
       "offset": 5816
     },
     {
       "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
+      "indirect": false,
       "name": "TUPLE_BOOL_U64",
       "offset": 5992
     },
     {
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
+      "indirect": false,
       "name": "STR_4",
       "offset": 5984
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "indirect": false,
       "name": "NOT_USED",
       "offset": 5976
     }
   ],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/json_abi_oracle_new_encoding.json
index b5e886d1a19..f76d8e06f79 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/json_abi_oracle_new_encoding.json
@@ -141,6 +141,7 @@
     }
   ],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle.json
index 07f42317619..317141c2f36 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle.json
@@ -16,6 +16,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
index 25b210026bf..8588287d114 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_ret_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_ret_intrinsic/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_ret_intrinsic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_ret_intrinsic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
index e4d28997902..76ea4402fdd 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
index d3062bbc070..f963b55721c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
@@ -2,6 +2,7 @@
   "concreteTypes": [],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [],
   "loggedTypes": [],
   "messagesTypes": [],
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_from_private_ancestor/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_from_private_ancestor/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_from_private_ancestor/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_from_private_ancestor/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/snapshot.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/snapshot.toml
index ab6f308f6b5..7bdc1ced234 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/snapshot.toml
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/snapshot.toml
@@ -1,5 +1,5 @@
 cmds = [
-    "forc build --path {root} --asm final | grep ecal",
-    "forc build --path {root} --release --asm final | grep ecal",
+    "forc build --path {root} --asm final | sub ecal",
+    "forc build --path {root} --release --asm final | sub ecal",
     "forc test --path {root} --logs",
-]
+]
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/stdout.snap
index f7031bc6a86..daab02f9da9 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/stdout.snap
@@ -1,7 +1,7 @@
 ---
 source: test/src/snapshot/mod.rs
 ---
-> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg --asm final | grep ecal
+> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg --asm final | sub ecal
 ecal $r0 $r2 $r3 $$retv       ; ecal id fd buf count
 ecal $r2 $r1 $zero $zero      ; ecal id fd zero zero
 ecal $r4 $r1 $r2 $r3          ; ecal id fd buf count
@@ -12,7 +12,7 @@ ecal $r3 $r0 $r1 $r2          ; ecal id fd buf count
 ecal $r2 $r0 $r1 $r3          ; ecal id fd buf count
 ecal $r3 $r1 $r2 $one         ; ecal id fd buf count
 
-> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg --release --asm final | grep ecal
+> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg --release --asm final | sub ecal
 
 > forc test --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg --logs
 exit status: 0
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/snapshot.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/snapshot.toml
index fd9a5d04396..97138716e13 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/snapshot.toml
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/snapshot.toml
@@ -1,4 +1,4 @@
 cmds = [
-    "forc build --path {root} --asm final | grep ecal",
-    "forc build --path {root} --release --asm final | grep ecal"
+    "forc build --path {root} --asm final | sub ecal",
+    "forc build --path {root} --release --asm final | sub ecal"
 ]
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/stdout.snap
index 59733f1c6fc..b028477cf99 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release/stdout.snap
@@ -1,7 +1,7 @@
 ---
 source: test/src/snapshot/mod.rs
 ---
-> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release --asm final | grep ecal
+> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release --asm final | sub ecal
 ecal $r3 $r0 $r1 $r2          ; ecal id fd buf count
 ecal $r3 $r0 $r1 $r2          ; ecal id fd buf count
 ecal $r3 $r0 $r1 $r2          ; ecal id fd buf count
@@ -11,7 +11,7 @@ ecal $r2 $r1 $zero $zero      ; ecal id fd zero zero
 ecal $r4 $r1 $r2 $r3          ; ecal id fd buf count
 ecal $r3 $r1 $r2 $one         ; ecal id fd buf count
 
-> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release --release --asm final | grep ecal
+> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg_release --release --asm final | sub ecal
 ecal $r4 $r5 $r2 $r3          ; ecal id fd buf count
 ecal $r2 $r3 $zero $zero      ; ecal id fd zero zero
 ecal $r0 $r2 $zero $zero      ; ecal id fd zero zero
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/transmute/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/transmute/json_abi_oracle_new_encoding.json
index 7ebeae3ddd5..304b3994beb 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/transmute/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/transmute/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
index 542c8009c36..2fa4be83d40 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
@@ -29,6 +29,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.encoding_v1.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.encoding_v1.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.encoding_v1.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.encoding_v1.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.json
index e88285b3d48..90fc9204758 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "0",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
index 64d80ab9878..f057f32a5c3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
index 92ddbbb270c..6eb8975bfe6 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
index a339f6ef46e..f068c1a0ed6 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
index 611b6c13c6d..e3da1df628f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
index 4320edea528..30f4be55ea0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
index 44236844825..9001146591c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
index ee7cb119623..27f8faf43b8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_generics/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_generics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
index 9fcae28cf1f..f13bac7e524 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
@@ -23,6 +23,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.lock
new file mode 100644
index 00000000000..f2f4700a8c1
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.lock
@@ -0,0 +1,16 @@
+[[package]]
+name = "panic_const_eval_string_slices_not_in_bytecode"
+source = "member"
+dependencies = [
+    "panicking_lib",
+    "std",
+]
+
+[[package]]
+name = "panicking_lib"
+source = "path+from-root-A86F78717C9300FF"
+dependencies = ["std"]
+
+[[package]]
+name = "std"
+source = "path+from-root-A86F78717C9300FF"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.toml
new file mode 100644
index 00000000000..1319d7b1481
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/Forc.toml
@@ -0,0 +1,9 @@
+[project]
+authors = ["Fuel Labs <contact@fuel.sh>"]
+entry = "main.sw"
+license = "Apache-2.0"
+name = "panic_const_eval_string_slices_not_in_bytecode"
+
+[dependencies]
+panicking_lib = { path = "../panicking_lib" }
+std = { path = "../../../../../reduced_std_libs/sway-lib-std-core" }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/snapshot.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/snapshot.toml
new file mode 100644
index 00000000000..cc7a67e7640
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/snapshot.toml
@@ -0,0 +1,3 @@
+cmds = [
+    "forc build --path {root} --experimental error_type --ir initial | regex '        (v0 = call call|v0 = const|v1 = const|revert)'"
+]
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/src/main.sw
new file mode 100644
index 00000000000..56aee3332da
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/src/main.sw
@@ -0,0 +1,20 @@
+script;
+
+// TODO: Move this test to ir_generation tests once experimental features are supported there.
+
+fn main() {
+    call_return_const_str_0();
+    panic "This is a panic string.";
+}
+
+fn return_const_str(choice: u8) -> str {
+    match choice {
+        0 => "This is the first panic string.",
+        1 => "This is the second panic string.",
+        _ => "This is a default panic string.",
+    }
+}
+
+fn call_return_const_str_0() {
+    panic return_const_str(0);
+}
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/stdout.snap
new file mode 100644
index 00000000000..3748999f773
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode/stdout.snap
@@ -0,0 +1,11 @@
+---
+source: test/src/snapshot/mod.rs
+assertion_line: 161
+---
+> forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_const_eval_string_slices_not_in_bytecode --experimental error_type --ir initial | regex '        (v0 = call call|v0 = const|v1 = const|revert)'
+        v0 = call call_return_const_str_0_1(), !18
+        v1 = const u64 18446744069414584321
+        revert v1, !19
+        v0 = const u64 18446744069414584320
+        revert v0, !23
+        v0 = const u64 1024
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.lock
new file mode 100644
index 00000000000..8af9335b4e2
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.lock
@@ -0,0 +1,16 @@
+[[package]]
+name = "panic_string_slices"
+source = "member"
+dependencies = [
+    "panicking_lib",
+    "std",
+]
+
+[[package]]
+name = "panicking_lib"
+source = "path+from-root-79F46FBB5D6E492C"
+dependencies = ["std"]
+
+[[package]]
+name = "std"
+source = "path+from-root-79F46FBB5D6E492C"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.toml
new file mode 100644
index 00000000000..864aeb14696
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/Forc.toml
@@ -0,0 +1,9 @@
+[project]
+authors = ["Fuel Labs <contact@fuel.sh>"]
+entry = "main.sw"
+license = "Apache-2.0"
+name = "panic_string_slices"
+
+[dependencies]
+panicking_lib = { path = "../panicking_lib" }
+std = { path = "../../../../../reduced_std_libs/sway-lib-std-core" }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/json_abi_oracle.json
new file mode 100644
index 00000000000..13c0a881e14
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/json_abi_oracle.json
@@ -0,0 +1,103 @@
+{
+  "concreteTypes": [
+    {
+      "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d",
+      "type": "()"
+    },
+    {
+      "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a",
+      "type": "str"
+    },
+    {
+      "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "type": "u8"
+    }
+  ],
+  "configurables": [],
+  "encodingVersion": "1",
+  "errorCodes": {
+    "18446744069414584320": {
+      "logId": null,
+      "msg": "This is the first panic string.",
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 31,
+        "pkg": "panic_string_slices"
+      }
+    },
+    "18446744069414584321": {
+      "logId": null,
+      "msg": "This is the second panic string.",
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 35,
+        "pkg": "panic_string_slices"
+      }
+    },
+    "18446744069414584322": {
+      "logId": null,
+      "msg": "This is a default panic string.",
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 39,
+        "pkg": "panic_string_slices"
+      }
+    },
+    "18446744069414584323": {
+      "logId": null,
+      "msg": "This is a panic string in then branch.",
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 43,
+        "pkg": "panic_string_slices"
+      }
+    },
+    "18446744069414584324": {
+      "logId": "10098701174489624218",
+      "msg": null,
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 27,
+        "pkg": "panic_string_slices"
+      }
+    },
+    "18446744069414584325": {
+      "logId": null,
+      "msg": "This is a panic string.",
+      "pos": {
+        "column": 5,
+        "file": "src/main.sw",
+        "line": 15,
+        "pkg": "panic_string_slices"
+      }
+    }
+  },
+  "functions": [
+    {
+      "attributes": null,
+      "inputs": [
+        {
+          "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+          "name": "choice"
+        }
+      ],
+      "name": "main",
+      "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
+    }
+  ],
+  "loggedTypes": [
+    {
+      "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a",
+      "logId": "10098701174489624218"
+    }
+  ],
+  "messagesTypes": [],
+  "metadataTypes": [],
+  "programType": "script",
+  "specVersion": "1.1"
+}
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/src/main.sw
new file mode 100644
index 00000000000..732cbc8d5c3
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/src/main.sw
@@ -0,0 +1,52 @@
+script;
+
+// TODO: Uncomment once str constants are supported.
+// const CONST: str = "This is a constant string.";
+
+fn main(choice: u8) {
+    // panic_const();
+    call_return_const_str_0();
+    call_return_const_str_1();
+    call_return_const_str_2();
+    panic_if_result();
+    call_return_const_str_no_const_eval(choice);
+    // TODO: Uncomment this line once https://github.com/FuelLabs/sway/issues/7107 is fixed.
+    // panic return_const_str(42);
+    panic "This is a panic string.";
+}
+
+fn return_const_str(choice: u8) -> str {
+    match choice {
+        0 => "This is the first panic string.",
+        1 => "This is the second panic string.",
+        _ => "This is a default panic string.",
+    }
+}
+
+fn call_return_const_str_no_const_eval(choice: u8) {
+    panic return_const_str(choice);
+}
+
+fn call_return_const_str_0() {
+    panic return_const_str(0);
+}
+
+fn call_return_const_str_1() {
+    panic return_const_str(1);
+}
+
+fn call_return_const_str_2() {
+    panic return_const_str(2);
+}
+
+fn panic_if_result() {
+    panic if true {
+        "This is a panic string in then branch."
+    } else {
+        "This is a panic string in else branch."
+    }
+}
+
+// fn panic_const() {
+//     panic CONST;
+// }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/test.toml
new file mode 100644
index 00000000000..bca5e92a32b
--- /dev/null
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panic_string_slices/test.toml
@@ -0,0 +1,3 @@
+category = "compile"
+validate_abi = true
+experimental = { error_type = true, new_encoding = true }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/Forc.toml
index 6bd65422749..c36b4f265c8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/Forc.toml
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/Forc.toml
@@ -3,6 +3,7 @@ authors = ["Fuel Labs <contact@fuel.sh>"]
 entry = "main.sw"
 license = "Apache-2.0"
 name = "panicking_contract"
+version = "1.2.3"
 
 [dependencies]
 panicking_lib = { path = "../panicking_lib" }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/src/main.sw
index 3d3ed950b1b..801ecef7754 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/src/main.sw
@@ -14,6 +14,7 @@ abi Abi {
     fn generic_panic_with_different_str_same_revert_code();
     fn generic_panic_with_error_type_enum();
     fn generic_panic_with_error_type_enum_different_variant_same_revert_code();
+    fn generic_function_with_non_generic_panic();
 }
 
 impl Abi for Contract {
@@ -60,6 +61,12 @@ impl Abi for Contract {
     fn generic_panic_with_error_type_enum_different_variant_same_revert_code() {
         generic_panic(ErrorEnum::B(42));
     }
+
+    fn generic_function_with_non_generic_panic() {
+        panicking_lib::generic_function_with_non_generic_panic::<u8>();
+        panicking_lib::generic_function_with_non_generic_panic::<u16>();
+        panicking_lib::generic_function_with_non_generic_panic::<u32>();
+    }
 }
 
 #[test(should_revert)]
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/stdout.snap
index 8194b8347ea..db6b57d2768 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract/stdout.snap
@@ -8,44 +8,44 @@ output:
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling library panicking_lib (test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib)
    Compiling contract panicking_contract (test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_contract)
-    Finished release [optimized + fuel] target(s) [8.168 KB] in ???
+    Finished release [optimized + fuel] target(s) [8.304 KB] in ???
      Running 11 tests, filtered 0 tests
 
 tested -- panicking_contract
 
-      test test_directly_panicking_method ... ok (???, 1735 gas)
+      test test_directly_panicking_method ... ok (???, 1736 gas)
 Decoded log value: C(true), log rb: 5503570629422409978
 Revert code: ffffffff00000000
-      test test_nested_panic_inlined ... ok (???, 2905 gas)
+      test test_nested_panic_inlined ... ok (???, 3012 gas)
 Decoded log value: E([AsciiString { data: "this" }, AsciiString { data: "is not" }, AsciiString { data: "the best practice" }]), log rb: 5503570629422409978
-Revert code: ffffffff00000004
-      test test_nested_panic_inlined_same_revert_code ... ok (???, 2905 gas)
+Revert code: ffffffff00000005
+      test test_nested_panic_inlined_same_revert_code ... ok (???, 3012 gas)
 Decoded log value: E([AsciiString { data: "this" }, AsciiString { data: "is not" }, AsciiString { data: "the best practice" }]), log rb: 5503570629422409978
-Revert code: ffffffff00000004
-      test test_nested_panic_not_inlined ... ok (???, 3098 gas)
-Decoded log value: E([AsciiString { data: "to have" }, AsciiString { data: "strings" }, AsciiString { data: "in error enum variants" }]), log rb: 5503570629422409978
 Revert code: ffffffff00000005
-      test test_nested_panic_not_inlined_same_revert_code ... ok (???, 3098 gas)
+      test test_nested_panic_not_inlined ... ok (???, 3205 gas)
 Decoded log value: E([AsciiString { data: "to have" }, AsciiString { data: "strings" }, AsciiString { data: "in error enum variants" }]), log rb: 5503570629422409978
-Revert code: ffffffff00000005
-      test test_generic_panic_with_unit ... ok (???, 2055 gas)
+Revert code: ffffffff00000006
+      test test_nested_panic_not_inlined_same_revert_code ... ok (???, 3205 gas)
+Decoded log value: E([AsciiString { data: "to have" }, AsciiString { data: "strings" }, AsciiString { data: "in error enum variants" }]), log rb: 5503570629422409978
+Revert code: ffffffff00000006
+      test test_generic_panic_with_unit ... ok (???, 2162 gas)
 Decoded log value: (), log rb: 3330666440490685604
-Revert code: ffffffff00000003
-      test test_generic_panic_with_unit_same_revert_code ... ok (???, 2055 gas)
+Revert code: ffffffff00000004
+      test test_generic_panic_with_unit_same_revert_code ... ok (???, 2162 gas)
 Decoded log value: (), log rb: 3330666440490685604
-Revert code: ffffffff00000003
-      test test_generic_panic_with_str ... ok (???, 2068 gas)
+Revert code: ffffffff00000004
+      test test_generic_panic_with_str ... ok (???, 2175 gas)
 Decoded log value: AsciiString { data: "generic panic with string" }, log rb: 10098701174489624218
-Revert code: ffffffff00000001
-      test test_generic_panic_with_different_str_same_revert_code ... ok (???, 1750 gas)
+Revert code: ffffffff00000002
+      test test_generic_panic_with_different_str_same_revert_code ... ok (???, 1857 gas)
 Decoded log value: AsciiString { data: "generic panic with different string" }, log rb: 10098701174489624218
-Revert code: ffffffff00000001
-      test test_generic_panic_with_error_type_enum ... ok (???, 1880 gas)
-Decoded log value: A, log rb: 5503570629422409978
 Revert code: ffffffff00000002
-      test test_generic_panic_with_error_type_enum_different_variant_same_revert_code ... ok (???, 2043 gas)
+      test test_generic_panic_with_error_type_enum ... ok (???, 1987 gas)
+Decoded log value: A, log rb: 5503570629422409978
+Revert code: ffffffff00000003
+      test test_generic_panic_with_error_type_enum_different_variant_same_revert_code ... ok (???, 2150 gas)
 Decoded log value: B(42), log rb: 5503570629422409978
-Revert code: ffffffff00000002
+Revert code: ffffffff00000003
 
 test result: OK. 11 passed; 0 failed; finished in ???
 
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/src/lib.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/src/lib.sw
index d0b602a04c6..b526c06f52f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/src/lib.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/src/lib.sw
@@ -74,6 +74,10 @@ pub fn generic_panic<T>(t: T) where T: Error {
     panic t;
 }
 
+pub fn generic_function_with_non_generic_panic<T>() {
+    panic "This is a non-generic panic in a generic function.";
+}
+
 #[test(should_revert)]
 fn test_generic_panic_with_unit() {
     generic_panic(());
@@ -116,7 +120,7 @@ fn test_panic_with_unit() {
 
 #[test(should_revert)]
 fn test_panic_with_str() {
-    panic "panic with string";
+    panic "panic with string"; // No log emitted here.
 }
 
 #[test(should_revert)]
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/stdout.snap
index 86cfba9ff5c..4667c048daa 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib/stdout.snap
@@ -7,7 +7,7 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling library panicking_lib (test/src/e2e_vm_tests/test_programs/should_pass/language/panic_expression/panicking_lib)
-    Finished release [optimized + fuel] target(s) [6.056 KB] in ???
+    Finished release [optimized + fuel] target(s) [5.832 KB] in ???
      Running 18 tests, filtered 0 tests
 
 tested -- panicking_lib
@@ -30,10 +30,10 @@ Revert code: ffffffff00000002
       test test_generic_panic_with_unit_same_revert_code ... ok (???, 189 gas)
 Decoded log value: (), log rb: 3330666440490685604
 Revert code: ffffffff00000002
-      test test_generic_panic_with_str ... ok (???, 307 gas)
+      test test_generic_panic_with_str ... ok (???, 288 gas)
 Decoded log value: AsciiString { data: "generic panic with string" }, log rb: 10098701174489624218
 Revert code: ffffffff00000003
-      test test_generic_panic_with_different_str_same_revert_code ... ok (???, 307 gas)
+      test test_generic_panic_with_different_str_same_revert_code ... ok (???, 288 gas)
 Decoded log value: AsciiString { data: "generic panic different string" }, log rb: 10098701174489624218
 Revert code: ffffffff00000003
       test test_generic_panic_with_error_type_enum_variant ... ok (???, 327 gas)
@@ -48,8 +48,7 @@ Revert code: ffffffff00000005
       test test_panic_with_unit ... ok (???, 189 gas)
 Decoded log value: (), log rb: 3330666440490685604
 Revert code: ffffffff00000006
-      test test_panic_with_str ... ok (???, 307 gas)
-Decoded log value: AsciiString { data: "panic with string" }, log rb: 10098701174489624218
+      test test_panic_with_str ... ok (???, 19 gas)
 Revert code: ffffffff00000007
       test test_panic_with_error_type_enum ... ok (???, 431 gas)
 Decoded log value: C(true), log rb: 2721958641300806892
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
index 2785b32ab24..70d107bcf7a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
index 6166d46c699..d049eb67e18 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
index 36d7f625c38..55fa1c7b7e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
index 4e7e23a6f3a..94fed1f286d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
index 70d0e8d8ab3..405cc194c13 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
index 983f51b0a4b..e0523ffb677 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_intrinsics/json_abi_oracle_new_encoding.json
index bf5debeec20..138a098dc40 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_intrinsics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_intrinsics/json_abi_oracle_new_encoding.json
@@ -11,6 +11,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
index dfbd54db3a4..893a066ba9b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
index 2ab312180d3..a17f9685979 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
@@ -65,6 +65,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
index 79842b24ed9..1c437c0711c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/totalord/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/totalord/json_abi_oracle_new_encoding.json
index 5d9532112a9..0239b78ca76 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/totalord/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/totalord/json_abi_oracle_new_encoding.json
@@ -27,6 +27,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
index 33a992a9fbc..b3154a130d4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
@@ -8,11 +8,13 @@
   "configurables": [
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
+      "indirect": false,
       "name": "SOME_U256",
       "offset": 728
     }
   ],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
index 022cfe8ab4c..f9d208201dc 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
@@ -8,6 +8,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
index ea0a762cd2d..eee25deab86 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
index be319f53762..776f737a281 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
index d59478ab357..de3f62abff5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
index d59478ab357..de3f62abff5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
index d59478ab357..de3f62abff5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
index 05b0f04b2d3..ef2c5ac3b1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
index 2543df7733e..3f74b3d8ac6 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
@@ -52,6 +52,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
index bf5debeec20..138a098dc40 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
@@ -11,6 +11,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
index 2543df7733e..3f74b3d8ac6 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
@@ -52,6 +52,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
index bf5debeec20..138a098dc40 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
@@ -11,6 +11,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
index aab161b0506..6721eda975b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
index ad33ec5b9e4..6e958bc77e0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
index 384c6b19008..5708c10c69e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
@@ -16,6 +16,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
index 668a88f2e07..62f4d8d6ead 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
index 2ddcfc0101a..38e1c79005a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
index 59b99c5020b..bf61ae5ed11 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
index 59b99c5020b..bf61ae5ed11 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
index 3c91baf4830..55f9dcfa3e0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
index 97235341a02..d5e99ecc62e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
index b9405753ac8..01837dfd4fc 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.json
index acc54cf39b3..4e61bd4de6f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
index 8c5867d2d6a..8e5922afe90 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
@@ -83,6 +83,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
index 2612bacc0d7..1117664c721 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
@@ -29,6 +29,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
index def96385449..66e90e8baec 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
@@ -22,6 +22,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
index 900b92717f2..24dc16b2610 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
@@ -22,6 +22,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
index 68a28651188..de6a7b87a73 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
index 6b05e8ae081..be007ae14ac 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
index 2f821ed58f1..bf0a10f1d28 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
@@ -44,6 +44,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
index f977048eae3..6cef76d408a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
@@ -17,6 +17,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
index e687a917725..a131444431a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
@@ -39,6 +39,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
index edd98a1f3d1..d5b3f7e92ba 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
@@ -15,6 +15,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
index 6da9ef90fa3..df3c732d47a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
@@ -12,6 +12,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
index 08401781dda..423504f2953 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
@@ -11,6 +11,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
index 874368e84fd..42a86e8c1bc 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
@@ -17,6 +17,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
index 7f2920780b5..b78da454d95 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
@@ -15,6 +15,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
index 9a1f9ebd31e..6493abb1333 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
@@ -50,6 +50,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
index 32bd4e374ca..252a86addc3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
@@ -7,6 +7,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
index a7b039e5eeb..782cf5d1d3c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
@@ -40,6 +40,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": [
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
index 09fce104773..a2e576dbb0a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
@@ -21,6 +21,7 @@
   ],
   "configurables": [],
   "encodingVersion": "1",
+  "errorCodes": {},
   "functions": [
     {
       "attributes": null,
diff --git a/test/src/ir_generation/mod.rs b/test/src/ir_generation/mod.rs
index 6a078a0d8ea..334598eb4ec 100644
--- a/test/src/ir_generation/mod.rs
+++ b/test/src/ir_generation/mod.rs
@@ -10,7 +10,7 @@ use sway_core::{
     compile_ir_context_to_finalized_asm, compile_to_ast,
     ir_generation::compile_program,
     namespace::{self, Package},
-    BuildConfig, BuildTarget, Engines, OptLevel,
+    BuildConfig, BuildTarget, Engines, OptLevel, PanicOccurrences,
 };
 use sway_error::handler::Handler;
 
@@ -282,7 +282,8 @@ pub(super) async fn run(
 
                 // Compile to IR.
                 let include_tests = true;
-                let mut ir = compile_program(typed_program, include_tests, &engines, experimental)
+                let mut panic_occurrences = PanicOccurrences::default();
+                let mut ir = compile_program(typed_program, &mut panic_occurrences, include_tests, &engines, experimental)
                     .unwrap_or_else(|e| {
                         use sway_types::span::Spanned;
                         let e = e[0].clone();
diff --git a/test/src/snapshot/mod.rs b/test/src/snapshot/mod.rs
index e22c4780aee..6657d5ffdd2 100644
--- a/test/src/snapshot/mod.rs
+++ b/test/src/snapshot/mod.rs
@@ -79,10 +79,12 @@ pub(super) async fn run(filter_regex: Option<&regex::Regex>) -> Result<()> {
 
                     let mut last_output: Option<String> = None;
 
-                    for cmd in cmd.split("|") {
+                    // We intentionally split the command by " | " to allow for
+                    // `regex` command to support `|` operator, although without
+                    // surrounding spaces.
+                    for cmd in cmd.split(" | ") {
                         let cmd = cmd.trim();
 
-                        // known commands
                         let cmd = if let Some(cmd) = cmd.strip_prefix("forc doc ") {
                             FORC_DOC_COMPILATION.call_once(|| {
                                 compile_forc_doc();
@@ -93,7 +95,7 @@ pub(super) async fn run(filter_regex: Option<&regex::Regex>) -> Result<()> {
                                 compile_forc();
                             });
                             format!("target/release/forc {cmd} 1>&2")
-                        } else if let Some(cmd) = cmd.strip_prefix("grep ") {
+                        } else if let Some(cmd) = cmd.strip_prefix("sub ") {
                             let arg = cmd.trim();
                             if let Some(l) = last_output.take() {
                                 let mut new_output = String::new();
@@ -106,8 +108,23 @@ pub(super) async fn run(filter_regex: Option<&regex::Regex>) -> Result<()> {
                                 last_output = Some(new_output);
                             }
                             continue;
+                        } else if let Some(cmd) = cmd.strip_prefix("regex ") {
+                            let arg = cmd.trim();
+                            let arg = arg.trim_matches('\'');
+                            let regex = Regex::new(arg).expect("regex provided to the snapshot `regex` filter is not a valid Rust regex");
+                            if let Some(l) = last_output.take() {
+                                let mut new_output = String::new();
+                                for line in l.lines() {
+                                    if regex.is_match(line) {
+                                        new_output.push_str(line);
+                                        new_output.push('\n');
+                                    }
+                                }
+                                last_output = Some(new_output);
+                            }
+                            continue;
                         } else {
-                            panic!("Not supported. Possible commands: forc")
+                            panic!("`{cmd}` is not a supported snapshot command.\nPossible tool commands: forc doc, forc\nPossible filtering commands: sub, regex");
                         };
 
                         let o = duct::cmd!("bash", "-c", cmd.clone())