From 54ca7dd57762ef2fd3a77f0b44dc38e8854badc8 Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Sat, 6 Jul 2024 10:25:52 +0530 Subject: [PATCH 01/47] LDC multi-chunk contract With the target contract broken down into chunks (with sizes that are word aligned), we can load it in pieces and then execute. --- sway-lib-std/src/execution.sw | 39 +++++++++++++++++++ .../test_projects/run_external_proxy/mod.rs | 26 ++++++++++--- .../run_external_proxy/src/main.sw | 11 +++--- 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/sway-lib-std/src/execution.sw b/sway-lib-std/src/execution.sw index f5a03395793..095a65c2bc5 100644 --- a/sway-lib-std/src/execution.sw +++ b/sway-lib-std/src/execution.sw @@ -30,3 +30,42 @@ pub fn run_external(load_target: ContractId) -> ! { } __jmp_mem() } + +pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { + asm( + load_target1: load_target1, + load_target2: load_target2, + load_target2_heap, + heap_alloc_size, + length1, + length2, + ssp_saved, + cur_stack_size, + ) { + // Get lengths of both chunks + csiz length1 load_target1; + csiz length2 load_target2; + + // Store load_target2 on the heap as it'll be overwritten with the first LDC we do. + addi heap_alloc_size zero i32; + aloc heap_alloc_size; + mcp hp load_target2 heap_alloc_size; + move load_target2_heap hp; + + // Save the old $ssp value as that's were the contract will be loaded. + move ssp_saved ssp; + // Shrink the stack since LDC wants $ssp == $sp + sub cur_stack_size sp ssp; + cfs cur_stack_size; + + // Do the loads + ldc load_target1 zero length1; + ldc load_target2_heap zero length2; + + // __jmp_mem jumps to $MEM[$hp], so set that up. + addi heap_alloc_size zero i64; + aloc heap_alloc_size; + sw hp ssp_saved i0; + } + __jmp_mem() +} \ No newline at end of file diff --git a/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs b/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs index 02882c79fda..6cb5a33ddc9 100644 --- a/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs +++ b/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs @@ -9,8 +9,8 @@ abigen!(Contract( async fn run_external_can_proxy_call() { let wallet = launch_provider_and_get_wallet().await.unwrap(); - let target_id = Contract::load_from( - "test_projects/run_external_target/out/release/run_external_target.bin", + let target_id1 = Contract::load_from( + "test_projects/run_external_target/out/release/part-1.bin", LoadConfiguration::default() .with_storage_configuration(StorageConfiguration::default().with_autoload(false)), ) @@ -19,8 +19,22 @@ async fn run_external_can_proxy_call() { .await .unwrap(); + let target_id2 = Contract::load_from( + "test_projects/run_external_target/out/release/part-2.bin", + LoadConfiguration::default() + .with_storage_configuration(StorageConfiguration::default().with_autoload(false)), + ) + .unwrap() + .deploy(&wallet, TxPolicies::default()) + .await + .unwrap(); + + dbg!(&target_id1, &target_id2); + let configurables = RunExternalProxyContractConfigurables::default() - .with_TARGET(target_id.clone().into()) + .with_TARGET_1(target_id1.clone().into()) + .unwrap() + .with_TARGET_2(target_id2.clone().into()) .unwrap(); let id = Contract::load_from( "test_projects/run_external_proxy/out/release/run_external_proxy.bin", @@ -40,7 +54,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .large_value() - .with_contract_ids(&[target_id.clone().into()]) + .with_contract_ids(&[target_id1.clone().into(), target_id2.clone().into()]) .call() .await .unwrap(); @@ -72,7 +86,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .double_value(42) - .with_contract_ids(&[target_id.clone().into()]) + .with_contract_ids(&[target_id1.clone().into(), target_id2.clone().into()]) .call() .await .unwrap(); @@ -101,7 +115,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .does_not_exist_in_the_target(42) - .with_contract_ids(&[target_id.into()]) + .with_contract_ids(&[target_id1.into(), target_id2.into()]) .call() .await .unwrap(); diff --git a/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw b/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw index cadfb1192a6..89cf10fcf57 100644 --- a/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw +++ b/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw @@ -1,9 +1,10 @@ contract; -use std::execution::run_external; +use std::execution::run_external2; configurable { - TARGET: ContractId = ContractId::zero(), + TARGET_1: ContractId = ContractId::zero(), + TARGET_2: ContractId = ContractId::zero(), } abi RunExternalTest { @@ -15,16 +16,16 @@ abi RunExternalTest { impl RunExternalTest for Contract { fn double_value(_foo: u64) -> u64 { __log(1); - run_external(TARGET) + run_external2(TARGET_1, TARGET_2) } fn large_value() -> b256 { - run_external(TARGET) + run_external2(TARGET_1, TARGET_2) } // ANCHOR: does_not_exist_in_the_target fn does_not_exist_in_the_target(_foo: u64) -> u64 { - run_external(TARGET) + run_external2(TARGET_1, TARGET_2) } // ANCHOR_END: does_not_exist_in_the_target } From 40f371f4f2582608c18484d3317407166e72b734 Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Tue, 9 Jul 2024 11:54:34 +0530 Subject: [PATCH 02/47] Some updates to build with dento/blob-tx branches of fuel-core and fuel-vm --- Cargo.lock | 1718 +++++++++-------- Cargo.toml | 23 +- sway-core/src/asm_generation/finalized_asm.rs | 2 + sway-core/src/asm_lang/allocated_ops.rs | 17 +- sway-core/src/asm_lang/mod.rs | 57 +- sway-core/src/asm_lang/virtual_ops.rs | 18 +- 6 files changed, 1049 insertions(+), 786 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6534b524472..7ee9f62ddf0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -238,12 +238,6 @@ dependencies = [ "critical-section", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "atty" version = "0.2.14" @@ -263,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -272,6 +266,53 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "axum" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.73" @@ -283,7 +324,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.1", + "object 0.36.0", "rustc-demangle", "serde", ] @@ -362,15 +403,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -407,11 +448,33 @@ dependencies = [ "constant_time_eq 0.1.5", ] +[[package]] +name = "blake2b_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "constant_time_eq 0.3.0", +] + +[[package]] +name = "blake2s_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "constant_time_eq 0.3.0", +] + [[package]] name = "blake3" -version = "1.5.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -458,7 +521,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "syn_derive", ] @@ -542,9 +605,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cast" @@ -554,12 +617,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.5" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -592,7 +656,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -624,14 +688,15 @@ dependencies = [ [[package]] name = "cid" -version = "0.11.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" dependencies = [ "core2", "multibase", - "multihash 0.19.1", - "unsigned-varint 0.8.0", + "multihash 0.18.1", + "serde", + "unsigned-varint", ] [[package]] @@ -652,7 +717,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -661,9 +726,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -671,9 +736,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -684,11 +749,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", ] [[package]] @@ -697,20 +762,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -817,12 +882,6 @@ dependencies = [ "unreachable", ] -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - [[package]] name = "common-multipart-rfc7578" version = "0.6.0" @@ -832,7 +891,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.12", + "http", "mime", "mime_guess", "rand", @@ -841,15 +900,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" +checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" [[package]] name = "completest-pty" -version = "0.5.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" +checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" dependencies = [ "completest", "ptyprocess", @@ -862,7 +921,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "entities", "memchr", "once_cell", @@ -886,7 +945,6 @@ dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", - "unicode-width", "windows-sys 0.52.0", ] @@ -1009,7 +1067,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.9", + "clap 4.5.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1135,6 +1193,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ct-logs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" +dependencies = [ + "sct 0.6.1", +] + [[package]] name = "ctr" version = "0.9.2" @@ -1167,7 +1234,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1177,7 +1244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1afa0591b1021e427e548a1f0f147fe6168f6c7c7f7006bace77f28856051b8" dependencies = [ "cynic-proc-macros", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "static_assertions", @@ -1233,12 +1300,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1257,16 +1324,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1282,13 +1349,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.9", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1382,7 +1449,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1402,19 +1469,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dialoguer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" -dependencies = [ - "console", - "shell-words", - "tempfile", - "thiserror", - "zeroize", -] - [[package]] name = "diff" version = "0.1.13" @@ -1588,9 +1642,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -1667,7 +1721,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1680,7 +1734,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1809,6 +1863,21 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" +[[package]] +name = "eventsource-client" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9146112ee3ce031aa5aebe3e049e10b1d353b9c7630cc6be488c2c62cc5d9c42" +dependencies = [ + "futures", + "hyper", + "hyper-rustls 0.22.1", + "hyper-timeout", + "log", + "pin-project", + "tokio", +] + [[package]] name = "eventsource-client" version = "0.12.2" @@ -1816,7 +1885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29" dependencies = [ "futures", - "hyper 0.14.30", + "hyper", "hyper-rustls 0.24.2", "hyper-timeout", "log", @@ -1843,7 +1912,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1862,12 +1931,6 @@ dependencies = [ "regex", ] -[[package]] -name = "faster-hex" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" - [[package]] name = "fastrand" version = "2.1.0" @@ -1980,21 +2043,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forc" -version = "0.62.0" +version = "0.61.2" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "clap_complete_fig", "completest-pty", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "fs_extra", - "fuel-asm", + "fuel-asm 0.54.1", "hex", "serde", "serde_json", @@ -2016,34 +2079,31 @@ dependencies = [ [[package]] name = "forc-client" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.9", + "clap 4.5.7", "devault", - "dialoguer", "forc", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-tx", "forc-util", "forc-wallet", "fuel-abi-types", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-vm", - "fuels", + "fuel-core-client 0.30.0", + "fuel-core-types 0.30.0", + "fuel-crypto 0.54.1", + "fuel-tx 0.54.1", + "fuel-vm 0.54.1", "fuels-accounts", "fuels-core", "futures", "hex", "portpicker", "rand", - "rexpect 0.5.0", "rpassword", "serde", "serde_json", @@ -2058,16 +2118,16 @@ dependencies = [ [[package]] name = "forc-crypto" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.9", - "forc-tracing 0.62.0", + "clap 4.5.7", + "forc-tracing 0.61.2", "forc-util", - "fuel-core-types", - "fuel-crypto", + "fuel-core-types 0.30.0", + "fuel-crypto 0.54.1", "fuels-core", "futures", "hex", @@ -2084,21 +2144,21 @@ dependencies = [ [[package]] name = "forc-debug" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dap", "escargot", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", - "fuel-core-client", - "fuel-types", - "fuel-vm", + "forc-tracing 0.61.2", + "fuel-core-client 0.30.0", + "fuel-types 0.54.1", + "fuel-vm 0.54.1", "portpicker", "rayon", - "rexpect 0.4.0", + "rexpect", "serde", "serde_json", "shellfish", @@ -2110,15 +2170,15 @@ dependencies = [ [[package]] name = "forc-doc" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "comrak", "dir_indexer", "expect-test", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "horrorshow", "include_dir", @@ -2135,12 +2195,12 @@ dependencies = [ [[package]] name = "forc-fmt" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "prettydiff 0.5.1", "sway-core", @@ -2152,10 +2212,10 @@ dependencies = [ [[package]] name = "forc-lsp" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2163,13 +2223,13 @@ dependencies = [ [[package]] name = "forc-pkg" -version = "0.62.0" +version = "0.61.2" dependencies = [ "ansi_term", "anyhow", "byte-unit", "cid", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "fuel-abi-types", "futures", @@ -2179,7 +2239,7 @@ dependencies = [ "ipfs-api-backend-hyper", "petgraph", "regex", - "reqwest 0.12.5", + "reqwest", "semver", "serde", "serde_ignored", @@ -2191,7 +2251,7 @@ dependencies = [ "sway-utils", "sysinfo", "tar", - "toml 0.8.15", + "toml 0.7.8", "tracing", "url", "vec1", @@ -2200,13 +2260,13 @@ dependencies = [ [[package]] name = "forc-test" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "forc-pkg", "fuel-abi-types", - "fuel-tx", - "fuel-vm", + "fuel-tx 0.54.1", + "fuel-vm 0.54.1", "fuels-core", "rand", "rayon", @@ -2227,7 +2287,7 @@ dependencies = [ [[package]] name = "forc-tracing" -version = "0.62.0" +version = "0.61.2" dependencies = [ "ansi_term", "tracing", @@ -2237,14 +2297,14 @@ dependencies = [ [[package]] name = "forc-tx" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "devault", "forc-util", - "fuel-tx", - "fuel-types", + "fuel-tx 0.54.1", + "fuel-types 0.54.1", "serde", "serde_json", "thiserror", @@ -2252,16 +2312,16 @@ dependencies = [ [[package]] name = "forc-util" -version = "0.62.0" +version = "0.61.2" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dirs 3.0.2", "fd-lock 4.0.2", - "forc-tracing 0.62.0", - "fuel-tx", + "forc-tracing 0.61.2", + "fuel-tx 0.54.1", "hex", "paste", "regex", @@ -2279,16 +2339,16 @@ dependencies = [ [[package]] name = "forc-wallet" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e88edfd8c98861cdf0c27ccea3d81b0033b1e80d3d22367fd0fd4e2b58dc9dd" +checksum = "be34342dd836a895201d271c9f0ffbde2eb146e1f3a09e55af373348dcd19c8d" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "eth-keystore", "forc-tracing 0.47.0", - "fuel-crypto", - "fuel-types", + "fuel-crypto 0.52.0", + "fuel-types 0.52.0", "fuels", "fuels-core", "futures", @@ -2355,33 +2415,54 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.71", + "syn 2.0.66", "thiserror", ] [[package]] name = "fuel-asm" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" +checksum = "9e3effa050e7e838d1eff68ca49f2d97558c4f90d13b2ac439253dfa3267c022" +dependencies = [ + "bitflags 2.5.0", + "fuel-types 0.52.0", + "serde", + "strum 0.24.1", +] + +[[package]] +name = "fuel-asm" +version = "0.54.1" dependencies = [ - "bitflags 2.6.0", - "fuel-types", + "bitflags 2.5.0", + "fuel-types 0.54.1", + "serde", + "strum 0.24.1", +] + +[[package]] +name = "fuel-asm" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +dependencies = [ + "bitflags 2.5.0", + "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", "serde", "strum 0.24.1", ] [[package]] name = "fuel-core-chain-config" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" +checksum = "d3c94ef1b699c840063968db8c6ed0e2c4f8459148cf1c2653fafad867591a36" dependencies = [ "anyhow", "bech32", "derivative", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.28.0", "itertools 0.12.1", "postcard", "rand", @@ -2393,20 +2474,42 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" +checksum = "671ea8ab1631ffae3f00313c4f1ef169fd0409f6ef5a90532291ce515b88b242" +dependencies = [ + "anyhow", + "cynic", + "derive_more", + "eventsource-client 0.10.2", + "fuel-core-types 0.28.0", + "futures", + "hex", + "hyper-rustls 0.24.2", + "itertools 0.12.1", + "reqwest", + "schemafy_lib", + "serde", + "serde_json", + "tai64", + "thiserror", + "tracing", +] + +[[package]] +name = "fuel-core-client" +version = "0.30.0" dependencies = [ "anyhow", "cynic", "derive_more", - "eventsource-client", - "fuel-core-types", + "eventsource-client 0.12.2", + "fuel-core-types 0.30.0", "futures", "hex", "hyper-rustls 0.24.2", "itertools 0.12.1", - "reqwest 0.11.27", + "reqwest", "schemafy_lib", "serde", "serde_json", @@ -2417,11 +2520,12 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e2f22f6c4ce2696c29c14083c465f276c8d8eca67f051cb7d09a72442ceb5e" +checksum = "c20c57acd2e55b0243510cd24c123b039b847eaf74da1852ff758bbafec1743a" dependencies = [ - "parking_lot 0.12.3", + "axum", + "once_cell", "pin-project-lite", "prometheus-client", "regex", @@ -2430,16 +2534,16 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" +checksum = "b33fb412a25993ae33137251cbd6dad6fc71e8f7489e009b3ab82c244323d3c3" dependencies = [ "anyhow", "async-trait", "fuel-core-chain-config", "fuel-core-services", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.28.0", "tokio", "tokio-stream", "tracing", @@ -2447,9 +2551,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8a175199e0e7b1373ac10d45eb26563c1e8299298c9589ab60efb1c7cae6ac" +checksum = "862791e22d79dc2ce76b27fd57e44d827ae7f0f4dfd7c56fc1fdf7a9bc0286af" dependencies = [ "anyhow", "async-trait", @@ -2462,15 +2566,15 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" +checksum = "0d384d6fbb284aa2b2b76c384261015d9cdb47ca94b898d671f9e2836fc53ec8" dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types", - "fuel-vm", + "fuel-core-types 0.28.0", + "fuel-vm 0.52.0", "impl-tools", "itertools 0.12.1", "num_enum 0.7.2", @@ -2484,15 +2588,15 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.31.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" +checksum = "0ecaf471ba500e936abac536af31d9f5ebdcf89d7fa1a348919fa38af55161a5" dependencies = [ "anyhow", "bs58", "derivative", "derive_more", - "fuel-vm", + "fuel-vm 0.52.0", "rand", "secrecy", "serde", @@ -2501,17 +2605,72 @@ dependencies = [ "zeroize", ] +[[package]] +name = "fuel-core-types" +version = "0.30.0" +dependencies = [ + "anyhow", + "bs58", + "derivative", + "derive_more", + "fuel-vm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "secrecy", + "serde", + "tai64", + "thiserror", + "zeroize", +] + [[package]] name = "fuel-crypto" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" +checksum = "a60228bcd5439c9bf206cf337d7d02b40efc56140769db52c2c035d43feb832b" +dependencies = [ + "coins-bip32", + "coins-bip39", + "ecdsa", + "ed25519-dalek", + "fuel-types 0.52.0", + "k256", + "lazy_static", + "p256", + "rand", + "secp256k1 0.26.0", + "serde", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "fuel-crypto" +version = "0.54.1" +dependencies = [ + "coins-bip32", + "coins-bip39", + "ecdsa", + "ed25519-dalek", + "fuel-types 0.54.1", + "k256", + "lazy_static", + "p256", + "rand", + "secp256k1 0.26.0", + "serde", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "fuel-crypto" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" dependencies = [ "coins-bip32", "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types", + "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", "k256", "lazy_static", "p256", @@ -2524,13 +2683,34 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" +checksum = "9f987a055f018d138248d530a0a40354fa173288c3f81db5b3dfb5087562ebdf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", + "synstructure 0.13.1", +] + +[[package]] +name = "fuel-derive" +version = "0.54.1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure 0.13.1", +] + +[[package]] +name = "fuel-derive" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", "synstructure 0.13.1", ] @@ -2583,13 +2763,40 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" +checksum = "3c82370a37e83c53d0a06ce580ccfc4e36eb4cf2b23e67a142de4491d8a2d624" +dependencies = [ + "derive_more", + "digest 0.10.7", + "fuel-storage 0.52.0", + "hashbrown 0.13.2", + "hex", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "fuel-merkle" +version = "0.54.1" +dependencies = [ + "derive_more", + "digest 0.10.7", + "fuel-storage 0.54.1", + "hashbrown 0.13.2", + "hex", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "fuel-merkle" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage", + "fuel-storage 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", "hashbrown 0.13.2", "hex", "serde", @@ -2598,23 +2805,75 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" +checksum = "51fc51ee30c4e8b447b4579351128466c507687748d3f1ae9740481d8ef5d5c5" + +[[package]] +name = "fuel-storage" +version = "0.54.1" + +[[package]] +name = "fuel-storage" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" [[package]] name = "fuel-tx" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" +checksum = "23baeb39cbc093b66adb951a205f1696bf2403c0bb1a667fb98ddedeb299a8cb" +dependencies = [ + "bitflags 2.5.0", + "derivative", + "derive_more", + "fuel-asm 0.52.0", + "fuel-crypto 0.52.0", + "fuel-merkle 0.52.0", + "fuel-types 0.52.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "postcard", + "rand", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", +] + +[[package]] +name = "fuel-tx" +version = "0.54.1" +dependencies = [ + "bitflags 2.5.0", + "derivative", + "derive_more", + "fuel-asm 0.54.1", + "fuel-crypto 0.54.1", + "fuel-merkle 0.54.1", + "fuel-types 0.54.1", + "hashbrown 0.14.5", + "itertools 0.10.5", + "postcard", + "rand", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", +] + +[[package]] +name = "fuel-tx" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "derivative", "derive_more", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-types", + "fuel-asm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-crypto 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-merkle 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2627,35 +2886,87 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" +checksum = "960797d6245c3a7a1efc1925216901e644d7e698b81f192f2d2645c3cb7723fb" +dependencies = [ + "fuel-derive 0.52.0", + "hex", + "rand", + "serde", +] + +[[package]] +name = "fuel-types" +version = "0.54.1" dependencies = [ - "fuel-derive", + "fuel-derive 0.54.1", "hex", "rand", "serde", ] +[[package]] +name = "fuel-types" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +dependencies = [ + "fuel-derive 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "hex", + "serde", +] + [[package]] name = "fuel-vm" -version = "0.55.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" +checksum = "b1efb9a8664859711066c9f786a84ff96e804940713d6e2cfcb3c88904d969fd" +dependencies = [ + "anyhow", + "async-trait", + "backtrace", + "bitflags 2.5.0", + "derivative", + "derive_more", + "ethnum", + "fuel-asm 0.52.0", + "fuel-crypto 0.52.0", + "fuel-merkle 0.52.0", + "fuel-storage 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "libm", + "paste", + "percent-encoding", + "primitive-types", + "rand", + "serde", + "serde_with", + "sha3", + "static_assertions", + "strum 0.24.1", + "tai64", +] + +[[package]] +name = "fuel-vm" +version = "0.54.1" dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.6.0", + "bitflags 2.5.0", "derivative", "derive_more", "ethnum", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-storage", - "fuel-tx", - "fuel-types", + "fuel-asm 0.54.1", + "fuel-crypto 0.54.1", + "fuel-merkle 0.54.1", + "fuel-storage 0.54.1", + "fuel-tx 0.54.1", + "fuel-types 0.54.1", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2671,15 +2982,46 @@ dependencies = [ "tai64", ] +[[package]] +name = "fuel-vm" +version = "0.54.1" +source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +dependencies = [ + "async-trait", + "backtrace", + "bitflags 2.5.0", + "derivative", + "derive_more", + "ethnum", + "fuel-asm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-crypto 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-merkle 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-storage 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-tx 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "hashbrown 0.14.5", + "itertools 0.10.5", + "libm", + "paste", + "percent-encoding", + "primitive-types", + "serde", + "serde_with", + "sha3", + "static_assertions", + "strum 0.24.1", + "tai64", +] + [[package]] name = "fuels" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601ed66a0485065471cd9c8bab2db7cfa58bc7ed5d2e68bd26fc573ac2575827" +checksum = "735414d717add659b5ab8bb90ccd700ccc80a8db51934f7fd23c2021b74bcd0f" dependencies = [ - "fuel-core-client", - "fuel-crypto", - "fuel-tx", + "fuel-core-client 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", "fuels-accounts", "fuels-core", "fuels-macros", @@ -2689,19 +3031,19 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed97e653906fe0bc60b5d7a7421f3c5fe766f516b762def8f4ccac707ac4bc3" +checksum = "430ee8d162ce2c37f953d66d190d7f2df60628e3e160f7b29f92d3e91611039d" dependencies = [ "async-trait", "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", + "fuel-core-client 0.28.0", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", "fuels-core", "itertools 0.12.1", "rand", @@ -2714,9 +3056,9 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edef30656b740ca9c279a7bcfe9e366557c271a2751e36316f780f18dc99c85" +checksum = "5c62cf6bfe69581bf806602c45ade998b7f34fb96bbbfc508819d7ae6c4957aa" dependencies = [ "Inflector", "fuel-abi-types", @@ -2725,27 +3067,27 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] name = "fuels-core" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff741c9f1ba2c701b50c76a98a5655d8bc0f275f7ae2dd0e724f8fc36eeb8a9f" +checksum = "9b9ac7981c7aad93b20c2131982bc6241e01c68a353224ead1bd9a682eb5c002" dependencies = [ "async-trait", "bech32", "chrono", "fuel-abi-types", - "fuel-asm", + "fuel-asm 0.52.0", "fuel-core-chain-config", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuel-vm", + "fuel-core-client 0.28.0", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "fuel-vm 0.52.0", "fuels-macros", "hex", "itertools 0.12.1", @@ -2758,28 +3100,28 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba1c2fd149a310879249144f2589336708ae860563a45b792907ae34ae6b959" +checksum = "365814aa188c7def2fb39cdb5ba90a87e7a1ec9e859be311f4ab6598e850464c" dependencies = [ "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] name = "fuels-programs" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45652fa07c48d5fba2ee50ddd279eead2c55b251b3d426d2189394b475330e9" +checksum = "4c75f67cf51f7ea66978828a9e2729c69819e1b43865afe372450ba25973c66a" dependencies = [ "async-trait", "fuel-abi-types", - "fuel-asm", - "fuel-tx", - "fuel-types", + "fuel-asm 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", "fuels-accounts", "fuels-core", "itertools 0.12.1", @@ -2790,17 +3132,17 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.65.1" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967a140a51095d071c84970365c37f856f4f098b835cb609b934dff4b8296cce" +checksum = "46c94d755da949026c999475cf92814d33b1fc3cdccbb08aebdd7185b6605608" dependencies = [ "fuel-core-chain-config", - "fuel-core-client", + "fuel-core-client 0.28.0", "fuel-core-poa", "fuel-core-services", - "fuel-crypto", - "fuel-tx", - "fuel-types", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", "fuels-accounts", "fuels-core", "futures", @@ -2873,7 +3215,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -2968,11 +3310,11 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.19.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2983,49 +3325,39 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.38.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" +checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" dependencies = [ "gix-hash", - "gix-trace", "libc", ] [[package]] name = "gix-hash" -version = "0.14.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" +checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" dependencies = [ - "faster-hex", + "hex", "thiserror", ] [[package]] name = "gix-path" -version = "0.10.9" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" +checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" dependencies = [ "bstr", - "gix-trace", - "home", - "once_cell", "thiserror", ] -[[package]] -name = "gix-trace" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" - [[package]] name = "gix-url" -version = "0.27.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156" +checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5" dependencies = [ "bstr", "gix-features", @@ -3085,26 +3417,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.12", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", + "http", "indexmap 2.2.6", "slab", "tokio", @@ -3190,7 +3503,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin", + "spin 0.9.8", "stable_deref_trait", ] @@ -3301,17 +3614,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http-body" version = "0.4.6" @@ -3319,32 +3621,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", + "http", "pin-project-lite", ] [[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" +name = "http-range-header" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "pin-project-lite", -] +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -3366,17 +3651,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -3388,26 +3673,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - [[package]] name = "hyper-multipart-rfc7578" version = "0.8.0" @@ -3417,42 +3682,42 @@ dependencies = [ "bytes", "common-multipart-rfc7578", "futures-core", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ + "ct-logs", "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "hyper", "log", - "rustls 0.21.12", - "rustls-native-certs", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "tokio", - "tokio-rustls 0.24.1", - "webpki-roots", + "tokio-rustls 0.22.0", + "webpki", ] [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", - "hyper-util", - "rustls 0.23.12", - "rustls-pki-types", + "http", + "hyper", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls 0.26.0", - "tower-service", + "tokio-rustls 0.24.1", + "webpki-roots", ] [[package]] @@ -3461,7 +3726,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.30", + "hyper", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -3469,38 +3734,15 @@ dependencies = [ [[package]] name = "hyper-tls" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "http-body-util", - "hyper 1.4.1", - "hyper-util", + "hyper", "native-tls", "tokio", "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", ] [[package]] @@ -3602,7 +3844,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -3614,7 +3856,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -3682,7 +3924,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3738,8 +3980,8 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "hyper-multipart-rfc7578", "ipfs-api-prelude", "thiserror", @@ -3757,7 +3999,7 @@ dependencies = [ "common-multipart-rfc7578", "dirs 4.0.0", "futures", - "http 0.2.12", + "http", "multiaddr", "multibase", "serde", @@ -3884,17 +4126,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "libc", ] [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -3915,9 +4157,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.17.0+1.8.1" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -3957,7 +4199,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -3968,7 +4210,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", ] @@ -4046,6 +4288,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4070,9 +4318,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logos" @@ -4103,7 +4351,7 @@ version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -4119,6 +4367,12 @@ dependencies = [ "regex-automata 0.1.10", ] +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "mdbook" version = "0.4.40" @@ -4127,7 +4381,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "env_logger", "handlebars", @@ -4150,7 +4404,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "mdbook", "semver", "serde", @@ -4283,9 +4537,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.5" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", @@ -4333,7 +4587,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.2", + "unsigned-varint", "url", ] @@ -4356,7 +4610,24 @@ checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "multihash-derive", - "unsigned-varint 0.7.2", + "unsigned-varint", +] + +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "blake2b_simd 1.0.2", + "blake2s_simd", + "blake3", + "core2", + "digest 0.10.7", + "multihash-derive", + "sha2 0.10.8", + "sha3", + "unsigned-varint", ] [[package]] @@ -4366,7 +4637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint 0.7.2", + "unsigned-varint", ] [[package]] @@ -4415,7 +4686,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -4424,29 +4695,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.2.1", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", - "pin-utils", ] [[package]] @@ -4455,7 +4711,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", @@ -4477,7 +4733,7 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4534,9 +4790,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ "num-integer", "num-traits", @@ -4647,7 +4903,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -4672,9 +4928,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -4687,13 +4943,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" -version = "6.3.1" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags 1.2.1", - "lazy_static", + "bitflags 1.3.2", "libc", + "once_cell", "onig_sys", ] @@ -4709,9 +4965,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -4747,7 +5003,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4764,7 +5020,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -4897,9 +5153,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4962,9 +5218,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -4973,9 +5229,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -4983,22 +5239,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -5078,7 +5334,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -5111,12 +5367,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap 2.2.6", + "line-wrap", "quick-xml", "serde", "time", @@ -5317,18 +5574,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.22.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", @@ -5344,7 +5601,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -5398,7 +5655,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5421,9 +5678,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5535,7 +5792,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -5544,16 +5801,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", ] [[package]] @@ -5650,55 +5907,12 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "hyper", "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.50.0", -] - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.2", "hyper-tls", - "hyper-util", "ipnet", "js-sys", "log", @@ -5707,20 +5921,23 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.1.2", + "rustls 0.21.12", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.52.0", + "webpki-roots", + "winreg", ] [[package]] @@ -5770,19 +5987,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "rexpect" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" -dependencies = [ - "comma", - "nix 0.25.1", - "regex", - "tempfile", - "thiserror", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -5793,6 +5997,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + [[package]] name = "ring" version = "0.17.8" @@ -5803,8 +6022,8 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -5832,7 +6051,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -5863,7 +6082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags 1.2.1", + "bitflags 1.3.2", "serde", ] @@ -5918,7 +6137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ "base64 0.13.1", - "blake2b_simd", + "blake2b_simd 0.5.11", "constant_time_eq 0.1.5", "crossbeam-utils", ] @@ -5972,13 +6191,26 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring 0.16.20", + "sct 0.6.1", + "webpki", +] + [[package]] name = "rustls" version = "0.21.12" @@ -5986,22 +6218,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.7", - "sct", + "ring 0.17.8", + "rustls-webpki", + "sct 0.7.1", ] [[package]] -name = "rustls" -version = "0.23.12" +name = "rustls-native-certs" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki 0.102.6", - "subtle", - "zeroize", + "openssl-probe", + "rustls 0.19.1", + "schannel", + "security-framework", ] [[package]] @@ -6011,7 +6242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "schannel", "security-framework", ] @@ -6025,41 +6256,14 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" - [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -6074,7 +6278,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "clipboard-win", "dirs-next", @@ -6082,7 +6286,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.20.2", + "nix 0.20.0", "radix_trie", "scopeguard", "smallvec", @@ -6129,9 +6333,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" dependencies = [ "sdd", ] @@ -6189,21 +6393,31 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + [[package]] name = "sct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "sdd" -version = "1.6.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb0dde0ccd15e337a3cf738a9a38115c6d8e74795d074e73973dad3d229a897" +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" [[package]] name = "seahash" @@ -6273,11 +6487,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6286,9 +6500,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -6305,22 +6519,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6334,9 +6548,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -6351,7 +6565,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6377,9 +6591,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64 0.22.1", "chrono", @@ -6395,14 +6609,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.10", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6440,7 +6654,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6631,6 +6845,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -6754,7 +6974,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6772,13 +6992,13 @@ dependencies = [ [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sway-ast" -version = "0.62.0" +version = "0.61.2" dependencies = [ "extension-trait", "num-bigint", @@ -6790,9 +7010,9 @@ dependencies = [ [[package]] name = "sway-core" -version = "0.62.0" +version = "0.61.2" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "derivative", "dirs 3.0.2", "either", @@ -6800,7 +7020,7 @@ dependencies = [ "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", - "fuel-vm", + "fuel-vm 0.54.1", "gimli 0.28.1", "graph-cycles", "hashbrown 0.13.2", @@ -6835,7 +7055,7 @@ dependencies = [ [[package]] name = "sway-error" -version = "0.62.0" +version = "0.61.2" dependencies = [ "either", "in_definite", @@ -6848,7 +7068,7 @@ dependencies = [ [[package]] name = "sway-ir" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "downcast-rs", @@ -6867,7 +7087,7 @@ dependencies = [ [[package]] name = "sway-ir-macros" -version = "0.62.0" +version = "0.61.2" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -6877,7 +7097,7 @@ dependencies = [ [[package]] name = "sway-lsp" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "assert-json-diff", @@ -6887,7 +7107,7 @@ dependencies = [ "dirs 4.0.0", "fd-lock 4.0.2", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "futures", "indexmap 2.2.6", @@ -6902,6 +7122,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", + "ropey", "serde", "serde_json", "sway-ast", @@ -6941,7 +7162,7 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.62.0" +version = "0.61.2" dependencies = [ "assert_matches", "extension-trait", @@ -6959,12 +7180,12 @@ dependencies = [ [[package]] name = "sway-types" -version = "0.62.0" +version = "0.61.2" dependencies = [ "bytecount", - "fuel-asm", - "fuel-crypto", - "fuel-tx", + "fuel-asm 0.54.1", + "fuel-crypto 0.54.1", + "fuel-tx 0.54.1", "indexmap 2.2.6", "lazy_static", "num-bigint", @@ -6978,7 +7199,7 @@ dependencies = [ [[package]] name = "sway-utils" -version = "0.62.0" +version = "0.61.2" dependencies = [ "serde", "walkdir", @@ -6986,11 +7207,11 @@ dependencies = [ [[package]] name = "swayfmt" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "difference", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "paste", "prettydiff 0.6.4", "ropey", @@ -7020,9 +7241,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -7038,7 +7259,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7047,12 +7268,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - [[package]] name = "synstructure" version = "0.12.6" @@ -7073,7 +7288,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7083,7 +7298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", - "bitflags 1.2.1", + "bitflags 1.3.2", "fancy-regex", "flate2", "fnv", @@ -7120,7 +7335,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -7214,9 +7429,9 @@ dependencies = [ [[package]] name = "term-table" -version = "1.4.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210f90191b719267bc8b6307659faf54a77400d06b8033ece26692696fc002be" +checksum = "d5e59d7fb313157de2a568be8d81e4d7f9af6e50e697702e8e00190a6566d3b8" dependencies = [ "lazy_static", "regex", @@ -7251,15 +7466,15 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.9", + "clap 4.5.7", "colored", "filecheck", "forc", "forc-client", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", - "fuel-vm", + "forc-tracing 0.61.2", + "fuel-vm 0.54.1", "futures", "gag", "hex", @@ -7316,22 +7531,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.62" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7435,9 +7650,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -7450,9 +7665,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -7485,7 +7700,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7500,22 +7715,22 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls 0.21.12", + "rustls 0.19.1", "tokio", + "webpki", ] [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.23.12", - "rustls-pki-types", + "rustls 0.21.12", "tokio", ] @@ -7564,18 +7779,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "toml" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.16", -] - [[package]] name = "toml_datetime" version = "0.6.6" @@ -7595,7 +7798,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] @@ -7606,20 +7809,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.6", "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.16", + "winnow", ] [[package]] @@ -7641,6 +7831,26 @@ dependencies = [ "tokio", "tower-layer", "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", ] [[package]] @@ -7680,7 +7890,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7695,6 +7905,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7708,7 +7919,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7781,7 +7992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7923,10 +8134,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" [[package]] -name = "unsigned-varint" -version = "0.8.0" +name = "untrusted" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "untrusted" @@ -7976,9 +8187,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" [[package]] name = "uwuify" @@ -8121,7 +8332,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -8155,7 +8366,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8176,6 +8387,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + [[package]] name = "webpki-roots" version = "0.25.4" @@ -8242,7 +8463,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8269,7 +8490,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8304,18 +8525,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "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", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -8332,9 +8553,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -8350,9 +8571,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -8368,15 +8589,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -8392,9 +8613,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -8410,9 +8631,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -8428,9 +8649,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -8446,9 +8667,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8459,15 +8680,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.50.0" @@ -8478,16 +8690,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - [[package]] name = "winsafe" version = "0.0.19" @@ -8614,22 +8816,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -8649,5 +8851,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] diff --git a/Cargo.toml b/Cargo.toml index bbb9d115edc..01d2ecf204e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,26 +34,25 @@ exclude = [ [workspace.dependencies] # Dependencies from the `fuel-core` repository: -fuel-core-client = { version = "0.31.0", default-features = false } -fuel-core-types = { version = "0.31.0", default-features = false } +fuel-core-client = { path = "../fuel-core/crates/client", default-features = false } +fuel-core-types = { path = "../fuel-core/crates/types", default-features = false } # Dependencies from the `fuel-vm` repository: -fuel-asm = "0.55.0" -fuel-crypto = "0.55.0" -fuel-types = "0.55.0" -fuel-tx = "0.55.0" -fuel-vm = "0.55.0" +fuel-asm = { path = "../fuel-vm/fuel-asm" } +fuel-crypto = { path = "../fuel-vm/fuel-crypto", features = ["random"]} +fuel-types = { path = "../fuel-vm/fuel-types" } +fuel-tx = { path = "../fuel-vm/fuel-tx" } +fuel-vm = { path = "../fuel-vm/fuel-vm" } # Dependencies from the `fuels-rs` repository: -fuels-core = "0.65.1" -fuels-accounts = "0.65.1" -fuels = "0.65.1" +fuels-core = "0.64.0" +fuels-accounts = "0.64.0" # Dependencies from the `forc-wallet` repository: -forc-wallet = "0.8.2" +forc-wallet = "0.8.1" # Dependencies from the `fuel-abi-types` repository: -fuel-abi-types = "0.5.2" +fuel-abi-types = "0.5.0" [workspace.package] edition = "2021" diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs index c3304b4fd53..9c2d3f565ab 100644 --- a/sway-core/src/asm_generation/finalized_asm.rs +++ b/sway-core/src/asm_generation/finalized_asm.rs @@ -537,6 +537,8 @@ fn print_instruction(op: &Instruction) { Instruction::WDMM(x) => f("WDMM", x.unpack()), Instruction::WQMM(x) => f("WQMM", x.unpack()), Instruction::ECAL(x) => f("ECAL", x.unpack()), + Instruction::BSIZ(x) => f("BSIZ", x.unpack()), + Instruction::BLDD(x) => f("BLDD", x.unpack()), } } diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs index 3164e2171e8..48167080287 100644 --- a/sway-core/src/asm_lang/allocated_ops.rs +++ b/sway-core/src/asm_lang/allocated_ops.rs @@ -18,7 +18,7 @@ use crate::{ fuel_prelude::fuel_asm::{self, op}, }; use either::Either; -use fuel_vm::fuel_asm::{op::ADDI, Imm12}; +use fuel_vm::fuel_asm::{op::ADDI, Imm06, Imm12}; use std::fmt::{self, Write}; use sway_types::span::Span; @@ -180,7 +180,12 @@ pub(crate) enum AllocatedOpcode { ), CROO(AllocatedRegister, AllocatedRegister), CSIZ(AllocatedRegister, AllocatedRegister), - LDC(AllocatedRegister, AllocatedRegister, AllocatedRegister), + LDC( + AllocatedRegister, + AllocatedRegister, + AllocatedRegister, + VirtualImmediate06, + ), LOG( AllocatedRegister, AllocatedRegister, @@ -330,7 +335,7 @@ impl AllocatedOpcode { CCP(_r1, _r2, _r3, _r4) => vec![], CROO(_r1, _r2) => vec![], CSIZ(r1, _r2) => vec![r1], - LDC(_r1, _r2, _r3) => vec![], + LDC(_r1, _r2, _r3, _i0) => vec![], LOG(_r1, _r2, _r3, _r4) => vec![], LOGD(_r1, _r2, _r3, _r4) => vec![], MINT(_r1, _r2) => vec![], @@ -454,7 +459,7 @@ impl fmt::Display for AllocatedOpcode { CCP(a, b, c, d) => write!(fmtr, "ccp {a} {b} {c} {d}"), CROO(a, b) => write!(fmtr, "croo {a} {b}"), CSIZ(a, b) => write!(fmtr, "csiz {a} {b}"), - LDC(a, b, c) => write!(fmtr, "ldc {a} {b} {c}"), + LDC(a, b, c, d) => write!(fmtr, "ldc {a} {b} {c} {d}"), LOG(a, b, c, d) => write!(fmtr, "log {a} {b} {c} {d}"), LOGD(a, b, c, d) => write!(fmtr, "logd {a} {b} {c} {d}"), MINT(a, b) => write!(fmtr, "mint {a} {b}"), @@ -630,7 +635,9 @@ impl AllocatedOp { } CROO(a, b) => op::CROO::new(a.to_reg_id(), b.to_reg_id()).into(), CSIZ(a, b) => op::CSIZ::new(a.to_reg_id(), b.to_reg_id()).into(), - LDC(a, b, c) => op::LDC::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), + LDC(a, b, c, d) => { + op::LDC::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.value.into()).into() + } LOG(a, b, c, d) => { op::LOG::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.to_reg_id()).into() } diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs index ba9b66090a4..b973b92650d 100644 --- a/sway-core/src/asm_lang/mod.rs +++ b/sway-core/src/asm_lang/mod.rs @@ -547,8 +547,8 @@ impl Op { } "ldc" => { - let (r1, r2, r3) = three_regs(handler, args, immediate, whole_op_span)?; - VirtualOp::LDC(r1, r2, r3) + let (r1, r2, r3, i0) = three_regs_imm_06(handler, args, immediate, whole_op_span)?; + VirtualOp::LDC(r1, r2, r3, i0) } "log" => { let (r1, r2, r3, r4) = four_regs(handler, args, immediate, whole_op_span)?; @@ -1041,6 +1041,57 @@ fn two_regs_imm_12( Ok((reg.clone(), reg2.clone(), imm)) } +fn three_regs_imm_06( + handler: &Handler, + args: &[VirtualRegister], + immediate: &Option, + whole_op_span: Span, +) -> Result<(VirtualRegister, VirtualRegister, VirtualRegister, VirtualImmediate06), ErrorEmitted> { + if args.len() > 3 { + handler.emit_err(CompileError::IncorrectNumberOfAsmRegisters { + span: whole_op_span.clone(), + expected: 3, + received: args.len(), + }); + } + let (reg, reg2, reg3) = match (args.first(), args.get(1), args.get(2)) { + (Some(reg), Some(reg2), Some(reg3)) => (reg, reg2, reg3), + _ => { + return Err( + handler.emit_err(CompileError::IncorrectNumberOfAsmRegisters { + span: whole_op_span, + expected: 3, + received: args.len(), + }), + ); + } + }; + let (imm, imm_span): (u64, _) = match immediate { + None => { + return Err(handler.emit_err(CompileError::MissingImmediate { + span: whole_op_span, + })); + } + Some(i) => match i.as_str()[1..].parse() { + Ok(o) => (o, i.span()), + Err(_) => { + return Err( + handler.emit_err(CompileError::InvalidImmediateValue { span: i.span() }) + ); + } + }, + }; + + let imm = match VirtualImmediate06::new(imm, imm_span) { + Ok(o) => o, + Err(e) => { + return Err(handler.emit_err(e)); + } + }; + + Ok((reg.clone(), reg2.clone(), reg3.clone(), imm)) +} + impl fmt::Display for Op { fn fmt(&self, fmtr: &mut fmt::Formatter<'_>) -> fmt::Result { fmt_opcode_and_comment(self.opcode.to_string(), &self.comment, fmtr) @@ -1123,7 +1174,7 @@ impl fmt::Display for VirtualOp { CCP(a, b, c, d) => write!(fmtr, "ccp {a} {b} {c} {d}"), CROO(a, b) => write!(fmtr, "croo {a} {b}"), CSIZ(a, b) => write!(fmtr, "csiz {a} {b}"), - LDC(a, b, c) => write!(fmtr, "ldc {a} {b} {c}"), + LDC(a, b, c, d) => write!(fmtr, "ldc {a} {b} {c} {d}"), LOG(a, b, c, d) => write!(fmtr, "log {a} {b} {c} {d}"), LOGD(a, b, c, d) => write!(fmtr, "logd {a} {b} {c} {d}"), MINT(a, b) => write!(fmtr, "mint {a} {b}"), diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs index 5c7f46d323e..a8db74863fa 100644 --- a/sway-core/src/asm_lang/virtual_ops.rs +++ b/sway-core/src/asm_lang/virtual_ops.rs @@ -137,7 +137,7 @@ pub(crate) enum VirtualOp { ), CROO(VirtualRegister, VirtualRegister), CSIZ(VirtualRegister, VirtualRegister), - LDC(VirtualRegister, VirtualRegister, VirtualRegister), + LDC(VirtualRegister, VirtualRegister, VirtualRegister, VirtualImmediate06), LOG( VirtualRegister, VirtualRegister, @@ -283,7 +283,7 @@ impl VirtualOp { CCP(r1, r2, r3, r4) => vec![r1, r2, r3, r4], CROO(r1, r2) => vec![r1, r2], CSIZ(r1, r2) => vec![r1, r2], - LDC(r1, r2, r3) => vec![r1, r2, r3], + LDC(r1, r2, r3, _i0) => vec![r1, r2, r3], LOG(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOGD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], MINT(r1, r2) => vec![r1, r2], @@ -406,7 +406,7 @@ impl VirtualOp { | CB(_) | CCP(_, _, _, _) | CROO(_, _) - | LDC(_, _, _) + | LDC(_, _, _, _) | LOG(_, _, _, _) | LOGD(_, _, _, _) | MINT(_, _) @@ -509,7 +509,7 @@ impl VirtualOp { | CCP(_, _, _, _) | CROO(_, _) | CSIZ(_, _) - | LDC(_, _, _) + | LDC(_, _, _, _) | LOG(_, _, _, _) | LOGD(_, _, _, _) | MINT(_, _) @@ -613,7 +613,7 @@ impl VirtualOp { CCP(r1, r2, r3, r4) => vec![r1, r2, r3, r4], CROO(r1, r2) => vec![r1, r2], CSIZ(_r1, r2) => vec![r2], - LDC(r1, r2, r3) => vec![r1, r2, r3], + LDC(r1, r2, r3, _i0) => vec![r1, r2, r3], LOG(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOGD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], MINT(r1, r2) => vec![r1, r2], @@ -730,7 +730,7 @@ impl VirtualOp { CCP(_r1, _r2, _r3, _r4) => vec![], CROO(_r1, _r2) => vec![], CSIZ(r1, _r2) => vec![r1], - LDC(_r1, _r2, _r3) => vec![], + LDC(_r1, _r2, _r3, _i0) => vec![], LOG(_r1, _r2, _r3, _r4) => vec![], LOGD(_r1, _r2, _r3, _r4) => vec![], MINT(_r1, _r2) => vec![], @@ -1073,10 +1073,11 @@ impl VirtualOp { update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), ), - LDC(r1, r2, r3) => Self::LDC( + LDC(r1, r2, r3, i0) => Self::LDC( update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), update_reg(reg_to_reg_map, r3), + i0.clone(), ), LOG(r1, r2, r3, r4) => Self::LOG( update_reg(reg_to_reg_map, r1), @@ -1533,10 +1534,11 @@ impl VirtualOp { CSIZ(reg1, reg2) => { AllocatedOpcode::CSIZ(map_reg(&mapping, reg1), map_reg(&mapping, reg2)) } - LDC(reg1, reg2, reg3) => AllocatedOpcode::LDC( + LDC(reg1, reg2, reg3, imm0) => AllocatedOpcode::LDC( map_reg(&mapping, reg1), map_reg(&mapping, reg2), map_reg(&mapping, reg3), + imm0.clone(), ), LOG(reg1, reg2, reg3, reg4) => AllocatedOpcode::LOG( map_reg(&mapping, reg1), From 686d275a9af86cff96a23e63ac44b306c33fe4f1 Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Fri, 12 Jul 2024 09:28:58 +0530 Subject: [PATCH 03/47] Support for the BSIZ and BLDD instructions --- sway-ast/src/expr/op_code.rs | 4 ++- sway-core/src/asm_lang/allocated_ops.rs | 17 +++++++++- sway-core/src/asm_lang/mod.rs | 17 ++++++++-- sway-core/src/asm_lang/virtual_ops.rs | 43 ++++++++++++++++++++++++- sway-parse/src/expr/op_code.rs | 4 ++- 5 files changed, 79 insertions(+), 6 deletions(-) diff --git a/sway-ast/src/expr/op_code.rs b/sway-ast/src/expr/op_code.rs index 47f9665897b..00c7a5e8e30 100644 --- a/sway-ast/src/expr/op_code.rs +++ b/sway-ast/src/expr/op_code.rs @@ -259,7 +259,9 @@ define_op_codes!( ), (Croo, CrooOpcode, "croo", (addr: reg, contract: reg)), (Csiz, CsizOpcode, "csiz", (ret: reg, contract: reg)), - (Ldc, LdcOpcode, "ldc", (contract: reg, addr: reg, size: reg)), + (Bsiz, BsizOpcode, "bsiz", (ret: reg, contract: reg)), + (Ldc, LdcOpcode, "ldc", (contract: reg, addr: reg, size: reg, mode: imm)), + (Bldd, BlddOpcode, "bldd", (dst_ptr: reg, addr: reg, offset: reg, len: reg)), ( Log, LogOpcode, diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs index 48167080287..4039c03e435 100644 --- a/sway-core/src/asm_lang/allocated_ops.rs +++ b/sway-core/src/asm_lang/allocated_ops.rs @@ -18,7 +18,7 @@ use crate::{ fuel_prelude::fuel_asm::{self, op}, }; use either::Either; -use fuel_vm::fuel_asm::{op::ADDI, Imm06, Imm12}; +use fuel_vm::fuel_asm::{op::ADDI, Imm12}; use std::fmt::{self, Write}; use sway_types::span::Span; @@ -180,12 +180,19 @@ pub(crate) enum AllocatedOpcode { ), CROO(AllocatedRegister, AllocatedRegister), CSIZ(AllocatedRegister, AllocatedRegister), + BSIZ(AllocatedRegister, AllocatedRegister), LDC( AllocatedRegister, AllocatedRegister, AllocatedRegister, VirtualImmediate06, ), + BLDD( + AllocatedRegister, + AllocatedRegister, + AllocatedRegister, + AllocatedRegister, + ), LOG( AllocatedRegister, AllocatedRegister, @@ -335,7 +342,9 @@ impl AllocatedOpcode { CCP(_r1, _r2, _r3, _r4) => vec![], CROO(_r1, _r2) => vec![], CSIZ(r1, _r2) => vec![r1], + BSIZ(r1, _r2) => vec![r1], LDC(_r1, _r2, _r3, _i0) => vec![], + BLDD(_r1, _r2, _r3, _r4) => vec![], LOG(_r1, _r2, _r3, _r4) => vec![], LOGD(_r1, _r2, _r3, _r4) => vec![], MINT(_r1, _r2) => vec![], @@ -459,7 +468,9 @@ impl fmt::Display for AllocatedOpcode { CCP(a, b, c, d) => write!(fmtr, "ccp {a} {b} {c} {d}"), CROO(a, b) => write!(fmtr, "croo {a} {b}"), CSIZ(a, b) => write!(fmtr, "csiz {a} {b}"), + BSIZ(a, b) => write!(fmtr, "bsiz {a} {b}"), LDC(a, b, c, d) => write!(fmtr, "ldc {a} {b} {c} {d}"), + BLDD(a, b, c, d) => write!(fmtr, "bldd {a} {b} {c} {d}"), LOG(a, b, c, d) => write!(fmtr, "log {a} {b} {c} {d}"), LOGD(a, b, c, d) => write!(fmtr, "logd {a} {b} {c} {d}"), MINT(a, b) => write!(fmtr, "mint {a} {b}"), @@ -635,9 +646,13 @@ impl AllocatedOp { } CROO(a, b) => op::CROO::new(a.to_reg_id(), b.to_reg_id()).into(), CSIZ(a, b) => op::CSIZ::new(a.to_reg_id(), b.to_reg_id()).into(), + BSIZ(a, b) => op::BSIZ::new(a.to_reg_id(), b.to_reg_id()).into(), LDC(a, b, c, d) => { op::LDC::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.value.into()).into() } + BLDD(a, b, c, d) => { + op::BLDD::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.to_reg_id()).into() + } LOG(a, b, c, d) => { op::LOG::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.to_reg_id()).into() } diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs index b973b92650d..c6c9ec6d585 100644 --- a/sway-core/src/asm_lang/mod.rs +++ b/sway-core/src/asm_lang/mod.rs @@ -545,7 +545,10 @@ impl Op { let (r1, r2) = two_regs(handler, args, immediate, whole_op_span)?; VirtualOp::CSIZ(r1, r2) } - + "bsiz" => { + let (r1, r2) = two_regs(handler, args, immediate, whole_op_span)?; + VirtualOp::BSIZ(r1, r2) + } "ldc" => { let (r1, r2, r3, i0) = three_regs_imm_06(handler, args, immediate, whole_op_span)?; VirtualOp::LDC(r1, r2, r3, i0) @@ -1046,7 +1049,15 @@ fn three_regs_imm_06( args: &[VirtualRegister], immediate: &Option, whole_op_span: Span, -) -> Result<(VirtualRegister, VirtualRegister, VirtualRegister, VirtualImmediate06), ErrorEmitted> { +) -> Result< + ( + VirtualRegister, + VirtualRegister, + VirtualRegister, + VirtualImmediate06, + ), + ErrorEmitted, +> { if args.len() > 3 { handler.emit_err(CompileError::IncorrectNumberOfAsmRegisters { span: whole_op_span.clone(), @@ -1174,7 +1185,9 @@ impl fmt::Display for VirtualOp { CCP(a, b, c, d) => write!(fmtr, "ccp {a} {b} {c} {d}"), CROO(a, b) => write!(fmtr, "croo {a} {b}"), CSIZ(a, b) => write!(fmtr, "csiz {a} {b}"), + BSIZ(a, b) => write!(fmtr, "bsiz {a} {b}"), LDC(a, b, c, d) => write!(fmtr, "ldc {a} {b} {c} {d}"), + BLDD(a, b, c, d) => write!(fmtr, "bldd {a} {b} {c} {d}"), LOG(a, b, c, d) => write!(fmtr, "log {a} {b} {c} {d}"), LOGD(a, b, c, d) => write!(fmtr, "logd {a} {b} {c} {d}"), MINT(a, b) => write!(fmtr, "mint {a} {b}"), diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs index a8db74863fa..45d066f0075 100644 --- a/sway-core/src/asm_lang/virtual_ops.rs +++ b/sway-core/src/asm_lang/virtual_ops.rs @@ -137,7 +137,19 @@ pub(crate) enum VirtualOp { ), CROO(VirtualRegister, VirtualRegister), CSIZ(VirtualRegister, VirtualRegister), - LDC(VirtualRegister, VirtualRegister, VirtualRegister, VirtualImmediate06), + BSIZ(VirtualRegister, VirtualRegister), + LDC( + VirtualRegister, + VirtualRegister, + VirtualRegister, + VirtualImmediate06, + ), + BLDD( + VirtualRegister, + VirtualRegister, + VirtualRegister, + VirtualRegister, + ), LOG( VirtualRegister, VirtualRegister, @@ -283,7 +295,9 @@ impl VirtualOp { CCP(r1, r2, r3, r4) => vec![r1, r2, r3, r4], CROO(r1, r2) => vec![r1, r2], CSIZ(r1, r2) => vec![r1, r2], + BSIZ(r1, r2) => vec![r1, r2], LDC(r1, r2, r3, _i0) => vec![r1, r2, r3], + BLDD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOG(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOGD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], MINT(r1, r2) => vec![r1, r2], @@ -367,6 +381,7 @@ impl VirtualOp { | BAL(_, _, _) | BHEI(_) | CSIZ(_, _) + | BSIZ(_, _) | SRW(_, _, _) | TIME(_, _) | GM(_, _) @@ -407,6 +422,7 @@ impl VirtualOp { | CCP(_, _, _, _) | CROO(_, _) | LDC(_, _, _, _) + | BLDD(_, _, _, _) | LOG(_, _, _, _) | LOGD(_, _, _, _) | MINT(_, _) @@ -509,7 +525,9 @@ impl VirtualOp { | CCP(_, _, _, _) | CROO(_, _) | CSIZ(_, _) + | BSIZ(_, _) | LDC(_, _, _, _) + | BLDD(_, _, _, _) | LOG(_, _, _, _) | LOGD(_, _, _, _) | MINT(_, _) @@ -613,7 +631,9 @@ impl VirtualOp { CCP(r1, r2, r3, r4) => vec![r1, r2, r3, r4], CROO(r1, r2) => vec![r1, r2], CSIZ(_r1, r2) => vec![r2], + BSIZ(_r1, r2) => vec![r2], LDC(r1, r2, r3, _i0) => vec![r1, r2, r3], + BLDD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOG(r1, r2, r3, r4) => vec![r1, r2, r3, r4], LOGD(r1, r2, r3, r4) => vec![r1, r2, r3, r4], MINT(r1, r2) => vec![r1, r2], @@ -730,7 +750,9 @@ impl VirtualOp { CCP(_r1, _r2, _r3, _r4) => vec![], CROO(_r1, _r2) => vec![], CSIZ(r1, _r2) => vec![r1], + BSIZ(r1, _r2) => vec![r1], LDC(_r1, _r2, _r3, _i0) => vec![], + BLDD(_r1, _r2, _r3, _i0) => vec![], LOG(_r1, _r2, _r3, _r4) => vec![], LOGD(_r1, _r2, _r3, _r4) => vec![], MINT(_r1, _r2) => vec![], @@ -1073,12 +1095,22 @@ impl VirtualOp { update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), ), + BSIZ(r1, r2) => Self::BSIZ( + update_reg(reg_to_reg_map, r1), + update_reg(reg_to_reg_map, r2), + ), LDC(r1, r2, r3, i0) => Self::LDC( update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), update_reg(reg_to_reg_map, r3), i0.clone(), ), + BLDD(r1, r2, r3, r4) => Self::BLDD( + update_reg(reg_to_reg_map, r1), + update_reg(reg_to_reg_map, r2), + update_reg(reg_to_reg_map, r3), + update_reg(reg_to_reg_map, r4), + ), LOG(r1, r2, r3, r4) => Self::LOG( update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), @@ -1534,12 +1566,21 @@ impl VirtualOp { CSIZ(reg1, reg2) => { AllocatedOpcode::CSIZ(map_reg(&mapping, reg1), map_reg(&mapping, reg2)) } + BSIZ(reg1, reg2) => { + AllocatedOpcode::BSIZ(map_reg(&mapping, reg1), map_reg(&mapping, reg2)) + } LDC(reg1, reg2, reg3, imm0) => AllocatedOpcode::LDC( map_reg(&mapping, reg1), map_reg(&mapping, reg2), map_reg(&mapping, reg3), imm0.clone(), ), + BLDD(reg1, reg2, reg3, reg4) => AllocatedOpcode::BLDD( + map_reg(&mapping, reg1), + map_reg(&mapping, reg2), + map_reg(&mapping, reg3), + map_reg(&mapping, reg4), + ), LOG(reg1, reg2, reg3, reg4) => AllocatedOpcode::LOG( map_reg(&mapping, reg1), map_reg(&mapping, reg2), diff --git a/sway-parse/src/expr/op_code.rs b/sway-parse/src/expr/op_code.rs index c2742da33e9..fd2c0de6114 100644 --- a/sway-parse/src/expr/op_code.rs +++ b/sway-parse/src/expr/op_code.rs @@ -88,7 +88,9 @@ define_op_codes!( (Ccp, CcpOpcode, "ccp", (dst_addr, contract, src_addr, size)), (Croo, CrooOpcode, "croo", (addr, contract)), (Csiz, CsizOpcode, "csiz", (ret, contract)), - (Ldc, LdcOpcode, "ldc", (contract, addr, size)), + (Bsiz, BsizOpcode, "bsiz", (ret, contract)), + (Ldc, LdcOpcode, "ldc", (contract, addr, size, imm)), + (Bldd, BlddOpcode, "bldd", (dst_ptr, addr, offset, len)), (Log, LogOpcode, "log", (reg_a, reg_b, reg_c, reg_d)), (Logd, LogdOpcode, "logd", (reg_a, reg_b, addr, size)), (Mint, MintOpcode, "mint", (coins, sub_id)), From eedd49a5035f1b8abec02650c9e8304831adf6c1 Mon Sep 17 00:00:00 2001 From: Kaya Gokalp Date: Tue, 13 Aug 2024 00:28:23 +0300 Subject: [PATCH 04/47] feat: support using 4 registers with ED19 --- Cargo.lock | 1141 +++++++---------------- Cargo.toml | 21 +- sway-core/src/asm_lang/allocated_ops.rs | 15 +- sway-core/src/asm_lang/mod.rs | 6 +- sway-core/src/asm_lang/virtual_ops.rs | 23 +- 5 files changed, 371 insertions(+), 835 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ee9f62ddf0..557a7418d45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -257,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -266,53 +266,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "axum" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.73" @@ -324,7 +277,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.0", + "object 0.36.1", "rustc-demangle", "serde", ] @@ -409,9 +362,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -521,7 +474,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "syn_derive", ] @@ -617,9 +570,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" dependencies = [ "jobserver", "libc", @@ -656,7 +609,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -726,9 +679,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -736,9 +689,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -749,11 +702,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" +checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", ] [[package]] @@ -762,20 +715,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -900,15 +853,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" +checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" [[package]] name = "completest-pty" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" +checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" dependencies = [ "completest", "ptyprocess", @@ -921,7 +874,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "entities", "memchr", "once_cell", @@ -1067,7 +1020,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.7", + "clap 4.5.9", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1193,15 +1146,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctr" version = "0.9.2" @@ -1234,7 +1178,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1300,12 +1244,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1324,16 +1268,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1349,13 +1293,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1449,7 +1393,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1642,9 +1586,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1721,7 +1665,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1734,7 +1678,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1863,21 +1807,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" -[[package]] -name = "eventsource-client" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9146112ee3ce031aa5aebe3e049e10b1d353b9c7630cc6be488c2c62cc5d9c42" -dependencies = [ - "futures", - "hyper", - "hyper-rustls 0.22.1", - "hyper-timeout", - "log", - "pin-project", - "tokio", -] - [[package]] name = "eventsource-client" version = "0.12.2" @@ -1886,7 +1815,7 @@ checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29" dependencies = [ "futures", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-timeout", "log", "pin-project", @@ -1912,7 +1841,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -2048,7 +1977,7 @@ dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "clap_complete_fig", "completest-pty", @@ -2057,7 +1986,7 @@ dependencies = [ "forc-tracing 0.61.2", "forc-util", "fs_extra", - "fuel-asm 0.54.1", + "fuel-asm", "hex", "serde", "serde_json", @@ -2084,7 +2013,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc", "forc-pkg", @@ -2092,12 +2021,12 @@ dependencies = [ "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types", - "fuel-core-client 0.30.0", - "fuel-core-types 0.30.0", - "fuel-crypto 0.54.1", - "fuel-tx 0.54.1", - "fuel-vm 0.54.1", + "fuel-abi-types 0.5.2", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-vm", "fuels-accounts", "fuels-core", "futures", @@ -2123,11 +2052,11 @@ dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.7", + "clap 4.5.9", "forc-tracing 0.61.2", "forc-util", - "fuel-core-types 0.30.0", - "fuel-crypto 0.54.1", + "fuel-core-types", + "fuel-crypto", "fuels-core", "futures", "hex", @@ -2147,15 +2076,15 @@ name = "forc-debug" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dap", "escargot", "forc-pkg", "forc-test", "forc-tracing 0.61.2", - "fuel-core-client 0.30.0", - "fuel-types 0.54.1", - "fuel-vm 0.54.1", + "fuel-core-client", + "fuel-types", + "fuel-vm", "portpicker", "rayon", "rexpect", @@ -2173,7 +2102,7 @@ name = "forc-doc" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "comrak", "dir_indexer", "expect-test", @@ -2198,7 +2127,7 @@ name = "forc-fmt" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "forc-pkg", "forc-tracing 0.61.2", "forc-util", @@ -2215,7 +2144,7 @@ name = "forc-lsp" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2231,7 +2160,7 @@ dependencies = [ "cid", "forc-tracing 0.61.2", "forc-util", - "fuel-abi-types", + "fuel-abi-types 0.5.2", "futures", "git2", "gix-url", @@ -2264,9 +2193,9 @@ version = "0.61.2" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types", - "fuel-tx 0.54.1", - "fuel-vm 0.54.1", + "fuel-abi-types 0.5.2", + "fuel-tx", + "fuel-vm", "fuels-core", "rand", "rayon", @@ -2300,11 +2229,11 @@ name = "forc-tx" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc-util", - "fuel-tx 0.54.1", - "fuel-types 0.54.1", + "fuel-tx", + "fuel-types", "serde", "serde_json", "thiserror", @@ -2317,11 +2246,11 @@ dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dirs 3.0.2", "fd-lock 4.0.2", "forc-tracing 0.61.2", - "fuel-tx 0.54.1", + "fuel-tx", "hex", "paste", "regex", @@ -2339,16 +2268,16 @@ dependencies = [ [[package]] name = "forc-wallet" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be34342dd836a895201d271c9f0ffbde2eb146e1f3a09e55af373348dcd19c8d" +checksum = "84fb8dd372e7141efc5a63a1e6036e4ae0789774087ec9936b6cf426ef19bb16" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "eth-keystore", "forc-tracing 0.47.0", - "fuel-crypto 0.52.0", - "fuel-types 0.52.0", + "fuel-crypto", + "fuel-types", "fuels", "fuels-core", "futures", @@ -2415,54 +2344,50 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.66", + "syn 2.0.70", "thiserror", ] [[package]] -name = "fuel-asm" -version = "0.52.0" +name = "fuel-abi-types" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3effa050e7e838d1eff68ca49f2d97558c4f90d13b2ac439253dfa3267c022" -dependencies = [ - "bitflags 2.5.0", - "fuel-types 0.52.0", - "serde", - "strum 0.24.1", -] - -[[package]] -name = "fuel-asm" -version = "0.54.1" +checksum = "bce44ac13b1971be7cea024a2003cf944522093dafec454fea9ff792f0ff2577" dependencies = [ - "bitflags 2.5.0", - "fuel-types 0.54.1", + "itertools 0.10.5", + "lazy_static", + "proc-macro2", + "quote", + "regex", "serde", - "strum 0.24.1", + "serde_json", + "syn 2.0.70", + "thiserror", ] [[package]] name = "fuel-asm" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" dependencies = [ - "bitflags 2.5.0", - "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "bitflags 2.6.0", + "fuel-types", "serde", "strum 0.24.1", ] [[package]] name = "fuel-core-chain-config" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c94ef1b699c840063968db8c6ed0e2c4f8459148cf1c2653fafad867591a36" +checksum = "db93098b2f39a7eab8c408eb6beb5b4580883a988b76377414eefe4b405455de" dependencies = [ "anyhow", "bech32", "derivative", "fuel-core-storage", - "fuel-core-types 0.28.0", + "fuel-core-types", "itertools 0.12.1", "postcard", "rand", @@ -2474,40 +2399,18 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671ea8ab1631ffae3f00313c4f1ef169fd0409f6ef5a90532291ce515b88b242" -dependencies = [ - "anyhow", - "cynic", - "derive_more", - "eventsource-client 0.10.2", - "fuel-core-types 0.28.0", - "futures", - "hex", - "hyper-rustls 0.24.2", - "itertools 0.12.1", - "reqwest", - "schemafy_lib", - "serde", - "serde_json", - "tai64", - "thiserror", - "tracing", -] - -[[package]] -name = "fuel-core-client" -version = "0.30.0" +checksum = "eeec47aa62e9418a61a9936b6ec30474b918000879e5f556980e0648390b1c10" dependencies = [ "anyhow", "cynic", "derive_more", - "eventsource-client 0.12.2", - "fuel-core-types 0.30.0", + "eventsource-client", + "fuel-core-types", "futures", "hex", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.12.1", "reqwest", "schemafy_lib", @@ -2520,12 +2423,11 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c57acd2e55b0243510cd24c123b039b847eaf74da1852ff758bbafec1743a" +checksum = "f69ff33d722268ab0533a75b260195169a3761e2ca1d13cdd8469a59c2826927" dependencies = [ - "axum", - "once_cell", + "parking_lot 0.12.3", "pin-project-lite", "prometheus-client", "regex", @@ -2534,16 +2436,16 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33fb412a25993ae33137251cbd6dad6fc71e8f7489e009b3ab82c244323d3c3" +checksum = "b3444c6b2ed6a7878e1a3b317f9922be41064cfafaf863bc7ab25823bcfbd749" dependencies = [ "anyhow", "async-trait", "fuel-core-chain-config", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.28.0", + "fuel-core-types", "tokio", "tokio-stream", "tracing", @@ -2551,9 +2453,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862791e22d79dc2ce76b27fd57e44d827ae7f0f4dfd7c56fc1fdf7a9bc0286af" +checksum = "e85c2a19cd58cf541409c94ef77ef9b2e742f196b9a0209fb6b9310184cec92f" dependencies = [ "anyhow", "async-trait", @@ -2566,15 +2468,15 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d384d6fbb284aa2b2b76c384261015d9cdb47ca94b898d671f9e2836fc53ec8" +checksum = "54f244ffed0818fc7f63ff46ea4087ea2c509876b32e733f22e9b7836aebece4" dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types 0.28.0", - "fuel-vm 0.52.0", + "fuel-core-types", + "fuel-vm", "impl-tools", "itertools 0.12.1", "num_enum 0.7.2", @@ -2588,15 +2490,15 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.28.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ecaf471ba500e936abac536af31d9f5ebdcf89d7fa1a348919fa38af55161a5" +checksum = "044371366fb644733dd0452ced749b0d926d81c1959fad5f19f81a28f13125ee" dependencies = [ "anyhow", "bs58", "derivative", "derive_more", - "fuel-vm 0.52.0", + "fuel-vm", "rand", "secrecy", "serde", @@ -2605,72 +2507,17 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-core-types" -version = "0.30.0" -dependencies = [ - "anyhow", - "bs58", - "derivative", - "derive_more", - "fuel-vm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "secrecy", - "serde", - "tai64", - "thiserror", - "zeroize", -] - [[package]] name = "fuel-crypto" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60228bcd5439c9bf206cf337d7d02b40efc56140769db52c2c035d43feb832b" -dependencies = [ - "coins-bip32", - "coins-bip39", - "ecdsa", - "ed25519-dalek", - "fuel-types 0.52.0", - "k256", - "lazy_static", - "p256", - "rand", - "secp256k1 0.26.0", - "serde", - "sha2 0.10.8", - "zeroize", -] - -[[package]] -name = "fuel-crypto" -version = "0.54.1" -dependencies = [ - "coins-bip32", - "coins-bip39", - "ecdsa", - "ed25519-dalek", - "fuel-types 0.54.1", - "k256", - "lazy_static", - "p256", - "rand", - "secp256k1 0.26.0", - "serde", - "sha2 0.10.8", - "zeroize", -] - -[[package]] -name = "fuel-crypto" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +checksum = "33548590131674e8f272a3e056be4dbaa1de7cb364eab2b17987cd5c0dc31cb0" dependencies = [ "coins-bip32", "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-types", "k256", "lazy_static", "p256", @@ -2683,34 +2530,13 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f987a055f018d138248d530a0a40354fa173288c3f81db5b3dfb5087562ebdf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", -] - -[[package]] -name = "fuel-derive" -version = "0.54.1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", -] - -[[package]] -name = "fuel-derive" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +checksum = "3f49fdbfc1615d88d2849650afc2b0ac2fecd69661ebadd31a073d8416747764" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "synstructure 0.13.1", ] @@ -2763,40 +2589,13 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c82370a37e83c53d0a06ce580ccfc4e36eb4cf2b23e67a142de4491d8a2d624" -dependencies = [ - "derive_more", - "digest 0.10.7", - "fuel-storage 0.52.0", - "hashbrown 0.13.2", - "hex", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "fuel-merkle" -version = "0.54.1" -dependencies = [ - "derive_more", - "digest 0.10.7", - "fuel-storage 0.54.1", - "hashbrown 0.13.2", - "hex", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "fuel-merkle" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-storage", "hashbrown 0.13.2", "hex", "serde", @@ -2805,75 +2604,23 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fc51ee30c4e8b447b4579351128466c507687748d3f1ae9740481d8ef5d5c5" - -[[package]] -name = "fuel-storage" -version = "0.54.1" - -[[package]] -name = "fuel-storage" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" +checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" [[package]] name = "fuel-tx" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23baeb39cbc093b66adb951a205f1696bf2403c0bb1a667fb98ddedeb299a8cb" +checksum = "13aae44611588d199dd119e4a0ebd8eb7ae4cde6bf8b4d12715610b1f5e5b731" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "derive_more", - "fuel-asm 0.52.0", - "fuel-crypto 0.52.0", - "fuel-merkle 0.52.0", - "fuel-types 0.52.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "postcard", - "rand", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", -] - -[[package]] -name = "fuel-tx" -version = "0.54.1" -dependencies = [ - "bitflags 2.5.0", - "derivative", - "derive_more", - "fuel-asm 0.54.1", - "fuel-crypto 0.54.1", - "fuel-merkle 0.54.1", - "fuel-types 0.54.1", - "hashbrown 0.14.5", - "itertools 0.10.5", - "postcard", - "rand", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", -] - -[[package]] -name = "fuel-tx" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" -dependencies = [ - "bitflags 2.5.0", - "derivative", - "derive_more", - "fuel-asm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-crypto 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-merkle 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2886,87 +2633,35 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960797d6245c3a7a1efc1925216901e644d7e698b81f192f2d2645c3cb7723fb" +checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" dependencies = [ - "fuel-derive 0.52.0", + "fuel-derive", "hex", "rand", "serde", ] -[[package]] -name = "fuel-types" -version = "0.54.1" -dependencies = [ - "fuel-derive 0.54.1", - "hex", - "rand", - "serde", -] - -[[package]] -name = "fuel-types" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" -dependencies = [ - "fuel-derive 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "hex", - "serde", -] - [[package]] name = "fuel-vm" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1efb9a8664859711066c9f786a84ff96e804940713d6e2cfcb3c88904d969fd" -dependencies = [ - "anyhow", - "async-trait", - "backtrace", - "bitflags 2.5.0", - "derivative", - "derive_more", - "ethnum", - "fuel-asm 0.52.0", - "fuel-crypto 0.52.0", - "fuel-merkle 0.52.0", - "fuel-storage 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "libm", - "paste", - "percent-encoding", - "primitive-types", - "rand", - "serde", - "serde_with", - "sha3", - "static_assertions", - "strum 0.24.1", - "tai64", -] - -[[package]] -name = "fuel-vm" -version = "0.54.1" +checksum = "64fc4695efac9207276f6229f2dd9811848b328a13604a698f7bce1d452bd986" dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "derive_more", "ethnum", - "fuel-asm 0.54.1", - "fuel-crypto 0.54.1", - "fuel-merkle 0.54.1", - "fuel-storage 0.54.1", - "fuel-tx 0.54.1", - "fuel-types 0.54.1", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-storage", + "fuel-tx", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2982,46 +2677,15 @@ dependencies = [ "tai64", ] -[[package]] -name = "fuel-vm" -version = "0.54.1" -source = "git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx#0e0e79ca2ddd09f37ebda2735a0d1550f8c781b4" -dependencies = [ - "async-trait", - "backtrace", - "bitflags 2.5.0", - "derivative", - "derive_more", - "ethnum", - "fuel-asm 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-crypto 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-merkle 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-storage 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-tx 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "fuel-types 0.54.1 (git+https://github.com/FuelLabs/fuel-vm?branch=dento/blob-tx)", - "hashbrown 0.14.5", - "itertools 0.10.5", - "libm", - "paste", - "percent-encoding", - "primitive-types", - "serde", - "serde_with", - "sha3", - "static_assertions", - "strum 0.24.1", - "tai64", -] - [[package]] name = "fuels" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735414d717add659b5ab8bb90ccd700ccc80a8db51934f7fd23c2021b74bcd0f" +checksum = "0921f0318576c0eff424a4d0f23c09fc7116880b7fc643a8012df519555b90a6" dependencies = [ - "fuel-core-client 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", "fuels-accounts", "fuels-core", "fuels-macros", @@ -3031,19 +2695,19 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430ee8d162ce2c37f953d66d190d7f2df60628e3e160f7b29f92d3e91611039d" +checksum = "409f2c0acdb512c19973e20253eda39b075c2b6c2378781679279072f65d78ce" dependencies = [ "async-trait", "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client 0.28.0", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", "fuels-core", "itertools 0.12.1", "rand", @@ -3056,38 +2720,38 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c62cf6bfe69581bf806602c45ade998b7f34fb96bbbfc508819d7ae6c4957aa" +checksum = "a1f4f9ef364fe74a7079a6ad8e239ce424b754ff0e168ffcddb0da60d4069008" dependencies = [ "Inflector", - "fuel-abi-types", + "fuel-abi-types 0.7.0", "itertools 0.12.1", "proc-macro2", "quote", "regex", "serde_json", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "fuels-core" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9ac7981c7aad93b20c2131982bc6241e01c68a353224ead1bd9a682eb5c002" +checksum = "928c7a1b18a60af04579eff687e76fac419fb060b7309a35675fac22a132af00" dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types", - "fuel-asm 0.52.0", + "fuel-abi-types 0.7.0", + "fuel-asm", "fuel-core-chain-config", - "fuel-core-client 0.28.0", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "fuel-vm 0.52.0", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuel-vm", "fuels-macros", "hex", "itertools 0.12.1", @@ -3100,28 +2764,28 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365814aa188c7def2fb39cdb5ba90a87e7a1ec9e859be311f4ab6598e850464c" +checksum = "5cf58bac268a3ee1dec31ec1b6273e326c8650fa805dad600a03329716d17c29" dependencies = [ "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "fuels-programs" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c75f67cf51f7ea66978828a9e2729c69819e1b43865afe372450ba25973c66a" +checksum = "313e13af93d629778f514cb876befdc30d5c030df58ab96885a39bdaeeddcff6" dependencies = [ "async-trait", - "fuel-abi-types", - "fuel-asm 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", + "fuel-abi-types 0.7.0", + "fuel-asm", + "fuel-tx", + "fuel-types", "fuels-accounts", "fuels-core", "itertools 0.12.1", @@ -3132,17 +2796,17 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c94d755da949026c999475cf92814d33b1fc3cdccbb08aebdd7185b6605608" +checksum = "559c9690c345c4ab5f368fb9309e3df3f745f44109f5e40aed87d184f8af0a3c" dependencies = [ "fuel-core-chain-config", - "fuel-core-client 0.28.0", + "fuel-core-client", "fuel-core-poa", "fuel-core-services", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", + "fuel-crypto", + "fuel-tx", + "fuel-types", "fuels-accounts", "fuels-core", "futures", @@ -3215,7 +2879,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3503,7 +3167,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -3625,12 +3289,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" version = "1.9.4" @@ -3651,9 +3309,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3686,23 +3344,6 @@ dependencies = [ "hyper", ] -[[package]] -name = "hyper-rustls" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" -dependencies = [ - "ct-logs", - "futures-util", - "hyper", - "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "tokio", - "tokio-rustls 0.22.0", - "webpki", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3713,10 +3354,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots", ] @@ -3844,7 +3485,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3856,7 +3497,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4132,11 +3773,11 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -4199,7 +3840,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -4210,7 +3851,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -4288,12 +3929,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4318,9 +3953,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logos" @@ -4367,12 +4002,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matchit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" - [[package]] name = "mdbook" version = "0.4.40" @@ -4381,7 +4010,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "env_logger", "handlebars", @@ -4404,7 +4033,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "mdbook", "semver", "serde", @@ -4537,9 +4166,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -4790,9 +4419,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4903,7 +4532,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4928,9 +4557,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4965,9 +4594,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -5003,7 +4632,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -5020,7 +4649,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5155,7 +4784,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5218,9 +4847,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -5229,9 +4858,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -5239,22 +4868,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -5334,7 +4963,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5367,13 +4996,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", "quick-xml", "serde", "time", @@ -5574,9 +5202,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -5601,7 +5229,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5655,7 +5283,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5678,9 +5306,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5810,7 +5438,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5911,7 +5539,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -5921,7 +5549,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -5930,7 +5558,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -5997,21 +5625,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -6022,8 +5635,8 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] @@ -6051,7 +5664,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] @@ -6191,26 +5804,13 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -6218,21 +5818,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki", - "sct 0.7.1", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", ] [[package]] @@ -6262,8 +5850,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6333,9 +5921,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" +checksum = "af947d0ca10a2f3e00c7ec1b515b7c83e5cb3fa62d4c11a64301d9eec54440e9" dependencies = [ "sdd", ] @@ -6393,24 +5981,14 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "sct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6491,7 +6069,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6519,22 +6097,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6548,9 +6126,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -6565,7 +6143,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6591,9 +6169,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "base64 0.22.1", "chrono", @@ -6609,14 +6187,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6654,7 +6232,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6845,12 +6423,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -6974,7 +6546,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6992,9 +6564,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sway-ast" @@ -7012,15 +6584,15 @@ dependencies = [ name = "sway-core" version = "0.61.2" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "derivative", "dirs 3.0.2", "either", - "fuel-abi-types", + "fuel-abi-types 0.5.2", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", - "fuel-vm 0.54.1", + "fuel-vm", "gimli 0.28.1", "graph-cycles", "hashbrown 0.13.2", @@ -7183,9 +6755,9 @@ name = "sway-types" version = "0.61.2" dependencies = [ "bytecount", - "fuel-asm 0.54.1", - "fuel-crypto 0.54.1", - "fuel-tx 0.54.1", + "fuel-asm", + "fuel-crypto", + "fuel-tx", "indexmap 2.2.6", "lazy_static", "num-bigint", @@ -7241,9 +6813,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -7259,7 +6831,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7288,7 +6860,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7466,7 +7038,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.7", + "clap 4.5.9", "colored", "filecheck", "forc", @@ -7474,7 +7046,7 @@ dependencies = [ "forc-pkg", "forc-test", "forc-tracing 0.61.2", - "fuel-vm 0.54.1", + "fuel-vm", "futures", "gag", "hex", @@ -7546,7 +7118,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7650,9 +7222,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7700,7 +7272,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7713,24 +7285,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.12", + "rustls", "tokio", ] @@ -7828,27 +7389,6 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", "tower-layer", "tower-service", ] @@ -7890,7 +7430,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7905,7 +7445,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7919,7 +7458,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7992,7 +7531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -8133,12 +7672,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -8187,9 +7720,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uwuify" @@ -8332,7 +7865,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -8366,7 +7899,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8387,16 +7920,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -8463,7 +7986,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8490,7 +8013,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8525,18 +8048,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -8553,9 +8076,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8571,9 +8094,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8589,15 +8112,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8613,9 +8136,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8631,9 +8154,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8649,9 +8172,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8667,9 +8190,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -8816,22 +8339,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -8851,5 +8374,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] diff --git a/Cargo.toml b/Cargo.toml index 01d2ecf204e..f994a18e5f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,22 +34,22 @@ exclude = [ [workspace.dependencies] # Dependencies from the `fuel-core` repository: -fuel-core-client = { path = "../fuel-core/crates/client", default-features = false } -fuel-core-types = { path = "../fuel-core/crates/types", default-features = false } +fuel-core-client = { version = "0.32.0", default-features = false } +fuel-core-types = { version = "0.32.0", default-features = false } # Dependencies from the `fuel-vm` repository: -fuel-asm = { path = "../fuel-vm/fuel-asm" } -fuel-crypto = { path = "../fuel-vm/fuel-crypto", features = ["random"]} -fuel-types = { path = "../fuel-vm/fuel-types" } -fuel-tx = { path = "../fuel-vm/fuel-tx" } -fuel-vm = { path = "../fuel-vm/fuel-vm" } +fuel-asm = "0.56.0" +fuel-crypto = "0.56.0" +fuel-types = "0.56.0" +fuel-tx = "0.56.0" +fuel-vm = "0.56.0" # Dependencies from the `fuels-rs` repository: -fuels-core = "0.64.0" -fuels-accounts = "0.64.0" +fuels-core = "0.66.0" +fuels-accounts = "0.66.0" # Dependencies from the `forc-wallet` repository: -forc-wallet = "0.8.1" +forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: fuel-abi-types = "0.5.0" @@ -60,4 +60,3 @@ authors = ["Fuel Labs "] homepage = "https://fuel.network/" license = "Apache-2.0" repository = "https://github.com/FuelLabs/sway" - diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs index 4039c03e435..23ff1c11acd 100644 --- a/sway-core/src/asm_lang/allocated_ops.rs +++ b/sway-core/src/asm_lang/allocated_ops.rs @@ -241,7 +241,12 @@ pub(crate) enum AllocatedOpcode { /* Cryptographic Instructions */ ECK1(AllocatedRegister, AllocatedRegister, AllocatedRegister), ECR1(AllocatedRegister, AllocatedRegister, AllocatedRegister), - ED19(AllocatedRegister, AllocatedRegister, AllocatedRegister), + ED19( + AllocatedRegister, + AllocatedRegister, + AllocatedRegister, + AllocatedRegister, + ), K256(AllocatedRegister, AllocatedRegister, AllocatedRegister), S256(AllocatedRegister, AllocatedRegister, AllocatedRegister), @@ -363,7 +368,7 @@ impl AllocatedOpcode { /* Cryptographic Instructions */ ECK1(_r1, _r2, _r3) => vec![], ECR1(_r1, _r2, _r3) => vec![], - ED19(_r1, _r2, _r3) => vec![], + ED19(_r1, _r2, _r3, _r4) => vec![], K256(_r1, _r2, _r3) => vec![], S256(_r1, _r2, _r3) => vec![], @@ -489,7 +494,7 @@ impl fmt::Display for AllocatedOpcode { /* Cryptographic Instructions */ ECK1(a, b, c) => write!(fmtr, "eck1 {a} {b} {c}"), ECR1(a, b, c) => write!(fmtr, "ecr1 {a} {b} {c}"), - ED19(a, b, c) => write!(fmtr, "ed19 {a} {b} {c}"), + ED19(a, b, c, d) => write!(fmtr, "ed19 {a} {b} {c} {d}"), K256(a, b, c) => write!(fmtr, "k256 {a} {b} {c}"), S256(a, b, c) => write!(fmtr, "s256 {a} {b} {c}"), @@ -683,7 +688,9 @@ impl AllocatedOp { /* Cryptographic Instructions */ ECK1(a, b, c) => op::ECK1::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), ECR1(a, b, c) => op::ECR1::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), - ED19(a, b, c) => op::ED19::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), + ED19(a, b, c, d) => { + op::ED19::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id(), d.to_reg_id()).into() + } K256(a, b, c) => op::K256::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), S256(a, b, c) => op::S256::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(), diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs index c6c9ec6d585..641fbfff9f6 100644 --- a/sway-core/src/asm_lang/mod.rs +++ b/sway-core/src/asm_lang/mod.rs @@ -620,8 +620,8 @@ impl Op { VirtualOp::ECR1(r1, r2, r3) } "ed19" => { - let (r1, r2, r3) = three_regs(handler, args, immediate, whole_op_span)?; - VirtualOp::ED19(r1, r2, r3) + let (r1, r2, r3, r4) = four_regs(handler, args, immediate, whole_op_span)?; + VirtualOp::ED19(r1, r2, r3, r4) } "k256" => { let (r1, r2, r3) = three_regs(handler, args, immediate, whole_op_span)?; @@ -1206,7 +1206,7 @@ impl fmt::Display for VirtualOp { /* Cryptographic Instructions */ ECK1(a, b, c) => write!(fmtr, "eck1 {a} {b} {c}"), ECR1(a, b, c) => write!(fmtr, "ecr1 {a} {b} {c}"), - ED19(a, b, c) => write!(fmtr, "ed19 {a} {b} {c}"), + ED19(a, b, c, d) => write!(fmtr, "ed19 {a} {b} {c} {d}"), K256(a, b, c) => write!(fmtr, "k256 {a} {b} {c}"), S256(a, b, c) => write!(fmtr, "s256 {a} {b} {c}"), diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs index 45d066f0075..29b7da0030e 100644 --- a/sway-core/src/asm_lang/virtual_ops.rs +++ b/sway-core/src/asm_lang/virtual_ops.rs @@ -198,7 +198,12 @@ pub(crate) enum VirtualOp { /* Cryptographic Instructions */ ECK1(VirtualRegister, VirtualRegister, VirtualRegister), ECR1(VirtualRegister, VirtualRegister, VirtualRegister), - ED19(VirtualRegister, VirtualRegister, VirtualRegister), + ED19( + VirtualRegister, + VirtualRegister, + VirtualRegister, + VirtualRegister, + ), K256(VirtualRegister, VirtualRegister, VirtualRegister), S256(VirtualRegister, VirtualRegister, VirtualRegister), @@ -316,7 +321,7 @@ impl VirtualOp { /* Cryptographic Instructions */ ECK1(r1, r2, r3) => vec![r1, r2, r3], ECR1(r1, r2, r3) => vec![r1, r2, r3], - ED19(r1, r2, r3) => vec![r1, r2, r3], + ED19(r1, r2, r3, r4) => vec![r1, r2, r3, r4], K256(r1, r2, r3) => vec![r1, r2, r3], S256(r1, r2, r3) => vec![r1, r2, r3], @@ -437,7 +442,7 @@ impl VirtualOp { | TRO(_, _, _, _) | ECK1(_, _, _) | ECR1(_, _, _) - | ED19(_, _, _) + | ED19(_, _, _, _) | K256(_, _, _) | S256(_, _, _) | FLAG(_) @@ -493,7 +498,7 @@ impl VirtualOp { // Cryptographic | ECK1(_, _, _) | ECR1(_, _, _) - | ED19(_, _, _) + | ED19(_, _, _, _) => vec![&VirtualRegister::Constant(Overflow), &VirtualRegister::Constant(Error)], FLAG(_) => vec![&VirtualRegister::Constant(Flags)], JMP(_) @@ -652,7 +657,7 @@ impl VirtualOp { /* Cryptographic Instructions */ ECK1(r1, r2, r3) => vec![r1, r2, r3], ECR1(r1, r2, r3) => vec![r1, r2, r3], - ED19(r1, r2, r3) => vec![r1, r2, r3], + ED19(r1, r2, r3, r4) => vec![r1, r2, r3, r4], K256(r1, r2, r3) => vec![r1, r2, r3], S256(r1, r2, r3) => vec![r1, r2, r3], @@ -771,7 +776,7 @@ impl VirtualOp { /* Cryptographic Instructions */ ECK1(_r1, _r2, _r3) => vec![], ECR1(_r1, _r2, _r3) => vec![], - ED19(_r1, _r2, _r3) => vec![], + ED19(_r1, _r2, _r3, _r4) => vec![], K256(_r1, _r2, _r3) => vec![], S256(_r1, _r2, _r3) => vec![], @@ -1192,10 +1197,11 @@ impl VirtualOp { update_reg(reg_to_reg_map, r2), update_reg(reg_to_reg_map, r3), ), - ED19(r1, r2, r3) => Self::ED19( + ED19(r1, r2, r3, r4) => Self::ED19( update_reg(reg_to_reg_map, r1), update_reg(reg_to_reg_map, r2), update_reg(reg_to_reg_map, r3), + update_reg(reg_to_reg_map, r4), ), K256(r1, r2, r3) => Self::K256( update_reg(reg_to_reg_map, r1), @@ -1659,10 +1665,11 @@ impl VirtualOp { map_reg(&mapping, reg2), map_reg(&mapping, reg3), ), - ED19(reg1, reg2, reg3) => AllocatedOpcode::ED19( + ED19(reg1, reg2, reg3, reg4) => AllocatedOpcode::ED19( map_reg(&mapping, reg1), map_reg(&mapping, reg2), map_reg(&mapping, reg3), + map_reg(&mapping, reg4), ), K256(reg1, reg2, reg3) => AllocatedOpcode::K256( map_reg(&mapping, reg1), From 4bd4ac7990e1e1580314acb0cb13199528774a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaya=20G=C3=B6kalp?= Date: Wed, 17 Jul 2024 09:44:25 -0700 Subject: [PATCH 05/47] chore: bump to use fuel-core v0.31.0 and sdk v0.65.1 (#6252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps dependencies so that we start to use fuel-core v0.31.0. Waiting on: 1. https://github.com/FuelLabs/forc-wallet/pull/197 2. https://github.com/FuelLabs/forc-wallet/pull/196 --------- Co-authored-by: Igor Rončević --- Cargo.lock | 504 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 251 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 557a7418d45..3f5d0f64e25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -257,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -277,7 +277,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.1", + "object 0.36.0", "rustc-demangle", "serde", ] @@ -362,9 +362,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -474,7 +474,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", "syn_derive", ] @@ -570,9 +570,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.0" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -609,7 +609,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -679,9 +679,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -689,9 +689,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -702,11 +702,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", ] [[package]] @@ -715,20 +715,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -853,15 +853,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" +checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" [[package]] name = "completest-pty" -version = "0.5.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" +checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" dependencies = [ "completest", "ptyprocess", @@ -874,7 +874,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "entities", "memchr", "once_cell", @@ -1020,7 +1020,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.9", + "clap 4.5.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1178,7 +1178,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1244,12 +1244,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1268,16 +1268,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1293,13 +1293,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.9", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1393,7 +1393,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1586,9 +1586,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -1665,7 +1665,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1678,7 +1678,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1841,7 +1841,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -1977,7 +1977,7 @@ dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "clap_complete_fig", "completest-pty", @@ -2013,7 +2013,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.9", + "clap 4.5.7", "devault", "forc", "forc-pkg", @@ -2021,7 +2021,7 @@ dependencies = [ "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types 0.5.2", + "fuel-abi-types", "fuel-core-client", "fuel-core-types", "fuel-crypto", @@ -2052,7 +2052,7 @@ dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.9", + "clap 4.5.7", "forc-tracing 0.61.2", "forc-util", "fuel-core-types", @@ -2076,7 +2076,7 @@ name = "forc-debug" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dap", "escargot", "forc-pkg", @@ -2102,7 +2102,7 @@ name = "forc-doc" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "comrak", "dir_indexer", "expect-test", @@ -2127,7 +2127,7 @@ name = "forc-fmt" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "forc-pkg", "forc-tracing 0.61.2", "forc-util", @@ -2144,7 +2144,7 @@ name = "forc-lsp" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2160,7 +2160,7 @@ dependencies = [ "cid", "forc-tracing 0.61.2", "forc-util", - "fuel-abi-types 0.5.2", + "fuel-abi-types", "futures", "git2", "gix-url", @@ -2193,7 +2193,7 @@ version = "0.61.2" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types 0.5.2", + "fuel-abi-types", "fuel-tx", "fuel-vm", "fuels-core", @@ -2229,7 +2229,7 @@ name = "forc-tx" version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "devault", "forc-util", "fuel-tx", @@ -2246,7 +2246,7 @@ dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dirs 3.0.2", "fd-lock 4.0.2", "forc-tracing 0.61.2", @@ -2268,12 +2268,12 @@ dependencies = [ [[package]] name = "forc-wallet" -version = "0.9.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fb8dd372e7141efc5a63a1e6036e4ae0789774087ec9936b6cf426ef19bb16" +checksum = "6e88edfd8c98861cdf0c27ccea3d81b0033b1e80d3d22367fd0fd4e2b58dc9dd" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "eth-keystore", "forc-tracing 0.47.0", "fuel-crypto", @@ -2344,34 +2344,17 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.70", - "thiserror", -] - -[[package]] -name = "fuel-abi-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce44ac13b1971be7cea024a2003cf944522093dafec454fea9ff792f0ff2577" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.70", + "syn 2.0.66", "thiserror", ] [[package]] name = "fuel-asm" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" +checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "fuel-types", "serde", "strum 0.24.1", @@ -2379,9 +2362,9 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db93098b2f39a7eab8c408eb6beb5b4580883a988b76377414eefe4b405455de" +checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" dependencies = [ "anyhow", "bech32", @@ -2399,9 +2382,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeec47aa62e9418a61a9936b6ec30474b918000879e5f556980e0648390b1c10" +checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" dependencies = [ "anyhow", "cynic", @@ -2423,9 +2406,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69ff33d722268ab0533a75b260195169a3761e2ca1d13cdd8469a59c2826927" +checksum = "b1e2f22f6c4ce2696c29c14083c465f276c8d8eca67f051cb7d09a72442ceb5e" dependencies = [ "parking_lot 0.12.3", "pin-project-lite", @@ -2436,9 +2419,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3444c6b2ed6a7878e1a3b317f9922be41064cfafaf863bc7ab25823bcfbd749" +checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" dependencies = [ "anyhow", "async-trait", @@ -2453,9 +2436,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85c2a19cd58cf541409c94ef77ef9b2e742f196b9a0209fb6b9310184cec92f" +checksum = "ff8a175199e0e7b1373ac10d45eb26563c1e8299298c9589ab60efb1c7cae6ac" dependencies = [ "anyhow", "async-trait", @@ -2468,9 +2451,9 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f244ffed0818fc7f63ff46ea4087ea2c509876b32e733f22e9b7836aebece4" +checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" dependencies = [ "anyhow", "derive_more", @@ -2490,9 +2473,9 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.32.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044371366fb644733dd0452ced749b0d926d81c1959fad5f19f81a28f13125ee" +checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" dependencies = [ "anyhow", "bs58", @@ -2509,9 +2492,9 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33548590131674e8f272a3e056be4dbaa1de7cb364eab2b17987cd5c0dc31cb0" +checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" dependencies = [ "coins-bip32", "coins-bip39", @@ -2530,13 +2513,13 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f49fdbfc1615d88d2849650afc2b0ac2fecd69661ebadd31a073d8416747764" +checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", "synstructure 0.13.1", ] @@ -2589,9 +2572,9 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" +checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" dependencies = [ "derive_more", "digest 0.10.7", @@ -2604,17 +2587,17 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" +checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" [[package]] name = "fuel-tx" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aae44611588d199dd119e4a0ebd8eb7ae4cde6bf8b4d12715610b1f5e5b731" +checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "derivative", "derive_more", "fuel-asm", @@ -2633,9 +2616,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" +checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" dependencies = [ "fuel-derive", "hex", @@ -2645,14 +2628,14 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.56.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fc4695efac9207276f6229f2dd9811848b328a13604a698f7bce1d452bd986" +checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.6.0", + "bitflags 2.5.0", "derivative", "derive_more", "ethnum", @@ -2679,9 +2662,9 @@ dependencies = [ [[package]] name = "fuels" -version = "0.66.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0921f0318576c0eff424a4d0f23c09fc7116880b7fc643a8012df519555b90a6" +checksum = "2513a5159300a6f0220b58ed989a5b9aa2c0af55cd26613eb89ff28c25d68364" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2695,9 +2678,9 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.66.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409f2c0acdb512c19973e20253eda39b075c2b6c2378781679279072f65d78ce" +checksum = "fed97e653906fe0bc60b5d7a7421f3c5fe766f516b762def8f4ccac707ac4bc3" dependencies = [ "async-trait", "chrono", @@ -2720,30 +2703,30 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.66.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f4f9ef364fe74a7079a6ad8e239ce424b754ff0e168ffcddb0da60d4069008" +checksum = "1edef30656b740ca9c279a7bcfe9e366557c271a2751e36316f780f18dc99c85" dependencies = [ "Inflector", - "fuel-abi-types 0.7.0", + "fuel-abi-types", "itertools 0.12.1", "proc-macro2", "quote", "regex", "serde_json", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] name = "fuels-core" -version = "0.66.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c7a1b18a60af04579eff687e76fac419fb060b7309a35675fac22a132af00" +checksum = "ff741c9f1ba2c701b50c76a98a5655d8bc0f275f7ae2dd0e724f8fc36eeb8a9f" dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types 0.7.0", + "fuel-abi-types", "fuel-asm", "fuel-core-chain-config", "fuel-core-client", @@ -2764,25 +2747,25 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.66.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf58bac268a3ee1dec31ec1b6273e326c8650fa805dad600a03329716d17c29" +checksum = "bba1c2fd149a310879249144f2589336708ae860563a45b792907ae34ae6b959" dependencies = [ "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] name = "fuels-programs" -version = "0.66.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313e13af93d629778f514cb876befdc30d5c030df58ab96885a39bdaeeddcff6" +checksum = "04fedba784b4dd4088d2c1709cd4afc380dbfa6d0a49db267ee98df9144e1d18" dependencies = [ "async-trait", - "fuel-abi-types 0.7.0", + "fuel-abi-types", "fuel-asm", "fuel-tx", "fuel-types", @@ -2796,9 +2779,9 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.66.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c9690c345c4ab5f368fb9309e3df3f745f44109f5e40aed87d184f8af0a3c" +checksum = "c3cbea43b7d6d2987ad59cf536534fc500a009b85eb3200be30116827c90ec33" dependencies = [ "fuel-core-chain-config", "fuel-core-client", @@ -2879,7 +2862,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -3167,7 +3150,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin", + "spin 0.9.8", "stable_deref_trait", ] @@ -3309,9 +3292,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -3485,7 +3468,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -3497,7 +3480,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -3773,11 +3756,11 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -3840,7 +3823,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -3851,7 +3834,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", ] @@ -3929,6 +3912,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3953,9 +3942,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logos" @@ -4010,7 +3999,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "env_logger", "handlebars", @@ -4033,7 +4022,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "mdbook", "semver", "serde", @@ -4166,9 +4155,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.5" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", @@ -4419,9 +4408,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ "num-integer", "num-traits", @@ -4532,7 +4521,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -4557,9 +4546,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -4594,9 +4583,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -4632,7 +4621,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4649,7 +4638,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -4784,7 +4773,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4847,9 +4836,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -4858,9 +4847,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -4868,22 +4857,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -4963,7 +4952,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -4996,12 +4985,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap 2.2.6", + "line-wrap", "quick-xml", "serde", "time", @@ -5202,9 +5192,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -5229,7 +5219,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -5283,7 +5273,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5306,9 +5296,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5438,7 +5428,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", ] [[package]] @@ -5635,7 +5625,7 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin", + "spin 0.9.8", "untrusted", "windows-sys 0.52.0", ] @@ -5664,7 +5654,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -5804,7 +5794,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -5921,9 +5911,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af947d0ca10a2f3e00c7ec1b515b7c83e5cb3fa62d4c11a64301d9eec54440e9" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" dependencies = [ "sdd", ] @@ -6069,7 +6059,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6097,22 +6087,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6126,9 +6116,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -6143,7 +6133,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6169,9 +6159,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.3" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64 0.22.1", "chrono", @@ -6187,14 +6177,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.3" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.10", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6232,7 +6222,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6423,6 +6413,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -6546,7 +6542,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6564,9 +6560,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sway-ast" @@ -6584,11 +6580,11 @@ dependencies = [ name = "sway-core" version = "0.61.2" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "derivative", "dirs 3.0.2", "either", - "fuel-abi-types 0.5.2", + "fuel-abi-types", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", @@ -6813,9 +6809,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -6831,7 +6827,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -6860,7 +6856,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7038,7 +7034,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.9", + "clap 4.5.7", "colored", "filecheck", "forc", @@ -7118,7 +7114,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7222,9 +7218,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -7272,7 +7268,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7430,7 +7426,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7458,7 +7454,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7531,7 +7527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -7720,9 +7716,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" [[package]] name = "uwuify" @@ -7865,7 +7861,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -7899,7 +7895,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7986,7 +7982,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8013,7 +8009,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8048,18 +8044,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "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", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -8076,9 +8072,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -8094,9 +8090,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -8112,15 +8108,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -8136,9 +8132,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -8154,9 +8150,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -8172,9 +8168,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -8190,9 +8186,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8339,22 +8335,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] [[package]] @@ -8374,5 +8370,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.66", ] diff --git a/Cargo.toml b/Cargo.toml index f994a18e5f5..586388775f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ fuels-accounts = "0.66.0" forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: -fuel-abi-types = "0.5.0" +fuel-abi-types = "0.5.2" [workspace.package] edition = "2021" From ebb030b2eb48fd5afd062b36511ddfe324414f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaya=20G=C3=B6kalp?= Date: Wed, 7 Aug 2024 03:41:44 -0700 Subject: [PATCH 06/47] feat: create and deploy a reference proxy contract for contracts with `[proxy]` enabled (#6069) Part of #6068. This PR adds couple of things: 1. A default proxy contract implementation taken from [sway standards](https://github.com/FuelLabs/sway-standards/blob/master/standards/src/src14.sw). 2. Infra for creating, building and deploying the reference implementation for proxy contracts. 3. Deployment procedure such that proxy contract is deployed while working on a contract which enables the `[proxy]` in its forc.toml. In a way that it is owned by the deployer and the target initially points to implementation contract. 4. Infra for making a contract call into the already deployed proxy contracts to update their targets. 5. Adds a `Building` text to the all forc build invocations to better inform the user about what forc is doing behind the scenes. 6. Removes duplicate forc-wallet password prompts which was very frustrating for the users. Now forc-wallet deployment path only asks for password once. 7. Refactors around how secret_key is selected based on user input 8. Updated docs around forc-client 9. Docs around how to use the proxy feature If the user does not have a proxy table in their forc.toml, nothing changes, same old deployment procedure is followed. Only difference is that this PR improves the ux by removing the need of providing the password multiple times. If the user has a contract with a proxy table but without an address like: ```TOML [project] authors = ["kaya"] entry = "main.sw" license = "Apache-2.0" name = "impl-contract" [dependencies] [proxy] enabled = true ``` Forc automatically creates a proxy contract based on the reference implementation at [SRC14](https://github.com/FuelLabs/sway-standard-implementations/tree/61fd4ad8f69d21cec0d5cd8135bdc4495e0c125c). Sets its target to the implementation contract, whichever contract enabled the proxy and the owner to the deployer (signing account of the transaction). If the user has a contract with a proxy table and an address specified like: ```TOML [project] authors = ["kaya"] entry = "main.sw" license = "Apache-2.0" name = "impl-contract" [dependencies] [proxy] enabled = true address = "........." ``` Forc automatically makes a set target conract call to update the proxy contract's target. Pointing it to the newly deployed impl contract which defines the proxy table. Generated proxy contract abi and bins are stored at `~/.forc/.generated_proxy_contracts/project_name` for housekeeping. --- Cargo.lock | 1 + docs/book/src/forc/plugins/forc_client/index.md | 14 ++++++-------- forc-plugins/forc-client/tests/deploy.rs | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f5d0f64e25..08ba5d73738 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2027,6 +2027,7 @@ dependencies = [ "fuel-crypto", "fuel-tx", "fuel-vm", + "fuels", "fuels-accounts", "fuels-core", "futures", diff --git a/docs/book/src/forc/plugins/forc_client/index.md b/docs/book/src/forc/plugins/forc_client/index.md index 8f35fd1b121..fc552e6bece 100644 --- a/docs/book/src/forc/plugins/forc_client/index.md +++ b/docs/book/src/forc/plugins/forc_client/index.md @@ -1,8 +1,6 @@ # `forc-client` -The forc plugin for interacting with a Fuel node. - -Since transactions are going to require some gas, you need to sign them with an account that has enough coins to pay for them. +Forc plugin for interacting with a Fuel node. Since transactions are going to require some gas, you need to sign them with an account that has enough tokens to pay for them. We offer multiple ways to sign the transaction: @@ -10,7 +8,7 @@ We offer multiple ways to sign the transaction: 2. Use the default signer to deploy to a local node 3. Use `forc-wallet` to manually sign transactions, and copy the signed transaction back to `forc-client`. -The easiest and recommended way to interact with deployed networks such as our testnets is option 1, using `forc-client` to sign your transactions which reads your default `forc-wallet` vault. For interacting with local node, we recommend using the second option, which leads `forc-client` to sign transactions with the private key that comes pre-funded in local environments. +The easiest and recommended way to interact with deployed networks such as our testnets is option 1, using `forc-client` to sign your transactions which reads your default `forc-wallet` vault. For interacting with local node, we recommend using the second option, which leads `forc-client` to sign transactions with the a private key that comes pre-funded in local environments. ## Option 1: Sign transactions via forc-client using your local forc-wallet vault @@ -39,7 +37,7 @@ As it can be seen from the example, `forc-client` asks for your password to decr ## Option 2: Using default signer -If you are not interacting with a deployed network, such as testnets, your local `fuel-core` environment can be structured such that it funds an account by default. Using `--default-signer` flag with `forc-client` binaries (run, deploy) will instruct `forc-client` to sign transactions with this pre-funded account. This makes it a useful command while working against a local node. +If you are not interacting with a deployed network, such as testnets, your local `fuel-core` environment can be structured such that it funds an account by default. Using `--default-signer` flag with `forc-client` binaries (run, deploy) will instruct `forc-client` to sign transactions with this pre-funded account. Which makes it a useful command while working against a local node. Example: @@ -56,7 +54,7 @@ Example: ## Option 3: Manually signing through forc-wallet (Deprecated) -This option is for creating the transaction first, signing it manually, and supplying the signed transaction back to forc-client. Since it requires multiple steps, it is more error-prone and not recommended for general use cases. Also this will be deprecated soon. +This option is for creating the transaction first, signing it manually and supplying the signed transaction back to forc-client. Since it requires multiple steps, it is more error-prone and not recommended for general use case. Also this will be deprecated soon. 1. Construct the transaction by using either `forc deploy` or `forc run`. To do so simply run `forc deploy --manual-sign` or `forc run --manual-sign` with your desired parameters. For a list of parameters please refer to the [forc-deploy](./forc_deploy.md) or [forc-run](./forc_run.md) section of the book. Once you run either command you will be asked the address of the wallet you are going to be signing with. After the address is given the transaction will be generated and you will be given a transaction ID. At this point CLI will actively wait for you to insert the signature. 2. Take the transaction ID generated in the first step and sign it with `forc wallet sign --account tx-id `. This will generate a signature. @@ -146,9 +144,9 @@ implicit-std = false enabled = true ``` -If there is no `address` field present under the proxy table, like the example above, `forc` will automatically create a proxy contract based on the [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) implementation from [sway-standards](https://github.com/FuelLabs/sway-standards). After generating and deploying the proxy contract, the target is set to the current contract, and the owner of the proxy is set to the account that is signing the transaction for deployment. +If there is no `address` field present under the proxy table, like the example above, `forc` will automatically create a proxy contract based on the [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) implementation from [sway-standards](https://github.com/FuelLabs/sway-standards). After generating and deploying the proxy contract, the target is set to the current contract, and owner of the proxy is set to the account that is signing the transaction for deployment. -This means that if you simply enable proxy in the `Forc.toml`, forc will automatically deploy a proxy contract for you and you do not need to do anything manually aside from signing the deployment transactions for the proxy contract. After deploying the proxy contract, the address is added into the `address` field of the proxy table. +This means that if you simply enable proxy in the `Forc.toml`, forc will automatically deploy a proxy contract for you and you do not need to do anything manually aside from signing the deployment transactions for the proxy contract. After deploying the proxy contract, the its address is added into the `address` field of the proxy table. If you want to update the target of an [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) compliant proxy contract rather than deploying a new one, simply add its `address` in the `address` field, like the following example: diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index e65e5e4f3cb..8f45d4a3478 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -141,7 +141,7 @@ async fn test_simple_deploy() { node.kill().unwrap(); let expected = vec![DeployedContract { id: ContractId::from_str( - "ad0bba17e0838ef859abe2693d8a5e3bc4e7cfb901601e30f4dc34999fda6335", + "822c8d3672471f64f14f326447793c7377b6e430122db23b622880ccbd8a33ef", ) .unwrap(), proxy: None, @@ -185,12 +185,12 @@ async fn test_deploy_fresh_proxy() { node.kill().unwrap(); let impl_contract = DeployedContract { id: ContractId::from_str( - "ad0bba17e0838ef859abe2693d8a5e3bc4e7cfb901601e30f4dc34999fda6335", + "822c8d3672471f64f14f326447793c7377b6e430122db23b622880ccbd8a33ef", ) .unwrap(), proxy: Some( ContractId::from_str( - "5237df8db3edbe825ce83f4292094923c989efe3265b0115ed050925593a3488", + "3da2f8ee967c62496db4b71df0acd7c3fea1e494fee1de0cd16e7abd22e6057f", ) .unwrap(), ), From 0aa3ee52808eaa15633b1ba22ade4cd47291d2b0 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 10 Jul 2024 10:25:19 +0100 Subject: [PATCH 07/47] Updates ABI with program_type and hash based ids. --- Cargo.lock | 31 +++-- Cargo.toml | 2 +- forc-pkg/src/pkg.rs | 140 +---------------------- sway-core/src/abi_generation/fuel_abi.rs | 129 +++++++++++++++------ 4 files changed, 126 insertions(+), 176 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08ba5d73738..18727c66ad9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2021,7 +2021,7 @@ dependencies = [ "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types", + "fuel-abi-types 0.6.0", "fuel-core-client", "fuel-core-types", "fuel-crypto", @@ -2161,7 +2161,7 @@ dependencies = [ "cid", "forc-tracing 0.61.2", "forc-util", - "fuel-abi-types", + "fuel-abi-types 0.6.0", "futures", "git2", "gix-url", @@ -2194,7 +2194,7 @@ version = "0.61.2" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types", + "fuel-abi-types 0.6.0", "fuel-tx", "fuel-vm", "fuels-core", @@ -2349,6 +2349,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "fuel-abi-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb98391d7df3963bc3f30d3c8bfce301573a115fa92a35bed55e4c94b836be2" +dependencies = [ + "itertools 0.10.5", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "serde", + "serde_json", + "syn 2.0.66", + "thiserror", +] + [[package]] name = "fuel-asm" version = "0.55.0" @@ -2709,7 +2726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edef30656b740ca9c279a7bcfe9e366557c271a2751e36316f780f18dc99c85" dependencies = [ "Inflector", - "fuel-abi-types", + "fuel-abi-types 0.5.2", "itertools 0.12.1", "proc-macro2", "quote", @@ -2727,7 +2744,7 @@ dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types", + "fuel-abi-types 0.5.2", "fuel-asm", "fuel-core-chain-config", "fuel-core-client", @@ -2766,7 +2783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04fedba784b4dd4088d2c1709cd4afc380dbfa6d0a49db267ee98df9144e1d18" dependencies = [ "async-trait", - "fuel-abi-types", + "fuel-abi-types 0.5.2", "fuel-asm", "fuel-tx", "fuel-types", @@ -6585,7 +6602,7 @@ dependencies = [ "derivative", "dirs 3.0.2", "either", - "fuel-abi-types", + "fuel-abi-types 0.6.0", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", diff --git a/Cargo.toml b/Cargo.toml index 586388775f1..3862f976fba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ fuels-accounts = "0.66.0" forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: -fuel-abi-types = "0.5.2" +fuel-abi-types = "0.6.0" [workspace.package] edition = "2021" diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 1937933719a..1a82b0d224a 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -15,7 +15,6 @@ use forc_util::{ default_output_directory, find_file_name, kebab_to_snake_case, print_compiling, print_on_failure, print_warnings, }; -use fuel_abi_types::abi::program as program_abi; use petgraph::{ self, dot, visit::{Bfs, Dfs, EdgeRef, Walker}, @@ -1834,6 +1833,8 @@ pub fn compile( ); const NEW_ENCODING_VERSION: &str = "1"; + const SPEC_VERSION: &str = "1"; + const ABI_VERSION: &str = "1"; let mut program_abi = match pkg.target { BuildTarget::Fuel => { @@ -1852,6 +1853,8 @@ pub fn compile( .experimental .new_encoding .then(|| NEW_ENCODING_VERSION.into()), + SPEC_VERSION.into(), + ABI_VERSION.into() ), Some(sway_build_config.clone()), metrics @@ -2483,11 +2486,6 @@ pub fn build( } source_map.insert_dependency(descriptor.manifest_file.dir()); - // TODO: This should probably be in `fuel_abi_json::generate_json_abi_program`? - if let ProgramABI::Fuel(ref mut program_abi) = compiled.program_abi { - standardize_json_abi_types(program_abi); - } - let built_pkg = BuiltPackage { descriptor, program_abi: compiled.program_abi, @@ -2507,136 +2505,6 @@ pub fn build( Ok(built_packages) } -/// Standardize the JSON ABI data structure by eliminating duplicate types. This is an iterative -/// process because every time two types are merged, new opportunities for more merging arise. -fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { - loop { - // If type with id_1 is a duplicate of type with id_2, then keep track of the mapping - // between id_1 and id_2 in the HashMap below. - let mut old_to_new_id: HashMap = HashMap::new(); - - // A vector containing unique `program_abi::TypeDeclaration`s. - // - // Two `program_abi::TypeDeclaration` are deemed the same if the have the same - // `type_field`, `components`, and `type_parameters` (even if their `type_id`s are - // different). - let mut deduped_types: Vec = Vec::new(); - - // Insert values in `deduped_types` if they haven't been inserted before. Otherwise, create - // an appropriate mapping between type IDs in the HashMap `old_to_new_id`. - for decl in &json_abi_program.types { - if let Some(ty) = deduped_types.iter().find(|d| { - d.type_field == decl.type_field - && d.components == decl.components - && d.type_parameters == decl.type_parameters - }) { - old_to_new_id.insert(decl.type_id, ty.type_id); - } else { - deduped_types.push(decl.clone()); - } - } - - // Nothing to do if the hash map is empty as there are not merge opportunities. We can now - // exit the loop. - if old_to_new_id.is_empty() { - break; - } - - json_abi_program.types = deduped_types; - - // Update all `program_abi::TypeApplication`s and all `program_abi::TypeDeclaration`s - update_all_types(json_abi_program, &old_to_new_id); - } - - // Sort the `program_abi::TypeDeclaration`s - json_abi_program - .types - .sort_by(|t1, t2| t1.type_field.cmp(&t2.type_field)); - - // Standardize IDs (i.e. change them to 0,1,2,... according to the alphabetical order above - let mut old_to_new_id: HashMap = HashMap::new(); - for (ix, decl) in json_abi_program.types.iter_mut().enumerate() { - old_to_new_id.insert(decl.type_id, ix); - decl.type_id = ix; - } - - // Update all `program_abi::TypeApplication`s and all `program_abi::TypeDeclaration`s - update_all_types(json_abi_program, &old_to_new_id); -} - -/// Recursively updates the type IDs used in a program_abi::ProgramABI -fn update_all_types( - json_abi_program: &mut program_abi::ProgramABI, - old_to_new_id: &HashMap, -) { - // Update all `program_abi::TypeApplication`s in every function - for func in &mut json_abi_program.functions { - for input in &mut func.inputs { - update_json_type_application(input, old_to_new_id); - } - - update_json_type_application(&mut func.output, old_to_new_id); - } - - // Update all `program_abi::TypeDeclaration` - for decl in &mut json_abi_program.types { - update_json_type_declaration(decl, old_to_new_id); - } - if let Some(logged_types) = &mut json_abi_program.logged_types { - for logged_type in logged_types { - update_json_type_application(&mut logged_type.application, old_to_new_id); - } - } - if let Some(messages_types) = &mut json_abi_program.messages_types { - for logged_type in messages_types { - update_json_type_application(&mut logged_type.application, old_to_new_id); - } - } - if let Some(configurables) = &mut json_abi_program.configurables { - for logged_type in configurables { - update_json_type_application(&mut logged_type.application, old_to_new_id); - } - } -} - -/// Recursively updates the type IDs used in a `program_abi::TypeApplication` given a HashMap from -/// old to new IDs -fn update_json_type_application( - type_application: &mut program_abi::TypeApplication, - old_to_new_id: &HashMap, -) { - if let Some(new_id) = old_to_new_id.get(&type_application.type_id) { - type_application.type_id = *new_id; - } - - if let Some(args) = &mut type_application.type_arguments { - for arg in args.iter_mut() { - update_json_type_application(arg, old_to_new_id); - } - } -} - -/// Recursively updates the type IDs used in a `program_abi::TypeDeclaration` given a HashMap from -/// old to new IDs -fn update_json_type_declaration( - type_declaration: &mut program_abi::TypeDeclaration, - old_to_new_id: &HashMap, -) { - if let Some(params) = &mut type_declaration.type_parameters { - for param in params.iter_mut() { - if let Some(new_id) = old_to_new_id.get(param) { - *param = *new_id; - } - } - } - - if let Some(components) = &mut type_declaration.components { - for component in components.iter_mut() { - update_json_type_application(component, old_to_new_id); - } - } -} - /// Compile the entire forc package and return the lexed, parsed and typed programs /// of the dependencies and project. /// The final item in the returned vector is the project. diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index f4d0205d8b0..8d03e379ac2 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -1,4 +1,5 @@ use fuel_abi_types::abi::program as program_abi; +use sha2::{Digest, Sha256}; use std::collections::HashSet; use crate::{ @@ -33,11 +34,24 @@ impl<'a> AbiContext<'a> { } } +impl TypeId { + fn get_abi_type_id(&self, ctx: &mut AbiContext, engines: &Engines) -> String { + let string = + self.get_abi_type_str(&ctx.to_str_context(engines, true), engines, self.clone()); + let mut hasher = Sha256::new(); + hasher.update(string); + let result = hasher.finalize(); + format!("{:x}", result) + } +} + pub fn generate_program_abi( ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, encoding: Option, + spec_version: program_abi::Version, + abi_version: program_abi::Version, ) -> program_abi::ProgramABI { let decl_engine = engines.de(); match &ctx.program.kind { @@ -53,6 +67,27 @@ pub fn generate_program_abi( let messages_types = generate_messages_types(ctx, engines, types); let configurables = generate_configurables(ctx, engines, types); program_abi::ProgramABI { + program_type: "contract".to_string(), + spec_version, + abi_version, + encoding, + types: types.to_vec(), + functions, + logged_types: Some(logged_types), + messages_types: Some(messages_types), + configurables: Some(configurables), + } + } + TyProgramKind::Script { main_function, .. } => { + let main_function = decl_engine.get_function(main_function); + let functions = vec![main_function.generate_abi_function(ctx, engines, types)]; + let logged_types = generate_logged_types(ctx, engines, types); + let messages_types = generate_messages_types(ctx, engines, types); + let configurables = generate_configurables(ctx, engines, types); + program_abi::ProgramABI { + program_type: "script".to_string(), + spec_version, + abi_version, encoding, types: types.to_vec(), functions, @@ -61,14 +96,16 @@ pub fn generate_program_abi( configurables: Some(configurables), } } - TyProgramKind::Script { main_function, .. } - | TyProgramKind::Predicate { main_function, .. } => { + TyProgramKind::Predicate { main_function, .. } => { let main_function = decl_engine.get_function(main_function); let functions = vec![main_function.generate_abi_function(ctx, engines, types)]; let logged_types = generate_logged_types(ctx, engines, types); let messages_types = generate_messages_types(ctx, engines, types); let configurables = generate_configurables(ctx, engines, types); program_abi::ProgramABI { + program_type: "predicate".to_string(), + spec_version, + abi_version, encoding, types: types.to_vec(), functions, @@ -77,7 +114,10 @@ pub fn generate_program_abi( configurables: Some(configurables), } } - _ => program_abi::ProgramABI { + TyProgramKind::Library { .. } => program_abi::ProgramABI { + program_type: "library".to_string(), + spec_version, + abi_version, encoding, types: vec![], functions: vec![], @@ -99,7 +139,7 @@ fn generate_logged_types( .logged_types .iter() .map(|(_, type_id)| program_abi::TypeDeclaration { - type_id: type_id.index(), + type_id: type_id.get_abi_type_id(ctx, engines), type_field: type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -128,7 +168,7 @@ fn generate_logged_types( log_id: log_id.to_string(), application: program_abi::TypeApplication { name: "".to_string(), - type_id: type_id.index(), + type_id: type_id.get_abi_type_id(ctx, engines), type_arguments: type_id .get_abi_type_arguments(ctx, engines, types, *type_id), }, @@ -149,7 +189,7 @@ fn generate_messages_types( .messages_types .iter() .map(|(_, type_id)| program_abi::TypeDeclaration { - type_id: type_id.index(), + type_id: type_id.get_abi_type_id(ctx, engines), type_field: type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -171,7 +211,7 @@ fn generate_messages_types( message_id: **message_id as u64, application: program_abi::TypeApplication { name: "".to_string(), - type_id: type_id.index(), + type_id: type_id.get_abi_type_id(ctx, engines), type_arguments: type_id.get_abi_type_arguments(ctx, engines, types, *type_id), }, }) @@ -189,7 +229,7 @@ fn generate_configurables( .configurables .iter() .map(|decl| program_abi::TypeDeclaration { - type_id: decl.type_ascription.type_id.index(), + type_id: decl.type_ascription.type_id.get_abi_type_id(ctx, engines), type_field: decl.type_ascription.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -221,7 +261,7 @@ fn generate_configurables( name: decl.call_path.suffix.to_string(), application: program_abi::TypeApplication { name: "".to_string(), - type_id: decl.type_ascription.type_id.index(), + type_id: decl.type_ascription.type_id.get_abi_type_id(ctx, engines), type_arguments: decl.type_ascription.type_id.get_abi_type_arguments( ctx, engines, @@ -246,7 +286,7 @@ impl TypeId { engines: &Engines, types: &mut Vec, resolved_type_id: TypeId, - ) -> Option> { + ) -> Option> { match self.is_generic_parameter(engines, resolved_type_id) { true => None, false => resolved_type_id.get_type_parameters(engines).map(|v| { @@ -277,7 +317,10 @@ impl TypeId { .variants .iter() .map(|x| program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -306,7 +349,10 @@ impl TypeId { .iter() .map(|x| program_abi::TypeApplication { name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -325,7 +371,10 @@ impl TypeId { .fields .iter() .map(|x| program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -354,7 +403,10 @@ impl TypeId { .iter() .map(|x| program_abi::TypeApplication { name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -369,7 +421,7 @@ impl TypeId { if let TypeInfo::Array(elem_ty, _) = &*type_engine.get(resolved_type_id) { // The `program_abi::TypeDeclaration`s needed for the array element type let elem_abi_ty = program_abi::TypeDeclaration { - type_id: elem_ty.initial_type_id.index(), + type_id: elem_ty.initial_type_id.get_abi_type_id(ctx, engines), type_field: elem_ty.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -394,7 +446,7 @@ impl TypeId { // `program_abi::TypeApplication` for the array element type Some(vec![program_abi::TypeApplication { name: "__array_element".to_string(), - type_id: elem_ty.initial_type_id.index(), + type_id: elem_ty.initial_type_id.get_abi_type_id(ctx, engines), type_arguments: elem_ty.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -453,7 +505,7 @@ impl TypeId { let fields_types = fields .iter() .map(|x| program_abi::TypeDeclaration { - type_id: x.initial_type_id.index(), + type_id: x.initial_type_id.get_abi_type_id(ctx, engines), type_field: x.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -477,7 +529,7 @@ impl TypeId { .iter() .map(|x| program_abi::TypeApplication { name: "__tuple_element".to_string(), - type_id: x.initial_type_id.index(), + type_id: x.initial_type_id.get_abi_type_id(ctx, engines), type_arguments: x .initial_type_id .get_abi_type_arguments(ctx, engines, types, x.type_id), @@ -502,7 +554,7 @@ impl TypeId { .iter(), ) .map(|(v, p)| program_abi::TypeDeclaration { - type_id: v.initial_type_id.index(), + type_id: v.initial_type_id.get_abi_type_id(ctx, engines), type_field: v.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -567,7 +619,7 @@ impl TypeId { .iter() .zip(resolved_params.iter()) .map(|(v, p)| program_abi::TypeDeclaration { - type_id: v.initial_type_id.index(), + type_id: v.initial_type_id.get_abi_type_id(ctx, engines), type_field: v.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -587,7 +639,7 @@ impl TypeId { .iter() .map(|arg| program_abi::TypeApplication { name: "".to_string(), - type_id: arg.initial_type_id.index(), + type_id: arg.initial_type_id.get_abi_type_id(ctx, engines), type_arguments: arg.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -604,7 +656,7 @@ impl TypeId { .type_parameters .iter() .map(|v| program_abi::TypeDeclaration { - type_id: v.type_id.index(), + type_id: v.type_id.get_abi_type_id(ctx, engines), type_field: v.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -625,7 +677,7 @@ impl TypeId { .iter() .map(|arg| program_abi::TypeApplication { name: "".to_string(), - type_id: arg.type_id.index(), + type_id: arg.type_id.get_abi_type_id(ctx, engines), type_arguments: arg.type_id.get_abi_type_arguments( ctx, engines, @@ -644,7 +696,7 @@ impl TypeId { .type_parameters .iter() .map(|v| program_abi::TypeDeclaration { - type_id: v.type_id.index(), + type_id: v.type_id.get_abi_type_id(ctx, engines), type_field: v.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -665,7 +717,7 @@ impl TypeId { .iter() .map(|arg| program_abi::TypeApplication { name: "".to_string(), - type_id: arg.type_id.index(), + type_id: arg.type_id.get_abi_type_id(ctx, engines), type_arguments: arg.type_id.get_abi_type_arguments( ctx, engines, @@ -693,7 +745,10 @@ impl TyFunctionDecl { .parameters .iter() .map(|x| program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -716,7 +771,10 @@ impl TyFunctionDecl { // The single `program_abi::TypeDeclaration` needed for the output let output_type = program_abi::TypeDeclaration { - type_id: self.return_type.initial_type_id.index(), + type_id: self + .return_type + .initial_type_id + .get_abi_type_id(ctx, engines), type_field: self.return_type.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -748,7 +806,10 @@ impl TyFunctionDecl { .iter() .map(|x| program_abi::TypeApplication { name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.index(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(ctx, engines), type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -759,7 +820,10 @@ impl TyFunctionDecl { .collect(), output: program_abi::TypeApplication { name: "".to_string(), - type_id: self.return_type.initial_type_id.index(), + type_id: self + .return_type + .initial_type_id + .get_abi_type_id(ctx, engines), type_arguments: self.return_type.initial_type_id.get_abi_type_arguments( ctx, engines, @@ -798,9 +862,10 @@ impl TypeParameter { ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, - ) -> usize { + ) -> String { + let type_id = self.initial_type_id.get_abi_type_id(ctx, engines); let type_parameter = program_abi::TypeDeclaration { - type_id: self.initial_type_id.index(), + type_id: type_id.clone(), type_field: self.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -815,6 +880,6 @@ impl TypeParameter { type_parameters: None, }; types.push(type_parameter); - self.initial_type_id.index() + type_id } } From 6ee44ece9fac448687cd9cf4218c70da0790edd0 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Thu, 11 Jul 2024 08:35:20 +0100 Subject: [PATCH 08/47] Uses fuels-core updated branch. --- Cargo.lock | 1002 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 641 insertions(+), 361 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18727c66ad9..203a8e4cc46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -257,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -277,7 +277,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.0", + "object 0.36.1", "rustc-demangle", "serde", ] @@ -356,15 +356,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -474,7 +474,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "syn_derive", ] @@ -558,9 +558,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cast" @@ -570,13 +570,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -609,7 +608,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -670,7 +669,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags 1.3.2", + "bitflags 1.2.1", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -679,9 +678,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -689,9 +688,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -702,11 +701,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" +checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", ] [[package]] @@ -715,20 +714,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -853,15 +852,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" +checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" [[package]] name = "completest-pty" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" +checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" dependencies = [ "completest", "ptyprocess", @@ -874,7 +873,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "entities", "memchr", "once_cell", @@ -1020,7 +1019,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.7", + "clap 4.5.9", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1178,7 +1177,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1244,12 +1243,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1268,16 +1267,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1293,13 +1292,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1393,7 +1392,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1586,9 +1585,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1665,7 +1664,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1678,7 +1677,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1823,6 +1822,22 @@ dependencies = [ "tokio", ] +[[package]] +name = "eventsource-client" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29" +dependencies = [ + "futures", + "hyper", + "hyper-rustls 0.24.2", + "hyper-timeout", + "log", + "pin-project", + "rand", + "tokio", +] + [[package]] name = "expect-test" version = "1.5.0" @@ -1841,7 +1856,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1972,21 +1987,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forc" -version = "0.61.2" +version = "0.62.0" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "clap_complete_fig", "completest-pty", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "fs_extra", - "fuel-asm", + "fuel-asm 0.52.0", "hex", "serde", "serde_json", @@ -2008,28 +2023,27 @@ dependencies = [ [[package]] name = "forc-client" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-tx", "forc-util", "forc-wallet", "fuel-abi-types 0.6.0", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-vm", - "fuels", - "fuels-accounts", - "fuels-core", + "fuel-core-client 0.28.0", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-vm 0.52.0", + "fuels-accounts 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", "futures", "hex", "portpicker", @@ -2048,17 +2062,17 @@ dependencies = [ [[package]] name = "forc-crypto" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.7", - "forc-tracing 0.61.2", + "clap 4.5.9", + "forc-tracing 0.62.0", "forc-util", - "fuel-core-types", - "fuel-crypto", - "fuels-core", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", "futures", "hex", "libp2p-identity", @@ -2074,15 +2088,15 @@ dependencies = [ [[package]] name = "forc-debug" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dap", "escargot", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-core-client", "fuel-types", "fuel-vm", @@ -2100,15 +2114,15 @@ dependencies = [ [[package]] name = "forc-doc" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "comrak", "dir_indexer", "expect-test", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "horrorshow", "include_dir", @@ -2125,12 +2139,12 @@ dependencies = [ [[package]] name = "forc-fmt" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "prettydiff 0.5.1", "sway-core", @@ -2142,10 +2156,10 @@ dependencies = [ [[package]] name = "forc-lsp" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2153,13 +2167,13 @@ dependencies = [ [[package]] name = "forc-pkg" -version = "0.61.2" +version = "0.62.0" dependencies = [ "ansi_term", "anyhow", "byte-unit", "cid", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "fuel-abi-types 0.6.0", "futures", @@ -2190,14 +2204,14 @@ dependencies = [ [[package]] name = "forc-test" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "forc-pkg", "fuel-abi-types 0.6.0", - "fuel-tx", - "fuel-vm", - "fuels-core", + "fuel-tx 0.52.0", + "fuel-vm 0.52.0", + "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", "rand", "rayon", "sway-core", @@ -2217,7 +2231,7 @@ dependencies = [ [[package]] name = "forc-tracing" -version = "0.61.2" +version = "0.62.0" dependencies = [ "ansi_term", "tracing", @@ -2227,14 +2241,14 @@ dependencies = [ [[package]] name = "forc-tx" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc-util", - "fuel-tx", - "fuel-types", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", "serde", "serde_json", "thiserror", @@ -2242,15 +2256,15 @@ dependencies = [ [[package]] name = "forc-util" -version = "0.61.2" +version = "0.62.0" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dirs 3.0.2", "fd-lock 4.0.2", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-tx", "hex", "paste", @@ -2274,13 +2288,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e88edfd8c98861cdf0c27ccea3d81b0033b1e80d3d22367fd0fd4e2b58dc9dd" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "eth-keystore", "forc-tracing 0.47.0", - "fuel-crypto", - "fuel-types", + "fuel-crypto 0.52.0", + "fuel-types 0.52.0", "fuels", - "fuels-core", + "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hex", "home", @@ -2345,7 +2359,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.66", + "syn 2.0.71", "thiserror", ] @@ -2372,7 +2386,7 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fuel-types", "serde", "strum 0.24.1", @@ -2387,8 +2401,8 @@ dependencies = [ "anyhow", "bech32", "derivative", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.28.0", + "fuel-core-types 0.28.0", "itertools 0.12.1", "postcard", "rand", @@ -2398,6 +2412,46 @@ dependencies = [ "tracing", ] +[[package]] +name = "fuel-core-chain-config" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" +dependencies = [ + "anyhow", + "derivative", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "itertools 0.12.1", + "postcard", + "serde", + "serde_with", +] + +[[package]] +name = "fuel-core-client" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" +dependencies = [ + "anyhow", + "cynic", + "derive_more", + "eventsource-client 0.10.2", + "fuel-core-types 0.28.0", + "futures", + "hex", + "hyper-rustls 0.24.2", + "itertools 0.12.1", + "reqwest", + "schemafy_lib", + "serde", + "serde_json", + "tai64", + "thiserror", + "tracing", +] + [[package]] name = "fuel-core-client" version = "0.31.0" @@ -2407,8 +2461,8 @@ dependencies = [ "anyhow", "cynic", "derive_more", - "eventsource-client", - "fuel-core-types", + "eventsource-client 0.12.2", + "fuel-core-types 0.31.0", "futures", "hex", "hyper-rustls", @@ -2443,10 +2497,10 @@ checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config", + "fuel-core-chain-config 0.28.0", "fuel-core-services", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.28.0", + "fuel-core-types 0.28.0", "tokio", "tokio-stream", "tracing", @@ -2476,8 +2530,30 @@ dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types", - "fuel-vm", + "fuel-core-types 0.28.0", + "fuel-vm 0.52.0", + "impl-tools", + "itertools 0.12.1", + "num_enum 0.7.2", + "paste", + "postcard", + "primitive-types", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", +] + +[[package]] +name = "fuel-core-storage" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" +dependencies = [ + "anyhow", + "derive_more", + "enum-iterator", + "fuel-core-types 0.31.0", + "fuel-vm 0.55.0", "impl-tools", "itertools 0.12.1", "num_enum 0.7.2", @@ -2499,7 +2575,7 @@ dependencies = [ "bs58", "derivative", "derive_more", - "fuel-vm", + "fuel-vm 0.52.0", "rand", "secrecy", "serde", @@ -2508,6 +2584,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "fuel-core-types" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" +dependencies = [ + "anyhow", + "bs58", + "derivative", + "derive_more", + "fuel-vm 0.55.0", + "secrecy", + "serde", + "tai64", + "thiserror", + "zeroize", +] + [[package]] name = "fuel-crypto" version = "0.55.0" @@ -2518,7 +2612,28 @@ dependencies = [ "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types", + "fuel-types 0.52.0", + "k256", + "lazy_static", + "p256", + "rand", + "secp256k1 0.26.0", + "serde", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "fuel-crypto" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" +dependencies = [ + "coins-bip32", + "coins-bip39", + "ecdsa", + "ed25519-dalek", + "fuel-types 0.55.0", "k256", "lazy_static", "p256", @@ -2529,6 +2644,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "fuel-derive" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", + "synstructure 0.13.1", +] + [[package]] name = "fuel-derive" version = "0.55.0" @@ -2596,7 +2723,22 @@ checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage", + "fuel-storage 0.52.0", + "hashbrown 0.13.2", + "hex", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "fuel-merkle" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" +dependencies = [ + "derive_more", + "digest 0.10.7", + "fuel-storage 0.55.0", "hashbrown 0.13.2", "hex", "serde", @@ -2609,6 +2751,35 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" +[[package]] +name = "fuel-storage" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" + +[[package]] +name = "fuel-tx" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" +dependencies = [ + "bitflags 2.6.0", + "derivative", + "derive_more", + "fuel-asm 0.52.0", + "fuel-crypto 0.52.0", + "fuel-merkle 0.52.0", + "fuel-types 0.52.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "postcard", + "rand", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", +] + [[package]] name = "fuel-tx" version = "0.55.0" @@ -2618,10 +2789,10 @@ dependencies = [ "bitflags 2.5.0", "derivative", "derive_more", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-types", + "fuel-asm 0.55.0", + "fuel-crypto 0.55.0", + "fuel-merkle 0.55.0", + "fuel-types 0.55.0", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2638,7 +2809,19 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" dependencies = [ - "fuel-derive", + "fuel-derive 0.52.0", + "hex", + "rand", + "serde", +] + +[[package]] +name = "fuel-types" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" +dependencies = [ + "fuel-derive 0.55.0", "hex", "rand", "serde", @@ -2653,16 +2836,16 @@ dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "derive_more", "ethnum", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-storage", - "fuel-tx", - "fuel-types", + "fuel-asm 0.52.0", + "fuel-crypto 0.52.0", + "fuel-merkle 0.52.0", + "fuel-storage 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2678,18 +2861,49 @@ dependencies = [ "tai64", ] +[[package]] +name = "fuel-vm" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" +dependencies = [ + "async-trait", + "backtrace", + "bitflags 2.5.0", + "derivative", + "derive_more", + "ethnum", + "fuel-asm 0.55.0", + "fuel-crypto 0.55.0", + "fuel-merkle 0.55.0", + "fuel-storage 0.55.0", + "fuel-tx 0.55.0", + "fuel-types 0.55.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "libm", + "paste", + "percent-encoding", + "primitive-types", + "serde", + "serde_with", + "sha3", + "static_assertions", + "strum 0.24.1", +] + [[package]] name = "fuels" -version = "0.65.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513a5159300a6f0220b58ed989a5b9aa2c0af55cd26613eb89ff28c25d68364" +checksum = "601ed66a0485065471cd9c8bab2db7cfa58bc7ed5d2e68bd26fc573ac2575827" dependencies = [ - "fuel-core-client", - "fuel-crypto", - "fuel-tx", - "fuels-accounts", - "fuels-core", - "fuels-macros", + "fuel-core-client 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuels-macros 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", "fuels-programs", "fuels-test-helpers", ] @@ -2704,12 +2918,36 @@ dependencies = [ "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuels-core", + "fuel-core-client 0.28.0", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.12.1", + "rand", + "semver", + "tai64", + "thiserror", + "tokio", + "zeroize", +] + +[[package]] +name = "fuels-accounts" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +dependencies = [ + "async-trait", + "chrono", + "elliptic-curve", + "eth-keystore", + "fuel-core-client 0.31.0", + "fuel-core-types 0.31.0", + "fuel-crypto 0.55.0", + "fuel-tx 0.55.0", + "fuel-types 0.55.0", + "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", "itertools 0.12.1", "rand", "semver", @@ -2732,6 +2970,21 @@ dependencies = [ "quote", "regex", "serde_json", + "syn 2.0.71", +] + +[[package]] +name = "fuels-code-gen" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +dependencies = [ + "Inflector", + "fuel-abi-types 0.6.0", + "itertools 0.12.1", + "proc-macro2", + "quote", + "regex", + "serde_json", "syn 2.0.66", ] @@ -2745,15 +2998,42 @@ dependencies = [ "bech32", "chrono", "fuel-abi-types 0.5.2", - "fuel-asm", - "fuel-core-chain-config", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuel-vm", - "fuels-macros", + "fuel-asm 0.52.0", + "fuel-core-chain-config 0.28.0", + "fuel-core-client 0.28.0", + "fuel-core-types 0.28.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "fuel-vm 0.52.0", + "fuels-macros 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex", + "itertools 0.12.1", + "postcard", + "serde", + "serde_json", + "thiserror", + "uint", +] + +[[package]] +name = "fuels-core" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +dependencies = [ + "async-trait", + "bech32", + "chrono", + "fuel-abi-types 0.6.0", + "fuel-asm 0.55.0", + "fuel-core-chain-config 0.31.0", + "fuel-core-client 0.31.0", + "fuel-core-types 0.31.0", + "fuel-crypto 0.55.0", + "fuel-tx 0.55.0", + "fuel-types 0.55.0", + "fuel-vm 0.55.0", + "fuels-macros 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", "hex", "itertools 0.12.1", "postcard", @@ -2769,26 +3049,38 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bba1c2fd149a310879249144f2589336708ae860563a45b792907ae34ae6b959" dependencies = [ - "fuels-code-gen", + "fuels-code-gen 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.66", ] +[[package]] +name = "fuels-macros" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +dependencies = [ + "fuels-code-gen 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "fuels-programs" -version = "0.65.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04fedba784b4dd4088d2c1709cd4afc380dbfa6d0a49db267ee98df9144e1d18" +checksum = "a45652fa07c48d5fba2ee50ddd279eead2c55b251b3d426d2189394b475330e9" dependencies = [ "async-trait", "fuel-abi-types 0.5.2", - "fuel-asm", - "fuel-tx", - "fuel-types", - "fuels-accounts", - "fuels-core", + "fuel-asm 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.12.1", "rand", "serde_json", @@ -2797,19 +3089,19 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.65.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbea43b7d6d2987ad59cf536534fc500a009b85eb3200be30116827c90ec33" +checksum = "967a140a51095d071c84970365c37f856f4f098b835cb609b934dff4b8296cce" dependencies = [ - "fuel-core-chain-config", - "fuel-core-client", + "fuel-core-chain-config 0.28.0", + "fuel-core-client 0.28.0", "fuel-core-poa", "fuel-core-services", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuels-accounts", - "fuels-core", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", + "fuel-types 0.52.0", + "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "portpicker", "rand", @@ -2880,7 +3172,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -2979,7 +3271,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "libc", "libgit2-sys", "log", @@ -3168,7 +3460,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -3310,9 +3602,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3486,7 +3778,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -3498,7 +3790,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -3566,7 +3858,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "inotify-sys", "libc", ] @@ -3768,17 +4060,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "libc", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -3841,7 +4133,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3852,7 +4144,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -3930,12 +4222,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3960,9 +4246,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logos" @@ -3993,7 +4279,7 @@ version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "serde", "serde_json", "serde_repr", @@ -4017,7 +4303,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "env_logger", "handlebars", @@ -4040,7 +4326,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "mdbook", "semver", "serde", @@ -4173,9 +4459,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -4322,7 +4608,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cc", "cfg-if 0.1.10", "libc", @@ -4331,14 +4617,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cc", "cfg-if 1.0.0", "libc", + "memoffset 0.6.5", ] [[package]] @@ -4347,7 +4634,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", @@ -4369,7 +4656,7 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4426,9 +4713,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4539,7 +4826,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -4564,9 +4851,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4579,13 +4866,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" -version = "6.4.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", + "lazy_static", "libc", - "once_cell", "onig_sys", ] @@ -4601,9 +4888,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -4639,7 +4926,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4656,7 +4943,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -4789,9 +5076,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4854,9 +5141,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -4865,9 +5152,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -4875,22 +5162,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -4970,7 +5257,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -5003,13 +5290,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", "quick-xml", "serde", "time", @@ -5210,18 +5496,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" +checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", @@ -5237,7 +5523,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -5291,7 +5577,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5314,9 +5600,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5428,7 +5714,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] @@ -5437,16 +5723,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5643,7 +5929,7 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -5672,7 +5958,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] @@ -5703,7 +5989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags 1.3.2", + "bitflags 1.2.1", "serde", ] @@ -5812,7 +6098,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5874,7 +6160,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cfg-if 1.0.0", "clipboard-win", "dirs-next", @@ -5882,7 +6168,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.20.0", + "nix 0.20.2", "radix_trie", "scopeguard", "smallvec", @@ -5929,9 +6215,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.1" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" +checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" dependencies = [ "sdd", ] @@ -6001,9 +6287,9 @@ dependencies = [ [[package]] name = "sdd" -version = "0.2.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" +checksum = "8eb0dde0ccd15e337a3cf738a9a38115c6d8e74795d074e73973dad3d229a897" [[package]] name = "seahash" @@ -6073,11 +6359,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6086,9 +6372,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6105,22 +6391,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6134,9 +6420,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -6151,7 +6437,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6177,9 +6463,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", @@ -6195,14 +6481,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6240,7 +6526,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6431,12 +6717,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -6560,7 +6840,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6578,13 +6858,13 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sway-ast" -version = "0.61.2" +version = "0.62.0" dependencies = [ "extension-trait", "num-bigint", @@ -6596,9 +6876,9 @@ dependencies = [ [[package]] name = "sway-core" -version = "0.61.2" +version = "0.62.0" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "derivative", "dirs 3.0.2", "either", @@ -6606,7 +6886,7 @@ dependencies = [ "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", - "fuel-vm", + "fuel-vm 0.52.0", "gimli 0.28.1", "graph-cycles", "hashbrown 0.13.2", @@ -6641,7 +6921,7 @@ dependencies = [ [[package]] name = "sway-error" -version = "0.61.2" +version = "0.62.0" dependencies = [ "either", "in_definite", @@ -6654,7 +6934,7 @@ dependencies = [ [[package]] name = "sway-ir" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "downcast-rs", @@ -6673,7 +6953,7 @@ dependencies = [ [[package]] name = "sway-ir-macros" -version = "0.61.2" +version = "0.62.0" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -6683,7 +6963,7 @@ dependencies = [ [[package]] name = "sway-lsp" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "assert-json-diff", @@ -6693,7 +6973,7 @@ dependencies = [ "dirs 4.0.0", "fd-lock 4.0.2", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "futures", "indexmap 2.2.6", @@ -6748,7 +7028,7 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.61.2" +version = "0.62.0" dependencies = [ "assert_matches", "extension-trait", @@ -6766,12 +7046,12 @@ dependencies = [ [[package]] name = "sway-types" -version = "0.61.2" +version = "0.62.0" dependencies = [ "bytecount", - "fuel-asm", - "fuel-crypto", - "fuel-tx", + "fuel-asm 0.52.0", + "fuel-crypto 0.52.0", + "fuel-tx 0.52.0", "indexmap 2.2.6", "lazy_static", "num-bigint", @@ -6785,7 +7065,7 @@ dependencies = [ [[package]] name = "sway-utils" -version = "0.61.2" +version = "0.62.0" dependencies = [ "serde", "walkdir", @@ -6793,11 +7073,11 @@ dependencies = [ [[package]] name = "swayfmt" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "difference", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "paste", "prettydiff 0.6.4", "ropey", @@ -6827,9 +7107,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -6845,7 +7125,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6874,7 +7154,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6884,7 +7164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", - "bitflags 1.3.2", + "bitflags 1.2.1", "fancy-regex", "flate2", "fnv", @@ -6921,7 +7201,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "core-foundation", "system-configuration-sys", ] @@ -7015,9 +7295,9 @@ dependencies = [ [[package]] name = "term-table" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e59d7fb313157de2a568be8d81e4d7f9af6e50e697702e8e00190a6566d3b8" +checksum = "210f90191b719267bc8b6307659faf54a77400d06b8033ece26692696fc002be" dependencies = [ "lazy_static", "regex", @@ -7052,14 +7332,14 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.7", + "clap 4.5.9", "colored", "filecheck", "forc", "forc-client", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-vm", "futures", "gag", @@ -7117,22 +7397,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7236,9 +7516,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7251,9 +7531,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -7286,7 +7566,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7444,7 +7724,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7472,7 +7752,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7545,7 +7825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7734,9 +8014,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uwuify" @@ -7879,7 +8159,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -7913,7 +8193,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8000,7 +8280,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8027,7 +8307,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8062,18 +8342,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -8090,9 +8370,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8108,9 +8388,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8126,15 +8406,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8150,9 +8430,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8168,9 +8448,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8186,9 +8466,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8204,9 +8484,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -8353,22 +8633,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -8388,5 +8668,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] From 7c9133f07f1ddbc3b0d7ead3654991d66b4ee960 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Thu, 11 Jul 2024 08:36:46 +0100 Subject: [PATCH 09/47] Changed fuel_abi to return Result. Added error ABIHashCollision error. --- forc-pkg/src/pkg.rs | 11 +- forc-test/src/lib.rs | 2 +- sway-core/src/abi_generation/fuel_abi.rs | 869 ++++++++++++++--------- sway-error/src/error.rs | 8 + 4 files changed, 546 insertions(+), 344 deletions(-) diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 1a82b0d224a..0ff9eecaad1 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -1839,13 +1839,15 @@ pub fn compile( let mut program_abi = match pkg.target { BuildTarget::Fuel => { let mut types = vec![]; - ProgramABI::Fuel(time_expr!( + let program_abi_res = time_expr!( "generate JSON ABI program", "generate_json_abi", fuel_abi::generate_program_abi( + &handler, &mut AbiContext { program: typed_program, abi_with_callpaths: profile.json_abi_with_callpaths, + type_ids_to_full_type_str: HashMap::::new(), }, engines, &mut types, @@ -1858,7 +1860,12 @@ pub fn compile( ), Some(sway_build_config.clone()), metrics - )) + ); + let program_abi = match program_abi_res { + Err(_) => return fail(handler), + Ok(program_abi) => program_abi, + }; + ProgramABI::Fuel(program_abi) } BuildTarget::EVM => { // Merge the ABI output of ASM gen with ABI gen to handle internal constructors diff --git a/forc-test/src/lib.rs b/forc-test/src/lib.rs index e1fca4ac561..b9406203c59 100644 --- a/forc-test/src/lib.rs +++ b/forc-test/src/lib.rs @@ -680,7 +680,7 @@ pub fn decode_log_data( let type_lookup = program_abi .types .iter() - .map(|decl| (decl.type_id, decl.clone())) + .map(|decl| (decl.type_id.clone(), decl.clone())) .collect::>(); let logged_type_lookup: HashMap<_, _> = program_abi diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 8d03e379ac2..93dd2ba5528 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -1,6 +1,8 @@ use fuel_abi_types::abi::program as program_abi; use sha2::{Digest, Sha256}; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; +use sway_error::handler::{ErrorEmitted, Handler}; +use sway_types::Span; use crate::{ language::ty::{TyFunctionDecl, TyProgram, TyProgramKind}, @@ -13,6 +15,7 @@ use super::abi_str::AbiStrContext; pub struct AbiContext<'a> { pub program: &'a TyProgram, pub abi_with_callpaths: bool, + pub type_ids_to_full_type_str: HashMap, } impl<'a> AbiContext<'a> { @@ -35,37 +38,61 @@ impl<'a> AbiContext<'a> { } impl TypeId { - fn get_abi_type_id(&self, ctx: &mut AbiContext, engines: &Engines) -> String { - let string = + fn get_abi_type_id( + &self, + handler: &Handler, + ctx: &mut AbiContext, + engines: &Engines, + ) -> Result { + let type_str = self.get_abi_type_str(&ctx.to_str_context(engines, true), engines, self.clone()); let mut hasher = Sha256::new(); - hasher.update(string); + hasher.update(type_str.clone()); let result = hasher.finalize(); - format!("{:x}", result) + let type_id = format!("{:x}", result); + + if let Some(old_type_str) = ctx + .type_ids_to_full_type_str + .insert(type_id.clone(), type_str.clone()) + { + if old_type_str != type_str { + return Err( + handler.emit_err(sway_error::error::CompileError::ABIHashCollision { + span: Span::dummy(), + hash: type_id, + first_type: old_type_str, + second_type: type_str, + }), + ); + } + } + + Ok(type_id) } } pub fn generate_program_abi( + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, encoding: Option, spec_version: program_abi::Version, abi_version: program_abi::Version, -) -> program_abi::ProgramABI { +) -> Result { let decl_engine = engines.de(); - match &ctx.program.kind { + let mut program_abi = match &ctx.program.kind { TyProgramKind::Contract { abi_entries, .. } => { let functions = abi_entries .iter() .map(|x| { let fn_decl = decl_engine.get_function(x); - fn_decl.generate_abi_function(ctx, engines, types) + Ok(fn_decl.generate_abi_function(handler, ctx, engines, types)?) }) - .collect(); - let logged_types = generate_logged_types(ctx, engines, types); - let messages_types = generate_messages_types(ctx, engines, types); - let configurables = generate_configurables(ctx, engines, types); + .collect::, _>>()?; + let logged_types = generate_logged_types(handler, ctx, engines, types)?; + let messages_types = generate_messages_types(handler, ctx, engines, types)?; + let configurables = generate_configurables(handler, ctx, engines, types)?; program_abi::ProgramABI { program_type: "contract".to_string(), spec_version, @@ -80,10 +107,11 @@ pub fn generate_program_abi( } TyProgramKind::Script { main_function, .. } => { let main_function = decl_engine.get_function(main_function); - let functions = vec![main_function.generate_abi_function(ctx, engines, types)]; - let logged_types = generate_logged_types(ctx, engines, types); - let messages_types = generate_messages_types(ctx, engines, types); - let configurables = generate_configurables(ctx, engines, types); + let functions = + vec![main_function.generate_abi_function(handler, ctx, engines, types)?]; + let logged_types = generate_logged_types(handler, ctx, engines, types)?; + let messages_types = generate_messages_types(handler, ctx, engines, types)?; + let configurables = generate_configurables(handler, ctx, engines, types)?; program_abi::ProgramABI { program_type: "script".to_string(), spec_version, @@ -98,10 +126,11 @@ pub fn generate_program_abi( } TyProgramKind::Predicate { main_function, .. } => { let main_function = decl_engine.get_function(main_function); - let functions = vec![main_function.generate_abi_function(ctx, engines, types)]; - let logged_types = generate_logged_types(ctx, engines, types); - let messages_types = generate_messages_types(ctx, engines, types); - let configurables = generate_configurables(ctx, engines, types); + let functions = + vec![main_function.generate_abi_function(handler, ctx, engines, types)?]; + let logged_types = generate_logged_types(handler, ctx, engines, types)?; + let messages_types = generate_messages_types(handler, ctx, engines, types)?; + let configurables = generate_configurables(handler, ctx, engines, types)?; program_abi::ProgramABI { program_type: "predicate".to_string(), spec_version, @@ -125,80 +154,128 @@ pub fn generate_program_abi( messages_types: None, configurables: None, }, + }; + + standardize_json_abi_types(&mut program_abi); + + Ok(program_abi) +} + +/// Standardize the JSON ABI data structure by eliminating duplicate types. +fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { + // Two `program_abi::TypeDeclaration` are deemed the same if the have the same type_id + let mut deduped_types: HashMap = + HashMap::::new(); + + // Insert values in `deduped_types` if they haven't been inserted before. Otherwise, check to see + // the types are identical if not throw an error. + for decl in &json_abi_program.types { + if let Some(ty) = deduped_types.get(&decl.type_id) { + if ty.type_field != decl.type_field + || ty.components != decl.components + || ty.type_parameters != decl.type_parameters + { + // We already throw an error on get_abi_type_id so this should not occur. + panic!("There are conflicting type ids for different type declarations.") + } + } else { + deduped_types.insert(decl.type_id.clone(), decl.clone()); + } } + + json_abi_program.types = deduped_types.values().cloned().collect::>(); + + // Sort the `program_abi::TypeDeclaration`s + json_abi_program + .types + .sort_by(|t1, t2| t1.type_field.cmp(&t2.type_field)); } fn generate_logged_types( + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, -) -> Vec { +) -> Result, ErrorEmitted> { // A list of all `program_abi::TypeDeclaration`s needed for the logged types let logged_types = ctx .program .logged_types .iter() - .map(|(_, type_id)| program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(ctx, engines), - type_field: type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - *type_id, - ), - components: type_id.get_abi_type_components(ctx, engines, types, *type_id), - type_parameters: type_id.get_abi_type_parameters(ctx, engines, types, *type_id), + .map(|(_, type_id)| { + Ok(program_abi::TypeDeclaration { + type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_field: type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + *type_id, + ), + components: type_id + .get_abi_type_components(handler, ctx, engines, types, *type_id)?, + type_parameters: type_id + .get_abi_type_parameters(handler, ctx, engines, types, *type_id)?, + }) }) - .collect::>(); + .collect::, _>>()?; // Add the new types to `types` types.extend(logged_types); // Generate the JSON data for the logged types let mut log_ids: HashSet = HashSet::default(); - ctx.program + Ok(ctx + .program .logged_types .iter() - .filter_map(|(log_id, type_id)| { + .map(|(log_id, type_id)| { let log_id = log_id.hash_id; if log_ids.contains(&log_id) { - None + Ok(None) } else { log_ids.insert(log_id); - Some(program_abi::LoggedType { + Ok(Some(program_abi::LoggedType { log_id: log_id.to_string(), application: program_abi::TypeApplication { name: "".to_string(), - type_id: type_id.get_abi_type_id(ctx, engines), + type_id: type_id.get_abi_type_id(handler, ctx, engines)?, type_arguments: type_id - .get_abi_type_arguments(ctx, engines, types, *type_id), + .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, }, - }) + })) } }) - .collect() + .collect::, _>>()? + .into_iter() + .filter_map(|o| o) + .collect()) } fn generate_messages_types( + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, -) -> Vec { +) -> Result, ErrorEmitted> { // A list of all `program_abi::TypeDeclaration`s needed for the messages types let messages_types = ctx .program .messages_types .iter() - .map(|(_, type_id)| program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(ctx, engines), - type_field: type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - *type_id, - ), - components: type_id.get_abi_type_components(ctx, engines, types, *type_id), - type_parameters: type_id.get_abi_type_parameters(ctx, engines, types, *type_id), + .map(|(_, type_id)| { + Ok(program_abi::TypeDeclaration { + type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_field: type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + *type_id, + ), + components: type_id + .get_abi_type_components(handler, ctx, engines, types, *type_id)?, + type_parameters: type_id + .get_abi_type_parameters(handler, ctx, engines, types, *type_id)?, + }) }) - .collect::>(); + .collect::, _>>()?; // Add the new types to `types` types.extend(messages_types); @@ -207,48 +284,59 @@ fn generate_messages_types( ctx.program .messages_types .iter() - .map(|(message_id, type_id)| program_abi::MessageType { - message_id: **message_id as u64, - application: program_abi::TypeApplication { - name: "".to_string(), - type_id: type_id.get_abi_type_id(ctx, engines), - type_arguments: type_id.get_abi_type_arguments(ctx, engines, types, *type_id), - }, + .map(|(message_id, type_id)| { + Ok(program_abi::MessageType { + message_id: **message_id as u64, + application: program_abi::TypeApplication { + name: "".to_string(), + type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_arguments: type_id + .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, + }, + }) }) - .collect() + .collect::, _>>() } fn generate_configurables( + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, -) -> Vec { +) -> Result, ErrorEmitted> { // A list of all `program_abi::TypeDeclaration`s needed for the configurables types let configurables_types = ctx .program .configurables .iter() - .map(|decl| program_abi::TypeDeclaration { - type_id: decl.type_ascription.type_id.get_abi_type_id(ctx, engines), - type_field: decl.type_ascription.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - decl.type_ascription.type_id, - ), - components: decl.type_ascription.type_id.get_abi_type_components( - ctx, - engines, - types, - decl.type_ascription.type_id, - ), - type_parameters: decl.type_ascription.type_id.get_abi_type_parameters( - ctx, - engines, - types, - decl.type_ascription.type_id, - ), + .map(|decl| { + Ok(program_abi::TypeDeclaration { + type_id: decl + .type_ascription + .type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: decl.type_ascription.type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + decl.type_ascription.type_id, + ), + components: decl.type_ascription.type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + decl.type_ascription.type_id, + )?, + type_parameters: decl.type_ascription.type_id.get_abi_type_parameters( + handler, + ctx, + engines, + types, + decl.type_ascription.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; // Add the new types to `types` types.extend(configurables_types); @@ -257,21 +345,27 @@ fn generate_configurables( ctx.program .configurables .iter() - .map(|decl| program_abi::Configurable { - name: decl.call_path.suffix.to_string(), - application: program_abi::TypeApplication { - name: "".to_string(), - type_id: decl.type_ascription.type_id.get_abi_type_id(ctx, engines), - type_arguments: decl.type_ascription.type_id.get_abi_type_arguments( - ctx, - engines, - types, - decl.type_ascription.type_id, - ), - }, - offset: 0, + .map(|decl| { + Ok(program_abi::Configurable { + name: decl.call_path.suffix.to_string(), + application: program_abi::TypeApplication { + name: "".to_string(), + type_id: decl + .type_ascription + .type_id + .get_abi_type_id(handler, ctx, engines)?, + type_arguments: decl.type_ascription.type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types, + decl.type_ascription.type_id, + )?, + }, + offset: 0, + }) }) - .collect() + .collect::, _>>() } impl TypeId { @@ -282,18 +376,22 @@ impl TypeId { /// types. pub(self) fn get_abi_type_parameters( &self, + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, resolved_type_id: TypeId, - ) -> Option> { + ) -> Result>, ErrorEmitted> { match self.is_generic_parameter(engines, resolved_type_id) { - true => None, - false => resolved_type_id.get_type_parameters(engines).map(|v| { - v.iter() - .map(|v| v.get_abi_type_parameter(ctx, engines, types)) - .collect::>() - }), + true => Ok(None), + false => resolved_type_id + .get_type_parameters(engines) + .map(|v| { + v.iter() + .map(|v| Ok(v.get_abi_type_parameter(handler, ctx, engines, types)?)) + .collect::, _>>() + }) + .map_or(Ok(None), |v| v.map(Some)), } } /// Return the components of a given (potentially generic) type while considering what it @@ -302,44 +400,52 @@ impl TypeId { /// `program_abi::TypeDeclaration`s to add the newly discovered types. pub(self) fn get_abi_type_components( &self, + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, resolved_type_id: TypeId, - ) -> Option> { + ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); - match &*type_engine.get(*self) { + Ok(match &*type_engine.get(*self) { TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); // A list of all `program_abi::TypeDeclaration`s needed for the enum variants let variants = decl .variants .iter() - .map(|x| program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - ctx, - engines, - types, - x.type_argument.type_id, - ), - type_parameters: x.type_argument.initial_type_id.get_abi_type_parameters( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeDeclaration { + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: x.type_argument.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + x.type_argument.type_id, + ), + components: x.type_argument.initial_type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + type_parameters: x + .type_argument + .initial_type_id + .get_abi_type_parameters( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(variants); // Generate the JSON data for the enum. This is basically a list of @@ -347,20 +453,26 @@ impl TypeId { Some( decl.variants .iter() - .map(|x| program_abi::TypeApplication { - name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeApplication { + name: x.name.to_string(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_arguments: x + .type_argument + .initial_type_id + .get_abi_type_arguments( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect(), + .collect::, _>>()?, ) } TypeInfo::Struct(decl_ref) => { @@ -370,30 +482,37 @@ impl TypeId { let field_types = decl .fields .iter() - .map(|x| program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - ctx, - engines, - types, - x.type_argument.type_id, - ), - type_parameters: x.type_argument.initial_type_id.get_abi_type_parameters( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeDeclaration { + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: x.type_argument.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + x.type_argument.type_id, + ), + components: x.type_argument.initial_type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + type_parameters: x + .type_argument + .initial_type_id + .get_abi_type_parameters( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(field_types); // Generate the JSON data for the struct. This is basically a list of @@ -401,44 +520,54 @@ impl TypeId { Some( decl.fields .iter() - .map(|x| program_abi::TypeApplication { - name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeApplication { + name: x.name.to_string(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_arguments: x + .type_argument + .initial_type_id + .get_abi_type_arguments( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect(), + .collect::, _>>()?, ) } TypeInfo::Array(..) => { if let TypeInfo::Array(elem_ty, _) = &*type_engine.get(resolved_type_id) { // The `program_abi::TypeDeclaration`s needed for the array element type let elem_abi_ty = program_abi::TypeDeclaration { - type_id: elem_ty.initial_type_id.get_abi_type_id(ctx, engines), + type_id: elem_ty + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, type_field: elem_ty.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, elem_ty.type_id, ), components: elem_ty.initial_type_id.get_abi_type_components( + handler, ctx, engines, types, elem_ty.type_id, - ), + )?, type_parameters: elem_ty.initial_type_id.get_abi_type_parameters( + handler, ctx, engines, types, elem_ty.type_id, - ), + )?, }; types.push(elem_abi_ty); @@ -446,13 +575,16 @@ impl TypeId { // `program_abi::TypeApplication` for the array element type Some(vec![program_abi::TypeApplication { name: "__array_element".to_string(), - type_id: elem_ty.initial_type_id.get_abi_type_id(ctx, engines), + type_id: elem_ty + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, type_arguments: elem_ty.initial_type_id.get_abi_type_arguments( + handler, ctx, engines, types, elem_ty.type_id, - ), + )?, }]) } else { unreachable!(); @@ -504,21 +636,25 @@ impl TypeId { // A list of all `program_abi::TypeDeclaration`s needed for the tuple fields let fields_types = fields .iter() - .map(|x| program_abi::TypeDeclaration { - type_id: x.initial_type_id.get_abi_type_id(ctx, engines), - type_field: x.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_id, - ), - components: x - .initial_type_id - .get_abi_type_components(ctx, engines, types, x.type_id), - type_parameters: x - .initial_type_id - .get_abi_type_parameters(ctx, engines, types, x.type_id), + .map(|x| { + Ok(program_abi::TypeDeclaration { + type_id: x + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: x.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + x.type_id, + ), + components: x.initial_type_id.get_abi_type_components( + handler, ctx, engines, types, x.type_id, + )?, + type_parameters: x.initial_type_id.get_abi_type_parameters( + handler, ctx, engines, types, x.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(fields_types); @@ -527,14 +663,18 @@ impl TypeId { Some( fields .iter() - .map(|x| program_abi::TypeApplication { - name: "__tuple_element".to_string(), - type_id: x.initial_type_id.get_abi_type_id(ctx, engines), - type_arguments: x - .initial_type_id - .get_abi_type_arguments(ctx, engines, types, x.type_id), + .map(|x| { + Ok(program_abi::TypeApplication { + name: "__tuple_element".to_string(), + type_id: x + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_arguments: x.initial_type_id.get_abi_type_arguments( + handler, ctx, engines, types, x.type_id, + )?, + }) }) - .collect(), + .collect::, _>>()?, ) } else { unreachable!() @@ -553,24 +693,34 @@ impl TypeId { .unwrap_or_default() .iter(), ) - .map(|(v, p)| program_abi::TypeDeclaration { - type_id: v.initial_type_id.get_abi_type_id(ctx, engines), - type_field: v.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - p.type_id, - ), - components: v - .initial_type_id - .get_abi_type_components(ctx, engines, types, p.type_id), - type_parameters: v - .initial_type_id - .get_abi_type_parameters(ctx, engines, types, p.type_id), + .map(|(v, p)| { + Ok(program_abi::TypeDeclaration { + type_id: v + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: v.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + p.type_id, + ), + components: v.initial_type_id.get_abi_type_components( + handler, ctx, engines, types, p.type_id, + )?, + type_parameters: v.initial_type_id.get_abi_type_parameters( + handler, ctx, engines, types, p.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(type_args); - resolved_type_id.get_abi_type_components(ctx, engines, types, resolved_type_id) + resolved_type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + resolved_type_id, + )? } else { None } @@ -578,7 +728,7 @@ impl TypeId { TypeInfo::Alias { .. } => { if let TypeInfo::Alias { ty, .. } = &*type_engine.get(resolved_type_id) { ty.initial_type_id - .get_abi_type_components(ctx, engines, types, ty.type_id) + .get_abi_type_components(handler, ctx, engines, types, ty.type_id)? } else { None } @@ -588,11 +738,17 @@ impl TypeId { if *self == resolved_type_id { None } else { - resolved_type_id.get_abi_type_components(ctx, engines, types, resolved_type_id) + resolved_type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + resolved_type_id, + )? } } _ => None, - } + }) } /// Return the type arguments of a given (potentially generic) type while considering what it @@ -601,15 +757,16 @@ impl TypeId { /// `program_abi::TypeDeclaration`s to add the newly discovered types. pub(self) fn get_abi_type_arguments( &self, + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, resolved_type_id: TypeId, - ) -> Option> { + ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); let resolved_params = resolved_type_id.get_type_parameters(engines); - match &*type_engine.get(*self) { + Ok(match &*type_engine.get(*self) { TypeInfo::Custom { type_arguments: Some(type_arguments), .. @@ -618,36 +775,41 @@ impl TypeId { let abi_type_arguments = type_arguments .iter() .zip(resolved_params.iter()) - .map(|(v, p)| program_abi::TypeDeclaration { - type_id: v.initial_type_id.get_abi_type_id(ctx, engines), - type_field: v.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - p.type_id, - ), - components: v - .initial_type_id - .get_abi_type_components(ctx, engines, types, p.type_id), - type_parameters: v - .initial_type_id - .get_abi_type_parameters(ctx, engines, types, p.type_id), + .map(|(v, p)| { + Ok(program_abi::TypeDeclaration { + type_id: v.initial_type_id.get_abi_type_id(handler, ctx, engines)?, + type_field: v.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + p.type_id, + ), + components: v + .initial_type_id + .get_abi_type_components(handler, ctx, engines, types, p.type_id)?, + type_parameters: v + .initial_type_id + .get_abi_type_parameters(handler, ctx, engines, types, p.type_id)?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(abi_type_arguments); type_arguments .iter() - .map(|arg| program_abi::TypeApplication { - name: "".to_string(), - type_id: arg.initial_type_id.get_abi_type_id(ctx, engines), - type_arguments: arg.initial_type_id.get_abi_type_arguments( - ctx, - engines, - types, - arg.type_id, - ), + .map(|arg| { + Ok(program_abi::TypeApplication { + name: "".to_string(), + type_id: arg.initial_type_id.get_abi_type_id(handler, ctx, engines)?, + type_arguments: arg.initial_type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types, + arg.type_id, + )?, + }) }) - .collect::>() + .collect::, _>>()? }), TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); @@ -655,37 +817,42 @@ impl TypeId { let abi_type_arguments = decl .type_parameters .iter() - .map(|v| program_abi::TypeDeclaration { - type_id: v.type_id.get_abi_type_id(ctx, engines), - type_field: v.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - v.type_id, - ), - components: v - .type_id - .get_abi_type_components(ctx, engines, types, v.type_id), - type_parameters: v - .type_id - .get_abi_type_parameters(ctx, engines, types, v.type_id), + .map(|v| { + Ok(program_abi::TypeDeclaration { + type_id: v.type_id.get_abi_type_id(handler, ctx, engines)?, + type_field: v.type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + v.type_id, + ), + components: v + .type_id + .get_abi_type_components(handler, ctx, engines, types, v.type_id)?, + type_parameters: v + .type_id + .get_abi_type_parameters(handler, ctx, engines, types, v.type_id)?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(abi_type_arguments); Some( decl.type_parameters .iter() - .map(|arg| program_abi::TypeApplication { - name: "".to_string(), - type_id: arg.type_id.get_abi_type_id(ctx, engines), - type_arguments: arg.type_id.get_abi_type_arguments( - ctx, - engines, - types, - arg.type_id, - ), + .map(|arg| { + Ok(program_abi::TypeApplication { + name: "".to_string(), + type_id: arg.type_id.get_abi_type_id(handler, ctx, engines)?, + type_arguments: arg.type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types, + arg.type_id, + )?, + }) }) - .collect::>(), + .collect::, _>>()?, ) } @@ -695,103 +862,115 @@ impl TypeId { let abi_type_arguments = decl .type_parameters .iter() - .map(|v| program_abi::TypeDeclaration { - type_id: v.type_id.get_abi_type_id(ctx, engines), - type_field: v.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - v.type_id, - ), - components: v - .type_id - .get_abi_type_components(ctx, engines, types, v.type_id), - type_parameters: v - .type_id - .get_abi_type_parameters(ctx, engines, types, v.type_id), + .map(|v| { + Ok(program_abi::TypeDeclaration { + type_id: v.type_id.get_abi_type_id(handler, ctx, engines)?, + type_field: v.type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + v.type_id, + ), + components: v + .type_id + .get_abi_type_components(handler, ctx, engines, types, v.type_id)?, + type_parameters: v + .type_id + .get_abi_type_parameters(handler, ctx, engines, types, v.type_id)?, + }) }) - .collect::>(); + .collect::, _>>()?; types.extend(abi_type_arguments); Some( decl.type_parameters .iter() - .map(|arg| program_abi::TypeApplication { - name: "".to_string(), - type_id: arg.type_id.get_abi_type_id(ctx, engines), - type_arguments: arg.type_id.get_abi_type_arguments( - ctx, - engines, - types, - arg.type_id, - ), + .map(|arg| { + Ok(program_abi::TypeApplication { + name: "".to_string(), + type_id: arg.type_id.get_abi_type_id(handler, ctx, engines)?, + type_arguments: arg.type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types, + arg.type_id, + )?, + }) }) - .collect::>(), + .collect::, _>>()?, ) } _ => None, - } + }) } } impl TyFunctionDecl { pub(self) fn generate_abi_function( &self, + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, - ) -> program_abi::ABIFunction { + ) -> Result { // A list of all `program_abi::TypeDeclaration`s needed for inputs let input_types = self .parameters .iter() - .map(|x| program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - ctx, - engines, - types, - x.type_argument.type_id, - ), - type_parameters: x.type_argument.type_id.get_abi_type_parameters( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeDeclaration { + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_field: x.type_argument.initial_type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + x.type_argument.type_id, + ), + components: x.type_argument.initial_type_id.get_abi_type_components( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + type_parameters: x.type_argument.type_id.get_abi_type_parameters( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect::>(); + .collect::, _>>()?; // The single `program_abi::TypeDeclaration` needed for the output let output_type = program_abi::TypeDeclaration { type_id: self .return_type .initial_type_id - .get_abi_type_id(ctx, engines), + .get_abi_type_id(handler, ctx, engines)?, type_field: self.return_type.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, self.return_type.type_id, ), components: self.return_type.type_id.get_abi_type_components( + handler, ctx, engines, types, self.return_type.type_id, - ), + )?, type_parameters: self.return_type.type_id.get_abi_type_parameters( + handler, ctx, engines, types, self.return_type.type_id, - ), + )?, }; // Add the new types to `types` @@ -799,40 +978,44 @@ impl TyFunctionDecl { types.push(output_type); // Generate the JSON data for the function - program_abi::ABIFunction { + Ok(program_abi::ABIFunction { name: self.name.as_str().to_string(), inputs: self .parameters .iter() - .map(|x| program_abi::TypeApplication { - name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(ctx, engines), - type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( - ctx, - engines, - types, - x.type_argument.type_id, - ), + .map(|x| { + Ok(program_abi::TypeApplication { + name: x.name.to_string(), + type_id: x + .type_argument + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?, + type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types, + x.type_argument.type_id, + )?, + }) }) - .collect(), + .collect::, _>>()?, output: program_abi::TypeApplication { name: "".to_string(), type_id: self .return_type .initial_type_id - .get_abi_type_id(ctx, engines), + .get_abi_type_id(handler, ctx, engines)?, type_arguments: self.return_type.initial_type_id.get_abi_type_arguments( + handler, ctx, engines, types, self.return_type.type_id, - ), + )?, }, attributes: generate_attributes_map(&self.attributes), - } + }) } } @@ -859,11 +1042,14 @@ impl TypeParameter { /// append the current TypeParameter as a `program_abi::TypeDeclaration`. pub(self) fn get_abi_type_parameter( &self, + handler: &Handler, ctx: &mut AbiContext, engines: &Engines, types: &mut Vec, - ) -> String { - let type_id = self.initial_type_id.get_abi_type_id(ctx, engines); + ) -> Result { + let type_id = self + .initial_type_id + .get_abi_type_id(handler, ctx, engines)?; let type_parameter = program_abi::TypeDeclaration { type_id: type_id.clone(), type_field: self.initial_type_id.get_abi_type_str( @@ -872,14 +1058,15 @@ impl TypeParameter { self.type_id, ), components: self.initial_type_id.get_abi_type_components( + handler, ctx, engines, types, self.type_id, - ), + )?, type_parameters: None, }; types.push(type_parameter); - type_id + Ok(type_id) } } diff --git a/sway-error/src/error.rs b/sway-error/src/error.rs index 0e625e02d1e..de771f32aec 100644 --- a/sway-error/src/error.rs +++ b/sway-error/src/error.rs @@ -1011,6 +1011,13 @@ pub enum CompileError { EncodingUnsupportedType { span: Span }, #[error("Configurables need a function named \"abi_decode_in_place\" to be in scope.")] ConfigurableMissingAbiDecodeInPlace { span: Span }, + #[error("Collision detected between two different types.\n Shared hash:{hash}\n First type:{first_type}\n Second type:{second_type}")] + ABIHashCollision { + span: Span, + hash: String, + first_type: String, + second_type: String, + }, #[error("Type must be known at this point")] TypeMustBeKnownAtThisPoint { span: Span, internal: String }, } @@ -1229,6 +1236,7 @@ impl Spanned for CompileError { CannotBeEvaluatedToConfigurableSizeUnknown { span } => span.clone(), EncodingUnsupportedType { span } => span.clone(), ConfigurableMissingAbiDecodeInPlace { span } => span.clone(), + ABIHashCollision { span, .. } => span.clone(), InvalidRangeEndGreaterThanStart { span, .. } => span.clone(), TypeMustBeKnownAtThisPoint { span, .. } => span.clone(), } From 6e22225ea6c235c6c2c24d40aa751b1fa146e744 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 12 Jul 2024 13:15:00 +0100 Subject: [PATCH 10/47] Updates fuel-vm and fuel-core to latest. --- Cargo.lock | 1042 +++++++++++++++++++--------------------------------- 1 file changed, 368 insertions(+), 674 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 203a8e4cc46..a7af364eeac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -257,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -277,7 +277,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.1", + "object 0.36.0", "rustc-demangle", "serde", ] @@ -356,15 +356,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -474,7 +474,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "syn_derive", ] @@ -558,9 +558,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cast" @@ -570,12 +570,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.5" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -608,7 +609,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -669,7 +670,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -678,9 +679,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -688,9 +689,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -701,11 +702,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", ] [[package]] @@ -714,20 +715,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -852,15 +853,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" +checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" [[package]] name = "completest-pty" -version = "0.5.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" +checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" dependencies = [ "completest", "ptyprocess", @@ -873,7 +874,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "entities", "memchr", "once_cell", @@ -1019,7 +1020,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.9", + "clap 4.5.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1177,7 +1178,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1243,12 +1244,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1267,16 +1268,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1292,13 +1293,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.9", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1392,7 +1393,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1585,9 +1586,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -1664,7 +1665,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1677,7 +1678,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1822,22 +1823,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "eventsource-client" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29" -dependencies = [ - "futures", - "hyper", - "hyper-rustls 0.24.2", - "hyper-timeout", - "log", - "pin-project", - "rand", - "tokio", -] - [[package]] name = "expect-test" version = "1.5.0" @@ -1856,7 +1841,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -1987,21 +1972,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forc" -version = "0.62.0" +version = "0.61.2" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "clap_complete_fig", "completest-pty", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "fs_extra", - "fuel-asm 0.52.0", + "fuel-asm", "hex", "serde", "serde_json", @@ -2023,27 +2008,27 @@ dependencies = [ [[package]] name = "forc-client" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.9", + "clap 4.5.7", "devault", "forc", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types 0.6.0", - "fuel-core-client 0.28.0", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-vm 0.52.0", - "fuels-accounts 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", - "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuel-abi-types", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-vm", + "fuels-accounts", + "fuels-core", "futures", "hex", "portpicker", @@ -2062,17 +2047,17 @@ dependencies = [ [[package]] name = "forc-crypto" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.9", - "forc-tracing 0.62.0", + "clap 4.5.7", + "forc-tracing 0.61.2", "forc-util", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuel-core-types", + "fuel-crypto", + "fuels-core", "futures", "hex", "libp2p-identity", @@ -2088,15 +2073,15 @@ dependencies = [ [[package]] name = "forc-debug" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dap", "escargot", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "fuel-core-client", "fuel-types", "fuel-vm", @@ -2114,15 +2099,15 @@ dependencies = [ [[package]] name = "forc-doc" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "comrak", "dir_indexer", "expect-test", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "horrorshow", "include_dir", @@ -2139,12 +2124,12 @@ dependencies = [ [[package]] name = "forc-fmt" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "prettydiff 0.5.1", "sway-core", @@ -2156,10 +2141,10 @@ dependencies = [ [[package]] name = "forc-lsp" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2167,15 +2152,15 @@ dependencies = [ [[package]] name = "forc-pkg" -version = "0.62.0" +version = "0.61.2" dependencies = [ "ansi_term", "anyhow", "byte-unit", "cid", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", - "fuel-abi-types 0.6.0", + "fuel-abi-types", "futures", "git2", "gix-url", @@ -2204,14 +2189,14 @@ dependencies = [ [[package]] name = "forc-test" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types 0.6.0", - "fuel-tx 0.52.0", - "fuel-vm 0.52.0", - "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuel-abi-types", + "fuel-tx", + "fuel-vm", + "fuels-core", "rand", "rayon", "sway-core", @@ -2231,7 +2216,7 @@ dependencies = [ [[package]] name = "forc-tracing" -version = "0.62.0" +version = "0.61.2" dependencies = [ "ansi_term", "tracing", @@ -2241,14 +2226,14 @@ dependencies = [ [[package]] name = "forc-tx" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "devault", "forc-util", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", + "fuel-tx", + "fuel-types", "serde", "serde_json", "thiserror", @@ -2256,15 +2241,15 @@ dependencies = [ [[package]] name = "forc-util" -version = "0.62.0" +version = "0.61.2" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.9", + "clap 4.5.7", "dirs 3.0.2", "fd-lock 4.0.2", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "fuel-tx", "hex", "paste", @@ -2284,17 +2269,16 @@ dependencies = [ [[package]] name = "forc-wallet" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e88edfd8c98861cdf0c27ccea3d81b0033b1e80d3d22367fd0fd4e2b58dc9dd" +source = "git+https://github.com/FuelLabs/forc-wallet?branch=esdrubal/abi_changes#d5ee04b73ee683df8380ecb165b5984406c514db" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "eth-keystore", "forc-tracing 0.47.0", - "fuel-crypto 0.52.0", - "fuel-types 0.52.0", + "fuel-crypto", + "fuel-types", "fuels", - "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuels-core", "futures", "hex", "home", @@ -2346,23 +2330,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fuel-abi-types" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e7e87f94417ff1a5d60e496906033c58bfe5367546621f131fe8cdabaa2671" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.71", - "thiserror", -] - [[package]] name = "fuel-abi-types" version = "0.6.0" @@ -2386,7 +2353,7 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "fuel-types", "serde", "strum 0.24.1", @@ -2401,8 +2368,8 @@ dependencies = [ "anyhow", "bech32", "derivative", - "fuel-core-storage 0.28.0", - "fuel-core-types 0.28.0", + "fuel-core-storage", + "fuel-core-types", "itertools 0.12.1", "postcard", "rand", @@ -2412,46 +2379,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-chain-config" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" -dependencies = [ - "anyhow", - "derivative", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "itertools 0.12.1", - "postcard", - "serde", - "serde_with", -] - -[[package]] -name = "fuel-core-client" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" -dependencies = [ - "anyhow", - "cynic", - "derive_more", - "eventsource-client 0.10.2", - "fuel-core-types 0.28.0", - "futures", - "hex", - "hyper-rustls 0.24.2", - "itertools 0.12.1", - "reqwest", - "schemafy_lib", - "serde", - "serde_json", - "tai64", - "thiserror", - "tracing", -] - [[package]] name = "fuel-core-client" version = "0.31.0" @@ -2461,8 +2388,8 @@ dependencies = [ "anyhow", "cynic", "derive_more", - "eventsource-client 0.12.2", - "fuel-core-types 0.31.0", + "eventsource-client", + "fuel-core-types", "futures", "hex", "hyper-rustls", @@ -2497,10 +2424,10 @@ checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config 0.28.0", + "fuel-core-chain-config", "fuel-core-services", - "fuel-core-storage 0.28.0", - "fuel-core-types 0.28.0", + "fuel-core-storage", + "fuel-core-types", "tokio", "tokio-stream", "tracing", @@ -2530,30 +2457,8 @@ dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types 0.28.0", - "fuel-vm 0.52.0", - "impl-tools", - "itertools 0.12.1", - "num_enum 0.7.2", - "paste", - "postcard", - "primitive-types", - "serde", - "strum 0.25.0", - "strum_macros 0.25.3", -] - -[[package]] -name = "fuel-core-storage" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" -dependencies = [ - "anyhow", - "derive_more", - "enum-iterator", - "fuel-core-types 0.31.0", - "fuel-vm 0.55.0", + "fuel-core-types", + "fuel-vm", "impl-tools", "itertools 0.12.1", "num_enum 0.7.2", @@ -2575,7 +2480,7 @@ dependencies = [ "bs58", "derivative", "derive_more", - "fuel-vm 0.52.0", + "fuel-vm", "rand", "secrecy", "serde", @@ -2584,45 +2489,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-core-types" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" -dependencies = [ - "anyhow", - "bs58", - "derivative", - "derive_more", - "fuel-vm 0.55.0", - "secrecy", - "serde", - "tai64", - "thiserror", - "zeroize", -] - -[[package]] -name = "fuel-crypto" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" -dependencies = [ - "coins-bip32", - "coins-bip39", - "ecdsa", - "ed25519-dalek", - "fuel-types 0.52.0", - "k256", - "lazy_static", - "p256", - "rand", - "secp256k1 0.26.0", - "serde", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "fuel-crypto" version = "0.55.0" @@ -2633,7 +2499,7 @@ dependencies = [ "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types 0.55.0", + "fuel-types", "k256", "lazy_static", "p256", @@ -2644,18 +2510,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-derive" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", - "synstructure 0.13.1", -] - [[package]] name = "fuel-derive" version = "0.55.0" @@ -2723,63 +2577,19 @@ checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage 0.52.0", + "fuel-storage", "hashbrown 0.13.2", "hex", "serde", "sha2 0.10.8", ] -[[package]] -name = "fuel-merkle" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" -dependencies = [ - "derive_more", - "digest 0.10.7", - "fuel-storage 0.55.0", - "hashbrown 0.13.2", - "hex", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "fuel-storage" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" - [[package]] name = "fuel-storage" version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" -[[package]] -name = "fuel-tx" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" -dependencies = [ - "bitflags 2.6.0", - "derivative", - "derive_more", - "fuel-asm 0.52.0", - "fuel-crypto 0.52.0", - "fuel-merkle 0.52.0", - "fuel-types 0.52.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "postcard", - "rand", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", -] - [[package]] name = "fuel-tx" version = "0.55.0" @@ -2789,10 +2599,10 @@ dependencies = [ "bitflags 2.5.0", "derivative", "derive_more", - "fuel-asm 0.55.0", - "fuel-crypto 0.55.0", - "fuel-merkle 0.55.0", - "fuel-types 0.55.0", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2809,19 +2619,7 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" dependencies = [ - "fuel-derive 0.52.0", - "hex", - "rand", - "serde", -] - -[[package]] -name = "fuel-types" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" -dependencies = [ - "fuel-derive 0.55.0", + "fuel-derive", "hex", "rand", "serde", @@ -2836,16 +2634,16 @@ dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.6.0", + "bitflags 2.5.0", "derivative", "derive_more", "ethnum", - "fuel-asm 0.52.0", - "fuel-crypto 0.52.0", - "fuel-merkle 0.52.0", - "fuel-storage 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-storage", + "fuel-tx", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2861,78 +2659,21 @@ dependencies = [ "tai64", ] -[[package]] -name = "fuel-vm" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" -dependencies = [ - "async-trait", - "backtrace", - "bitflags 2.5.0", - "derivative", - "derive_more", - "ethnum", - "fuel-asm 0.55.0", - "fuel-crypto 0.55.0", - "fuel-merkle 0.55.0", - "fuel-storage 0.55.0", - "fuel-tx 0.55.0", - "fuel-types 0.55.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "libm", - "paste", - "percent-encoding", - "primitive-types", - "serde", - "serde_with", - "sha3", - "static_assertions", - "strum 0.24.1", -] - [[package]] name = "fuels" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601ed66a0485065471cd9c8bab2db7cfa58bc7ed5d2e68bd26fc573ac2575827" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" dependencies = [ - "fuel-core-client 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fuels-macros 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", + "fuels-accounts", + "fuels-core", + "fuels-macros", "fuels-programs", "fuels-test-helpers", ] -[[package]] -name = "fuels-accounts" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed97e653906fe0bc60b5d7a7421f3c5fe766f516b762def8f4ccac707ac4bc3" -dependencies = [ - "async-trait", - "chrono", - "elliptic-curve", - "eth-keystore", - "fuel-core-client 0.28.0", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.12.1", - "rand", - "semver", - "tai64", - "thiserror", - "tokio", - "zeroize", -] - [[package]] name = "fuels-accounts" version = "0.64.0" @@ -2942,12 +2683,12 @@ dependencies = [ "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client 0.31.0", - "fuel-core-types 0.31.0", - "fuel-crypto 0.55.0", - "fuel-tx 0.55.0", - "fuel-types 0.55.0", - "fuels-core 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuels-core", "itertools 0.12.1", "rand", "semver", @@ -2957,29 +2698,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuels-code-gen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edef30656b740ca9c279a7bcfe9e366557c271a2751e36316f780f18dc99c85" -dependencies = [ - "Inflector", - "fuel-abi-types 0.5.2", - "itertools 0.12.1", - "proc-macro2", - "quote", - "regex", - "serde_json", - "syn 2.0.71", -] - [[package]] name = "fuels-code-gen" version = "0.64.0" source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" dependencies = [ "Inflector", - "fuel-abi-types 0.6.0", + "fuel-abi-types", "itertools 0.12.1", "proc-macro2", "quote", @@ -2988,34 +2713,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "fuels-core" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff741c9f1ba2c701b50c76a98a5655d8bc0f275f7ae2dd0e724f8fc36eeb8a9f" -dependencies = [ - "async-trait", - "bech32", - "chrono", - "fuel-abi-types 0.5.2", - "fuel-asm 0.52.0", - "fuel-core-chain-config 0.28.0", - "fuel-core-client 0.28.0", - "fuel-core-types 0.28.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "fuel-vm 0.52.0", - "fuels-macros 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hex", - "itertools 0.12.1", - "postcard", - "serde", - "serde_json", - "thiserror", - "uint", -] - [[package]] name = "fuels-core" version = "0.64.0" @@ -3024,16 +2721,16 @@ dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types 0.6.0", - "fuel-asm 0.55.0", - "fuel-core-chain-config 0.31.0", - "fuel-core-client 0.31.0", - "fuel-core-types 0.31.0", - "fuel-crypto 0.55.0", - "fuel-tx 0.55.0", - "fuel-types 0.55.0", - "fuel-vm 0.55.0", - "fuels-macros 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuel-abi-types", + "fuel-asm", + "fuel-core-chain-config", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuel-vm", + "fuels-macros", "hex", "itertools 0.12.1", "postcard", @@ -3043,44 +2740,30 @@ dependencies = [ "uint", ] -[[package]] -name = "fuels-macros" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba1c2fd149a310879249144f2589336708ae860563a45b792907ae34ae6b959" -dependencies = [ - "fuels-code-gen 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "fuels-macros" version = "0.64.0" source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" dependencies = [ - "fuels-code-gen 0.64.0 (git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec)", + "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] name = "fuels-programs" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45652fa07c48d5fba2ee50ddd279eead2c55b251b3d426d2189394b475330e9" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" dependencies = [ "async-trait", - "fuel-abi-types 0.5.2", - "fuel-asm 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-abi-types", + "fuel-asm", + "fuel-tx", + "fuel-types", + "fuels-accounts", + "fuels-core", "itertools 0.12.1", "rand", "serde_json", @@ -3089,19 +2772,18 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967a140a51095d071c84970365c37f856f4f098b835cb609b934dff4b8296cce" +version = "0.64.0" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" dependencies = [ - "fuel-core-chain-config 0.28.0", - "fuel-core-client 0.28.0", + "fuel-core-chain-config", + "fuel-core-client", "fuel-core-poa", "fuel-core-services", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", - "fuel-types 0.52.0", - "fuels-accounts 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fuels-core 0.64.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuels-accounts", + "fuels-core", "futures", "portpicker", "rand", @@ -3172,7 +2854,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -3271,7 +2953,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -3460,7 +3142,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin", + "spin 0.9.8", "stable_deref_trait", ] @@ -3602,9 +3284,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -3778,7 +3460,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -3790,7 +3472,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -3858,7 +3540,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -4060,17 +3742,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "libc", ] [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -4133,7 +3815,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -4144,7 +3826,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", ] @@ -4222,6 +3904,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4246,9 +3934,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logos" @@ -4279,7 +3967,7 @@ version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -4303,7 +3991,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.9", + "clap 4.5.7", "clap_complete", "env_logger", "handlebars", @@ -4326,7 +4014,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.9", + "clap 4.5.7", "mdbook", "semver", "serde", @@ -4459,9 +4147,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.5" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", @@ -4608,7 +4296,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -4617,15 +4305,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", ] [[package]] @@ -4634,7 +4321,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", @@ -4656,7 +4343,7 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4713,9 +4400,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ "num-integer", "num-traits", @@ -4826,7 +4513,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -4851,9 +4538,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -4866,13 +4553,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" -version = "6.3.1" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags 1.2.1", - "lazy_static", + "bitflags 1.3.2", "libc", + "once_cell", "onig_sys", ] @@ -4888,9 +4575,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -4926,7 +4613,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4943,7 +4630,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -5076,9 +4763,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -5141,9 +4828,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -5152,9 +4839,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -5162,22 +4849,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -5257,7 +4944,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -5290,12 +4977,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap 2.2.6", + "line-wrap", "quick-xml", "serde", "time", @@ -5496,18 +5184,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.22.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", @@ -5523,7 +5211,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -5577,7 +5265,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5600,9 +5288,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5714,7 +5402,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -5723,16 +5411,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", ] [[package]] @@ -5929,7 +5617,7 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin", + "spin 0.9.8", "untrusted", "windows-sys 0.52.0", ] @@ -5958,7 +5646,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -5989,7 +5677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags 1.2.1", + "bitflags 1.3.2", "serde", ] @@ -6098,7 +5786,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -6160,7 +5848,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "clipboard-win", "dirs-next", @@ -6168,7 +5856,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.20.2", + "nix 0.20.0", "radix_trie", "scopeguard", "smallvec", @@ -6215,9 +5903,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" dependencies = [ "sdd", ] @@ -6287,9 +5975,9 @@ dependencies = [ [[package]] name = "sdd" -version = "1.6.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb0dde0ccd15e337a3cf738a9a38115c6d8e74795d074e73973dad3d229a897" +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" [[package]] name = "seahash" @@ -6359,11 +6047,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6372,9 +6060,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -6391,22 +6079,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6420,9 +6108,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -6437,7 +6125,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6463,9 +6151,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64 0.22.1", "chrono", @@ -6481,14 +6169,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.10", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6526,7 +6214,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6717,6 +6405,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -6840,7 +6534,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -6858,13 +6552,13 @@ dependencies = [ [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sway-ast" -version = "0.62.0" +version = "0.61.2" dependencies = [ "extension-trait", "num-bigint", @@ -6876,17 +6570,17 @@ dependencies = [ [[package]] name = "sway-core" -version = "0.62.0" +version = "0.61.2" dependencies = [ - "clap 4.5.9", + "clap 4.5.7", "derivative", "dirs 3.0.2", "either", - "fuel-abi-types 0.6.0", + "fuel-abi-types", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", - "fuel-vm 0.52.0", + "fuel-vm", "gimli 0.28.1", "graph-cycles", "hashbrown 0.13.2", @@ -6921,7 +6615,7 @@ dependencies = [ [[package]] name = "sway-error" -version = "0.62.0" +version = "0.61.2" dependencies = [ "either", "in_definite", @@ -6934,7 +6628,7 @@ dependencies = [ [[package]] name = "sway-ir" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "downcast-rs", @@ -6953,7 +6647,7 @@ dependencies = [ [[package]] name = "sway-ir-macros" -version = "0.62.0" +version = "0.61.2" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -6963,7 +6657,7 @@ dependencies = [ [[package]] name = "sway-lsp" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "assert-json-diff", @@ -6973,7 +6667,7 @@ dependencies = [ "dirs 4.0.0", "fd-lock 4.0.2", "forc-pkg", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "forc-util", "futures", "indexmap 2.2.6", @@ -7028,7 +6722,7 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.62.0" +version = "0.61.2" dependencies = [ "assert_matches", "extension-trait", @@ -7046,12 +6740,12 @@ dependencies = [ [[package]] name = "sway-types" -version = "0.62.0" +version = "0.61.2" dependencies = [ "bytecount", - "fuel-asm 0.52.0", - "fuel-crypto 0.52.0", - "fuel-tx 0.52.0", + "fuel-asm", + "fuel-crypto", + "fuel-tx", "indexmap 2.2.6", "lazy_static", "num-bigint", @@ -7065,7 +6759,7 @@ dependencies = [ [[package]] name = "sway-utils" -version = "0.62.0" +version = "0.61.2" dependencies = [ "serde", "walkdir", @@ -7073,11 +6767,11 @@ dependencies = [ [[package]] name = "swayfmt" -version = "0.62.0" +version = "0.61.2" dependencies = [ "anyhow", "difference", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "paste", "prettydiff 0.6.4", "ropey", @@ -7107,9 +6801,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -7125,7 +6819,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7154,7 +6848,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7164,7 +6858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", - "bitflags 1.2.1", + "bitflags 1.3.2", "fancy-regex", "flate2", "fnv", @@ -7201,7 +6895,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -7295,9 +6989,9 @@ dependencies = [ [[package]] name = "term-table" -version = "1.4.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210f90191b719267bc8b6307659faf54a77400d06b8033ece26692696fc002be" +checksum = "d5e59d7fb313157de2a568be8d81e4d7f9af6e50e697702e8e00190a6566d3b8" dependencies = [ "lazy_static", "regex", @@ -7332,14 +7026,14 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.9", + "clap 4.5.7", "colored", "filecheck", "forc", "forc-client", "forc-pkg", "forc-test", - "forc-tracing 0.62.0", + "forc-tracing 0.61.2", "fuel-vm", "futures", "gag", @@ -7397,22 +7091,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.62" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7516,9 +7210,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -7531,9 +7225,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -7566,7 +7260,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7724,7 +7418,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7752,7 +7446,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -7825,7 +7519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -8014,9 +7708,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" [[package]] name = "uwuify" @@ -8159,7 +7853,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -8193,7 +7887,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8280,7 +7974,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8307,7 +8001,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -8342,18 +8036,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "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", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -8370,9 +8064,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -8388,9 +8082,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -8406,15 +8100,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -8430,9 +8124,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -8448,9 +8142,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -8466,9 +8160,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -8484,9 +8178,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8633,22 +8327,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] [[package]] @@ -8668,5 +8362,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.66", ] From 97fb1295bc8920ed064369768d9d07ae56b55fb5 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 12 Jul 2024 13:17:12 +0100 Subject: [PATCH 11/47] Passes resolved_type to get_abi_type_id. --- sway-core/src/abi_generation/fuel_abi.rs | 184 +++++++++++++++-------- 1 file changed, 122 insertions(+), 62 deletions(-) diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 93dd2ba5528..6336adc56d9 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -43,9 +43,22 @@ impl TypeId { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, + resolved_type_id: TypeId, ) -> Result { - let type_str = - self.get_abi_type_str(&ctx.to_str_context(engines, true), engines, self.clone()); + let type_str = self.get_abi_type_str( + &AbiStrContext { + program_name: ctx + .program + .root + .namespace + .program_id(engines) + .read(engines, |m| m.name.clone().map(|v| v.as_str().to_string())), + abi_with_callpaths: true, + abi_with_fully_specified_types: true, + }, + engines, + resolved_type_id, + ); let mut hasher = Sha256::new(); hasher.update(type_str.clone()); let result = hasher.finalize(); @@ -204,7 +217,7 @@ fn generate_logged_types( .iter() .map(|(_, type_id)| { Ok(program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, type_field: type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -237,7 +250,7 @@ fn generate_logged_types( log_id: log_id.to_string(), application: program_abi::TypeApplication { name: "".to_string(), - type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, type_arguments: type_id .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, }, @@ -263,7 +276,7 @@ fn generate_messages_types( .iter() .map(|(_, type_id)| { Ok(program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, type_field: type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -289,7 +302,7 @@ fn generate_messages_types( message_id: **message_id as u64, application: program_abi::TypeApplication { name: "".to_string(), - type_id: type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, type_arguments: type_id .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, }, @@ -311,10 +324,12 @@ fn generate_configurables( .iter() .map(|decl| { Ok(program_abi::TypeDeclaration { - type_id: decl - .type_ascription - .type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: decl.type_ascription.type_id.get_abi_type_id( + handler, + ctx, + engines, + decl.type_ascription.type_id, + )?, type_field: decl.type_ascription.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -350,10 +365,12 @@ fn generate_configurables( name: decl.call_path.suffix.to_string(), application: program_abi::TypeApplication { name: "".to_string(), - type_id: decl - .type_ascription - .type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: decl.type_ascription.type_id.get_abi_type_id( + handler, + ctx, + engines, + decl.type_ascription.type_id, + )?, type_arguments: decl.type_ascription.type_id.get_abi_type_arguments( handler, ctx, @@ -417,10 +434,12 @@ impl TypeId { .iter() .map(|x| { Ok(program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -456,10 +475,12 @@ impl TypeId { .map(|x| { Ok(program_abi::TypeApplication { name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_arguments: x .type_argument .initial_type_id @@ -484,10 +505,12 @@ impl TypeId { .iter() .map(|x| { Ok(program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -523,10 +546,12 @@ impl TypeId { .map(|x| { Ok(program_abi::TypeApplication { name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_arguments: x .type_argument .initial_type_id @@ -546,9 +571,12 @@ impl TypeId { if let TypeInfo::Array(elem_ty, _) = &*type_engine.get(resolved_type_id) { // The `program_abi::TypeDeclaration`s needed for the array element type let elem_abi_ty = program_abi::TypeDeclaration { - type_id: elem_ty - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: elem_ty.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + elem_ty.type_id, + )?, type_field: elem_ty.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -575,9 +603,12 @@ impl TypeId { // `program_abi::TypeApplication` for the array element type Some(vec![program_abi::TypeApplication { name: "__array_element".to_string(), - type_id: elem_ty - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: elem_ty.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + elem_ty.type_id, + )?, type_arguments: elem_ty.initial_type_id.get_abi_type_arguments( handler, ctx, @@ -640,7 +671,7 @@ impl TypeId { Ok(program_abi::TypeDeclaration { type_id: x .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + .get_abi_type_id(handler, ctx, engines, x.type_id)?, type_field: x.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -668,7 +699,7 @@ impl TypeId { name: "__tuple_element".to_string(), type_id: x .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + .get_abi_type_id(handler, ctx, engines, x.type_id)?, type_arguments: x.initial_type_id.get_abi_type_arguments( handler, ctx, engines, types, x.type_id, )?, @@ -697,7 +728,7 @@ impl TypeId { Ok(program_abi::TypeDeclaration { type_id: v .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + .get_abi_type_id(handler, ctx, engines, p.type_id)?, type_field: v.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -777,7 +808,9 @@ impl TypeId { .zip(resolved_params.iter()) .map(|(v, p)| { Ok(program_abi::TypeDeclaration { - type_id: v.initial_type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: v + .initial_type_id + .get_abi_type_id(handler, ctx, engines, p.type_id)?, type_field: v.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -799,7 +832,12 @@ impl TypeId { .map(|arg| { Ok(program_abi::TypeApplication { name: "".to_string(), - type_id: arg.initial_type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: arg.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + arg.type_id, + )?, type_arguments: arg.initial_type_id.get_abi_type_arguments( handler, ctx, @@ -819,7 +857,9 @@ impl TypeId { .iter() .map(|v| { Ok(program_abi::TypeDeclaration { - type_id: v.type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: v + .type_id + .get_abi_type_id(handler, ctx, engines, v.type_id)?, type_field: v.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -842,7 +882,12 @@ impl TypeId { .map(|arg| { Ok(program_abi::TypeApplication { name: "".to_string(), - type_id: arg.type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: arg.type_id.get_abi_type_id( + handler, + ctx, + engines, + arg.type_id, + )?, type_arguments: arg.type_id.get_abi_type_arguments( handler, ctx, @@ -864,7 +909,9 @@ impl TypeId { .iter() .map(|v| { Ok(program_abi::TypeDeclaration { - type_id: v.type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: v + .type_id + .get_abi_type_id(handler, ctx, engines, v.type_id)?, type_field: v.type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -887,7 +934,12 @@ impl TypeId { .map(|arg| { Ok(program_abi::TypeApplication { name: "".to_string(), - type_id: arg.type_id.get_abi_type_id(handler, ctx, engines)?, + type_id: arg.type_id.get_abi_type_id( + handler, + ctx, + engines, + arg.type_id, + )?, type_arguments: arg.type_id.get_abi_type_arguments( handler, ctx, @@ -919,10 +971,12 @@ impl TyFunctionDecl { .iter() .map(|x| { Ok(program_abi::TypeDeclaration { - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_field: x.type_argument.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -948,10 +1002,12 @@ impl TyFunctionDecl { // The single `program_abi::TypeDeclaration` needed for the output let output_type = program_abi::TypeDeclaration { - type_id: self - .return_type - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: self.return_type.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + self.return_type.type_id, + )?, type_field: self.return_type.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -986,10 +1042,12 @@ impl TyFunctionDecl { .map(|x| { Ok(program_abi::TypeApplication { name: x.name.to_string(), - type_id: x - .type_argument - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: x.type_argument.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + x.type_argument.type_id, + )?, type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( handler, ctx, @@ -1002,10 +1060,12 @@ impl TyFunctionDecl { .collect::, _>>()?, output: program_abi::TypeApplication { name: "".to_string(), - type_id: self - .return_type - .initial_type_id - .get_abi_type_id(handler, ctx, engines)?, + type_id: self.return_type.initial_type_id.get_abi_type_id( + handler, + ctx, + engines, + self.return_type.type_id, + )?, type_arguments: self.return_type.initial_type_id.get_abi_type_arguments( handler, ctx, @@ -1049,7 +1109,7 @@ impl TypeParameter { ) -> Result { let type_id = self .initial_type_id - .get_abi_type_id(handler, ctx, engines)?; + .get_abi_type_id(handler, ctx, engines, self.type_id)?; let type_parameter = program_abi::TypeDeclaration { type_id: type_id.clone(), type_field: self.initial_type_id.get_abi_type_str( From 93368c03844b079181c9780024b588ebb9ba20ce Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 12 Jul 2024 13:26:56 +0100 Subject: [PATCH 12/47] Fixes cargo clippy. --- sway-core/src/abi_generation/fuel_abi.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 6336adc56d9..552194b8279 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -100,7 +100,7 @@ pub fn generate_program_abi( .iter() .map(|x| { let fn_decl = decl_engine.get_function(x); - Ok(fn_decl.generate_abi_function(handler, ctx, engines, types)?) + fn_decl.generate_abi_function(handler, ctx, engines, types) }) .collect::, _>>()?; let logged_types = generate_logged_types(handler, ctx, engines, types)?; @@ -259,7 +259,7 @@ fn generate_logged_types( }) .collect::, _>>()? .into_iter() - .filter_map(|o| o) + .flatten() .collect()) } @@ -405,7 +405,7 @@ impl TypeId { .get_type_parameters(engines) .map(|v| { v.iter() - .map(|v| Ok(v.get_abi_type_parameter(handler, ctx, engines, types)?)) + .map(|v| v.get_abi_type_parameter(handler, ctx, engines, types)) .collect::, _>>() }) .map_or(Ok(None), |v| v.map(Some)), From d6f4f5b67c06e46ae4d62114b2deda7b5ec20570 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 15 Jul 2024 10:34:43 +0100 Subject: [PATCH 13/47] Use resolved types. --- sway-core/src/abi_generation/abi_str.rs | 4 ++-- sway-core/src/abi_generation/fuel_abi.rs | 22 ++++++++-------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sway-core/src/abi_generation/abi_str.rs b/sway-core/src/abi_generation/abi_str.rs index ed8e9ae3cb0..b20c1981468 100644 --- a/sway-core/src/abi_generation/abi_str.rs +++ b/sway-core/src/abi_generation/abi_str.rs @@ -32,7 +32,7 @@ impl TypeId { } (TypeInfo::Tuple(fields), TypeInfo::Tuple(resolved_fields)) => { assert_eq!(fields.len(), resolved_fields.len()); - let field_strs = fields + let field_strs = resolved_fields .iter() .map(|f| { if ctx.abi_with_fully_specified_types { @@ -44,7 +44,7 @@ impl TypeId { .collect::>(); format!("({})", field_strs.join(", ")) } - (TypeInfo::Array(type_arg, count), TypeInfo::Array(_, resolved_count)) => { + (TypeInfo::Array(_, count), TypeInfo::Array(type_arg, resolved_count)) => { assert_eq!(count.val(), resolved_count.val()); let inner_type = if ctx.abi_with_fully_specified_types { type_engine.get(type_arg.type_id).abi_str(ctx, engines) diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 552194b8279..8d60058069c 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -829,22 +829,16 @@ impl TypeId { type_arguments .iter() - .map(|arg| { + .zip(resolved_params.iter()) + .map(|(arg, p)| { Ok(program_abi::TypeApplication { name: "".to_string(), - type_id: arg.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - arg.type_id, - )?, - type_arguments: arg.initial_type_id.get_abi_type_arguments( - handler, - ctx, - engines, - types, - arg.type_id, - )?, + type_id: arg + .initial_type_id + .get_abi_type_id(handler, ctx, engines, p.type_id)?, + type_arguments: arg + .initial_type_id + .get_abi_type_arguments(handler, ctx, engines, types, p.type_id)?, }) }) .collect::, _>>()? From cac38d7ac41691454b0f5e0f718f3418ae82ca77 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 15 Jul 2024 11:49:20 +0100 Subject: [PATCH 14/47] Fixes generic enums and structs type ids. --- sway-core/src/abi_generation/abi_str.rs | 99 +++++++++++-------- sway-core/src/abi_generation/fuel_abi.rs | 10 +- .../ty/expression/intrinsic_function.rs | 1 + 3 files changed, 62 insertions(+), 48 deletions(-) diff --git a/sway-core/src/abi_generation/abi_str.rs b/sway-core/src/abi_generation/abi_str.rs index b20c1981468..56d43fbf317 100644 --- a/sway-core/src/abi_generation/abi_str.rs +++ b/sway-core/src/abi_generation/abi_str.rs @@ -2,10 +2,12 @@ use sway_types::integer_bits::IntegerBits; use crate::{language::CallPath, Engines, TypeArgument, TypeId, TypeInfo}; +#[derive(Clone)] pub struct AbiStrContext { pub program_name: String, pub abi_with_callpaths: bool, pub abi_with_fully_specified_types: bool, + pub abi_root_type_without_generic_type_parameters: bool, } impl TypeId { @@ -17,7 +19,7 @@ impl TypeId { resolved_type_id: TypeId, ) -> String { let type_engine = engines.te(); - let self_abi_str = type_engine.get(*self).abi_str(ctx, engines); + let self_abi_str = type_engine.get(*self).abi_str(ctx, engines, true); if self.is_generic_parameter(engines, resolved_type_id) { format!("generic {}", self_abi_str) } else { @@ -27,16 +29,16 @@ impl TypeId { ) { (TypeInfo::Custom { .. }, TypeInfo::Struct { .. }) | (TypeInfo::Custom { .. }, TypeInfo::Enum { .. }) - | (TypeInfo::Custom { .. }, TypeInfo::Alias { .. }) => { - type_engine.get(resolved_type_id).abi_str(ctx, engines) - } + | (TypeInfo::Custom { .. }, TypeInfo::Alias { .. }) => type_engine + .get(resolved_type_id) + .abi_str(ctx, engines, true), (TypeInfo::Tuple(fields), TypeInfo::Tuple(resolved_fields)) => { assert_eq!(fields.len(), resolved_fields.len()); let field_strs = resolved_fields .iter() .map(|f| { if ctx.abi_with_fully_specified_types { - type_engine.get(f.type_id).abi_str(ctx, engines) + type_engine.get(f.type_id).abi_str(ctx, engines, false) } else { "_".to_string() } @@ -47,7 +49,9 @@ impl TypeId { (TypeInfo::Array(_, count), TypeInfo::Array(type_arg, resolved_count)) => { assert_eq!(count.val(), resolved_count.val()); let inner_type = if ctx.abi_with_fully_specified_types { - type_engine.get(type_arg.type_id).abi_str(ctx, engines) + type_engine + .get(type_arg.type_id) + .abi_str(ctx, engines, false) } else { "_".to_string() }; @@ -64,14 +68,16 @@ impl TypeId { (TypeInfo::Custom { .. }, _) => { format!("generic {}", self_abi_str) } - _ => type_engine.get(resolved_type_id).abi_str(ctx, engines), + _ => type_engine + .get(resolved_type_id) + .abi_str(ctx, engines, true), } } } } impl TypeInfo { - pub fn abi_str(&self, ctx: &AbiStrContext, engines: &Engines) -> String { + pub fn abi_str(&self, ctx: &AbiStrContext, engines: &Engines, is_root: bool) -> String { use TypeInfo::*; let decl_engine = engines.de(); let type_engine = engines.te(); @@ -99,7 +105,7 @@ impl TypeInfo { Tuple(fields) => { let field_strs = fields .iter() - .map(|field| field.abi_str(ctx, engines)) + .map(|field| field.abi_str(ctx, engines, false)) .collect::>(); format!("({})", field_strs.join(", ")) } @@ -109,19 +115,20 @@ impl TypeInfo { ErrorRecovery(_) => "unknown due to error".into(), Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); - let type_params = - if !ctx.abi_with_fully_specified_types || decl.type_parameters.is_empty() { - "".into() - } else { - format!( - "<{}>", - decl.type_parameters - .iter() - .map(|p| type_engine.get(p.type_id).abi_str(ctx, engines)) - .collect::>() - .join(",") - ) - }; + let type_params = if (ctx.abi_root_type_without_generic_type_parameters && is_root) + || decl.type_parameters.is_empty() + { + "".into() + } else { + format!( + "<{}>", + decl.type_parameters + .iter() + .map(|p| type_engine.get(p.type_id).abi_str(ctx, engines, false)) + .collect::>() + .join(",") + ) + }; format!( "enum {}{}", call_path_display(ctx, &decl.call_path), @@ -130,19 +137,20 @@ impl TypeInfo { } Struct(decl_ref) => { let decl = decl_engine.get_struct(decl_ref); - let type_params = - if !ctx.abi_with_fully_specified_types || decl.type_parameters.is_empty() { - "".into() - } else { - format!( - "<{}>", - decl.type_parameters - .iter() - .map(|p| type_engine.get(p.type_id).abi_str(ctx, engines)) - .collect::>() - .join(",") - ) - }; + let type_params = if (ctx.abi_root_type_without_generic_type_parameters && is_root) + || decl.type_parameters.is_empty() + { + "".into() + } else { + format!( + "<{}>", + decl.type_parameters + .iter() + .map(|p| type_engine.get(p.type_id).abi_str(ctx, engines, false)) + .collect::>() + .join(",") + ) + }; format!( "struct {}{}", call_path_display(ctx, &decl.call_path), @@ -153,18 +161,22 @@ impl TypeInfo { format!("contract caller {abi_name}") } Array(elem_ty, length) => { - format!("[{}; {}]", elem_ty.abi_str(ctx, engines), length.val()) + format!( + "[{}; {}]", + elem_ty.abi_str(ctx, engines, false), + length.val() + ) } Storage { .. } => "contract storage".into(), RawUntypedPtr => "raw untyped ptr".into(), RawUntypedSlice => "raw untyped slice".into(), Ptr(ty) => { - format!("__ptr {}", ty.abi_str(ctx, engines)) + format!("__ptr {}", ty.abi_str(ctx, engines, false)) } Slice(ty) => { - format!("__slice {}", ty.abi_str(ctx, engines)) + format!("__slice {}", ty.abi_str(ctx, engines, false)) } - Alias { ty, .. } => ty.abi_str(ctx, engines), + Alias { ty, .. } => ty.abi_str(ctx, engines, false), TraitType { name, trait_type_id: _, @@ -176,7 +188,7 @@ impl TypeInfo { format!( "__ref {}{}", // TODO-IG: No references in ABIs according to the RFC. Or we want to have them? if *to_mutable_value { "mut " } else { "" }, - referenced_type.abi_str(ctx, engines) + referenced_type.abi_str(ctx, engines, false) ) } } @@ -203,7 +215,10 @@ fn call_path_display(ctx: &AbiStrContext, call_path: &CallPath) -> String { } impl TypeArgument { - pub(self) fn abi_str(&self, ctx: &AbiStrContext, engines: &Engines) -> String { - engines.te().get(self.type_id).abi_str(ctx, engines) + pub(self) fn abi_str(&self, ctx: &AbiStrContext, engines: &Engines, is_root: bool) -> String { + engines + .te() + .get(self.type_id) + .abi_str(ctx, engines, is_root) } } diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 8d60058069c..3c54487c563 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -19,11 +19,7 @@ pub struct AbiContext<'a> { } impl<'a> AbiContext<'a> { - fn to_str_context( - &self, - engines: &Engines, - abi_with_fully_specified_types: bool, - ) -> AbiStrContext { + fn to_str_context(&self, engines: &Engines, abi_full: bool) -> AbiStrContext { AbiStrContext { program_name: self .program @@ -32,7 +28,8 @@ impl<'a> AbiContext<'a> { .program_id(engines) .read(engines, |m| m.name().to_string()), abi_with_callpaths: self.abi_with_callpaths, - abi_with_fully_specified_types, + abi_with_fully_specified_types: abi_full, + abi_root_type_without_generic_type_parameters: !abi_full, } } } @@ -55,6 +52,7 @@ impl TypeId { .read(engines, |m| m.name.clone().map(|v| v.as_str().to_string())), abi_with_callpaths: true, abi_with_fully_specified_types: true, + abi_root_type_without_generic_type_parameters: true, }, engines, resolved_type_id, diff --git a/sway-core/src/language/ty/expression/intrinsic_function.rs b/sway-core/src/language/ty/expression/intrinsic_function.rs index 2d9466d3c0c..681fa6da873 100644 --- a/sway-core/src/language/ty/expression/intrinsic_function.rs +++ b/sway-core/src/language/ty/expression/intrinsic_function.rs @@ -121,6 +121,7 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind { program_name: ctx.program_name.clone(), abi_with_callpaths: true, abi_with_fully_specified_types: true, + abi_root_type_without_generic_type_parameters: false, }, ctx.engines, logged_type, From 79299fbb0643fcf74623648ae4574625c0215345 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Thu, 18 Jul 2024 21:43:47 +0100 Subject: [PATCH 15/47] Updates cargo crates. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3862f976fba..e614760e753 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ fuels-accounts = "0.66.0" forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: -fuel-abi-types = "0.6.0" +fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } [workspace.package] edition = "2021" From b4b6de9494dbfadc6d5f4daa7415f2159982f686 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Thu, 18 Jul 2024 21:45:48 +0100 Subject: [PATCH 16/47] Fixes. --- forc-pkg/src/pkg.rs | 8 +- forc-test/src/lib.rs | 6 +- sway-core/src/abi_generation/fuel_abi.rs | 1346 ++++++++++++---------- test/src/e2e_vm_tests/mod.rs | 2 +- 4 files changed, 754 insertions(+), 608 deletions(-) diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 0ff9eecaad1..7f1b28522c4 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -1832,13 +1832,12 @@ pub fn compile( metrics ); + const OLD_ENCODING_VERSION: &str = "0"; const NEW_ENCODING_VERSION: &str = "1"; const SPEC_VERSION: &str = "1"; - const ABI_VERSION: &str = "1"; let mut program_abi = match pkg.target { BuildTarget::Fuel => { - let mut types = vec![]; let program_abi_res = time_expr!( "generate JSON ABI program", "generate_json_abi", @@ -1850,13 +1849,12 @@ pub fn compile( type_ids_to_full_type_str: HashMap::::new(), }, engines, - &mut types, profile .experimental .new_encoding - .then(|| NEW_ENCODING_VERSION.into()), + .then(|| NEW_ENCODING_VERSION.into()) + .unwrap_or(OLD_ENCODING_VERSION.into()), SPEC_VERSION.into(), - ABI_VERSION.into() ), Some(sway_build_config.clone()), metrics diff --git a/forc-test/src/lib.rs b/forc-test/src/lib.rs index b9406203c59..58394055d75 100644 --- a/forc-test/src/lib.rs +++ b/forc-test/src/lib.rs @@ -672,7 +672,9 @@ pub fn decode_log_data( program_abi: &ProgramABI, ) -> anyhow::Result { let program_abi = match program_abi { - ProgramABI::Fuel(fuel_abi) => Some(fuel_abi), + ProgramABI::Fuel(fuel_abi) => Some( + fuel_abi_types::abi::unified_program::UnifiedProgramABI::from_counterpart(fuel_abi)?, + ), _ => None, } .ok_or_else(|| anyhow::anyhow!("only fuelvm is supported for log decoding"))?; @@ -680,7 +682,7 @@ pub fn decode_log_data( let type_lookup = program_abi .types .iter() - .map(|decl| (decl.type_id.clone(), decl.clone())) + .map(|decl| (decl.type_id, decl.clone())) .collect::>(); let logged_type_lookup: HashMap<_, _> = program_abi diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 3c54487c563..09f9c6510cf 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -1,4 +1,6 @@ -use fuel_abi_types::abi::program as program_abi; +use fuel_abi_types::abi::program::{ + self as program_abi, ConcreteTypeId, MetadataTypeId, TypeConcreteDeclaration, +}; use sha2::{Digest, Sha256}; use std::collections::{HashMap, HashSet}; use sway_error::handler::{ErrorEmitted, Handler}; @@ -35,13 +37,13 @@ impl<'a> AbiContext<'a> { } impl TypeId { - fn get_abi_type_id( + fn get_abi_type_field_and_concrete_id( &self, handler: &Handler, ctx: &mut AbiContext, engines: &Engines, resolved_type_id: TypeId, - ) -> Result { + ) -> Result<(String, ConcreteTypeId), ErrorEmitted> { let type_str = self.get_abi_type_str( &AbiStrContext { program_name: ctx @@ -78,7 +80,7 @@ impl TypeId { } } - Ok(type_id) + Ok((type_str, ConcreteTypeId(type_id))) } } @@ -86,30 +88,39 @@ pub fn generate_program_abi( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, - encoding: Option, + encoding_version: program_abi::Version, spec_version: program_abi::Version, - abi_version: program_abi::Version, ) -> Result { let decl_engine = engines.de(); + let types_metadata: &mut Vec = &mut vec![]; + let concrete_types: &mut Vec = &mut vec![]; let mut program_abi = match &ctx.program.kind { TyProgramKind::Contract { abi_entries, .. } => { let functions = abi_entries .iter() .map(|x| { let fn_decl = decl_engine.get_function(x); - fn_decl.generate_abi_function(handler, ctx, engines, types) + fn_decl.generate_abi_function( + handler, + ctx, + engines, + types_metadata, + concrete_types, + ) }) .collect::, _>>()?; - let logged_types = generate_logged_types(handler, ctx, engines, types)?; - let messages_types = generate_messages_types(handler, ctx, engines, types)?; - let configurables = generate_configurables(handler, ctx, engines, types)?; + let logged_types = + generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + let messages_types = + generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + let configurables = + generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; program_abi::ProgramABI { program_type: "contract".to_string(), spec_version, - abi_version, - encoding, - types: types.to_vec(), + encoding_version, + types_metadata: types_metadata.to_vec(), + concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), messages_types: Some(messages_types), @@ -118,17 +129,25 @@ pub fn generate_program_abi( } TyProgramKind::Script { main_function, .. } => { let main_function = decl_engine.get_function(main_function); - let functions = - vec![main_function.generate_abi_function(handler, ctx, engines, types)?]; - let logged_types = generate_logged_types(handler, ctx, engines, types)?; - let messages_types = generate_messages_types(handler, ctx, engines, types)?; - let configurables = generate_configurables(handler, ctx, engines, types)?; + let functions = vec![main_function.generate_abi_function( + handler, + ctx, + engines, + types_metadata, + concrete_types, + )?]; + let logged_types = + generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + let messages_types = + generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + let configurables = + generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; program_abi::ProgramABI { program_type: "script".to_string(), spec_version, - abi_version, - encoding, - types: types.to_vec(), + encoding_version, + types_metadata: types_metadata.to_vec(), + concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), messages_types: Some(messages_types), @@ -137,17 +156,25 @@ pub fn generate_program_abi( } TyProgramKind::Predicate { main_function, .. } => { let main_function = decl_engine.get_function(main_function); - let functions = - vec![main_function.generate_abi_function(handler, ctx, engines, types)?]; - let logged_types = generate_logged_types(handler, ctx, engines, types)?; - let messages_types = generate_messages_types(handler, ctx, engines, types)?; - let configurables = generate_configurables(handler, ctx, engines, types)?; + let functions = vec![main_function.generate_abi_function( + handler, + ctx, + engines, + types_metadata, + concrete_types, + )?]; + let logged_types = + generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + let messages_types = + generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + let configurables = + generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; program_abi::ProgramABI { program_type: "predicate".to_string(), spec_version, - abi_version, - encoding, - types: types.to_vec(), + encoding_version, + types_metadata: types_metadata.to_vec(), + concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), messages_types: Some(messages_types), @@ -157,9 +184,9 @@ pub fn generate_program_abi( TyProgramKind::Library { .. } => program_abi::ProgramABI { program_type: "library".to_string(), spec_version, - abi_version, - encoding, - types: vec![], + encoding_version, + types_metadata: vec![], + concrete_types: vec![], functions: vec![], logged_types: None, messages_types: None, @@ -172,66 +199,297 @@ pub fn generate_program_abi( Ok(program_abi) } -/// Standardize the JSON ABI data structure by eliminating duplicate types. +/// Standardize the JSON ABI data structure by eliminating duplicate types. This is an iterative +/// process because every time two types are merged, new opportunities for more merging arise. fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { - // Two `program_abi::TypeDeclaration` are deemed the same if the have the same type_id - let mut deduped_types: HashMap = - HashMap::::new(); - - // Insert values in `deduped_types` if they haven't been inserted before. Otherwise, check to see - // the types are identical if not throw an error. - for decl in &json_abi_program.types { - if let Some(ty) = deduped_types.get(&decl.type_id) { - if ty.type_field != decl.type_field - || ty.components != decl.components - || ty.type_parameters != decl.type_parameters - { - // We already throw an error on get_abi_type_id so this should not occur. - panic!("There are conflicting type ids for different type declarations.") + // Dedup TypeMetadataDeclaration + loop { + // If type with id_1 is a duplicate of type with id_2, then keep track of the mapping + // between id_1 and id_2 in the HashMap below. + let mut old_to_new_id: HashMap = HashMap::new(); + + // A vector containing unique `program_abi::TypeMetadataDeclaration`s. + // + // Two `program_abi::TypeMetadataDeclaration` are deemed the same if the have the same + // `type_field`, `components`, and `type_parameters` (even if their `type_id`s are + // different). + let mut deduped_types: Vec = Vec::new(); + + // Insert values in `deduped_types` if they haven't been inserted before. Otherwise, create + // an appropriate mapping between type IDs in the HashMap `old_to_new_id`. + for decl in &json_abi_program.types_metadata { + // First replace metadata_type_id with concrete_type_id when possible + if let Some(ty) = json_abi_program.concrete_types.iter().find(|d| { + d.type_field == decl.type_field + && decl.components.is_none() + && decl.type_parameters.is_none() + }) { + old_to_new_id.insert( + decl.metadata_type_id.clone(), + program_abi::TypeId::Concrete(ty.concrete_type_id.clone()), + ); + } else { + // Second replace metadata_type_id with metadata_type_id when possible + if let Some(ty) = deduped_types.iter().find(|d| { + d.type_field == decl.type_field + && d.components == decl.components + && d.type_parameters == decl.type_parameters + }) { + old_to_new_id.insert( + decl.metadata_type_id.clone(), + program_abi::TypeId::Metadata(ty.metadata_type_id.clone()), + ); + } else { + deduped_types.push(decl.clone()); + } } - } else { - deduped_types.insert(decl.type_id.clone(), decl.clone()); } + + // Nothing to do if the hash map is empty as there are not merge opportunities. We can now + // exit the loop. + if old_to_new_id.is_empty() { + break; + } + + json_abi_program.types_metadata = deduped_types; + + update_all_types(json_abi_program, &old_to_new_id); } - json_abi_program.types = deduped_types.values().cloned().collect::>(); + // Dedup TypeConcreteDeclaration + let mut concrete_declarations_map: HashMap = + HashMap::new(); + for decl in &json_abi_program.concrete_types { + concrete_declarations_map.insert(decl.concrete_type_id.clone(), decl.clone()); + } + json_abi_program.concrete_types = concrete_declarations_map.values().cloned().collect(); - // Sort the `program_abi::TypeDeclaration`s + // Sort the `program_abi::TypeMetadataDeclaration`s json_abi_program - .types + .types_metadata .sort_by(|t1, t2| t1.type_field.cmp(&t2.type_field)); + + // Sort the `program_abi::TypeConcreteDeclaration`s + json_abi_program + .concrete_types + .sort_by(|t1, t2| t1.type_field.cmp(&t2.type_field)); + + // Standardize IDs (i.e. change them to 0,1,2,... according to the alphabetical order above + let mut old_to_new_id: HashMap = HashMap::new(); + for (ix, decl) in json_abi_program.types_metadata.iter_mut().enumerate() { + old_to_new_id.insert( + decl.metadata_type_id.clone(), + program_abi::TypeId::Metadata(MetadataTypeId(ix)), + ); + decl.metadata_type_id = MetadataTypeId(ix); + } + + update_all_types(json_abi_program, &old_to_new_id); } -fn generate_logged_types( +/// Recursively updates the type IDs used in a program_abi::ProgramABI +fn update_all_types( + json_abi_program: &mut program_abi::ProgramABI, + old_to_new_id: &HashMap, +) { + // Update all `program_abi::TypeMetadataDeclaration` + for decl in &mut json_abi_program.types_metadata { + update_json_type_metadata_declaration(decl, old_to_new_id); + } + + // Update all `program_abi::TypeConcreteDeclaration` + for decl in &mut json_abi_program.concrete_types { + update_json_type_concrete_declaration(decl, old_to_new_id); + } +} + +/// Recursively updates the type IDs used in a `program_abi::TypeApplication` given a HashMap from +/// old to new IDs +fn update_json_type_application( + type_application: &mut program_abi::TypeApplication, + old_to_new_id: &HashMap, +) { + if let fuel_abi_types::abi::program::TypeId::Metadata(metadata_type_id) = + &type_application.type_id + { + if let Some(new_id) = old_to_new_id.get(metadata_type_id) { + type_application.type_id = new_id.clone(); + } + } + + if let Some(args) = &mut type_application.type_arguments { + for arg in args.iter_mut() { + update_json_type_application(arg, old_to_new_id); + } + } +} + +/// Recursively updates the metadata type IDs used in a `program_abi::TypeMetadataDeclaration` given a HashMap from +/// old to new IDs +fn update_json_type_metadata_declaration( + type_declaration: &mut program_abi::TypeMetadataDeclaration, + old_to_new_id: &HashMap, +) { + if let Some(params) = &mut type_declaration.type_parameters { + for param in params.iter_mut() { + if let Some(fuel_abi_types::abi::program::TypeId::Metadata(new_id)) = + old_to_new_id.get(param) + { + *param = new_id.clone(); + } + } + } + + if let Some(components) = &mut type_declaration.components { + for component in components.iter_mut() { + update_json_type_application(component, old_to_new_id); + } + } +} + +/// RUpdates the metadata type IDs used in a `program_abi::TypeConcreteDeclaration` given a HashMap from +/// old to new IDs +fn update_json_type_concrete_declaration( + type_declaration: &mut program_abi::TypeConcreteDeclaration, + old_to_new_id: &HashMap, +) { + if let Some(metadata_type_id) = &mut type_declaration.metadata_type_id { + if let Some(fuel_abi_types::abi::program::TypeId::Metadata(new_id)) = + old_to_new_id.get(metadata_type_id) + { + *metadata_type_id = new_id.clone(); + } + } +} + +fn generate_concrete_type_declaration( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, -) -> Result, ErrorEmitted> { - // A list of all `program_abi::TypeDeclaration`s needed for the logged types - let logged_types = ctx - .program - .logged_types - .iter() - .map(|(_, type_id)| { - Ok(program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, - type_field: type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - *type_id, - ), - components: type_id - .get_abi_type_components(handler, ctx, engines, types, *type_id)?, - type_parameters: type_id - .get_abi_type_parameters(handler, ctx, engines, types, *type_id)?, - }) - }) - .collect::, _>>()?; + types_metadata: &mut Vec, + concrete_types: &mut Vec, + type_id: TypeId, + resolved_type_id: TypeId, +) -> Result { + let mut new_types_metadata_to_add = Vec::::new(); + let type_metadata_decl = program_abi::TypeMetadataDeclaration { + metadata_type_id: MetadataTypeId(type_id.index()), + type_field: type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + resolved_type_id, + ), + components: type_id.get_abi_type_components( + handler, + ctx, + engines, + types_metadata, + concrete_types, + resolved_type_id, + &mut new_types_metadata_to_add, + )?, + type_parameters: type_id.get_abi_type_parameters( + handler, + ctx, + engines, + types_metadata, + concrete_types, + resolved_type_id, + &mut new_types_metadata_to_add, + )?, + }; - // Add the new types to `types` - types.extend(logged_types); + let metadata_type_id = if type_metadata_decl.type_parameters.is_some() + || type_metadata_decl.components.is_some() + { + Some(type_metadata_decl.metadata_type_id.clone()) + } else { + None + }; + let type_arguments = if type_metadata_decl.type_parameters.is_some() { + type_id.get_abi_type_arguments_as_concrete_type_ids( + handler, + ctx, + engines, + types_metadata, + concrete_types, + resolved_type_id, + )? + } else { + None + }; + + types_metadata.push(type_metadata_decl); + types_metadata.extend(new_types_metadata_to_add); + let (type_field, concrete_type_id) = + type_id.get_abi_type_field_and_concrete_id(handler, ctx, engines, resolved_type_id)?; + let concrete_type_decl = TypeConcreteDeclaration { + type_field, + concrete_type_id: concrete_type_id.clone(), + metadata_type_id, + type_arguments, + }; + + concrete_types.push(concrete_type_decl); + + Ok(concrete_type_id) +} + +#[allow(clippy::too_many_arguments)] +fn generate_type_metadata_declaration( + handler: &Handler, + ctx: &mut AbiContext, + engines: &Engines, + types_metadata: &mut Vec, + concrete_types: &mut Vec, + type_id: TypeId, + resolved_type_id: TypeId, + types_metadata_to_add: &mut Vec, +) -> Result<(), ErrorEmitted> { + let mut new_types_metadata_to_add = Vec::::new(); + let components = type_id.get_abi_type_components( + handler, + ctx, + engines, + types_metadata, + concrete_types, + resolved_type_id, + &mut new_types_metadata_to_add, + )?; + let type_parameters = type_id.get_abi_type_parameters( + handler, + ctx, + engines, + types_metadata, + concrete_types, + resolved_type_id, + &mut new_types_metadata_to_add, + )?; + let type_metadata_decl = program_abi::TypeMetadataDeclaration { + metadata_type_id: MetadataTypeId(type_id.index()), + type_field: type_id.get_abi_type_str( + &ctx.to_str_context(engines, false), + engines, + resolved_type_id, + ), + components, + type_parameters, + }; + + types_metadata_to_add.push(type_metadata_decl.clone()); + types_metadata_to_add.extend(new_types_metadata_to_add); + + Ok(()) +} + +fn generate_logged_types( + handler: &Handler, + ctx: &mut AbiContext, + engines: &Engines, + types_metadata: &mut Vec, + concrete_types: &mut Vec, +) -> Result, ErrorEmitted> { // Generate the JSON data for the logged types let mut log_ids: HashSet = HashSet::default(); Ok(ctx @@ -246,12 +504,15 @@ fn generate_logged_types( log_ids.insert(log_id); Ok(Some(program_abi::LoggedType { log_id: log_id.to_string(), - application: program_abi::TypeApplication { - name: "".to_string(), - type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, - type_arguments: type_id - .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, - }, + concrete_type_id: generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + *type_id, + *type_id, + )?, })) } }) @@ -265,45 +526,25 @@ fn generate_messages_types( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, ) -> Result, ErrorEmitted> { - // A list of all `program_abi::TypeDeclaration`s needed for the messages types - let messages_types = ctx - .program - .messages_types - .iter() - .map(|(_, type_id)| { - Ok(program_abi::TypeDeclaration { - type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, - type_field: type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - *type_id, - ), - components: type_id - .get_abi_type_components(handler, ctx, engines, types, *type_id)?, - type_parameters: type_id - .get_abi_type_parameters(handler, ctx, engines, types, *type_id)?, - }) - }) - .collect::, _>>()?; - - // Add the new types to `types` - types.extend(messages_types); - // Generate the JSON data for the messages types ctx.program .messages_types .iter() .map(|(message_id, type_id)| { Ok(program_abi::MessageType { - message_id: **message_id as u64, - application: program_abi::TypeApplication { - name: "".to_string(), - type_id: type_id.get_abi_type_id(handler, ctx, engines, *type_id)?, - type_arguments: type_id - .get_abi_type_arguments(handler, ctx, engines, types, *type_id)?, - }, + message_id: (**message_id as u64).to_string(), + concrete_type_id: generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + *type_id, + *type_id, + )?, }) }) .collect::, _>>() @@ -313,70 +554,25 @@ fn generate_configurables( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, ) -> Result, ErrorEmitted> { - // A list of all `program_abi::TypeDeclaration`s needed for the configurables types - let configurables_types = ctx - .program + // Generate the JSON data for the configurables types + ctx.program .configurables .iter() .map(|decl| { - Ok(program_abi::TypeDeclaration { - type_id: decl.type_ascription.type_id.get_abi_type_id( - handler, - ctx, - engines, - decl.type_ascription.type_id, - )?, - type_field: decl.type_ascription.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - decl.type_ascription.type_id, - ), - components: decl.type_ascription.type_id.get_abi_type_components( + Ok(program_abi::Configurable { + name: decl.call_path.suffix.to_string(), + concrete_type_id: generate_concrete_type_declaration( handler, ctx, engines, - types, + types_metadata, + concrete_types, decl.type_ascription.type_id, - )?, - type_parameters: decl.type_ascription.type_id.get_abi_type_parameters( - handler, - ctx, - engines, - types, decl.type_ascription.type_id, )?, - }) - }) - .collect::, _>>()?; - - // Add the new types to `types` - types.extend(configurables_types); - - // Generate the JSON data for the configurables types - ctx.program - .configurables - .iter() - .map(|decl| { - Ok(program_abi::Configurable { - name: decl.call_path.suffix.to_string(), - application: program_abi::TypeApplication { - name: "".to_string(), - type_id: decl.type_ascription.type_id.get_abi_type_id( - handler, - ctx, - engines, - decl.type_ascription.type_id, - )?, - type_arguments: decl.type_ascription.type_id.get_abi_type_arguments( - handler, - ctx, - engines, - types, - decl.type_ascription.type_id, - )?, - }, offset: 0, }) }) @@ -386,233 +582,192 @@ fn generate_configurables( 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 - /// basically the IDs of some set of `program_abi::TypeDeclaration`s. The method below also - /// updates the provide list of `program_abi::TypeDeclaration`s to add the newly discovered + /// basically the IDs of some set of `program_abi::TypeMetadataDeclaration`s. The method below also + /// updates the provide list of `program_abi::TypeMetadataDeclaration`s to add the newly discovered /// types. + #[allow(clippy::too_many_arguments)] pub(self) fn get_abi_type_parameters( &self, handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, resolved_type_id: TypeId, - ) -> Result>, ErrorEmitted> { + types_metadata_to_add: &mut Vec, + ) -> Result>, ErrorEmitted> { match self.is_generic_parameter(engines, resolved_type_id) { true => Ok(None), false => resolved_type_id .get_type_parameters(engines) .map(|v| { v.iter() - .map(|v| v.get_abi_type_parameter(handler, ctx, engines, types)) + .map(|v| { + v.get_abi_type_parameter( + handler, + ctx, + engines, + types_metadata, + concrete_types, + types_metadata_to_add, + ) + }) .collect::, _>>() }) .map_or(Ok(None), |v| v.map(Some)), } } + /// Return the components of a given (potentially generic) type while considering what it /// actually resolves to. These components are essentially of type of /// `program_abi::TypeApplication`. The method below also updates the provided list of - /// `program_abi::TypeDeclaration`s to add the newly discovered types. + /// `program_abi::TypeMetadataDeclaration`s to add the newly discovered types. + #[allow(clippy::too_many_arguments)] pub(self) fn get_abi_type_components( &self, handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, resolved_type_id: TypeId, + mut types_metadata_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); Ok(match &*type_engine.get(*self) { TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); - // A list of all `program_abi::TypeDeclaration`s needed for the enum variants - let variants = decl + + let mut new_types_metadata_to_add = + Vec::::new(); + for x in decl.variants.iter() { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + x.type_argument.initial_type_id, + x.type_argument.type_id, + &mut new_types_metadata_to_add, + )?; + } + + // Generate the JSON data for the enum. This is basically a list of + // `program_abi::TypeApplication`s + let components = decl .variants .iter() .map(|x| { - Ok(program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - type_parameters: x + Ok(program_abi::TypeApplication { + name: x.name.to_string(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + x.type_argument.initial_type_id.index(), + )), + type_arguments: x .type_argument .initial_type_id - .get_abi_type_parameters( + .get_abi_type_arguments( handler, ctx, engines, - types, + types_metadata, + concrete_types, x.type_argument.type_id, + &mut new_types_metadata_to_add, )?, }) }) .collect::, _>>()?; - types.extend(variants); - // Generate the JSON data for the enum. This is basically a list of - // `program_abi::TypeApplication`s - Some( - decl.variants - .iter() - .map(|x| { - Ok(program_abi::TypeApplication { - name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_arguments: x - .type_argument - .initial_type_id - .get_abi_type_arguments( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - }) - }) - .collect::, _>>()?, - ) + if components.is_empty() { + None + } else { + types_metadata_to_add.extend(new_types_metadata_to_add); + Some(components) + } } TypeInfo::Struct(decl_ref) => { let decl = decl_engine.get_struct(decl_ref); - // A list of all `program_abi::TypeDeclaration`s needed for the struct fields - let field_types = decl + let mut new_types_metadata_to_add = + Vec::::new(); + for x in decl.fields.iter() { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + x.type_argument.initial_type_id, + x.type_argument.type_id, + &mut new_types_metadata_to_add, + )?; + } + + // Generate the JSON data for the struct. This is basically a list of + // `program_abi::TypeApplication`s + let components = decl .fields .iter() .map(|x| { - Ok(program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - type_parameters: x + Ok(program_abi::TypeApplication { + name: x.name.to_string(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + x.type_argument.initial_type_id.index(), + )), + type_arguments: x .type_argument .initial_type_id - .get_abi_type_parameters( + .get_abi_type_arguments( handler, ctx, engines, - types, + types_metadata, + concrete_types, x.type_argument.type_id, + &mut new_types_metadata_to_add, )?, }) }) .collect::, _>>()?; - types.extend(field_types); - // Generate the JSON data for the struct. This is basically a list of - // `program_abi::TypeApplication`s - Some( - decl.fields - .iter() - .map(|x| { - Ok(program_abi::TypeApplication { - name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_arguments: x - .type_argument - .initial_type_id - .get_abi_type_arguments( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - }) - }) - .collect::, _>>()?, - ) + if components.is_empty() { + None + } else { + types_metadata_to_add.extend(new_types_metadata_to_add); + Some(components) + } } TypeInfo::Array(..) => { if let TypeInfo::Array(elem_ty, _) = &*type_engine.get(resolved_type_id) { - // The `program_abi::TypeDeclaration`s needed for the array element type - let elem_abi_ty = program_abi::TypeDeclaration { - type_id: elem_ty.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - elem_ty.type_id, - )?, - type_field: elem_ty.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - elem_ty.type_id, - ), - components: elem_ty.initial_type_id.get_abi_type_components( - handler, - ctx, - engines, - types, - elem_ty.type_id, - )?, - type_parameters: elem_ty.initial_type_id.get_abi_type_parameters( - handler, - ctx, - engines, - types, - elem_ty.type_id, - )?, - }; - types.push(elem_abi_ty); + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + elem_ty.initial_type_id, + elem_ty.type_id, + types_metadata_to_add, + )?; // Generate the JSON data for the array. This is basically a single // `program_abi::TypeApplication` for the array element type Some(vec![program_abi::TypeApplication { name: "__array_element".to_string(), - type_id: elem_ty.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - elem_ty.type_id, - )?, + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + elem_ty.initial_type_id.index(), + )), type_arguments: elem_ty.initial_type_id.get_abi_type_arguments( handler, ctx, engines, - types, + types_metadata, + concrete_types, elem_ty.type_id, + types_metadata_to_add, )?, }]) } else { @@ -662,93 +817,80 @@ impl TypeId { } TypeInfo::Tuple(_) => { if let TypeInfo::Tuple(fields) = &*type_engine.get(resolved_type_id) { - // A list of all `program_abi::TypeDeclaration`s needed for the tuple fields - let fields_types = fields + let mut new_types_metadata_to_add = + Vec::::new(); + for x in fields.iter() { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + x.initial_type_id, + x.type_id, + &mut new_types_metadata_to_add, + )?; + } + + // Generate the JSON data for the tuple. This is basically a list of + // `program_abi::TypeApplication`s + let components = fields .iter() .map(|x| { - Ok(program_abi::TypeDeclaration { - type_id: x - .initial_type_id - .get_abi_type_id(handler, ctx, engines, x.type_id)?, - type_field: x.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), + Ok(program_abi::TypeApplication { + name: "__tuple_element".to_string(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + x.initial_type_id.index(), + )), + type_arguments: x.initial_type_id.get_abi_type_arguments( + handler, + ctx, engines, + types_metadata, + concrete_types, x.type_id, - ), - components: x.initial_type_id.get_abi_type_components( - handler, ctx, engines, types, x.type_id, - )?, - type_parameters: x.initial_type_id.get_abi_type_parameters( - handler, ctx, engines, types, x.type_id, + types_metadata_to_add, )?, }) }) .collect::, _>>()?; - - types.extend(fields_types); - - // Generate the JSON data for the tuple. This is basically a list of - // `program_abi::TypeApplication`s - Some( - fields - .iter() - .map(|x| { - Ok(program_abi::TypeApplication { - name: "__tuple_element".to_string(), - type_id: x - .initial_type_id - .get_abi_type_id(handler, ctx, engines, x.type_id)?, - type_arguments: x.initial_type_id.get_abi_type_arguments( - handler, ctx, engines, types, x.type_id, - )?, - }) - }) - .collect::, _>>()?, - ) + if components.is_empty() { + None + } else { + types_metadata_to_add.extend(new_types_metadata_to_add); + Some(components) + } } else { unreachable!() } } TypeInfo::Custom { type_arguments, .. } => { if !self.is_generic_parameter(engines, resolved_type_id) { - // A list of all `program_abi::TypeDeclaration`s needed for the type arguments - let type_args = type_arguments - .clone() - .unwrap_or_default() - .iter() - .zip( - resolved_type_id - .get_type_parameters(engines) - .unwrap_or_default() - .iter(), - ) - .map(|(v, p)| { - Ok(program_abi::TypeDeclaration { - type_id: v - .initial_type_id - .get_abi_type_id(handler, ctx, engines, p.type_id)?, - type_field: v.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - p.type_id, - ), - components: v.initial_type_id.get_abi_type_components( - handler, ctx, engines, types, p.type_id, - )?, - type_parameters: v.initial_type_id.get_abi_type_parameters( - handler, ctx, engines, types, p.type_id, - )?, - }) - }) - .collect::, _>>()?; - types.extend(type_args); - + for (v, p) in type_arguments.clone().unwrap_or_default().iter().zip( + resolved_type_id + .get_type_parameters(engines) + .unwrap_or_default() + .iter(), + ) { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + v.initial_type_id, + p.type_id, + types_metadata_to_add, + )?; + } resolved_type_id.get_abi_type_components( handler, ctx, engines, - types, + types_metadata, + concrete_types, resolved_type_id, + types_metadata_to_add, )? } else { None @@ -756,8 +898,15 @@ impl TypeId { } TypeInfo::Alias { .. } => { if let TypeInfo::Alias { ty, .. } = &*type_engine.get(resolved_type_id) { - ty.initial_type_id - .get_abi_type_components(handler, ctx, engines, types, ty.type_id)? + ty.initial_type_id.get_abi_type_components( + handler, + ctx, + engines, + types_metadata, + concrete_types, + ty.type_id, + types_metadata_to_add, + )? } else { None } @@ -771,8 +920,10 @@ impl TypeId { handler, ctx, engines, - types, + types_metadata, + concrete_types, resolved_type_id, + types_metadata_to_add, )? } } @@ -783,14 +934,17 @@ impl TypeId { /// Return the type arguments of a given (potentially generic) type while considering what it /// actually resolves to. These arguments are essentially of type of /// `program_abi::TypeApplication`. The method below also updates the provided list of - /// `program_abi::TypeDeclaration`s to add the newly discovered types. + /// `program_abi::TypeMetadataDeclaration`s to add the newly discovered types. + #[allow(clippy::too_many_arguments)] pub(self) fn get_abi_type_arguments( &self, handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, resolved_type_id: TypeId, + mut types_metadata_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); @@ -801,29 +955,19 @@ impl TypeId { .. } => (!type_arguments.is_empty()).then_some({ let resolved_params = resolved_params.unwrap_or_default(); - let abi_type_arguments = type_arguments - .iter() - .zip(resolved_params.iter()) - .map(|(v, p)| { - Ok(program_abi::TypeDeclaration { - type_id: v - .initial_type_id - .get_abi_type_id(handler, ctx, engines, p.type_id)?, - type_field: v.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - p.type_id, - ), - components: v - .initial_type_id - .get_abi_type_components(handler, ctx, engines, types, p.type_id)?, - type_parameters: v - .initial_type_id - .get_abi_type_parameters(handler, ctx, engines, types, p.type_id)?, - }) - }) - .collect::, _>>()?; - types.extend(abi_type_arguments); + + for (v, p) in type_arguments.iter().zip(resolved_params.iter()) { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + v.type_id, + p.type_id, + types_metadata_to_add, + )?; + } type_arguments .iter() @@ -831,115 +975,193 @@ impl TypeId { .map(|(arg, p)| { Ok(program_abi::TypeApplication { name: "".to_string(), - type_id: arg - .initial_type_id - .get_abi_type_id(handler, ctx, engines, p.type_id)?, - type_arguments: arg - .initial_type_id - .get_abi_type_arguments(handler, ctx, engines, types, p.type_id)?, + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + arg.initial_type_id.index(), + )), + type_arguments: arg.initial_type_id.get_abi_type_arguments( + handler, + ctx, + engines, + types_metadata, + concrete_types, + p.type_id, + types_metadata_to_add, + )?, }) }) .collect::, _>>()? }), TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); - // Here, type_id for each type parameter should contain resolved types - let abi_type_arguments = decl + + let mut new_types_metadata_to_add = + Vec::::new(); + for v in decl.type_parameters.iter() { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + v.type_id, + v.type_id, + &mut new_types_metadata_to_add, + )?; + } + + let type_arguments = decl .type_parameters .iter() - .map(|v| { - Ok(program_abi::TypeDeclaration { - type_id: v - .type_id - .get_abi_type_id(handler, ctx, engines, v.type_id)?, - type_field: v.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), + .map(|arg| { + Ok(program_abi::TypeApplication { + name: "".to_string(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + arg.type_id.index(), + )), + type_arguments: arg.type_id.get_abi_type_arguments( + handler, + ctx, engines, - v.type_id, - ), - components: v - .type_id - .get_abi_type_components(handler, ctx, engines, types, v.type_id)?, - type_parameters: v - .type_id - .get_abi_type_parameters(handler, ctx, engines, types, v.type_id)?, + types_metadata, + concrete_types, + arg.type_id, + &mut new_types_metadata_to_add, + )?, }) }) .collect::, _>>()?; - types.extend(abi_type_arguments); - Some( - decl.type_parameters - .iter() - .map(|arg| { - Ok(program_abi::TypeApplication { - name: "".to_string(), - type_id: arg.type_id.get_abi_type_id( - handler, - ctx, - engines, - arg.type_id, - )?, - type_arguments: arg.type_id.get_abi_type_arguments( - handler, - ctx, - engines, - types, - arg.type_id, - )?, - }) - }) - .collect::, _>>()?, - ) + if type_arguments.is_empty() { + None + } else { + types_metadata_to_add.extend(new_types_metadata_to_add); + Some(type_arguments) + } } TypeInfo::Struct(decl_ref) => { let decl = decl_engine.get_struct(decl_ref); - // Here, type_id for each type parameter should contain resolved types - let abi_type_arguments = decl + + let mut new_types_metadata_to_add = + Vec::::new(); + for v in decl.type_parameters.iter() { + generate_type_metadata_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + v.type_id, + v.type_id, + &mut new_types_metadata_to_add, + )?; + } + + let type_arguments = decl .type_parameters .iter() - .map(|v| { - Ok(program_abi::TypeDeclaration { - type_id: v - .type_id - .get_abi_type_id(handler, ctx, engines, v.type_id)?, - type_field: v.type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), + .map(|arg| { + Ok(program_abi::TypeApplication { + name: "".to_string(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + arg.type_id.index(), + )), + type_arguments: arg.type_id.get_abi_type_arguments( + handler, + ctx, engines, - v.type_id, - ), - components: v - .type_id - .get_abi_type_components(handler, ctx, engines, types, v.type_id)?, - type_parameters: v - .type_id - .get_abi_type_parameters(handler, ctx, engines, types, v.type_id)?, + types_metadata, + concrete_types, + arg.type_id, + &mut new_types_metadata_to_add, + )?, }) }) .collect::, _>>()?; - types.extend(abi_type_arguments); + if type_arguments.is_empty() { + None + } else { + types_metadata_to_add.extend(new_types_metadata_to_add); + Some(type_arguments) + } + } + _ => None, + }) + } + + /// Return the type arguments of a given (potentially generic) type while considering what it + /// actually resolves to. These arguments are essentially of type of + /// `program_abi::TypeApplication`. The method below also updates the provided list of + /// `program_abi::TypeMetadataDeclaration`s to add the newly discovered types. + pub(self) fn get_abi_type_arguments_as_concrete_type_ids( + &self, + handler: &Handler, + ctx: &mut AbiContext, + engines: &Engines, + types_metadata: &mut Vec, + concrete_types: &mut Vec, + resolved_type_id: TypeId, + ) -> Result>, ErrorEmitted> { + let type_engine = engines.te(); + let decl_engine = engines.de(); + let resolved_params = resolved_type_id.get_type_parameters(engines); + Ok(match &*type_engine.get(*self) { + TypeInfo::Custom { + type_arguments: Some(type_arguments), + .. + } => (!type_arguments.is_empty()).then_some({ + let resolved_params = resolved_params.unwrap_or_default(); + type_arguments + .iter() + .zip(resolved_params.iter()) + .map(|(arg, p)| { + generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + arg.initial_type_id, + p.type_id, + ) + }) + .collect::, _>>()? + }), + TypeInfo::Enum(decl_ref) => { + let decl = decl_engine.get_enum(decl_ref); Some( decl.type_parameters .iter() .map(|arg| { - Ok(program_abi::TypeApplication { - name: "".to_string(), - type_id: arg.type_id.get_abi_type_id( - handler, - ctx, - engines, - arg.type_id, - )?, - type_arguments: arg.type_id.get_abi_type_arguments( - handler, - ctx, - engines, - types, - arg.type_id, - )?, - }) + generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + arg.type_id, + arg.type_id, + ) + }) + .collect::, _>>()?, + ) + } + TypeInfo::Struct(decl_ref) => { + let decl = decl_engine.get_struct(decl_ref); + Some( + decl.type_parameters + .iter() + .map(|arg| { + generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + arg.type_id, + arg.type_id, + ) }) .collect::, _>>()?, ) @@ -955,76 +1177,9 @@ impl TyFunctionDecl { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types: &mut Vec, + types_metadata: &mut Vec, + concrete_types: &mut Vec, ) -> Result { - // A list of all `program_abi::TypeDeclaration`s needed for inputs - let input_types = self - .parameters - .iter() - .map(|x| { - Ok(program_abi::TypeDeclaration { - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_field: x.type_argument.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - x.type_argument.type_id, - ), - components: x.type_argument.initial_type_id.get_abi_type_components( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - type_parameters: x.type_argument.type_id.get_abi_type_parameters( - handler, - ctx, - engines, - types, - x.type_argument.type_id, - )?, - }) - }) - .collect::, _>>()?; - - // The single `program_abi::TypeDeclaration` needed for the output - let output_type = program_abi::TypeDeclaration { - type_id: self.return_type.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - self.return_type.type_id, - )?, - type_field: self.return_type.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - self.return_type.type_id, - ), - components: self.return_type.type_id.get_abi_type_components( - handler, - ctx, - engines, - types, - self.return_type.type_id, - )?, - type_parameters: self.return_type.type_id.get_abi_type_parameters( - handler, - ctx, - engines, - types, - self.return_type.type_id, - )?, - }; - - // Add the new types to `types` - types.extend(input_types); - types.push(output_type); - // Generate the JSON data for the function Ok(program_abi::ABIFunction { name: self.name.as_str().to_string(), @@ -1032,40 +1187,29 @@ impl TyFunctionDecl { .parameters .iter() .map(|x| { - Ok(program_abi::TypeApplication { + Ok(program_abi::TypeConcreteParameter { name: x.name.to_string(), - type_id: x.type_argument.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - x.type_argument.type_id, - )?, - type_arguments: x.type_argument.initial_type_id.get_abi_type_arguments( + concrete_type_id: generate_concrete_type_declaration( handler, ctx, engines, - types, + types_metadata, + concrete_types, + x.type_argument.initial_type_id, x.type_argument.type_id, )?, }) }) .collect::, _>>()?, - output: program_abi::TypeApplication { - name: "".to_string(), - type_id: self.return_type.initial_type_id.get_abi_type_id( - handler, - ctx, - engines, - self.return_type.type_id, - )?, - type_arguments: self.return_type.initial_type_id.get_abi_type_arguments( - handler, - ctx, - engines, - types, - self.return_type.type_id, - )?, - }, + output: generate_concrete_type_declaration( + handler, + ctx, + engines, + types_metadata, + concrete_types, + self.return_type.initial_type_id, + self.return_type.type_id, + )?, attributes: generate_attributes_map(&self.attributes), }) } @@ -1091,19 +1235,19 @@ fn generate_attributes_map(attr_map: &AttributesMap) -> Option, - ) -> Result { - let type_id = self - .initial_type_id - .get_abi_type_id(handler, ctx, engines, self.type_id)?; - let type_parameter = program_abi::TypeDeclaration { - type_id: type_id.clone(), + types_metadata: &mut Vec, + concrete_types: &mut Vec, + mut types_metadata_to_add: &mut Vec, + ) -> Result { + let type_id = MetadataTypeId(self.initial_type_id.index()); + let type_parameter = program_abi::TypeMetadataDeclaration { + metadata_type_id: type_id.clone(), type_field: self.initial_type_id.get_abi_type_str( &ctx.to_str_context(engines, false), engines, @@ -1113,12 +1257,14 @@ impl TypeParameter { handler, ctx, engines, - types, + types_metadata, + concrete_types, self.type_id, + types_metadata_to_add, )?, type_parameters: None, }; - types.push(type_parameter); + types_metadata_to_add.push(type_parameter); Ok(type_id) } } diff --git a/test/src/e2e_vm_tests/mod.rs b/test/src/e2e_vm_tests/mod.rs index f52bba955c6..947ad9b20cc 100644 --- a/test/src/e2e_vm_tests/mod.rs +++ b/test/src/e2e_vm_tests/mod.rs @@ -494,8 +494,8 @@ impl TestContext { ) }) .await; - result?; output.push_str(&out); + result?; } } From fd1d9eadca3baddf52e5018d316ba43878c38abd Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 19 Jul 2024 12:02:46 +0100 Subject: [PATCH 17/47] Fixes. --- sway-core/src/abi_generation/fuel_abi.rs | 8 ++++---- test/src/sdk-harness/Cargo.toml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 09f9c6510cf..599324f0fba 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -54,7 +54,7 @@ impl TypeId { .read(engines, |m| m.name.clone().map(|v| v.as_str().to_string())), abi_with_callpaths: true, abi_with_fully_specified_types: true, - abi_root_type_without_generic_type_parameters: true, + abi_root_type_without_generic_type_parameters: false, }, engines, resolved_type_id, @@ -631,7 +631,7 @@ impl TypeId { types_metadata: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, - mut types_metadata_to_add: &mut Vec, + types_metadata_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); @@ -944,7 +944,7 @@ impl TypeId { types_metadata: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, - mut types_metadata_to_add: &mut Vec, + types_metadata_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); @@ -1243,7 +1243,7 @@ impl TypeParameter { engines: &Engines, types_metadata: &mut Vec, concrete_types: &mut Vec, - mut types_metadata_to_add: &mut Vec, + types_metadata_to_add: &mut Vec, ) -> Result { let type_id = MetadataTypeId(self.initial_type_id.index()); let type_parameter = program_abi::TypeMetadataDeclaration { diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml index 14d4d43e5fd..32c4b51c7f2 100644 --- a/test/src/sdk-harness/Cargo.toml +++ b/test/src/sdk-harness/Cargo.toml @@ -17,7 +17,8 @@ fuel-core-client = { version = "0.31.0", default-features = false } fuel-vm = { version = "0.55.0", features = ["random"] } # Dependencies from the `fuels-rs` repository: -fuels = { version = "0.65.1", features = ["fuel-core-lib"] } +fuels = { git = "https://github.com/FuelLabs/fuels-rs", branch = "esdrubal/abi_changes2", features = ["fuel-core-lib"]} +#fuels = { version = "0.65.1", features = ["fuel-core-lib"] } hex = "0.4.3" paste = "1.0.14" From 8b574bf6d3dcc8fa39f85ef602780cfe8b84e0f5 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 19 Jul 2024 13:45:24 +0100 Subject: [PATCH 18/47] Updates Cargo.lock --- Cargo.lock | 576 ++++++++++++++++---------------- test/src/sdk-harness/Cargo.lock | 26 +- 2 files changed, 290 insertions(+), 312 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7af364eeac..118e93f9b22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,13 +220,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -257,7 +257,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -277,7 +277,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.0", + "object 0.36.1", "rustc-demangle", "serde", ] @@ -356,15 +356,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -474,7 +474,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "syn_derive", ] @@ -558,9 +558,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cast" @@ -570,13 +570,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -609,7 +608,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -670,7 +669,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags 1.3.2", + "bitflags 1.2.1", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -679,9 +678,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -689,9 +688,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -702,11 +701,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" +checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", ] [[package]] @@ -715,20 +714,20 @@ version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -853,15 +852,15 @@ dependencies = [ [[package]] name = "completest" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8229e041ca8f8130ad7f0ce1afb9cfdb3033de7fd548e6422dbb2f4f12184f41" +checksum = "e6cda99a94266124c2cce3d239973ef8ce3160c83a3f426a314285d9bf6422d1" [[package]] name = "completest-pty" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a6d1272e27f608f97616be67a2aed03ed8d73910b5df9a7f4a50c4ffd59d185" +checksum = "ee700748da7d34de4bbe0296d3153e8ef5217233d814d23fb68106c110dd9bc5" dependencies = [ "completest", "ptyprocess", @@ -874,7 +873,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784836d0812dade01579cc0cc9b1684847044e716fd7aa6bffbc172e42199500" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "entities", "memchr", "once_cell", @@ -1020,7 +1019,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.7", + "clap 4.5.9", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1178,7 +1177,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1244,12 +1243,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1268,16 +1267,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1293,13 +1292,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1393,7 +1392,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1586,9 +1585,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1665,7 +1664,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1678,7 +1677,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1841,7 +1840,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -1972,18 +1971,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forc" -version = "0.61.2" +version = "0.62.0" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "clap_complete_fig", "completest-pty", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "fs_extra", "fuel-asm", @@ -2008,16 +2007,16 @@ dependencies = [ [[package]] name = "forc-client" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-tx", "forc-util", "forc-wallet", @@ -2047,13 +2046,13 @@ dependencies = [ [[package]] name = "forc-crypto" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "async-trait", "atty", - "clap 4.5.7", - "forc-tracing 0.61.2", + "clap 4.5.9", + "forc-tracing 0.62.0", "forc-util", "fuel-core-types", "fuel-crypto", @@ -2073,15 +2072,15 @@ dependencies = [ [[package]] name = "forc-debug" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dap", "escargot", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-core-client", "fuel-types", "fuel-vm", @@ -2099,15 +2098,15 @@ dependencies = [ [[package]] name = "forc-doc" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "comrak", "dir_indexer", "expect-test", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "horrorshow", "include_dir", @@ -2124,12 +2123,12 @@ dependencies = [ [[package]] name = "forc-fmt" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "prettydiff 0.5.1", "sway-core", @@ -2141,10 +2140,10 @@ dependencies = [ [[package]] name = "forc-lsp" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "sway-lsp", "tikv-jemallocator", "tokio", @@ -2152,13 +2151,13 @@ dependencies = [ [[package]] name = "forc-pkg" -version = "0.61.2" +version = "0.62.0" dependencies = [ "ansi_term", "anyhow", "byte-unit", "cid", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "fuel-abi-types", "futures", @@ -2189,7 +2188,7 @@ dependencies = [ [[package]] name = "forc-test" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "forc-pkg", @@ -2216,7 +2215,7 @@ dependencies = [ [[package]] name = "forc-tracing" -version = "0.61.2" +version = "0.62.0" dependencies = [ "ansi_term", "tracing", @@ -2226,10 +2225,10 @@ dependencies = [ [[package]] name = "forc-tx" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "devault", "forc-util", "fuel-tx", @@ -2241,15 +2240,15 @@ dependencies = [ [[package]] name = "forc-util" -version = "0.61.2" +version = "0.62.0" dependencies = [ "annotate-snippets", "ansi_term", "anyhow", - "clap 4.5.7", + "clap 4.5.9", "dirs 3.0.2", "fd-lock 4.0.2", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-tx", "hex", "paste", @@ -2269,10 +2268,10 @@ dependencies = [ [[package]] name = "forc-wallet" version = "0.8.2" -source = "git+https://github.com/FuelLabs/forc-wallet?branch=esdrubal/abi_changes#d5ee04b73ee683df8380ecb165b5984406c514db" +source = "git+https://github.com/FuelLabs/forc-wallet?branch=esdrubal/abi_changes#5ccd3694103d0775e6f844561cc2606aefa13352" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "eth-keystore", "forc-tracing 0.47.0", "fuel-crypto", @@ -2333,8 +2332,7 @@ dependencies = [ [[package]] name = "fuel-abi-types" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb98391d7df3963bc3f30d3c8bfce301573a115fa92a35bed55e4c94b836be2" +source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#25010513ad66c01b03a22474ae6ff1bd3ee04614" dependencies = [ "itertools 0.10.5", "lazy_static", @@ -2343,7 +2341,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.66", + "syn 2.0.71", "thiserror", ] @@ -2353,7 +2351,7 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fuel-types", "serde", "strum 0.24.1", @@ -2518,7 +2516,7 @@ checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "synstructure 0.13.1", ] @@ -2596,7 +2594,7 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "derive_more", "fuel-asm", @@ -2634,7 +2632,7 @@ dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "derive_more", "ethnum", @@ -2661,8 +2659,8 @@ dependencies = [ [[package]] name = "fuels" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2676,8 +2674,8 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "chrono", @@ -2700,8 +2698,8 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "Inflector", "fuel-abi-types", @@ -2710,13 +2708,13 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] name = "fuels-core" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "bech32", @@ -2742,20 +2740,20 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] name = "fuels-programs" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "fuel-abi-types", @@ -2772,8 +2770,8 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.64.0" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=hal3e/new-fuel-abi-spec#87191cab92f0505e5db4e2ec2782736d3b566161" +version = "0.65.1" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuel-core-chain-config", "fuel-core-client", @@ -2854,7 +2852,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -2953,7 +2951,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "libc", "libgit2-sys", "log", @@ -3142,7 +3140,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -3284,9 +3282,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3460,7 +3458,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -3472,7 +3470,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -3540,7 +3538,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "inotify-sys", "libc", ] @@ -3742,17 +3740,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "libc", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -3815,7 +3813,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3826,7 +3824,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -3904,12 +3902,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3934,9 +3926,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logos" @@ -3967,7 +3959,7 @@ version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "serde", "serde_json", "serde_repr", @@ -3991,7 +3983,7 @@ checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" dependencies = [ "anyhow", "chrono", - "clap 4.5.7", + "clap 4.5.9", "clap_complete", "env_logger", "handlebars", @@ -4014,7 +4006,7 @@ name = "mdbook-forc-documenter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.5.7", + "clap 4.5.9", "mdbook", "semver", "serde", @@ -4147,9 +4139,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -4296,7 +4288,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cc", "cfg-if 0.1.10", "libc", @@ -4305,14 +4297,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cc", "cfg-if 1.0.0", "libc", + "memoffset 0.6.5", ] [[package]] @@ -4321,7 +4314,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", @@ -4343,7 +4336,7 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4400,9 +4393,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4513,7 +4506,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -4538,9 +4531,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4553,13 +4546,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" -version = "6.4.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", + "lazy_static", "libc", - "once_cell", "onig_sys", ] @@ -4575,9 +4568,9 @@ dependencies = [ [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -4613,7 +4606,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4630,7 +4623,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -4763,9 +4756,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4828,9 +4821,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -4839,9 +4832,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -4849,22 +4842,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -4944,7 +4937,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -4977,13 +4970,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", "quick-xml", "serde", "time", @@ -5184,18 +5176,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" +checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", @@ -5211,7 +5203,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -5265,7 +5257,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -5288,9 +5280,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5402,7 +5394,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] @@ -5411,16 +5403,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5617,7 +5609,7 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -5646,7 +5638,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] @@ -5677,7 +5669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags 1.3.2", + "bitflags 1.2.1", "serde", ] @@ -5786,7 +5778,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5848,7 +5840,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cfg-if 1.0.0", "clipboard-win", "dirs-next", @@ -5856,7 +5848,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.20.0", + "nix 0.20.2", "radix_trie", "scopeguard", "smallvec", @@ -5903,9 +5895,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.1" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" +checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" dependencies = [ "sdd", ] @@ -5975,9 +5967,9 @@ dependencies = [ [[package]] name = "sdd" -version = "0.2.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" +checksum = "8eb0dde0ccd15e337a3cf738a9a38115c6d8e74795d074e73973dad3d229a897" [[package]] name = "seahash" @@ -6047,11 +6039,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6060,9 +6052,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6079,22 +6071,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6108,9 +6100,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -6125,7 +6117,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6151,9 +6143,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", @@ -6169,14 +6161,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6214,7 +6206,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6405,12 +6397,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -6534,7 +6520,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6552,13 +6538,13 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sway-ast" -version = "0.61.2" +version = "0.62.0" dependencies = [ "extension-trait", "num-bigint", @@ -6570,9 +6556,9 @@ dependencies = [ [[package]] name = "sway-core" -version = "0.61.2" +version = "0.62.0" dependencies = [ - "clap 4.5.7", + "clap 4.5.9", "derivative", "dirs 3.0.2", "either", @@ -6615,7 +6601,7 @@ dependencies = [ [[package]] name = "sway-error" -version = "0.61.2" +version = "0.62.0" dependencies = [ "either", "in_definite", @@ -6628,7 +6614,7 @@ dependencies = [ [[package]] name = "sway-ir" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "downcast-rs", @@ -6647,7 +6633,7 @@ dependencies = [ [[package]] name = "sway-ir-macros" -version = "0.61.2" +version = "0.62.0" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -6657,7 +6643,7 @@ dependencies = [ [[package]] name = "sway-lsp" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "assert-json-diff", @@ -6667,7 +6653,7 @@ dependencies = [ "dirs 4.0.0", "fd-lock 4.0.2", "forc-pkg", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "forc-util", "futures", "indexmap 2.2.6", @@ -6722,7 +6708,7 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.61.2" +version = "0.62.0" dependencies = [ "assert_matches", "extension-trait", @@ -6740,7 +6726,7 @@ dependencies = [ [[package]] name = "sway-types" -version = "0.61.2" +version = "0.62.0" dependencies = [ "bytecount", "fuel-asm", @@ -6759,7 +6745,7 @@ dependencies = [ [[package]] name = "sway-utils" -version = "0.61.2" +version = "0.62.0" dependencies = [ "serde", "walkdir", @@ -6767,11 +6753,11 @@ dependencies = [ [[package]] name = "swayfmt" -version = "0.61.2" +version = "0.62.0" dependencies = [ "anyhow", "difference", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "paste", "prettydiff 0.6.4", "ropey", @@ -6801,9 +6787,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -6819,7 +6805,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6848,7 +6834,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -6858,7 +6844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", - "bitflags 1.3.2", + "bitflags 1.2.1", "fancy-regex", "flate2", "fnv", @@ -6895,7 +6881,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "core-foundation", "system-configuration-sys", ] @@ -6989,9 +6975,9 @@ dependencies = [ [[package]] name = "term-table" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e59d7fb313157de2a568be8d81e4d7f9af6e50e697702e8e00190a6566d3b8" +checksum = "210f90191b719267bc8b6307659faf54a77400d06b8033ece26692696fc002be" dependencies = [ "lazy_static", "regex", @@ -7026,14 +7012,14 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap 4.5.7", + "clap 4.5.9", "colored", "filecheck", "forc", "forc-client", "forc-pkg", "forc-test", - "forc-tracing 0.61.2", + "forc-tracing 0.62.0", "fuel-vm", "futures", "gag", @@ -7091,22 +7077,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7210,9 +7196,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7225,9 +7211,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -7260,7 +7246,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7418,7 +7404,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7446,7 +7432,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7519,7 +7505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -7708,9 +7694,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uwuify" @@ -7853,7 +7839,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -7887,7 +7873,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7974,7 +7960,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8001,7 +7987,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8036,18 +8022,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -8064,9 +8050,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8082,9 +8068,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8100,15 +8086,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8124,9 +8110,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8142,9 +8128,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8160,9 +8146,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8178,9 +8164,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -8327,22 +8313,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] [[package]] @@ -8362,5 +8348,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.71", ] diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index 22a1ea4e487..86e982d4f19 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -1508,9 +1508,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fuel-abi-types" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e7e87f94417ff1a5d60e496906033c58bfe5367546621f131fe8cdabaa2671" +version = "0.6.0" +source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#25010513ad66c01b03a22474ae6ff1bd3ee04614" dependencies = [ "itertools 0.10.5", "lazy_static", @@ -2006,8 +2005,7 @@ dependencies = [ [[package]] name = "fuels" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601ed66a0485065471cd9c8bab2db7cfa58bc7ed5d2e68bd26fc573ac2575827" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuel-core", "fuel-core-client", @@ -2023,8 +2021,7 @@ dependencies = [ [[package]] name = "fuels-accounts" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed97e653906fe0bc60b5d7a7421f3c5fe766f516b762def8f4ccac707ac4bc3" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "chrono", @@ -2048,8 +2045,7 @@ dependencies = [ [[package]] name = "fuels-code-gen" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edef30656b740ca9c279a7bcfe9e366557c271a2751e36316f780f18dc99c85" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "Inflector", "fuel-abi-types", @@ -2064,8 +2060,7 @@ dependencies = [ [[package]] name = "fuels-core" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff741c9f1ba2c701b50c76a98a5655d8bc0f275f7ae2dd0e724f8fc36eeb8a9f" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "bech32", @@ -2092,8 +2087,7 @@ dependencies = [ [[package]] name = "fuels-macros" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba1c2fd149a310879249144f2589336708ae860563a45b792907ae34ae6b959" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2105,8 +2099,7 @@ dependencies = [ [[package]] name = "fuels-programs" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45652fa07c48d5fba2ee50ddd279eead2c55b251b3d426d2189394b475330e9" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "async-trait", "fuel-abi-types", @@ -2124,8 +2117,7 @@ dependencies = [ [[package]] name = "fuels-test-helpers" version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967a140a51095d071c84970365c37f856f4f098b835cb609b934dff4b8296cce" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" dependencies = [ "fuel-core", "fuel-core-chain-config", From c5cf48bfb9d7618e9500b4c6e9682af831f0ef22 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Fri, 19 Jul 2024 14:06:54 +0100 Subject: [PATCH 19/47] Updates json_abi_oracle_new_encoding.json files. --- .../standalone_contract-abi.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 307 ++++------- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 75 ++- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 7 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../logging/json_abi_oracle_new_encoding.json | 220 +++----- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 99 ++-- .../json_abi_oracle_new_encoding.json | 30 +- .../json_abi_oracle_new_encoding.json | 42 +- .../json_abi_oracle_new_encoding.json | 47 +- .../json_abi_oracle_new_encoding.json | 47 +- .../json_abi_oracle_new_encoding.json | 35 +- .../json_abi_oracle_new_encoding.json | 86 ++- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 84 +-- .../json_abi_oracle_new_encoding.json | 25 +- .../ops/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../aliases/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 33 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 33 +- .../json_abi_oracle_new_encoding.json | 59 +- .../json_abi_oracle_new_encoding.json | 33 +- .../json_abi_oracle_new_encoding.json | 25 +- .../size_of/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 42 +- .../json_abi_oracle_new_encoding.json | 30 +- .../smo/json_abi_oracle_new_encoding.json | 286 ++++------ .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 30 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 39 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 39 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 250 ++++----- .../json_abi_oracle_new_encoding.json | 43 +- .../json_abi_oracle_new_encoding.json | 250 ++++----- .../json_abi_oracle_new_encoding.json | 43 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../ge_test/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../option/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../raw_ptr/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../require/json_abi_oracle_new_encoding.json | 75 ++- .../result/json_abi_oracle_new_encoding.json | 25 +- .../sha256/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../vec/json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 31 +- .../json_abi_oracle_new_encoding.json | 43 +- .../json_abi_oracle_new_encoding.json | 43 +- .../json_abi_oracle_new_encoding.json | 31 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 31 +- .../json_abi_oracle_new_encoding.json | 423 ++++++--------- .../json_abi_oracle_new_encoding.json | 125 ++--- .../json_abi_oracle_new_encoding.json | 127 ++--- .../json_abi_oracle_new_encoding.json | 104 ++-- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 284 ++++------ .../json_abi_oracle_new_encoding.json | 107 ++-- .../json_abi_oracle_new_encoding.json | 192 +++---- .../json_abi_oracle_new_encoding.json | 80 ++- .../json_abi_oracle_new_encoding.json | 50 +- .../json_abi_oracle_new_encoding.json | 43 +- .../json_abi_oracle_new_encoding.json | 68 +-- .../json_abi_oracle_new_encoding.json | 58 +- .../json_abi_oracle_new_encoding.json | 511 ++++++------------ .../json_abi_oracle_new_encoding.json | 25 +- .../json_abi_oracle_new_encoding.json | 266 ++++----- .../json_abi_oracle_new_encoding.json | 103 ++-- 239 files changed, 4145 insertions(+), 5739 deletions(-) diff --git a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json index f8ba2707608..06288f6470b 100644 --- a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json +++ b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json @@ -1,26 +1,23 @@ { - "encoding": "1", - "types": [ + "concreteTypes": [ { - "typeId": 0, - "type": "bool", - "components": null, - "typeParameters": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" } ], + "configurables": [], + "encodingVersion": "1", "functions": [ { + "attributes": null, "inputs": [], - "name": "test_function", - "output": { - "name": "", - "type": 0, - "typeArguments": null - }, - "attributes": null + "name": "main", + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "configurables": [] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json index e60dda965d4..6ba89864136 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json index 068da3305ab..06288f6470b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json index 068da3305ab..06288f6470b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 677c2d3f36e..2a56bd4ce5a 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 @@ -1,299 +1,224 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be", + "metadataTypeId": 0, + "type": "(bool, u64)" + }, + { + "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6", + "metadataTypeId": 1, + "type": "[bool; 3]" + }, + { + "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199", + "metadataTypeId": 2, + "type": "[u64; 3]" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", + "metadataTypeId": 3, + "type": "enum ConfigurableEnum" + }, + { + "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a", + "type": "str[4]" + }, + { + "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff", + "metadataTypeId": 4, + "type": "struct ConfigurableStruct" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "type": "u256" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [ { - "configurableType": { - "name": "", - "type": 5, - "typeArguments": null - }, + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", "name": "BOOL", - "offset": 7400 + "offset": 6968 }, { - "configurableType": { - "name": "", - "type": 13, - "typeArguments": null - }, + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "U8", - "offset": 7592 + "offset": 7112 }, { - "configurableType": { - "name": "", - "type": 13, - "typeArguments": null - }, + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "ANOTHER_U8", - "offset": 7328 + "offset": 6896 }, { - "configurableType": { - "name": "", - "type": 9, - "typeArguments": null - }, + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", "name": "U16", - "offset": 7536 + "offset": 7056 }, { - "configurableType": { - "name": "", - "type": 11, - "typeArguments": null - }, + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "name": "U32", - "offset": 7576 + "offset": 7096 }, { - "configurableType": { - "name": "", - "type": 11, - "typeArguments": null - }, + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "name": "U64", - "offset": 7584 + "offset": 7104 }, { - "configurableType": { - "name": "", - "type": 10, - "typeArguments": null - }, + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", "name": "U256", - "offset": 7544 + "offset": 7064 }, { - "configurableType": { - "name": "", - "type": 4, - "typeArguments": null - }, + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", "name": "B256", - "offset": 7368 + "offset": 6936 }, { - "configurableType": { - "name": "", - "type": 8, - "typeArguments": [] - }, + "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff", "name": "CONFIGURABLE_STRUCT", - "offset": 7488 + "offset": 7008 }, { - "configurableType": { - "name": "", - "type": 6, - "typeArguments": [] - }, + "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "name": "CONFIGURABLE_ENUM_A", - "offset": 7408 + "offset": 6976 }, { - "configurableType": { - "name": "", - "type": 6, - "typeArguments": [] - }, + "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "name": "CONFIGURABLE_ENUM_B", - "offset": 7448 + "offset": 6992 }, { - "configurableType": { - "name": "", - "type": 2, - "typeArguments": null - }, + "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6", "name": "ARRAY_BOOL", - "offset": 7336 + "offset": 6904 }, { - "configurableType": { - "name": "", - "type": 3, - "typeArguments": null - }, + "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199", "name": "ARRAY_U64", - "offset": 7344 + "offset": 6912 }, { - "configurableType": { - "name": "", - "type": 1, - "typeArguments": null - }, + "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be", "name": "TUPLE_BOOL_U64", - "offset": 7520 + "offset": 7040 }, { - "configurableType": { - "name": "", - "type": 7, - "typeArguments": null - }, + "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a", "name": "STR_4", - "offset": 7512 + "offset": 7032 }, { - "configurableType": { - "name": "", - "type": 13, - "typeArguments": null - }, + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "NOT_USED", - "offset": 7504 + "offset": 7024 } ], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 5, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "__tuple_element", - "type": 12, - "typeArguments": null + "typeId": 5 } ], - "type": "(_, _)", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" }, { "components": [ { "name": "__array_element", - "type": 5, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], - "type": "[_; 3]", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 1, + "type": "[_; 3]" }, { "components": [ { "name": "__array_element", - "type": 12, - "typeArguments": null + "typeId": 5 } ], - "type": "[_; 3]", - "typeId": 3, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 4, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 2, + "type": "[_; 3]" }, { "components": [ { "name": "A", - "type": 5, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "B", - "type": 12, - "typeArguments": null - }, - { - "name": "C", - "type": 4, - "typeArguments": null + "typeId": 5 } ], - "type": "enum ConfigurableEnum", - "typeId": 6, - "typeParameters": null - }, - { - "components": null, - "type": "str[4]", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 3, + "type": "enum ConfigurableEnum" }, { "components": [ { "name": "a", - "type": 5, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "b", - "type": 12, - "typeArguments": null + "typeId": 5 } ], - "type": "struct ConfigurableStruct", - "typeId": 8, - "typeParameters": null - }, - { - "components": null, - "type": "u16", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u256", - "typeId": 10, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 11, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 12, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct ConfigurableStruct" }, { - "components": null, - "type": "u8", - "typeId": 13, - "typeParameters": null + "metadataTypeId": 5, + "type": "u64" } ] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 ef7773fb592..d505ce86cc5 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "test_function", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b2f5dfdc6ff..9a9f92029fb 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 @@ -1,100 +1,89 @@ { + "concreteTypes": [ + { + "concreteTypeId": "93720e77cde7ac793c849579230ed2eb10cd51d3634075b9932b66153e0abafd", + "metadataTypeId": 3, + "type": "enum TopLevelEnum" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "93720e77cde7ac793c849579230ed2eb10cd51d3634075b9932b66153e0abafd" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 1, - "typeArguments": null + "typeId": 1 }, { "name": "__tuple_element", - "type": 1, - "typeArguments": null + "typeId": 1 } ], - "type": "(_, _)", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" }, { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "b256" }, { "components": [ { "name": "first", - "type": 1, - "typeArguments": null + "typeId": 1 }, { "name": "second", - "type": 5, - "typeArguments": null + "typeId": 5 } ], - "type": "enum LowerLevelEnum", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 2, + "type": "enum LowerLevelEnum" }, { "components": [ { "name": "first", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "second", - "type": 4, - "typeArguments": null + "typeId": 4 } ], - "type": "enum TopLevelEnum", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 3, + "type": "enum TopLevelEnum" }, { "components": [ { "name": "first", - "type": 5, - "typeArguments": null + "typeId": 5 }, { "name": "second", - "type": 2, - "typeArguments": null + "typeId": 2 } ], - "type": "struct ThenAStruct", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct ThenAStruct" }, { - "components": null, - "type": "u32", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 5, + "type": "u32" } ] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 a6eb72514c0..fdae20048cd 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 @@ -1,8 +1,11 @@ { + "concreteTypes": [], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [], "loggedTypes": [], "messagesTypes": [], - "types": [] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 8af65bf6ec9..1f8a5a19847 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 @@ -1,171 +1,149 @@ { + "concreteTypes": [ + { + "concreteTypeId": "469b6a3ae1aee813b2c73788d36a1e8dd84089a16afa4d87d726f87eea55a219", + "metadataTypeId": 1, + "type": "enum E" + }, + { + "concreteTypeId": "4d1a8e2800ffb1d7af9edbf4e885657c6b930a0fe4596dec7297f2d0f064ebb5", + "type": "struct CustomAbiEncode" + }, + { + "concreteTypeId": "3f8dc98862e8f3a9b179125e425353ebec6c0f5fc639afce8ed40456c21d3c62", + "metadataTypeId": 5, + "type": "struct S" + }, + { + "concreteTypeId": "e5e8538f6cad3ebdae70cc8ba333e874c75e6478b85ac050988823aaf5fd81e2", + "metadataTypeId": 6, + "type": "struct SS", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 13, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [ { - "logId": "4579537983717831593", - "loggedType": { - "name": "", - "type": 6, - "typeArguments": [] - } - }, - { - "logId": "16566583104751091389", - "loggedType": { - "name": "", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 13, - "typeArguments": null - } - ] - } - }, - { - "logId": "5087777005172090899", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": [] - } - }, - { - "logId": "5555909392781521367", - "loggedType": { - "name": "", - "type": 5, - "typeArguments": [] - } + "concreteTypeId": "3f8dc98862e8f3a9b179125e425353ebec6c0f5fc639afce8ed40456c21d3c62", + "logId": "4579537983717831593" + }, + { + "concreteTypeId": "e5e8538f6cad3ebdae70cc8ba333e874c75e6478b85ac050988823aaf5fd81e2", + "logId": "16566583104751091389" + }, + { + "concreteTypeId": "469b6a3ae1aee813b2c73788d36a1e8dd84089a16afa4d87d726f87eea55a219", + "logId": "5087777005172090899" + }, + { + "concreteTypeId": "4d1a8e2800ffb1d7af9edbf4e885657c6b930a0fe4596dec7297f2d0f064ebb5", + "logId": "5555909392781521367" } ], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "A", - "type": 7, "typeArguments": [ { "name": "", - "type": 13, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } - ] + ], + "typeId": 6 }, { "name": "B", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "enum E", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "generic T", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 1, + "type": "enum E" }, { - "components": null, - "type": "raw untyped ptr", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "generic T" }, { - "components": null, - "type": "str", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 3, + "type": "raw untyped ptr" }, { - "components": [], - "type": "struct CustomAbiEncode", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "str" }, { "components": [ { "name": "a", - "type": 13, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "b", - "type": 12, - "typeArguments": null + "typeId": 11 }, { "name": "c", - "type": 10, - "typeArguments": null + "typeId": 9 }, { "name": "d", - "type": 14, - "typeArguments": null + "typeId": 12 }, { "name": "e", - "type": 9, "typeArguments": [ { "name": "", - "type": 13, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } - ] + ], + "typeId": 8 }, { "name": "f", - "type": 4, - "typeArguments": null + "typeId": 4 }, { "name": "g", - "type": 11, - "typeArguments": null + "typeId": 10 } ], - "type": "struct S", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 5, + "type": "struct S" }, { "components": [ { "name": "ss", - "type": 2, - "typeArguments": null + "typeId": 2 } ], + "metadataTypeId": 6, "type": "struct SS", - "typeId": 7, "typeParameters": [ 2 ] @@ -174,17 +152,15 @@ "components": [ { "name": "ptr", - "type": 3, - "typeArguments": null + "typeId": 3 }, { "name": "cap", - "type": 13, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 7, "type": "struct std::vec::RawVec", - "typeId": 8, "typeParameters": [ 2 ] @@ -193,56 +169,40 @@ "components": [ { "name": "buf", - "type": 8, "typeArguments": [ { "name": "", - "type": 2, - "typeArguments": null + "typeId": 2 } - ] + ], + "typeId": 7 }, { "name": "len", - "type": 13, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 8, "type": "struct std::vec::Vec", - "typeId": 9, "typeParameters": [ 2 ] }, { - "components": null, - "type": "u16", - "typeId": 10, - "typeParameters": null - }, - { - "components": null, - "type": "u256", - "typeId": 11, - "typeParameters": null + "metadataTypeId": 9, + "type": "u16" }, { - "components": null, - "type": "u32", - "typeId": 12, - "typeParameters": null + "metadataTypeId": 10, + "type": "u256" }, { - "components": null, - "type": "u64", - "typeId": 13, - "typeParameters": null + "metadataTypeId": 11, + "type": "u32" }, { - "components": null, - "type": "u8", - "typeId": 14, - "typeParameters": null + "metadataTypeId": 12, + "type": "u8" } ] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json index 068da3305ab..06288f6470b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 7cf591df1b1..2cf5f86404a 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 @@ -1,89 +1,82 @@ { + "concreteTypes": [ + { + "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080", + "metadataTypeId": 0, + "type": "(struct TwoGenerics, struct OneGeneric)" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "input", - "type": 0, - "typeArguments": null + "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080", + "name": "input" } ], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 5, "typeArguments": [ { "name": "", - "type": 7, - "typeArguments": null + "typeId": 7 }, { "name": "", - "type": 6, - "typeArguments": null + "typeId": 6 } - ] + ], + "typeId": 5 }, { "name": "__tuple_element", - "type": 4, "typeArguments": [ { "name": "", - "type": 8, - "typeArguments": null + "typeId": 8 } - ] + ], + "typeId": 4 } ], - "type": "(struct TwoGenerics, struct OneGeneric)", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "(struct TwoGenerics, struct OneGeneric)" }, { - "components": null, - "type": "generic T", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "generic T" }, { - "components": null, - "type": "generic U", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 2, + "type": "generic U" }, { - "components": null, - "type": "generic V", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 3, + "type": "generic V" }, { "components": [ { "name": "a", - "type": 2, - "typeArguments": null + "typeId": 2 } ], + "metadataTypeId": 4, "type": "struct OneGeneric", - "typeId": 4, "typeParameters": [ 2 ] @@ -92,45 +85,37 @@ "components": [ { "name": "b", - "type": 4, "typeArguments": [ { "name": "", - "type": 1, - "typeArguments": null + "typeId": 1 } - ] + ], + "typeId": 4 }, { "name": "c", - "type": 3, - "typeArguments": null + "typeId": 3 } ], + "metadataTypeId": 5, "type": "struct TwoGenerics", - "typeId": 5, "typeParameters": [ 1, 3 ] }, { - "components": null, - "type": "u32", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 6, + "type": "u32" }, { - "components": null, - "type": "u64", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 7, + "type": "u64" }, { - "components": null, - "type": "u8", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 8, + "type": "u8" } ] } \ No newline at end of file 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 11eabcab880..82c8d31ddf0 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 @@ -1,32 +1,28 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "baba", - "type": 0, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "baba" } ], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 ec82fc196ce..6aef6e46eab 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 @@ -1,44 +1,44 @@ { + "concreteTypes": [ + { + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "metadataTypeId": 0, + "type": "struct TestStruct" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "baba", - "type": 0, - "typeArguments": null + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "name": "baba" } ], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "val", - "type": 1, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct TestStruct", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "struct TestStruct" } ] } \ No newline at end of file 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 cc3f79bbc62..912a245e98d 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 @@ -1,49 +1,48 @@ { + "concreteTypes": [ + { + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "metadataTypeId": 0, + "type": "struct TestStruct" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "baba", - "type": 0, - "typeArguments": null + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "name": "baba" }, { - "name": "keke", - "type": 1, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "keke" } ], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "val", - "type": 1, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct TestStruct", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "struct TestStruct" } ] } \ No newline at end of file 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 b22a72cff8e..2e3cb6d4100 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 @@ -1,49 +1,48 @@ { + "concreteTypes": [ + { + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "metadataTypeId": 0, + "type": "struct TestStruct" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "baba", - "type": 0, - "typeArguments": null + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "name": "baba" }, { - "name": "keke", - "type": 0, - "typeArguments": null + "concreteTypeId": "f662bc0a8cc3280d0e276822675f38d76d489e5b30f23542d6724ffb81d17030", + "name": "keke" } ], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "val", - "type": 1, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct TestStruct", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "struct TestStruct" } ] } \ No newline at end of file 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 7379bbd3b90..c31b63b5240 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 @@ -1,37 +1,32 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "baba", - "type": 0, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "baba" }, { - "name": "keke", - "type": 0, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "keke" } ], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 09b704fef9b..c9aac407b0a 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 @@ -1,105 +1,91 @@ { + "concreteTypes": [ + { + "concreteTypeId": "329d9cd6cc55beaa7f1d12e6e1c141134cad14dc31d74d9e2e39c03144d18ba5", + "metadataTypeId": 1, + "type": "[(struct OpName, enum SignedNum); 2]" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "ops", - "type": 1, - "typeArguments": null + "concreteTypeId": "329d9cd6cc55beaa7f1d12e6e1c141134cad14dc31d74d9e2e39c03144d18ba5", + "name": "ops" } ], "name": "main", - "output": { - "name": "", - "type": 5, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [ { - "logId": "3647243719605075626", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "329d9cd6cc55beaa7f1d12e6e1c141134cad14dc31d74d9e2e39c03144d18ba5", + "logId": "3647243719605075626" } ], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 4, - "typeArguments": null + "typeId": 4 }, { "name": "__tuple_element", - "type": 2, - "typeArguments": null + "typeId": 2 } ], - "type": "(_, _)", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" }, { "components": [ { "name": "__array_element", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "[_; 2]", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "[_; 2]" }, { "components": [ { "name": "Positive", - "type": 5, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "Negative", - "type": 5, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "enum SignedNum", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 2, + "type": "enum SignedNum" }, { - "components": null, - "type": "str[3]", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 3, + "type": "str[3]" }, { "components": [ { "name": "val", - "type": 3, - "typeArguments": null + "typeId": 3 } ], - "type": "struct OpName", - "typeId": 4, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct OpName" } ] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 d7fc3a10846..620a27423d0 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 @@ -1,83 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } - } - ], - "loggedTypes": [ - { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 3, - "typeArguments": null - } - }, - { - "logId": "15520703124961489725", - "loggedType": { - "name": "", - "type": 2, - "typeArguments": null - } - }, - { - "logId": "2992671284987479467", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } - }, - { - "logId": "14454674236531057292", - "loggedType": { - "name": "", - "type": 4, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], + "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u16", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 4, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json index 068da3305ab..06288f6470b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 8a40e7a2984..89d8954c067 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "0a92c8e0f509a2d3a66f68dd50408ce45a1a2596803b0bc983a69b34bd40dad2", + "type": "str[3]" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "0a92c8e0f509a2d3a66f68dd50408ce45a1a2596803b0bc983a69b34bd40dad2" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "str[3]", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 19570ea7986..d2219886527 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 @@ -1,38 +1,39 @@ { + "concreteTypes": [ + { + "concreteTypeId": "fff091c1b987e0dabd44005f2ff24bd4a58ae5a2e6225b261dbd8812592472fe", + "metadataTypeId": 1, + "type": "struct Wrapper" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "fff091c1b987e0dabd44005f2ff24bd4a58ae5a2e6225b261dbd8812592472fe" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { - "components": null, - "type": "str[9]", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "str[9]" }, { "components": [ { "name": "name", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct Wrapper", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct Wrapper" } ] } \ No newline at end of file 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 5cc58c95131..aae05f0c143 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "b256", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 cdce150e08c..b8a07c4dfdd 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 @@ -1,38 +1,39 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1327785bbe4ca72fe0dc2e24483357df172feed9833c4048f05d9bb741d6c813", + "metadataTypeId": 0, + "type": "[u32; 1]" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1327785bbe4ca72fe0dc2e24483357df172feed9833c4048f05d9bb741d6c813" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 1, - "typeArguments": null + "typeId": 1 } ], - "type": "[_; 1]", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 1]" }, { - "components": null, - "type": "u32", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "u32" } ] } \ No newline at end of file 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 d43cc168090..ca2bc452800 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 @@ -1,72 +1,65 @@ { + "concreteTypes": [ + { + "concreteTypeId": "389b2ea3cbdf4d5643e7c700fa138ffafdfdd9f8b756241f030679d7c17012b8", + "metadataTypeId": 2, + "type": "struct BiggerThanAWord" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "389b2ea3cbdf4d5643e7c700fa138ffafdfdd9f8b756241f030679d7c17012b8" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 4, - "typeArguments": null + "typeId": 4 } ], - "type": "[_; 2]", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 2]" }, { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "b256" }, { "components": [ { "name": "field_1", - "type": 3, - "typeArguments": null + "typeId": 3 }, { "name": "field_2", - "type": 1, - "typeArguments": null + "typeId": 1 }, { "name": "field_3", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct BiggerThanAWord", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct BiggerThanAWord" }, { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 3, + "type": "u64" }, { - "components": null, - "type": "u8", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 4, + "type": "u8" } ] } \ No newline at end of file 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 63afb0181c9..c501244c889 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 @@ -1,38 +1,39 @@ { + "concreteTypes": [ + { + "concreteTypeId": "ad5cceb591a12bb56461db8eb039b1433f0624d68fd773ed66707a3facfe0b9f", + "metadataTypeId": 0, + "type": "[u32; 0]" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "ad5cceb591a12bb56461db8eb039b1433f0624d68fd773ed66707a3facfe0b9f" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 1, - "typeArguments": null + "typeId": 1 } ], - "type": "[_; 0]", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 0]" }, { - "components": null, - "type": "u32", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "u32" } ] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 17f3d600e0d..06288f6470b 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 @@ -1,41 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } - } - ], - "loggedTypes": [ - { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 5d2bf854d27..af2d550d3d5 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 @@ -1,32 +1,28 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1e1c7c52c1c7a9901681337f8669555f62aac58911332c9ff6b4ea8e73786570", + "type": "raw untyped slice" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "a", - "type": 0, - "typeArguments": null + "concreteTypeId": "1e1c7c52c1c7a9901681337f8669555f62aac58911332c9ff6b4ea8e73786570", + "name": "a" } ], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1e1c7c52c1c7a9901681337f8669555f62aac58911332c9ff6b4ea8e73786570" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "raw untyped slice", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 27b39b8702e..f0e5f9c18e2 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 @@ -1,262 +1,202 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2dc21094c0e9d81b843d1c1c308e2d60755d727d0f9b8981389845dd6d8686b2", + "metadataTypeId": 1, + "type": "[u8; 3]" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "4ca93e765958806c8bb1d93e48c7d359f5c949785cc571959c2d6a985a389e08", + "metadataTypeId": 2, + "type": "enum Option>", + "typeArguments": [ + "4a28f33bb57426a71884323fb9163c851f60c723dce949f3860dc2a97d06792b" + ] + }, + { + "concreteTypeId": "f51956598ea2c3f8b9d3fae025e2d1bceda1e29e13a0a0d44e613596c7b20bea", + "metadataTypeId": 3, + "type": "enum TestEnum" + }, + { + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a", + "type": "str" + }, + { + "concreteTypeId": "5707520cd48d332d49e92fe0626d70391cda07cf95fe651f1656a18a013da11d", + "metadataTypeId": 5, + "type": "struct TestStruct", + "typeArguments": [ + "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" + ] + }, + { + "concreteTypeId": "4a28f33bb57426a71884323fb9163c851f60c723dce949f3860dc2a97d06792b", + "metadataTypeId": 5, + "type": "struct TestStruct", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [ { - "logId": "10098701174489624218", - "loggedType": { - "name": "", - "type": 7, - "typeArguments": null - } + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a", + "logId": "10098701174489624218" }, { - "logId": "3297216108266379291", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "2dc21094c0e9d81b843d1c1c308e2d60755d727d0f9b8981389845dd6d8686b2", + "logId": "3297216108266379291" } ], "messagesTypes": [ { - "messageId": 0, - "messageType": { - "name": "", - "type": 2, - "typeArguments": null - } + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "messageId": "0" }, { - "messageId": 1, - "messageType": { - "name": "", - "type": 11, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "messageId": "1" }, { - "messageId": 2, - "messageType": { - "name": "", - "type": 10, - "typeArguments": null - } + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "messageId": "2" }, { - "messageId": 3, - "messageType": { - "name": "", - "type": 9, - "typeArguments": null - } + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "messageId": "3" }, { - "messageId": 4, - "messageType": { - "name": "", - "type": 12, - "typeArguments": null - } + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "messageId": "4" }, { - "messageId": 5, - "messageType": { - "name": "", - "type": 7, - "typeArguments": null - } + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a", + "messageId": "5" }, { - "messageId": 6, - "messageType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "2dc21094c0e9d81b843d1c1c308e2d60755d727d0f9b8981389845dd6d8686b2", + "messageId": "6" }, { - "messageId": 7, - "messageType": { - "name": "", - "type": 8, - "typeArguments": [ - { - "name": "", - "type": 2, - "typeArguments": null - } - ] - } + "concreteTypeId": "5707520cd48d332d49e92fe0626d70391cda07cf95fe651f1656a18a013da11d", + "messageId": "7" }, { - "messageId": 8, - "messageType": { - "name": "", - "type": 5, - "typeArguments": [] - } + "concreteTypeId": "f51956598ea2c3f8b9d3fae025e2d1bceda1e29e13a0a0d44e613596c7b20bea", + "messageId": "8" }, { - "messageId": 9, - "messageType": { - "name": "", - "type": 4, - "typeArguments": [ - { - "name": "", - "type": 8, - "typeArguments": [ - { - "name": "", - "type": 11, - "typeArguments": null - } - ] - } - ] - } + "concreteTypeId": "4ca93e765958806c8bb1d93e48c7d359f5c949785cc571959c2d6a985a389e08", + "messageId": "9" } ], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "__array_element", - "type": 12, - "typeArguments": null + "typeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" } ], - "type": "[_; 3]", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "[_; 3]" }, { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "Some", - "type": 6, - "typeArguments": null + "typeId": 4 } ], + "metadataTypeId": 2, "type": "enum Option", - "typeId": 4, "typeParameters": [ - 6 + 4 ] }, { "components": [ { "name": "VariantOne", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "VariantTwo", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "enum TestEnum", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "enum TestEnum" }, { - "components": null, - "type": "generic T", - "typeId": 6, - "typeParameters": null - }, - { - "components": null, - "type": "str", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 4, + "type": "generic T" }, { "components": [ { "name": "field_1", - "type": 3, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "field_2", - "type": 6, - "typeArguments": null + "typeId": 4 }, { "name": "field_3", - "type": 11, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 5, "type": "struct TestStruct", - "typeId": 8, "typeParameters": [ - 6 + 4 ] - }, - { - "components": null, - "type": "u16", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 10, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 11, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 12, - "typeParameters": null } ] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 9ccfe9e575c..491a3c63853 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 @@ -1,32 +1,28 @@ { + "concreteTypes": [ + { + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a", + "type": "str" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "a", - "type": 0, - "typeArguments": null + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a", + "name": "a" } ], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "str", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 d2552663ebd..6d7e7a9eda4 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 @@ -1,45 +1,34 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "type": "u256" + } + ], "configurables": [ { - "configurableType": { - "name": "", - "type": 0, - "typeArguments": null - }, + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", "name": "SOME_U256", "offset": 816 } ], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e" } ], "loggedTypes": [ { - "logId": "1970142151624111756", - "loggedType": { - "name": "", - "type": 0, - "typeArguments": null - } + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "logId": "1970142151624111756" } ], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u256", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 2b1053b6a48..0af8ce821c9 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 @@ -1,48 +1,47 @@ { + "concreteTypes": [ + { + "concreteTypeId": "469b6a3ae1aee813b2c73788d36a1e8dd84089a16afa4d87d726f87eea55a219", + "metadataTypeId": 1, + "type": "enum E" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "469b6a3ae1aee813b2c73788d36a1e8dd84089a16afa4d87d726f87eea55a219" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "A", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "B", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "C", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "enum E", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "enum E" } ] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 90719972265..e6cbe62d615 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u32", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 9bcf8ff9976..46476e699bd 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 @@ -1,6 +1,12 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -14,21 +20,12 @@ ], "inputs": [], "name": "impure_func", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 21c7e4af04d..27dd3a2ed67 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u8", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 21c7e4af04d..27dd3a2ed67 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u8", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 21c7e4af04d..27dd3a2ed67 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u8", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 068da3305ab..06288f6470b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json index 068da3305ab..06288f6470b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b50fc6cfd6b..6d6731dad31 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 @@ -1,242 +1,196 @@ { + "concreteTypes": [ + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335", + "metadataTypeId": 1, + "type": "enum std::identity::Identity" + }, + { + "concreteTypeId": "f597b637c3b0f588fb8d7086c6f4735caa3122b85f0423b82e489f9bb58e2308", + "metadataTypeId": 3, + "type": "struct std::address::Address" + }, + { + "concreteTypeId": "745e252e80bec590efc3999ae943f07ccea4d5b45b00bb6575499b64abdd3322", + "metadataTypeId": 4, + "type": "struct std::b512::B512" + }, + { + "concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb", + "metadataTypeId": 5, + "type": "struct std::bytes::Bytes" + }, + { + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "metadataTypeId": 7, + "type": "struct std::contract_id::ContractId" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 12, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" }, { - "logId": "15520703124961489725", - "loggedType": { - "name": "", - "type": 11, - "typeArguments": null - } + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "logId": "15520703124961489725" }, { - "logId": "2992671284987479467", - "loggedType": { - "name": "", - "type": 10, - "typeArguments": null - } + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "logId": "2992671284987479467" }, { - "logId": "14454674236531057292", - "loggedType": { - "name": "", - "type": 13, - "typeArguments": null - } + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "logId": "14454674236531057292" }, { - "logId": "8961848586872524460", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "logId": "8961848586872524460" }, { - "logId": "17696813611398264200", - "loggedType": { - "name": "", - "type": 5, - "typeArguments": [] - } + "concreteTypeId": "f597b637c3b0f588fb8d7086c6f4735caa3122b85f0423b82e489f9bb58e2308", + "logId": "17696813611398264200" }, { - "logId": "3008693953818743129", - "loggedType": { - "name": "", - "type": 9, - "typeArguments": [] - } + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "logId": "3008693953818743129" }, { - "logId": "14832741149864513620", - "loggedType": { - "name": "", - "type": 7, - "typeArguments": [] - } + "concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb", + "logId": "14832741149864513620" }, { - "logId": "8385180437869151632", - "loggedType": { - "name": "", - "type": 6, - "typeArguments": [] - } + "concreteTypeId": "745e252e80bec590efc3999ae943f07ccea4d5b45b00bb6575499b64abdd3322", + "logId": "8385180437869151632" }, { - "logId": "12356980511120185571", - "loggedType": { - "name": "", - "type": 3, - "typeArguments": [] - } + "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335", + "logId": "12356980511120185571" } ], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "[_; 2]", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 2]" }, { "components": [ { "name": "Address", - "type": 5, - "typeArguments": null + "typeId": 3 }, { "name": "ContractId", - "type": 9, - "typeArguments": null + "typeId": 7 } ], - "type": "enum std::identity::Identity", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "enum std::identity::Identity" }, { - "components": null, - "type": "raw untyped ptr", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 2, + "type": "raw untyped ptr" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::address::Address", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct std::address::Address" }, { "components": [ { "name": "bits", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::b512::B512", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct std::b512::B512" }, { "components": [ { "name": "buf", - "type": 8, - "typeArguments": null + "typeId": 6 }, { "name": "len", - "type": 12, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct std::bytes::Bytes", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 5, + "type": "struct std::bytes::Bytes" }, { "components": [ { "name": "ptr", - "type": 4, - "typeArguments": null + "typeId": 2 }, { "name": "cap", - "type": 12, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct std::bytes::RawBytes", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 6, + "type": "struct std::bytes::RawBytes" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::contract_id::ContractId", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u16", - "typeId": 10, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 11, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 12, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 13, - "typeParameters": null + "metadataTypeId": 7, + "type": "struct std::contract_id::ContractId" } ] } \ No newline at end of file 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 17f3d600e0d..c0493d35b2c 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 @@ -1,41 +1,32 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b50fc6cfd6b..6d6731dad31 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 @@ -1,242 +1,196 @@ { + "concreteTypes": [ + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335", + "metadataTypeId": 1, + "type": "enum std::identity::Identity" + }, + { + "concreteTypeId": "f597b637c3b0f588fb8d7086c6f4735caa3122b85f0423b82e489f9bb58e2308", + "metadataTypeId": 3, + "type": "struct std::address::Address" + }, + { + "concreteTypeId": "745e252e80bec590efc3999ae943f07ccea4d5b45b00bb6575499b64abdd3322", + "metadataTypeId": 4, + "type": "struct std::b512::B512" + }, + { + "concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb", + "metadataTypeId": 5, + "type": "struct std::bytes::Bytes" + }, + { + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "metadataTypeId": 7, + "type": "struct std::contract_id::ContractId" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 12, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" }, { - "logId": "15520703124961489725", - "loggedType": { - "name": "", - "type": 11, - "typeArguments": null - } + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "logId": "15520703124961489725" }, { - "logId": "2992671284987479467", - "loggedType": { - "name": "", - "type": 10, - "typeArguments": null - } + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "logId": "2992671284987479467" }, { - "logId": "14454674236531057292", - "loggedType": { - "name": "", - "type": 13, - "typeArguments": null - } + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "logId": "14454674236531057292" }, { - "logId": "8961848586872524460", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "logId": "8961848586872524460" }, { - "logId": "17696813611398264200", - "loggedType": { - "name": "", - "type": 5, - "typeArguments": [] - } + "concreteTypeId": "f597b637c3b0f588fb8d7086c6f4735caa3122b85f0423b82e489f9bb58e2308", + "logId": "17696813611398264200" }, { - "logId": "3008693953818743129", - "loggedType": { - "name": "", - "type": 9, - "typeArguments": [] - } + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "logId": "3008693953818743129" }, { - "logId": "14832741149864513620", - "loggedType": { - "name": "", - "type": 7, - "typeArguments": [] - } + "concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb", + "logId": "14832741149864513620" }, { - "logId": "8385180437869151632", - "loggedType": { - "name": "", - "type": 6, - "typeArguments": [] - } + "concreteTypeId": "745e252e80bec590efc3999ae943f07ccea4d5b45b00bb6575499b64abdd3322", + "logId": "8385180437869151632" }, { - "logId": "12356980511120185571", - "loggedType": { - "name": "", - "type": 3, - "typeArguments": [] - } + "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335", + "logId": "12356980511120185571" } ], "messagesTypes": [], - "types": [ + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "[_; 2]", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 2]" }, { "components": [ { "name": "Address", - "type": 5, - "typeArguments": null + "typeId": 3 }, { "name": "ContractId", - "type": 9, - "typeArguments": null + "typeId": 7 } ], - "type": "enum std::identity::Identity", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "enum std::identity::Identity" }, { - "components": null, - "type": "raw untyped ptr", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 2, + "type": "raw untyped ptr" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::address::Address", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct std::address::Address" }, { "components": [ { "name": "bits", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::b512::B512", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct std::b512::B512" }, { "components": [ { "name": "buf", - "type": 8, - "typeArguments": null + "typeId": 6 }, { "name": "len", - "type": 12, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct std::bytes::Bytes", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 5, + "type": "struct std::bytes::Bytes" }, { "components": [ { "name": "ptr", - "type": 4, - "typeArguments": null + "typeId": 2 }, { "name": "cap", - "type": 12, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct std::bytes::RawBytes", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 6, + "type": "struct std::bytes::RawBytes" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::contract_id::ContractId", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u16", - "typeId": 10, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 11, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 12, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 13, - "typeParameters": null + "metadataTypeId": 7, + "type": "struct std::contract_id::ContractId" } ] } \ No newline at end of file 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 17f3d600e0d..c0493d35b2c 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 @@ -1,41 +1,32 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 e60dda965d4..6ba89864136 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b3a98a8bfc4..c2438d6380b 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1e1c7c52c1c7a9901681337f8669555f62aac58911332c9ff6b4ea8e73786570", + "type": "raw untyped slice" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1e1c7c52c1c7a9901681337f8669555f62aac58911332c9ff6b4ea8e73786570" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "raw untyped slice", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 3c87c103235..d21a750855b 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 @@ -1,77 +1,64 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "aeb05892041dca93eed4135c33da756bc24675f1e2574e9295c337a84a48d456", + "metadataTypeId": 1, + "type": "struct CustomError" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 3, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" }, { - "logId": "12587658342658067091", - "loggedType": { - "name": "", - "type": 2, - "typeArguments": [] - } + "concreteTypeId": "aeb05892041dca93eed4135c33da756bc24675f1e2574e9295c337a84a48d456", + "logId": "12587658342658067091" } ], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "b256", - "typeId": 0, - "typeParameters": null - }, + "programType": "script", + "specVersion": "1", + "typesMetadata": [ { - "components": null, - "type": "bool", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "b256" }, { "components": [ { "name": "val_1", - "type": 1, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "val_2", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "val_3", - "type": 3, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct CustomError", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct CustomError" } ] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 b89d516ddd1..620a27423d0 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "main", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "script", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 634a41c163c..5fb0761e122 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 @@ -1,36 +1,29 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "super_abi_method", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "abi_method", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 fa8f6e44880..0ceadc76a66 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 @@ -1,56 +1,41 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "top", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "left", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "right", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "bottom", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 fa8f6e44880..0ceadc76a66 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 @@ -1,56 +1,41 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "top", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "left", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "right", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "bottom", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 25fafbe4062..dcb0dea516c 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 @@ -1,36 +1,29 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "bar", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "baz", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 9552e74478e..d4a41d5f0b6 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "abi_method", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 5b35f8b4e05..0013f8a7747 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 @@ -1,36 +1,29 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "interface_method", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [], "name": "impl_method", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 92455dcaf17..29a536c5dea 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 @@ -1,451 +1,386 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "a1e229302ed2f092752a6bc4fbe66bb9305e0802b1b01ecc5e1d59356702e956", + "metadataTypeId": 0, + "type": "(str[5], bool)" + }, + { + "concreteTypeId": "81342782c917fcfd178741cb2b3a12ea1ebeaa57253fc4ee6700b4d7d6ab32d3", + "metadataTypeId": 3, + "type": "[b256; 3]" + }, + { + "concreteTypeId": "2d25d8a7618f6e2d5d830cf75baedc6b5081b435d08644cc9dc1ff8ceba6e97b", + "metadataTypeId": 5, + "type": "[struct MyStruct; 4]" + }, + { + "concreteTypeId": "ed705f920eb2c423c81df912430030def10f03218f0a064bfab81b68de71ae21", + "type": "str[6]" + }, + { + "concreteTypeId": "c03a3a8c7676b8c228bb24c90bf19a6d8ef92aad1dea3c1939fac4181700eb09", + "metadataTypeId": 18, + "type": "struct MyArrayStruct", + "typeArguments": [ + "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef" + ] + }, + { + "concreteTypeId": "885e4c283947ed1ad5ef39b71f7b60135e268e96c6f8101eec48528e61b361ae", + "metadataTypeId": 19, + "type": "struct MyOtherStruct" + }, + { + "concreteTypeId": "86969aac37f36f85cea48bd525e5ff2b0e82867977905bc0121d886fa09a09c3", + "metadataTypeId": 20, + "type": "struct MyStruct<[b256; 3],u8>", + "typeArguments": [ + "81342782c917fcfd178741cb2b3a12ea1ebeaa57253fc4ee6700b4d7d6ab32d3", + "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" + ] + }, + { + "concreteTypeId": "034b31a2288dc1bcad6f11d7617f613c1d1ab12b157957279b559b67cccb8136", + "metadataTypeId": 21, + "type": "struct MyStructWithTuple,u16,u32>", + "typeArguments": [ + "c241e75899be40c59f0124bdf35f69f22b5e1aa4d79ed70f78689caa5e861c63", + "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" + ] + }, + { + "concreteTypeId": "c241e75899be40c59f0124bdf35f69f22b5e1aa4d79ed70f78689caa5e861c63", + "metadataTypeId": 22, + "type": "struct SomeGenericStruct", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "_arg1", - "type": 22, - "typeArguments": [ - { - "name": "", - "type": 4, - "typeArguments": null - }, - { - "name": "", - "type": 28, - "typeArguments": null - } - ] + "concreteTypeId": "86969aac37f36f85cea48bd525e5ff2b0e82867977905bc0121d886fa09a09c3", + "name": "_arg1" }, { - "name": "_arg2", - "type": 6, - "typeArguments": null + "concreteTypeId": "2d25d8a7618f6e2d5d830cf75baedc6b5081b435d08644cc9dc1ff8ceba6e97b", + "name": "_arg2" }, { - "name": "_arg3", - "type": 1, - "typeArguments": null + "concreteTypeId": "a1e229302ed2f092752a6bc4fbe66bb9305e0802b1b01ecc5e1d59356702e956", + "name": "_arg3" }, { - "name": "_arg4", - "type": 21, - "typeArguments": null + "concreteTypeId": "885e4c283947ed1ad5ef39b71f7b60135e268e96c6f8101eec48528e61b361ae", + "name": "_arg4" } ], "name": "complex_function", - "output": { - "name": "", - "type": 19, - "typeArguments": null - } + "output": "ed705f920eb2c423c81df912430030def10f03218f0a064bfab81b68de71ae21" }, { "attributes": null, "inputs": [ { - "name": "_arg", - "type": 20, - "typeArguments": [ - { - "name": "", - "type": 28, - "typeArguments": null - }, - { - "name": "", - "type": 25, - "typeArguments": null - } - ] + "concreteTypeId": "c03a3a8c7676b8c228bb24c90bf19a6d8ef92aad1dea3c1939fac4181700eb09", + "name": "_arg" } ], "name": "take_generic_array", - "output": { - "name": "", - "type": 27, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": null, "inputs": [ { - "name": "_arg", - "type": 23, - "typeArguments": [ - { - "name": "", - "type": 24, - "typeArguments": [ - { - "name": "", - "type": 27, - "typeArguments": null - } - ] - }, - { - "name": "", - "type": 25, - "typeArguments": null - }, - { - "name": "", - "type": 26, - "typeArguments": null - } - ] + "concreteTypeId": "034b31a2288dc1bcad6f11d7617f613c1d1ab12b157957279b559b67cccb8136", + "name": "_arg" } ], "name": "take_generic_struct_containing_tuple", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 18, - "typeArguments": null + "typeId": 17 }, { "name": "__tuple_element", - "type": 9, - "typeArguments": null + "typeId": 8 } ], - "type": "(_, _)", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" }, { "components": [ { "name": "__tuple_element", - "type": 17, - "typeArguments": null + "typeId": 16 }, { "name": "__tuple_element", - "type": 15, - "typeArguments": null + "typeId": 14 } ], - "type": "(_, _)", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 1, + "type": "(_, _)" }, { "components": [ { "name": "__tuple_element", - "type": 15, - "typeArguments": null + "typeId": 14 }, { "name": "__tuple_element", - "type": 16, - "typeArguments": null + "typeId": 15 }, { "name": "__tuple_element", - "type": 17, - "typeArguments": null + "typeId": 16 } ], - "type": "(_, _, _)", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "(_, _, _)" }, { "components": [ { "name": "__array_element", - "type": 8, - "typeArguments": null + "typeId": 7 } ], - "type": "[_; 3]", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 3, + "type": "[_; 3]" }, { "components": [ { "name": "__array_element", - "type": 13, - "typeArguments": null + "typeId": 12 } ], - "type": "[_; 3]", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "[_; 3]" }, { "components": [ { "name": "__array_element", - "type": 22, "typeArguments": [ { "name": "", - "type": 27, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "", - "type": 9, - "typeArguments": null + "typeId": 8 } - ] + ], + "typeId": 20 } ], - "type": "[_; 4]", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 5, + "type": "[_; 4]" }, { "components": [ { "name": "__array_element", - "type": 22, "typeArguments": [ { "name": "", - "type": 13, - "typeArguments": null + "typeId": 12 }, { "name": "", - "type": 14, - "typeArguments": null + "typeId": 13 } - ] + ], + "typeId": 20 } ], - "type": "[_; 5]", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 6, + "type": "[_; 5]" }, { - "components": null, - "type": "b256", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 7, + "type": "b256" }, { - "components": null, - "type": "bool", - "typeId": 9, - "typeParameters": null + "metadataTypeId": 8, + "type": "bool" }, { "components": [ { "name": "Foo", - "type": 27, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "Bar", - "type": 9, - "typeArguments": null + "typeId": 8 } ], + "metadataTypeId": 9, "type": "enum MyEnum", - "typeId": 10, "typeParameters": [ - 13 + 12 ] }, { - "components": null, - "type": "generic T", - "typeId": 11, - "typeParameters": null - }, - { - "components": null, - "type": "generic U", - "typeId": 12, - "typeParameters": null + "metadataTypeId": 10, + "type": "generic T" }, { - "components": null, - "type": "generic V", - "typeId": 13, - "typeParameters": null + "metadataTypeId": 11, + "type": "generic U" }, { - "components": null, - "type": "generic W", - "typeId": 14, - "typeParameters": null + "metadataTypeId": 12, + "type": "generic V" }, { - "components": null, - "type": "generic X", - "typeId": 15, - "typeParameters": null + "metadataTypeId": 13, + "type": "generic W" }, { - "components": null, - "type": "generic Y", - "typeId": 16, - "typeParameters": null + "metadataTypeId": 14, + "type": "generic X" }, { - "components": null, - "type": "generic Z", - "typeId": 17, - "typeParameters": null + "metadataTypeId": 15, + "type": "generic Y" }, { - "components": null, - "type": "str[5]", - "typeId": 18, - "typeParameters": null + "metadataTypeId": 16, + "type": "generic Z" }, { - "components": null, - "type": "str[6]", - "typeId": 19, - "typeParameters": null + "metadataTypeId": 17, + "type": "str[5]" }, { "components": [ { "name": "tim", - "type": 5, - "typeArguments": null + "typeId": 4 }, { "name": "tam", - "type": 7, - "typeArguments": null + "typeId": 6 } ], + "metadataTypeId": 18, "type": "struct MyArrayStruct", - "typeId": 20, "typeParameters": [ - 13, - 14 + 12, + 13 ] }, { "components": [ { "name": "bom", - "type": 27, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct MyOtherStruct", - "typeId": 21, - "typeParameters": null + "metadataTypeId": 19, + "type": "struct MyOtherStruct" }, { "components": [ { "name": "bim", - "type": 11, - "typeArguments": null + "typeId": 10 }, { "name": "bam", - "type": 10, "typeArguments": [ { "name": "", - "type": 27, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } - ] + ], + "typeId": 9 } ], + "metadataTypeId": 20, "type": "struct MyStruct", - "typeId": 22, "typeParameters": [ - 11, - 12 + 10, + 11 ] }, { "components": [ { "name": "tuple1", - "type": 3, - "typeArguments": null + "typeId": 2 }, { "name": "tuple2", - "type": 2, - "typeArguments": null + "typeId": 1 } ], + "metadataTypeId": 21, "type": "struct MyStructWithTuple", - "typeId": 23, "typeParameters": [ + 14, 15, - 16, - 17 + 16 ] }, { "components": [ { "name": "b", - "type": 17, - "typeArguments": null + "typeId": 16 } ], + "metadataTypeId": 22, "type": "struct SomeGenericStruct", - "typeId": 24, "typeParameters": [ - 17 + 16 ] - }, - { - "components": null, - "type": "u16", - "typeId": 25, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 26, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 27, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 28, - "typeParameters": null } ] } \ No newline at end of file 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 0a3b91cb7be..7ff27cfea77 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 @@ -1,133 +1,124 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "metadataTypeId": 1, + "type": "enum std::option::Option", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "ed705f920eb2c423c81df912430030def10f03218f0a064bfab81b68de71ae21", + "type": "str[6]" + }, + { + "concreteTypeId": "a45846b92d83fc9bce3ae9107300f47b4adc654abc3a42c7bd6395f4ab30a519", + "metadataTypeId": 3, + "type": "struct dep_1::MyStruct1" + }, + { + "concreteTypeId": "871f7c31e4209def536096b47765433990004089691aa2814a497f27040bee45", + "metadataTypeId": 5, + "type": "struct dep_2::MyStruct2" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "_arg1", - "type": 4, - "typeArguments": null + "concreteTypeId": "a45846b92d83fc9bce3ae9107300f47b4adc654abc3a42c7bd6395f4ab30a519", + "name": "_arg1" }, { - "name": "_arg2", - "type": 6, - "typeArguments": null + "concreteTypeId": "871f7c31e4209def536096b47765433990004089691aa2814a497f27040bee45", + "name": "_arg2" }, { - "name": "_arg3", - "type": 1, - "typeArguments": [ - { - "name": "", - "type": 8, - "typeArguments": null - } - ] + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "name": "_arg3" } ], "name": "function", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "ed705f920eb2c423c81df912430030def10f03218f0a064bfab81b68de71ae21" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "Some", - "type": 2, - "typeArguments": null + "typeId": 2 } ], + "metadataTypeId": 1, "type": "enum std::option::Option", - "typeId": 1, "typeParameters": [ 2 ] }, { - "components": null, - "type": "generic T", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "str[6]", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "generic T" }, { "components": [ { "name": "bam", - "type": 5, - "typeArguments": null + "typeId": 4 } ], - "type": "struct dep_1::MyStruct1", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct dep_1::MyStruct1" }, { "components": [ { "name": "bam", - "type": 8, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct dep_1::MyStructDuplicated", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "struct dep_1::MyStructDuplicated" }, { "components": [ { "name": "bam", - "type": 7, - "typeArguments": null + "typeId": 6 } ], - "type": "struct dep_2::MyStruct2", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 5, + "type": "struct dep_2::MyStruct2" }, { "components": [ { "name": "bam", - "type": 8, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct dep_2::MyStructDuplicated", - "typeId": 7, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 6, + "type": "struct dep_2::MyStructDuplicated" } ] } \ No newline at end of file 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 80d8e741055..f72bc7ef1ef 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 @@ -1,152 +1,137 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1b2815d813e5e2d01d9a1f161e912b1f43f1eb83c2410a41f5bd5e3cc384377d", + "metadataTypeId": 3, + "type": "(enum abi_with_tuples::Location, u64)" + }, + { + "concreteTypeId": "aa3d290422f6a2c01b8a81c1d5c290096cd31190571b4f102b8e597a658ea64a", + "metadataTypeId": 2, + "type": "(struct abi_with_tuples::Person, u64)" + }, + { + "concreteTypeId": "b826e3d5f69670efb0476cddb17428c7c01752bfbe75f0619995d2957b59e7f5", + "metadataTypeId": 1, + "type": "(struct abi_with_tuples::some_module::SomeStruct)" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "_param", - "type": 2, - "typeArguments": null + "concreteTypeId": "aa3d290422f6a2c01b8a81c1d5c290096cd31190571b4f102b8e597a658ea64a", + "name": "_param" } ], "name": "bug1", - "output": { - "name": "", - "type": 4, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "attributes": null, "inputs": [ { - "name": "_param", - "type": 3, - "typeArguments": null + "concreteTypeId": "1b2815d813e5e2d01d9a1f161e912b1f43f1eb83c2410a41f5bd5e3cc384377d", + "name": "_param" } ], "name": "bug2", - "output": { - "name": "", - "type": 4, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "attributes": null, "inputs": [], "name": "struct_at_return", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "b826e3d5f69670efb0476cddb17428c7c01752bfbe75f0619995d2957b59e7f5" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "__tuple_element", - "type": 7, - "typeArguments": null + "typeId": 6 } ], - "type": "(_)", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "(_)" }, { "components": [ { "name": "__tuple_element", - "type": 6, - "typeArguments": null + "typeId": 5 }, { "name": "__tuple_element", - "type": 8, - "typeArguments": null + "typeId": 7 } ], - "type": "(_, _)", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 2, + "type": "(_, _)" }, { "components": [ { "name": "__tuple_element", - "type": 5, - "typeArguments": null + "typeId": 4 }, { "name": "__tuple_element", - "type": 8, - "typeArguments": null + "typeId": 7 } ], - "type": "(_, _)", - "typeId": 3, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 3, + "type": "(_, _)" }, { "components": [ { "name": "Earth", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "enum abi_with_tuples::Location", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "enum abi_with_tuples::Location" }, { "components": [ { "name": "age", - "type": 8, - "typeArguments": null + "typeId": 7 } ], - "type": "struct abi_with_tuples::Person", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 5, + "type": "struct abi_with_tuples::Person" }, { "components": [ { "name": "data", - "type": 8, - "typeArguments": null + "typeId": 7 } ], - "type": "struct abi_with_tuples::some_module::SomeStruct", - "typeId": 7, - "typeParameters": null + "metadataTypeId": 6, + "type": "struct abi_with_tuples::some_module::SomeStruct" }, { - "components": null, - "type": "u64", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 7, + "type": "u64" } ] } \ No newline at end of file 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 c86143ac246..2fb87bc80c3 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 @@ -1,118 +1,110 @@ { + "concreteTypes": [ + { + "concreteTypeId": "49fc07a2e561e763cabe6e181708cc45f213801c05244888c1ce2292b0977f88", + "metadataTypeId": 1, + "type": "[str[3]; 3]" + }, + { + "concreteTypeId": "5daee639ca3a655c4eae99c0c1987f7153e50ad7e7cf1fde2633709bf7ed09bd", + "metadataTypeId": 0, + "type": "[struct array_of_structs_abi::Wrapper; 2]" + }, + { + "concreteTypeId": "0a92c8e0f509a2d3a66f68dd50408ce45a1a2596803b0bc983a69b34bd40dad2", + "type": "str[3]" + }, + { + "concreteTypeId": "ed2e4683365827293d77b21104cd3278cdff5ebcd36bda8544e30c8c42261d27", + "metadataTypeId": 3, + "type": "struct array_of_structs_abi::Wrapper" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "param", - "type": 0, - "typeArguments": null + "concreteTypeId": "5daee639ca3a655c4eae99c0c1987f7153e50ad7e7cf1fde2633709bf7ed09bd", + "name": "param" } ], "name": "return_array_of_structs", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "5daee639ca3a655c4eae99c0c1987f7153e50ad7e7cf1fde2633709bf7ed09bd" }, { "attributes": null, "inputs": [ { - "name": "param", - "type": 1, - "typeArguments": null + "concreteTypeId": "49fc07a2e561e763cabe6e181708cc45f213801c05244888c1ce2292b0977f88", + "name": "param" } ], "name": "return_element_of_array_of_strings", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "0a92c8e0f509a2d3a66f68dd50408ce45a1a2596803b0bc983a69b34bd40dad2" }, { "attributes": null, "inputs": [ { - "name": "param", - "type": 0, - "typeArguments": null + "concreteTypeId": "5daee639ca3a655c4eae99c0c1987f7153e50ad7e7cf1fde2633709bf7ed09bd", + "name": "param" } ], "name": "return_element_of_array_of_structs", - "output": { - "name": "", - "type": 4, - "typeArguments": null - } + "output": "ed2e4683365827293d77b21104cd3278cdff5ebcd36bda8544e30c8c42261d27" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__array_element", - "type": 4, - "typeArguments": null + "typeId": 3 } ], - "type": "[_; 2]", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "[_; 2]" }, { "components": [ { "name": "__array_element", - "type": 2, - "typeArguments": null + "typeId": "0a92c8e0f509a2d3a66f68dd50408ce45a1a2596803b0bc983a69b34bd40dad2" } ], - "type": "[_; 3]", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "str[3]", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 1, + "type": "[_; 3]" }, { "components": [ { "name": "number", - "type": 5, - "typeArguments": null + "typeId": 4 } ], - "type": "struct array_of_structs_abi::Id", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct array_of_structs_abi::Id" }, { "components": [ { "name": "id", - "type": 3, - "typeArguments": null + "typeId": 2 } ], - "type": "struct array_of_structs_abi::Wrapper", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct array_of_structs_abi::Wrapper" }, { - "components": null, - "type": "u64", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 4, + "type": "u64" } ] } \ No newline at end of file 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 0c8be9e6e1c..019dd46ee95 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "returns_gm_one", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "bool", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 de452a1600d..2304727e1be 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 @@ -1,26 +1,23 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "get_42", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 1ac3be1b41d..90d3e3df19d 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 @@ -1,6 +1,49 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "metadataTypeId": 0, + "type": "enum std::option::Option", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "6906df92e2e485dde893b7d719d621b8910422e7c468f99caa5920e6ac19d9c6", + "metadataTypeId": 3, + "type": "struct basic_storage_abi::Quad" + }, + { + "concreteTypeId": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff", + "metadataTypeId": 5, + "type": "struct std::vec::Vec", + "typeArguments": [ + "6906df92e2e485dde893b7d719d621b8910422e7c468f99caa5920e6ac19d9c6" + ] + }, + { + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "type": "u256" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -13,23 +56,12 @@ ], "inputs": [ { - "name": "storage_key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "storage_key" } ], "name": "get_u64", - "output": { - "name": "", - "type": 2, - "typeArguments": [ - { - "name": "", - "type": 9, - "typeArguments": null - } - ] - } + "output": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d" }, { "attributes": [ @@ -42,28 +74,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "slots", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "slots" } ], "name": "intrinsic_load_quad", - "output": { - "name": "", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 5, - "typeArguments": null - } - ] - } + "output": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff" }, { "attributes": [ @@ -76,17 +96,12 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" } ], "name": "intrinsic_load_word", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -99,28 +114,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "values", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 5, - "typeArguments": null - } - ] + "concreteTypeId": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff", + "name": "values" } ], "name": "intrinsic_store_quad", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -133,22 +136,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "value", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "value" } ], "name": "intrinsic_store_word", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -161,22 +158,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "value", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "value" } ], "name": "store_u64", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -190,180 +181,117 @@ ], "inputs": [], "name": "test_storage_exhaustive", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "14454674236531057292", - "loggedType": { - "name": "", - "type": 10, - "typeArguments": null - } + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "logId": "14454674236531057292" }, { - "logId": "1970142151624111756", - "loggedType": { - "name": "", - "type": 8, - "typeArguments": null - } + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "logId": "1970142151624111756" }, { - "logId": "8961848586872524460", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "logId": "8961848586872524460" }, { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 9, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null - }, + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "name": "Some", - "type": 3, - "typeArguments": null + "typeId": 1 } ], + "metadataTypeId": 0, "type": "enum std::option::Option", - "typeId": 2, "typeParameters": [ - 3 + 1 ] }, { - "components": null, - "type": "generic T", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "generic T" }, { - "components": null, - "type": "raw untyped ptr", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 2, + "type": "raw untyped ptr" }, { "components": [ { "name": "v1", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v2", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v3", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v4", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct basic_storage_abi::Quad", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct basic_storage_abi::Quad" }, { "components": [ { "name": "ptr", - "type": 4, - "typeArguments": null + "typeId": 2 }, { "name": "cap", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 4, "type": "struct std::vec::RawVec", - "typeId": 6, "typeParameters": [ - 3 + 1 ] }, { "components": [ { "name": "buf", - "type": 6, "typeArguments": [ { "name": "", - "type": 3, - "typeArguments": null + "typeId": 1 } - ] + ], + "typeId": 4 }, { "name": "len", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 5, "type": "struct std::vec::Vec", - "typeId": 7, "typeParameters": [ - 3 + 1 ] - }, - { - "components": null, - "type": "u256", - "typeId": 8, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 10, - "typeParameters": null } ] } \ No newline at end of file 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 ad4a24595e0..d1c28f4bec4 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 @@ -1,133 +1,108 @@ { + "concreteTypes": [ + { + "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", + "metadataTypeId": 1, + "type": "struct std::asset_id::AssetId" + }, + { + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "metadataTypeId": 2, + "type": "struct std::contract_id::ContractId" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "get_amount", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": null, "inputs": [], "name": "get_asset_id", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974" }, { "attributes": null, "inputs": [ { - "name": "asset_id", - "type": 1, - "typeArguments": null + "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", + "name": "asset_id" }, { - "name": "cid", - "type": 2, - "typeArguments": null + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "name": "cid" } ], "name": "get_balance_of_contract", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": null, "inputs": [], "name": "get_gas", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": null, "inputs": [], "name": "get_global_gas", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": null, "inputs": [], "name": "get_id", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54" }, { "attributes": null, "inputs": [ { - "name": "asset_id", - "type": 1, - "typeArguments": null + "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", + "name": "asset_id" } ], "name": "get_this_balance", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": null, - "type": "b256", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "b256" }, { "components": [ { "name": "bits", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::asset_id::AssetId", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct std::asset_id::AssetId" }, { "components": [ { "name": "bits", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::contract_id::ContractId", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct std::contract_id::ContractId" } ] } \ No newline at end of file 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 48cafb9b68d..ed9ba29007b 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 @@ -1,214 +1,202 @@ { + "concreteTypes": [ + { + "concreteTypeId": "a28cf4bd3deddbee8bde0daa7b4534d37db682c73dc398fd720c75f3775a3df0", + "metadataTypeId": 1, + "type": "(b256, [enum std::identity::Identity; 2], struct contract_with_type_aliases_abi::IdentityAliasWrapper, struct contract_with_type_aliases_abi::Generic, (b256, b256), str[9])" + }, + { + "concreteTypeId": "bc42ec26f2a17c5b23fc007d96b96bf35f8949ee156afdd789064210d881f7e0", + "metadataTypeId": 0, + "type": "(b256, b256)" + }, + { + "concreteTypeId": "2771ee6889dff227342d90c5f1ea6019ad8c8de50880048f823e1b926b26c13e", + "metadataTypeId": 2, + "type": "[enum std::identity::Identity; 2]" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8", + "type": "str[9]" + }, + { + "concreteTypeId": "3981e3d30e52d053c35da213685243d8c82ef363f58bfc2d14986c393254c450", + "metadataTypeId": 5, + "type": "struct contract_with_type_aliases_abi::Generic", + "typeArguments": [ + "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b" + ] + }, + { + "concreteTypeId": "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b", + "metadataTypeId": 6, + "type": "struct contract_with_type_aliases_abi::IdentityAliasWrapper" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "x", - "type": 3, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "x" }, { - "name": "y", - "type": 2, - "typeArguments": null + "concreteTypeId": "2771ee6889dff227342d90c5f1ea6019ad8c8de50880048f823e1b926b26c13e", + "name": "y" }, { - "name": "z", - "type": 8, - "typeArguments": null + "concreteTypeId": "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b", + "name": "z" }, { - "name": "w", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 8, - "typeArguments": null - } - ] + "concreteTypeId": "3981e3d30e52d053c35da213685243d8c82ef363f58bfc2d14986c393254c450", + "name": "w" }, { - "name": "u", - "type": 0, - "typeArguments": null + "concreteTypeId": "bc42ec26f2a17c5b23fc007d96b96bf35f8949ee156afdd789064210d881f7e0", + "name": "u" }, { - "name": "s", - "type": 6, - "typeArguments": null + "concreteTypeId": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8", + "name": "s" } ], "name": "foo", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "a28cf4bd3deddbee8bde0daa7b4534d37db682c73dc398fd720c75f3775a3df0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 3, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "name": "__tuple_element", - "type": 3, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "(_, _)", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" }, { "components": [ { "name": "__tuple_element", - "type": 3, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "name": "__tuple_element", - "type": 2, - "typeArguments": null + "typeId": 2 }, { "name": "__tuple_element", - "type": 8, - "typeArguments": null + "typeId": 6 }, { "name": "__tuple_element", - "type": 7, "typeArguments": [ { "name": "", - "type": 8, - "typeArguments": null + "typeId": 6 } - ] + ], + "typeId": 5 }, { "name": "__tuple_element", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "__tuple_element", - "type": 6, - "typeArguments": null + "typeId": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8" } ], - "type": "(_, _, _, _, _, _)", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "(_, _, _, _, _, _)" }, { "components": [ { "name": "__array_element", - "type": 4, - "typeArguments": null + "typeId": 3 } ], - "type": "[_; 2]", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "[_; 2]" }, { "components": [ { "name": "Address", - "type": 9, - "typeArguments": null + "typeId": 7 }, { "name": "ContractId", - "type": 10, - "typeArguments": null + "typeId": 8 } ], - "type": "enum std::identity::Identity", - "typeId": 4, - "typeParameters": null - }, - { - "components": null, - "type": "generic T", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "enum std::identity::Identity" }, { - "components": null, - "type": "str[9]", - "typeId": 6, - "typeParameters": null + "metadataTypeId": 4, + "type": "generic T" }, { "components": [ { "name": "f", - "type": 5, - "typeArguments": null + "typeId": 4 } ], + "metadataTypeId": 5, "type": "struct contract_with_type_aliases_abi::Generic", - "typeId": 7, "typeParameters": [ - 5 + 4 ] }, { "components": [ { "name": "i", - "type": 4, - "typeArguments": null + "typeId": 3 } ], - "type": "struct contract_with_type_aliases_abi::IdentityAliasWrapper", - "typeId": 8, - "typeParameters": null + "metadataTypeId": 6, + "type": "struct contract_with_type_aliases_abi::IdentityAliasWrapper" }, { "components": [ { "name": "bits", - "type": 3, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::address::Address", - "typeId": 9, - "typeParameters": null + "metadataTypeId": 7, + "type": "struct std::address::Address" }, { "components": [ { "name": "bits", - "type": 3, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], - "type": "struct std::contract_id::ContractId", - "typeId": 10, - "typeParameters": null + "metadataTypeId": 8, + "type": "struct std::contract_id::ContractId" } ] } \ No newline at end of file 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 c0b6e46f685..1813c7befe0 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 @@ -1,6 +1,20 @@ { + "concreteTypes": [ + { + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "metadataTypeId": 1, + "type": "enum std::option::Option", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -13,11 +27,7 @@ ], "inputs": [], "name": "get", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -31,17 +41,12 @@ ], "inputs": [ { - "name": "increment_by", - "type": 3, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "increment_by" } ], "name": "increment", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -55,64 +60,43 @@ ], "inputs": [ { - "name": "initial_value", - "type": 1, - "typeArguments": [ - { - "name": "", - "type": 3, - "typeArguments": null - } - ] + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "name": "initial_value" } ], "name": "increment_or_not", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "Some", - "type": 2, - "typeArguments": null + "typeId": 2 } ], + "metadataTypeId": 1, "type": "enum std::option::Option", - "typeId": 1, "typeParameters": [ 2 ] }, { - "components": null, - "type": "generic T", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "generic T" } ] } \ No newline at end of file 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 5d70f6008ee..0f079c86b6a 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 @@ -1,54 +1,52 @@ { + "concreteTypes": [ + { + "concreteTypeId": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0", + "metadataTypeId": 0, + "type": "(u64, u64)" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "a", - "type": 1, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "a" }, { - "name": "b", - "type": 1, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "b" } ], "name": "multiply_u64", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "__tuple_element", - "type": 1, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "__tuple_element", - "type": 1, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "(_, _)", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "(_, _)" } ] } \ No newline at end of file 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 e8d2e4e28d4..89be1b69e12 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 @@ -1,41 +1,32 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [], "name": "foo", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 1, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 f7a0b9fa15c..48b700f51af 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 @@ -1,73 +1,73 @@ { + "concreteTypes": [ + { + "concreteTypeId": "42ec906f917884c527853724049ec3e303d2de2916baa4aee461cb71433d0b22", + "metadataTypeId": 1, + "type": "struct nested_struct_args_abi::StructOne" + }, + { + "concreteTypeId": "13f26ca88e0921e7c728fb5763d18dfb2cdad4d55629991628dd5d9f986d6242", + "metadataTypeId": 2, + "type": "struct nested_struct_args_abi::StructTwo" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "input1", - "type": 1, - "typeArguments": null + "concreteTypeId": "42ec906f917884c527853724049ec3e303d2de2916baa4aee461cb71433d0b22", + "name": "input1" }, { - "name": "input2", - "type": 2, - "typeArguments": null + "concreteTypeId": "13f26ca88e0921e7c728fb5763d18dfb2cdad4d55629991628dd5d9f986d6242", + "name": "input2" } ], "name": "foo", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "foo", - "type": 3, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct nested_struct_args_abi::Inner", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "struct nested_struct_args_abi::Inner" }, { "components": [ { "name": "inn", - "type": 0, - "typeArguments": null + "typeId": 0 } ], - "type": "struct nested_struct_args_abi::StructOne", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct nested_struct_args_abi::StructOne" }, { "components": [ { "name": "foo", - "type": 3, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct nested_struct_args_abi::StructTwo", - "typeId": 2, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct nested_struct_args_abi::StructTwo" } ] } \ No newline at end of file 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 5df1d2110b4..f8b0d6f1a18 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 @@ -1,6 +1,20 @@ { + "concreteTypes": [ + { + "concreteTypeId": "37c06f042972ba5bedfdee34c16f38ace7789cdc2a879df80724d91fb6268d03", + "metadataTypeId": 1, + "type": "enum std::option::Option", + "typeArguments": [ + "37837f87e64f16ec63ac8568b452352098ff2a330df38aa21a9d794dfe33e7cc" + ] + }, + { + "concreteTypeId": "37837f87e64f16ec63ac8568b452352098ff2a330df38aa21a9d794dfe33e7cc", + "type": "struct data_structures::MyStruct" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -13,58 +27,38 @@ ], "inputs": [], "name": "test_function", - "output": { - "name": "", - "type": 1, - "typeArguments": [ - { - "name": "", - "type": 3, - "typeArguments": null - } - ] - } + "output": "37c06f042972ba5bedfdee34c16f38ace7789cdc2a879df80724d91fb6268d03" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null + "metadataTypeId": 0, + "type": "()" }, { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": 0 }, { "name": "Some", - "type": 2, - "typeArguments": null + "typeId": 2 } ], + "metadataTypeId": 1, "type": "enum std::option::Option", - "typeId": 1, "typeParameters": [ 2 ] }, { - "components": null, - "type": "generic T", - "typeId": 2, - "typeParameters": null - }, - { - "components": [], - "type": "struct data_structures::MyStruct", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 2, + "type": "generic T" } ] } \ No newline at end of file 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 90c5fa2590e..11f306577a5 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 @@ -1,6 +1,55 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "type": "bool" + }, + { + "concreteTypeId": "35b24140807b67d1f1675de36775d5d6c62b04f3721f616a9adee739e24c9c15", + "metadataTypeId": 0, + "type": "enum storage_access_abi::E" + }, + { + "concreteTypeId": "893a66eb2f595d7e0cc15e2253da1b6e53fd634ad542b2f1a198a8ae3d8d92b2", + "type": "str[40]" + }, + { + "concreteTypeId": "427fd62288add8763eb5e0c4facf553d877489a3038b29a8a1045e9a853660f0", + "metadataTypeId": 1, + "type": "struct storage_access_abi::S" + }, + { + "concreteTypeId": "74df8abb4a65a07ec7420c0f167703fc6e26c9e43b8036ffacb89d399f13db73", + "metadataTypeId": 2, + "type": "struct storage_access_abi::T" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -13,11 +62,7 @@ ], "inputs": [], "name": "get_boolean", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "attributes": [ @@ -30,11 +75,7 @@ ], "inputs": [], "name": "get_e", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "35b24140807b67d1f1675de36775d5d6c62b04f3721f616a9adee739e24c9c15" }, { "attributes": [ @@ -47,11 +88,7 @@ ], "inputs": [], "name": "get_e2", - "output": { - "name": "", - "type": 3, - "typeArguments": null - } + "output": "35b24140807b67d1f1675de36775d5d6c62b04f3721f616a9adee739e24c9c15" }, { "attributes": [ @@ -64,11 +101,7 @@ ], "inputs": [], "name": "get_int16", - "output": { - "name": "", - "type": 7, - "typeArguments": null - } + "output": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef" }, { "attributes": [ @@ -81,11 +114,7 @@ ], "inputs": [], "name": "get_int32", - "output": { - "name": "", - "type": 8, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" }, { "attributes": [ @@ -98,11 +127,7 @@ ], "inputs": [], "name": "get_int8", - "output": { - "name": "", - "type": 10, - "typeArguments": null - } + "output": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" }, { "attributes": [ @@ -115,11 +140,7 @@ ], "inputs": [], "name": "get_s", - "output": { - "name": "", - "type": 5, - "typeArguments": null - } + "output": "427fd62288add8763eb5e0c4facf553d877489a3038b29a8a1045e9a853660f0" }, { "attributes": [ @@ -132,11 +153,7 @@ ], "inputs": [], "name": "get_s_dot_t", - "output": { - "name": "", - "type": 6, - "typeArguments": null - } + "output": "74df8abb4a65a07ec7420c0f167703fc6e26c9e43b8036ffacb89d399f13db73" }, { "attributes": [ @@ -149,11 +166,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_boolean", - "output": { - "name": "", - "type": 2, - "typeArguments": null - } + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "attributes": [ @@ -166,11 +179,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_int16", - "output": { - "name": "", - "type": 7, - "typeArguments": null - } + "output": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef" }, { "attributes": [ @@ -183,11 +192,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_int32", - "output": { - "name": "", - "type": 8, - "typeArguments": null - } + "output": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" }, { "attributes": [ @@ -200,11 +205,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_int8", - "output": { - "name": "", - "type": 10, - "typeArguments": null - } + "output": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" }, { "attributes": [ @@ -217,11 +218,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_x", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -234,11 +231,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_y", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -251,11 +244,7 @@ ], "inputs": [], "name": "get_s_dot_t_dot_z", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "attributes": [ @@ -268,11 +257,7 @@ ], "inputs": [], "name": "get_s_dot_x", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -285,11 +270,7 @@ ], "inputs": [], "name": "get_s_dot_y", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -302,11 +283,7 @@ ], "inputs": [], "name": "get_s_dot_z", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "attributes": [ @@ -319,11 +296,7 @@ ], "inputs": [], "name": "get_string", - "output": { - "name": "", - "type": 4, - "typeArguments": null - } + "output": "893a66eb2f595d7e0cc15e2253da1b6e53fd634ad542b2f1a198a8ae3d8d92b2" }, { "attributes": [ @@ -336,11 +309,7 @@ ], "inputs": [], "name": "get_x", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -353,11 +322,7 @@ ], "inputs": [], "name": "get_y", - "output": { - "name": "", - "type": 1, - "typeArguments": null - } + "output": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "attributes": [ @@ -370,17 +335,12 @@ ], "inputs": [ { - "name": "boolean", - "type": 2, - "typeArguments": null + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "name": "boolean" } ], "name": "set_boolean", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -393,17 +353,12 @@ ], "inputs": [ { - "name": "e", - "type": 3, - "typeArguments": null + "concreteTypeId": "35b24140807b67d1f1675de36775d5d6c62b04f3721f616a9adee739e24c9c15", + "name": "e" } ], "name": "set_e", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -416,17 +371,12 @@ ], "inputs": [ { - "name": "int16", - "type": 7, - "typeArguments": null + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "name": "int16" } ], "name": "set_int16", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -439,17 +389,12 @@ ], "inputs": [ { - "name": "int32", - "type": 8, - "typeArguments": null + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "name": "int32" } ], "name": "set_int32", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -462,17 +407,12 @@ ], "inputs": [ { - "name": "int8", - "type": 10, - "typeArguments": null + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "name": "int8" } ], "name": "set_int8", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -485,17 +425,12 @@ ], "inputs": [ { - "name": "s", - "type": 5, - "typeArguments": null + "concreteTypeId": "427fd62288add8763eb5e0c4facf553d877489a3038b29a8a1045e9a853660f0", + "name": "s" } ], "name": "set_s", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -508,17 +443,12 @@ ], "inputs": [ { - "name": "t", - "type": 6, - "typeArguments": null + "concreteTypeId": "74df8abb4a65a07ec7420c0f167703fc6e26c9e43b8036ffacb89d399f13db73", + "name": "t" } ], "name": "set_s_dot_t", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -531,17 +461,12 @@ ], "inputs": [ { - "name": "boolean", - "type": 2, - "typeArguments": null + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "name": "boolean" } ], "name": "set_s_dot_t_dot_boolean", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -554,17 +479,12 @@ ], "inputs": [ { - "name": "int16", - "type": 7, - "typeArguments": null + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "name": "int16" } ], "name": "set_s_dot_t_dot_int16", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -577,17 +497,12 @@ ], "inputs": [ { - "name": "int32", - "type": 8, - "typeArguments": null + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "name": "int32" } ], "name": "set_s_dot_t_dot_int32", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -600,17 +515,12 @@ ], "inputs": [ { - "name": "int8", - "type": 10, - "typeArguments": null + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "name": "int8" } ], "name": "set_s_dot_t_dot_int8", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -623,17 +533,12 @@ ], "inputs": [ { - "name": "x", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "x" } ], "name": "set_s_dot_t_dot_x", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -646,17 +551,12 @@ ], "inputs": [ { - "name": "y", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "y" } ], "name": "set_s_dot_t_dot_y", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -669,17 +569,12 @@ ], "inputs": [ { - "name": "z", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "z" } ], "name": "set_s_dot_t_dot_z", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -692,17 +587,12 @@ ], "inputs": [ { - "name": "x", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "x" } ], "name": "set_s_dot_x", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -715,17 +605,12 @@ ], "inputs": [ { - "name": "y", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "y" } ], "name": "set_s_dot_y", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -738,17 +623,12 @@ ], "inputs": [ { - "name": "z", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "z" } ], "name": "set_s_dot_z", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -761,17 +641,12 @@ ], "inputs": [ { - "name": "string", - "type": 4, - "typeArguments": null + "concreteTypeId": "893a66eb2f595d7e0cc15e2253da1b6e53fd634ad542b2f1a198a8ae3d8d92b2", + "name": "string" } ], "name": "set_string", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -784,17 +659,12 @@ ], "inputs": [ { - "name": "x", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "x" } ], "name": "set_x", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -807,164 +677,93 @@ ], "inputs": [ { - "name": "y", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "y" } ], "name": "set_y", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "13213829929622723620", - "loggedType": { - "name": "", - "type": 2, - "typeArguments": null - } + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "logId": "13213829929622723620" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null - }, - { - "components": null, - "type": "bool", - "typeId": 2, - "typeParameters": null - }, + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "A", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "B", - "type": 6, - "typeArguments": null + "typeId": 2 } ], - "type": "enum storage_access_abi::E", - "typeId": 3, - "typeParameters": null - }, - { - "components": null, - "type": "str[40]", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 0, + "type": "enum storage_access_abi::E" }, { "components": [ { "name": "x", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "y", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "z", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "name": "t", - "type": 6, - "typeArguments": null + "typeId": 2 } ], - "type": "struct storage_access_abi::S", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct storage_access_abi::S" }, { "components": [ { "name": "x", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "y", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "z", - "type": 1, - "typeArguments": null + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" }, { "name": "boolean", - "type": 2, - "typeArguments": null + "typeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" }, { "name": "int8", - "type": 10, - "typeArguments": null + "typeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" }, { "name": "int16", - "type": 7, - "typeArguments": null + "typeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef" }, { "name": "int32", - "type": 8, - "typeArguments": null + "typeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc" } ], - "type": "struct storage_access_abi::T", - "typeId": 6, - "typeParameters": null - }, - { - "components": null, - "type": "u16", - "typeId": 7, - "typeParameters": null - }, - { - "components": null, - "type": "u32", - "typeId": 8, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 9, - "typeParameters": null - }, - { - "components": null, - "type": "u8", - "typeId": 10, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct storage_access_abi::T" } ] } \ No newline at end of file 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 5f87ffd5d9a..720dd728f3f 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 @@ -1,6 +1,12 @@ { + "concreteTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -14,21 +20,12 @@ ], "inputs": [], "name": "read_write_enums", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": null, - "type": "u64", - "typeId": 0, - "typeParameters": null - } - ] + "programType": "contract", + "specVersion": "1", + "typesMetadata": [] } \ No newline at end of file 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 8e817c80160..0f6f8c622f1 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 @@ -1,6 +1,45 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "type": "b256" + }, + { + "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", + "metadataTypeId": 0, + "type": "enum std::option::Option", + "typeArguments": [ + "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + ] + }, + { + "concreteTypeId": "6906df92e2e485dde893b7d719d621b8910422e7c468f99caa5920e6ac19d9c6", + "metadataTypeId": 3, + "type": "struct basic_storage_abi::Quad" + }, + { + "concreteTypeId": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff", + "metadataTypeId": 5, + "type": "struct std::vec::Vec", + "typeArguments": [ + "6906df92e2e485dde893b7d719d621b8910422e7c468f99caa5920e6ac19d9c6" + ] + }, + { + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "type": "u256" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": [ @@ -13,23 +52,12 @@ ], "inputs": [ { - "name": "storage_key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "storage_key" } ], "name": "get_u64", - "output": { - "name": "", - "type": 2, - "typeArguments": [ - { - "name": "", - "type": 9, - "typeArguments": null - } - ] - } + "output": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d" }, { "attributes": [ @@ -42,28 +70,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "slots", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "slots" } ], "name": "intrinsic_load_quad", - "output": { - "name": "", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 5, - "typeArguments": null - } - ] - } + "output": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff" }, { "attributes": [ @@ -76,17 +92,12 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" } ], "name": "intrinsic_load_word", - "output": { - "name": "", - "type": 9, - "typeArguments": null - } + "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "attributes": [ @@ -99,28 +110,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "values", - "type": 7, - "typeArguments": [ - { - "name": "", - "type": 5, - "typeArguments": null - } - ] + "concreteTypeId": "7880d311d30802b48bd6a100a31adb5af17f94bff12daee556d4f02c1ac5b2ff", + "name": "values" } ], "name": "intrinsic_store_quad", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -133,22 +132,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "value", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "value" } ], "name": "intrinsic_store_word", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -161,22 +154,16 @@ ], "inputs": [ { - "name": "key", - "type": 1, - "typeArguments": null + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "name": "key" }, { - "name": "value", - "type": 9, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "value" } ], "name": "store_u64", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": [ @@ -190,166 +177,113 @@ ], "inputs": [], "name": "test_storage_exhaustive", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [ { - "logId": "1515152261580153489", - "loggedType": { - "name": "", - "type": 9, - "typeArguments": null - } + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" }, { - "logId": "1970142151624111756", - "loggedType": { - "name": "", - "type": 8, - "typeArguments": null - } + "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", + "logId": "1970142151624111756" }, { - "logId": "8961848586872524460", - "loggedType": { - "name": "", - "type": 1, - "typeArguments": null - } + "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", + "logId": "8961848586872524460" } ], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, - { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null - }, + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "name": "Some", - "type": 3, - "typeArguments": null + "typeId": 1 } ], + "metadataTypeId": 0, "type": "enum std::option::Option", - "typeId": 2, "typeParameters": [ - 3 + 1 ] }, { - "components": null, - "type": "generic T", - "typeId": 3, - "typeParameters": null + "metadataTypeId": 1, + "type": "generic T" }, { - "components": null, - "type": "raw untyped ptr", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 2, + "type": "raw untyped ptr" }, { "components": [ { "name": "v1", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v2", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v3", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" }, { "name": "v4", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], - "type": "struct basic_storage_abi::Quad", - "typeId": 5, - "typeParameters": null + "metadataTypeId": 3, + "type": "struct basic_storage_abi::Quad" }, { "components": [ { "name": "ptr", - "type": 4, - "typeArguments": null + "typeId": 2 }, { "name": "cap", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 4, "type": "struct std::vec::RawVec", - "typeId": 6, "typeParameters": [ - 3 + 1 ] }, { "components": [ { "name": "buf", - "type": 6, "typeArguments": [ { "name": "", - "type": 3, - "typeArguments": null + "typeId": 1 } - ] + ], + "typeId": 4 }, { "name": "len", - "type": 9, - "typeArguments": null + "typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" } ], + "metadataTypeId": 5, "type": "struct std::vec::Vec", - "typeId": 7, "typeParameters": [ - 3 + 1 ] - }, - { - "components": null, - "type": "u256", - "typeId": 8, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 9, - "typeParameters": null } ] } \ No newline at end of file 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 2f17decfa67..7c82826b9ad 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 @@ -1,110 +1,97 @@ { + "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, + { + "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", + "metadataTypeId": 1, + "type": "struct std::asset_id::AssetId" + }, + { + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "metadataTypeId": 2, + "type": "struct std::contract_id::ContractId" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + } + ], "configurables": [], - "encoding": "1", + "encodingVersion": "1", "functions": [ { "attributes": null, "inputs": [ { - "name": "burn_amount", - "type": 4, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "burn_amount" } ], "name": "burn", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [ { - "name": "coins", - "type": 4, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "coins" }, { - "name": "asset_id", - "type": 2, - "typeArguments": null + "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", + "name": "asset_id" }, { - "name": "c_id", - "type": 3, - "typeArguments": null + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "name": "c_id" } ], "name": "force_transfer", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "attributes": null, "inputs": [ { - "name": "mint_amount", - "type": 4, - "typeArguments": null + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "name": "mint_amount" } ], "name": "mint", - "output": { - "name": "", - "type": 0, - "typeArguments": null - } + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } ], "loggedTypes": [], "messagesTypes": [], - "types": [ - { - "components": [], - "type": "()", - "typeId": 0, - "typeParameters": null - }, + "programType": "contract", + "specVersion": "1", + "typesMetadata": [ { - "components": null, - "type": "b256", - "typeId": 1, - "typeParameters": null + "metadataTypeId": 0, + "type": "b256" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::asset_id::AssetId", - "typeId": 2, - "typeParameters": null + "metadataTypeId": 1, + "type": "struct std::asset_id::AssetId" }, { "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": 0 } ], - "type": "struct std::contract_id::ContractId", - "typeId": 3, - "typeParameters": null - }, - { - "components": null, - "type": "u64", - "typeId": 4, - "typeParameters": null + "metadataTypeId": 2, + "type": "struct std::contract_id::ContractId" } ] } \ No newline at end of file From 49b81964a69037fee6f6d9d88eb694a4a3d5a93b Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 22 Jul 2024 15:59:27 +0100 Subject: [PATCH 20/47] Updates hardcoded JSON ABI. --- forc-plugins/forc-client/src/op/run/encode.rs | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/forc-plugins/forc-client/src/op/run/encode.rs b/forc-plugins/forc-client/src/op/run/encode.rs index c1f36524591..3849635226f 100644 --- a/forc-plugins/forc-client/src/op/run/encode.rs +++ b/forc-plugins/forc-client/src/op/run/encode.rs @@ -62,14 +62,17 @@ impl ScriptCallHandler { mod tests { use super::{ScriptCallHandler, Type}; + const TEST_JSON_ABI: &str = r#"{"concreteTypes":[{"concreteTypeId":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type":"()"},{"concreteTypeId":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903","type":"bool"}, + {"concreteTypeId":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b","type":"u8"}], + "functions":[{"inputs":[{"name":"test_u8","type":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"}, + {"name":"test_bool","type":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903"}],"name":"main", + "output":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"}],"loggedTypes":[], + "messagesTypes":[],"configurables":[]}"#; + #[test] fn test_script_call_handler_generation_success() { - let test_json_abi = r#"{"types":[{"typeId":0,"type":"()","components":[],"typeParameters":null}, -{"typeId":1,"type":"bool","components":null,"typeParameters":null},{"typeId":2,"type":"u8","components":null, -"typeParameters":null}],"functions":[{"inputs":[{"name":"test_u8","type":2,"typeArguments":null},{"name":"test_bool", -"type":1,"typeArguments":null}],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}], -"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#; - let generated_call_handler = ScriptCallHandler::from_json_abi_str(test_json_abi).unwrap(); + let generated_call_handler = ScriptCallHandler::from_json_abi_str(TEST_JSON_ABI).unwrap(); let expected_call_handler = ScriptCallHandler { main_arg_types: vec![Type::U8, Type::Bool], @@ -88,12 +91,7 @@ mod tests { #[test] fn test_main_encoding_success() { - let test_json_abi = r#"{"types":[{"typeId":0,"type":"()","components":[],"typeParameters":null}, -{"typeId":1,"type":"bool","components":null,"typeParameters":null},{"typeId":2,"type":"u8","components":null, -"typeParameters":null}],"functions":[{"inputs":[{"name":"test_u8","type":2,"typeArguments":null},{"name":"test_bool", -"type":1,"typeArguments":null}],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}], -"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#; - let call_handler = ScriptCallHandler::from_json_abi_str(test_json_abi).unwrap(); + let call_handler = ScriptCallHandler::from_json_abi_str(TEST_JSON_ABI).unwrap(); let values = ["2", "true"]; let encoded_bytes = call_handler.encode_arguments(&values).unwrap(); @@ -104,12 +102,7 @@ mod tests { #[test] #[should_panic] fn test_main_encoding_fail_arg_type_mismatch() { - let test_json_abi = r#"{"types":[{"typeId":0,"type":"()","components":[],"typeParameters":null}, -{"typeId":1,"type":"bool","components":null,"typeParameters":null},{"typeId":2,"type":"u8","components":null, -"typeParameters":null}],"functions":[{"inputs":[{"name":"test_u8","type":2,"typeArguments":null},{"name":"test_bool", -"type":1,"typeArguments":null}],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}], -"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#; - let call_handler = ScriptCallHandler::from_json_abi_str(test_json_abi).unwrap(); + let call_handler = ScriptCallHandler::from_json_abi_str(TEST_JSON_ABI).unwrap(); // The abi describes the following main function: // - fn main(test_u8: u8, test_bool: bool) // Providing a bool to u8 field should return an error. @@ -120,12 +113,7 @@ mod tests { #[test] #[should_panic(expected = "main function takes 2 arguments, 1 provided")] fn test_main_encoding_fail_arg_count_mismatch() { - let test_json_abi = r#"{"types":[{"typeId":0,"type":"()","components":[],"typeParameters":null}, -{"typeId":1,"type":"bool","components":null,"typeParameters":null},{"typeId":2,"type":"u8","components":null, -"typeParameters":null}],"functions":[{"inputs":[{"name":"test_u8","type":2,"typeArguments":null},{"name":"test_bool", -"type":1,"typeArguments":null}],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}], -"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#; - let call_handler = ScriptCallHandler::from_json_abi_str(test_json_abi).unwrap(); + let call_handler = ScriptCallHandler::from_json_abi_str(TEST_JSON_ABI).unwrap(); // The abi describes the following main function: // - fn main(test_u8: u8, test_bool: bool) // Providing only 1 value should return an error as function requires 2 args. From 2c90f01a998712caf6f3d633a41a44c8d89e7821 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 22 Jul 2024 16:13:01 +0100 Subject: [PATCH 21/47] Updates usage of module name. --- sway-core/src/abi_generation/fuel_abi.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 599324f0fba..591b9d023f6 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -51,7 +51,7 @@ impl TypeId { .root .namespace .program_id(engines) - .read(engines, |m| m.name.clone().map(|v| v.as_str().to_string())), + .read(engines, |m| m.name().clone().as_str().to_string()), abi_with_callpaths: true, abi_with_fully_specified_types: true, abi_root_type_without_generic_type_parameters: false, From 9c41ee505fa578651a5ed3a35121c7f567ec5e65 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 22 Jul 2024 16:18:44 +0100 Subject: [PATCH 22/47] Fixes cargo clippy. --- forc-pkg/src/pkg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 7f1b28522c4..6e66f94b3e4 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -2471,7 +2471,7 @@ pub fn build( } }; - let mut compiled = compile( + let compiled = compile( &descriptor, &profile, &engines, From 9d7d1de7b647636b5604c68aee1f960a86aac99d Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Mon, 22 Jul 2024 16:39:40 +0100 Subject: [PATCH 23/47] Fixes hardcoded JSON ABI. --- forc-plugins/forc-client/src/op/run/encode.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forc-plugins/forc-client/src/op/run/encode.rs b/forc-plugins/forc-client/src/op/run/encode.rs index 3849635226f..9fe7979c7e4 100644 --- a/forc-plugins/forc-client/src/op/run/encode.rs +++ b/forc-plugins/forc-client/src/op/run/encode.rs @@ -65,8 +65,8 @@ mod tests { const TEST_JSON_ABI: &str = r#"{"concreteTypes":[{"concreteTypeId":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", "type":"()"},{"concreteTypeId":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903","type":"bool"}, {"concreteTypeId":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b","type":"u8"}], - "functions":[{"inputs":[{"name":"test_u8","type":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"}, - {"name":"test_bool","type":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903"}],"name":"main", + "functions":[{"inputs":[{"name":"test_u8","concreteTypeId":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"}, + {"name":"test_bool","concreteTypeId":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903"}],"name":"main", "output":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"}],"loggedTypes":[], "messagesTypes":[],"configurables":[]}"#; From 82d79b3465cae4e38900feb517113a691a1a89f8 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 23 Jul 2024 09:18:51 +0100 Subject: [PATCH 24/47] Renames typesMetadata to metadataTypes. --- Cargo.lock | 51 ++-- .../standalone_contract-abi.json | 2 +- sway-core/src/abi_generation/fuel_abi.rs | 224 +++++++++--------- sway-core/src/language/ty/ast_node.rs | 10 +- .../language/ty/declaration/declaration.rs | 12 +- .../src/language/ty/declaration/function.rs | 10 +- .../src/language/ty/expression/expression.rs | 70 +++--- .../ty/expression/intrinsic_function.rs | 14 +- sway-core/src/language/ty/program.rs | 12 +- sway-core/src/lib.rs | 59 ++--- .../ast_elements/trait_constraint.rs | 4 +- sway-core/src/type_system/id.rs | 2 +- ..._metadata.rs => collect_metadata_types.rs} | 2 +- sway-core/src/types/mod.rs | 4 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../logging/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../ops/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../aliases/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../size_of/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../smo/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../ge_test/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../option/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../raw_ptr/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../require/json_abi_oracle_new_encoding.json | 2 +- .../result/json_abi_oracle_new_encoding.json | 2 +- .../sha256/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../vec/json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- .../json_abi_oracle_new_encoding.json | 2 +- 252 files changed, 479 insertions(+), 473 deletions(-) rename sway-core/src/types/{collect_types_metadata.rs => collect_metadata_types.rs} (99%) diff --git a/Cargo.lock b/Cargo.lock index 118e93f9b22..778ce29b4be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2020,7 +2020,7 @@ dependencies = [ "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", "fuel-core-client", "fuel-core-types", "fuel-crypto", @@ -2159,7 +2159,7 @@ dependencies = [ "cid", "forc-tracing 0.62.0", "forc-util", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", "futures", "git2", "gix-url", @@ -2192,7 +2192,7 @@ version = "0.62.0" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", "fuel-tx", "fuel-vm", "fuels-core", @@ -2332,7 +2332,24 @@ dependencies = [ [[package]] name = "fuel-abi-types" version = "0.6.0" -source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#25010513ad66c01b03a22474ae6ff1bd3ee04614" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb98391d7df3963bc3f30d3c8bfce301573a115fa92a35bed55e4c94b836be2" +dependencies = [ + "itertools 0.10.5", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "serde", + "serde_json", + "syn 2.0.71", + "thiserror", +] + +[[package]] +name = "fuel-abi-types" +version = "0.6.0" +source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#ec2182cfcc66908041d7305511dbc6d4ee3d9e8a" dependencies = [ "itertools 0.10.5", "lazy_static", @@ -2660,7 +2677,7 @@ dependencies = [ [[package]] name = "fuels" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2675,7 +2692,7 @@ dependencies = [ [[package]] name = "fuels-accounts" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "async-trait", "chrono", @@ -2699,10 +2716,10 @@ dependencies = [ [[package]] name = "fuels-code-gen" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "Inflector", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.12.1", "proc-macro2", "quote", @@ -2714,12 +2731,12 @@ dependencies = [ [[package]] name = "fuels-core" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fuel-asm", "fuel-core-chain-config", "fuel-core-client", @@ -2741,7 +2758,7 @@ dependencies = [ [[package]] name = "fuels-macros" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2753,10 +2770,10 @@ dependencies = [ [[package]] name = "fuels-programs" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "async-trait", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fuel-asm", "fuel-tx", "fuel-types", @@ -2771,7 +2788,7 @@ dependencies = [ [[package]] name = "fuels-test-helpers" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "fuel-core-chain-config", "fuel-core-client", @@ -4503,7 +4520,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 2.0.71", @@ -6562,7 +6579,7 @@ dependencies = [ "derivative", "dirs 3.0.2", "either", - "fuel-abi-types", + "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", @@ -7520,7 +7537,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "static_assertions", ] diff --git a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json index 06288f6470b..b2ca88cc80b 100644 --- a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json +++ b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ 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 591b9d023f6..0f641830dc9 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -92,7 +92,7 @@ pub fn generate_program_abi( spec_version: program_abi::Version, ) -> Result { let decl_engine = engines.de(); - let types_metadata: &mut Vec = &mut vec![]; + let metadata_types: &mut Vec = &mut vec![]; let concrete_types: &mut Vec = &mut vec![]; let mut program_abi = match &ctx.program.kind { TyProgramKind::Contract { abi_entries, .. } => { @@ -104,22 +104,22 @@ pub fn generate_program_abi( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, ) }) .collect::, _>>()?; let logged_types = - generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_logged_types(handler, ctx, engines, metadata_types, concrete_types)?; let messages_types = - generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?; let configurables = - generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; + generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?; program_abi::ProgramABI { program_type: "contract".to_string(), spec_version, encoding_version, - types_metadata: types_metadata.to_vec(), + metadata_types: metadata_types.to_vec(), concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), @@ -133,20 +133,20 @@ pub fn generate_program_abi( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, )?]; let logged_types = - generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_logged_types(handler, ctx, engines, metadata_types, concrete_types)?; let messages_types = - generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?; let configurables = - generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; + generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?; program_abi::ProgramABI { program_type: "script".to_string(), spec_version, encoding_version, - types_metadata: types_metadata.to_vec(), + metadata_types: metadata_types.to_vec(), concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), @@ -160,20 +160,20 @@ pub fn generate_program_abi( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, )?]; let logged_types = - generate_logged_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_logged_types(handler, ctx, engines, metadata_types, concrete_types)?; let messages_types = - generate_messages_types(handler, ctx, engines, types_metadata, concrete_types)?; + generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?; let configurables = - generate_configurables(handler, ctx, engines, types_metadata, concrete_types)?; + generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?; program_abi::ProgramABI { program_type: "predicate".to_string(), spec_version, encoding_version, - types_metadata: types_metadata.to_vec(), + metadata_types: metadata_types.to_vec(), concrete_types: concrete_types.to_vec(), functions, logged_types: Some(logged_types), @@ -185,7 +185,7 @@ pub fn generate_program_abi( program_type: "library".to_string(), spec_version, encoding_version, - types_metadata: vec![], + metadata_types: vec![], concrete_types: vec![], functions: vec![], logged_types: None, @@ -217,7 +217,7 @@ fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { // Insert values in `deduped_types` if they haven't been inserted before. Otherwise, create // an appropriate mapping between type IDs in the HashMap `old_to_new_id`. - for decl in &json_abi_program.types_metadata { + for decl in &json_abi_program.metadata_types { // First replace metadata_type_id with concrete_type_id when possible if let Some(ty) = json_abi_program.concrete_types.iter().find(|d| { d.type_field == decl.type_field @@ -251,7 +251,7 @@ fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { break; } - json_abi_program.types_metadata = deduped_types; + json_abi_program.metadata_types = deduped_types; update_all_types(json_abi_program, &old_to_new_id); } @@ -266,7 +266,7 @@ fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { // Sort the `program_abi::TypeMetadataDeclaration`s json_abi_program - .types_metadata + .metadata_types .sort_by(|t1, t2| t1.type_field.cmp(&t2.type_field)); // Sort the `program_abi::TypeConcreteDeclaration`s @@ -276,7 +276,7 @@ fn standardize_json_abi_types(json_abi_program: &mut program_abi::ProgramABI) { // Standardize IDs (i.e. change them to 0,1,2,... according to the alphabetical order above let mut old_to_new_id: HashMap = HashMap::new(); - for (ix, decl) in json_abi_program.types_metadata.iter_mut().enumerate() { + for (ix, decl) in json_abi_program.metadata_types.iter_mut().enumerate() { old_to_new_id.insert( decl.metadata_type_id.clone(), program_abi::TypeId::Metadata(MetadataTypeId(ix)), @@ -293,7 +293,7 @@ fn update_all_types( old_to_new_id: &HashMap, ) { // Update all `program_abi::TypeMetadataDeclaration` - for decl in &mut json_abi_program.types_metadata { + for decl in &mut json_abi_program.metadata_types { update_json_type_metadata_declaration(decl, old_to_new_id); } @@ -366,12 +366,12 @@ fn generate_concrete_type_declaration( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, type_id: TypeId, resolved_type_id: TypeId, ) -> Result { - let mut new_types_metadata_to_add = Vec::::new(); + let mut new_metadata_types_to_add = Vec::::new(); let type_metadata_decl = program_abi::TypeMetadataDeclaration { metadata_type_id: MetadataTypeId(type_id.index()), type_field: type_id.get_abi_type_str( @@ -383,19 +383,19 @@ fn generate_concrete_type_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, type_parameters: type_id.get_abi_type_parameters( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, }; @@ -411,7 +411,7 @@ fn generate_concrete_type_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, )? @@ -419,8 +419,8 @@ fn generate_concrete_type_declaration( None }; - types_metadata.push(type_metadata_decl); - types_metadata.extend(new_types_metadata_to_add); + metadata_types.push(type_metadata_decl); + metadata_types.extend(new_metadata_types_to_add); let (type_field, concrete_type_id) = type_id.get_abi_type_field_and_concrete_id(handler, ctx, engines, resolved_type_id)?; @@ -441,30 +441,30 @@ fn generate_type_metadata_declaration( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, type_id: TypeId, resolved_type_id: TypeId, - types_metadata_to_add: &mut Vec, + metadata_types_to_add: &mut Vec, ) -> Result<(), ErrorEmitted> { - let mut new_types_metadata_to_add = Vec::::new(); + let mut new_metadata_types_to_add = Vec::::new(); let components = type_id.get_abi_type_components( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; let type_parameters = type_id.get_abi_type_parameters( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; let type_metadata_decl = program_abi::TypeMetadataDeclaration { metadata_type_id: MetadataTypeId(type_id.index()), @@ -477,8 +477,8 @@ fn generate_type_metadata_declaration( type_parameters, }; - types_metadata_to_add.push(type_metadata_decl.clone()); - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.push(type_metadata_decl.clone()); + metadata_types_to_add.extend(new_metadata_types_to_add); Ok(()) } @@ -487,7 +487,7 @@ fn generate_logged_types( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, ) -> Result, ErrorEmitted> { // Generate the JSON data for the logged types @@ -508,7 +508,7 @@ fn generate_logged_types( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, *type_id, *type_id, @@ -526,7 +526,7 @@ fn generate_messages_types( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, ) -> Result, ErrorEmitted> { // Generate the JSON data for the messages types @@ -540,7 +540,7 @@ fn generate_messages_types( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, *type_id, *type_id, @@ -554,7 +554,7 @@ fn generate_configurables( handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, ) -> Result, ErrorEmitted> { // Generate the JSON data for the configurables types @@ -568,7 +568,7 @@ fn generate_configurables( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, decl.type_ascription.type_id, decl.type_ascription.type_id, @@ -591,10 +591,10 @@ impl TypeId { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, - types_metadata_to_add: &mut Vec, + metadata_types_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { match self.is_generic_parameter(engines, resolved_type_id) { true => Ok(None), @@ -607,9 +607,9 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, - types_metadata_to_add, + metadata_types_to_add, ) }) .collect::, _>>() @@ -628,10 +628,10 @@ impl TypeId { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, - types_metadata_to_add: &mut Vec, + metadata_types_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); @@ -639,18 +639,18 @@ impl TypeId { TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); - let mut new_types_metadata_to_add = + let mut new_metadata_types_to_add = Vec::::new(); for x in decl.variants.iter() { generate_type_metadata_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_argument.initial_type_id, x.type_argument.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; } @@ -672,10 +672,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_argument.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, }) }) @@ -684,25 +684,25 @@ impl TypeId { if components.is_empty() { None } else { - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.extend(new_metadata_types_to_add); Some(components) } } TypeInfo::Struct(decl_ref) => { let decl = decl_engine.get_struct(decl_ref); - let mut new_types_metadata_to_add = + let mut new_metadata_types_to_add = Vec::::new(); for x in decl.fields.iter() { generate_type_metadata_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_argument.initial_type_id, x.type_argument.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; } @@ -724,10 +724,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_argument.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, }) }) @@ -736,7 +736,7 @@ impl TypeId { if components.is_empty() { None } else { - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.extend(new_metadata_types_to_add); Some(components) } } @@ -746,11 +746,11 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, elem_ty.initial_type_id, elem_ty.type_id, - types_metadata_to_add, + metadata_types_to_add, )?; // Generate the JSON data for the array. This is basically a single @@ -764,10 +764,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, elem_ty.type_id, - types_metadata_to_add, + metadata_types_to_add, )?, }]) } else { @@ -817,18 +817,18 @@ impl TypeId { } TypeInfo::Tuple(_) => { if let TypeInfo::Tuple(fields) = &*type_engine.get(resolved_type_id) { - let mut new_types_metadata_to_add = + let mut new_metadata_types_to_add = Vec::::new(); for x in fields.iter() { generate_type_metadata_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.initial_type_id, x.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; } @@ -846,10 +846,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_id, - types_metadata_to_add, + metadata_types_to_add, )?, }) }) @@ -857,7 +857,7 @@ impl TypeId { if components.is_empty() { None } else { - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.extend(new_metadata_types_to_add); Some(components) } } else { @@ -876,21 +876,21 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, v.initial_type_id, p.type_id, - types_metadata_to_add, + metadata_types_to_add, )?; } resolved_type_id.get_abi_type_components( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - types_metadata_to_add, + metadata_types_to_add, )? } else { None @@ -902,10 +902,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, ty.type_id, - types_metadata_to_add, + metadata_types_to_add, )? } else { None @@ -920,10 +920,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, resolved_type_id, - types_metadata_to_add, + metadata_types_to_add, )? } } @@ -941,10 +941,10 @@ impl TypeId { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, - types_metadata_to_add: &mut Vec, + metadata_types_to_add: &mut Vec, ) -> Result>, ErrorEmitted> { let type_engine = engines.te(); let decl_engine = engines.de(); @@ -961,11 +961,11 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, v.type_id, p.type_id, - types_metadata_to_add, + metadata_types_to_add, )?; } @@ -982,10 +982,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, p.type_id, - types_metadata_to_add, + metadata_types_to_add, )?, }) }) @@ -994,18 +994,18 @@ impl TypeId { TypeInfo::Enum(decl_ref) => { let decl = decl_engine.get_enum(decl_ref); - let mut new_types_metadata_to_add = + let mut new_metadata_types_to_add = Vec::::new(); for v in decl.type_parameters.iter() { generate_type_metadata_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, v.type_id, v.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; } @@ -1022,10 +1022,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, arg.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, }) }) @@ -1034,7 +1034,7 @@ impl TypeId { if type_arguments.is_empty() { None } else { - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.extend(new_metadata_types_to_add); Some(type_arguments) } } @@ -1042,18 +1042,18 @@ impl TypeId { TypeInfo::Struct(decl_ref) => { let decl = decl_engine.get_struct(decl_ref); - let mut new_types_metadata_to_add = + let mut new_metadata_types_to_add = Vec::::new(); for v in decl.type_parameters.iter() { generate_type_metadata_declaration( handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, v.type_id, v.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?; } @@ -1070,10 +1070,10 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, arg.type_id, - &mut new_types_metadata_to_add, + &mut new_metadata_types_to_add, )?, }) }) @@ -1082,7 +1082,7 @@ impl TypeId { if type_arguments.is_empty() { None } else { - types_metadata_to_add.extend(new_types_metadata_to_add); + metadata_types_to_add.extend(new_metadata_types_to_add); Some(type_arguments) } } @@ -1099,7 +1099,7 @@ impl TypeId { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, resolved_type_id: TypeId, ) -> Result>, ErrorEmitted> { @@ -1120,7 +1120,7 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, arg.initial_type_id, p.type_id, @@ -1138,7 +1138,7 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, arg.type_id, arg.type_id, @@ -1157,7 +1157,7 @@ impl TypeId { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, arg.type_id, arg.type_id, @@ -1177,7 +1177,7 @@ impl TyFunctionDecl { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, ) -> Result { // Generate the JSON data for the function @@ -1193,7 +1193,7 @@ impl TyFunctionDecl { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, x.type_argument.initial_type_id, x.type_argument.type_id, @@ -1205,7 +1205,7 @@ impl TyFunctionDecl { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, self.return_type.initial_type_id, self.return_type.type_id, @@ -1241,9 +1241,9 @@ impl TypeParameter { handler: &Handler, ctx: &mut AbiContext, engines: &Engines, - types_metadata: &mut Vec, + metadata_types: &mut Vec, concrete_types: &mut Vec, - types_metadata_to_add: &mut Vec, + metadata_types_to_add: &mut Vec, ) -> Result { let type_id = MetadataTypeId(self.initial_type_id.index()); let type_parameter = program_abi::TypeMetadataDeclaration { @@ -1257,14 +1257,14 @@ impl TypeParameter { handler, ctx, engines, - types_metadata, + metadata_types, concrete_types, self.type_id, - types_metadata_to_add, + metadata_types_to_add, )?, type_parameters: None, }; - types_metadata_to_add.push(type_parameter); + metadata_types_to_add.push(type_parameter); Ok(type_id) } } diff --git a/sway-core/src/language/ty/ast_node.rs b/sway-core/src/language/ty/ast_node.rs index f988836d757..09bfe0f0b4f 100644 --- a/sway-core/src/language/ty/ast_node.rs +++ b/sway-core/src/language/ty/ast_node.rs @@ -125,12 +125,12 @@ impl TypeCheckFinalization for TyAstNode { } impl CollectTypesMetadata for TyAstNode { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { - self.content.collect_types_metadata(handler, ctx) + self.content.collect_metadata_types(handler, ctx) } } @@ -409,15 +409,15 @@ impl TypeCheckFinalization for TyAstNodeContent { } impl CollectTypesMetadata for TyAstNodeContent { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { use TyAstNodeContent::*; match self { - Declaration(decl) => decl.collect_types_metadata(handler, ctx), - Expression(expr) => expr.collect_types_metadata(handler, ctx), + Declaration(decl) => decl.collect_metadata_types(handler, ctx), + Expression(expr) => expr.collect_metadata_types(handler, ctx), SideEffect(_) => Ok(vec![]), Error(_, _) => Ok(vec![]), } diff --git a/sway-core/src/language/ty/declaration/declaration.rs b/sway-core/src/language/ty/declaration/declaration.rs index 61363124c11..4e711fa619c 100644 --- a/sway-core/src/language/ty/declaration/declaration.rs +++ b/sway-core/src/language/ty/declaration/declaration.rs @@ -396,7 +396,7 @@ impl DebugWithEngines for TyDecl { impl CollectTypesMetadata for TyDecl { // this is only run on entry nodes, which must have all well-formed types - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -404,24 +404,24 @@ impl CollectTypesMetadata for TyDecl { let decl_engine = ctx.engines.de(); let metadata = match self { TyDecl::VariableDecl(decl) => { - let mut body = decl.body.collect_types_metadata(handler, ctx)?; + let mut body = decl.body.collect_metadata_types(handler, ctx)?; body.append( &mut decl .type_ascription .type_id - .collect_types_metadata(handler, ctx)?, + .collect_metadata_types(handler, ctx)?, ); body } TyDecl::FunctionDecl(FunctionDecl { decl_id, .. }) => { let decl = decl_engine.get_function(decl_id); - decl.collect_types_metadata(handler, ctx)? + decl.collect_metadata_types(handler, ctx)? } TyDecl::ConstantDecl(ConstantDecl { decl_id, .. }) => { let decl = decl_engine.get_constant(decl_id); let TyConstantDecl { value, .. } = &*decl; if let Some(value) = value { - value.collect_types_metadata(handler, ctx)? + value.collect_metadata_types(handler, ctx)? } else { return Ok(vec![]); } @@ -430,7 +430,7 @@ impl CollectTypesMetadata for TyDecl { let decl = decl_engine.get_configurable(decl_id); let TyConfigurableDecl { value, .. } = &*decl; if let Some(value) = value { - value.collect_types_metadata(handler, ctx)? + value.collect_metadata_types(handler, ctx)? } else { return Ok(vec![]); } diff --git a/sway-core/src/language/ty/declaration/function.rs b/sway-core/src/language/ty/declaration/function.rs index f6304845c35..a6dba082b1e 100644 --- a/sway-core/src/language/ty/declaration/function.rs +++ b/sway-core/src/language/ty/declaration/function.rs @@ -249,30 +249,30 @@ impl MonomorphizeHelper for TyFunctionDecl { } impl CollectTypesMetadata for TyFunctionDecl { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { let mut body = vec![]; for content in self.body.contents.iter() { - body.append(&mut content.collect_types_metadata(handler, ctx)?); + body.append(&mut content.collect_metadata_types(handler, ctx)?); } body.append( &mut self .return_type .type_id - .collect_types_metadata(handler, ctx)?, + .collect_metadata_types(handler, ctx)?, ); for type_param in self.type_parameters.iter() { - body.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?); + body.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?); } for param in self.parameters.iter() { body.append( &mut param .type_argument .type_id - .collect_types_metadata(handler, ctx)?, + .collect_metadata_types(handler, ctx)?, ); } Ok(body) diff --git a/sway-core/src/language/ty/expression/expression.rs b/sway-core/src/language/ty/expression/expression.rs index 762b3fd2384..ab66b852e65 100644 --- a/sway-core/src/language/ty/expression/expression.rs +++ b/sway-core/src/language/ty/expression/expression.rs @@ -128,14 +128,14 @@ impl TypeCheckFinalization for TyExpression { } impl CollectTypesMetadata for TyExpression { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { use TyExpressionVariant::*; let decl_engine = ctx.engines.de(); - let mut res = self.return_type.collect_types_metadata(handler, ctx)?; + let mut res = self.return_type.collect_metadata_types(handler, ctx)?; match &self.expression { FunctionApplication { arguments, @@ -144,7 +144,7 @@ impl CollectTypesMetadata for TyExpression { .. } => { for arg in arguments.iter() { - res.append(&mut arg.1.collect_types_metadata(handler, ctx)?); + res.append(&mut arg.1.collect_metadata_types(handler, ctx)?); } let function_decl = decl_engine.get_function(fn_ref); @@ -154,19 +154,19 @@ impl CollectTypesMetadata for TyExpression { } for content in function_decl.body.contents.iter() { - res.append(&mut content.collect_types_metadata(handler, ctx)?); + res.append(&mut content.collect_metadata_types(handler, ctx)?); } ctx.call_site_pop(); } Tuple { fields } => { for field in fields.iter() { - res.append(&mut field.collect_types_metadata(handler, ctx)?); + res.append(&mut field.collect_metadata_types(handler, ctx)?); } } AsmExpression { registers, .. } => { for register in registers.iter() { if let Some(init) = register.initializer.as_ref() { - res.append(&mut init.collect_types_metadata(handler, ctx)?); + res.append(&mut init.collect_metadata_types(handler, ctx)?); } } } @@ -187,42 +187,42 @@ impl CollectTypesMetadata for TyExpression { } } for field in fields.iter() { - res.append(&mut field.value.collect_types_metadata(handler, ctx)?); + res.append(&mut field.value.collect_metadata_types(handler, ctx)?); } } LazyOperator { lhs, rhs, .. } => { - res.append(&mut lhs.collect_types_metadata(handler, ctx)?); - res.append(&mut rhs.collect_types_metadata(handler, ctx)?); + res.append(&mut lhs.collect_metadata_types(handler, ctx)?); + res.append(&mut rhs.collect_metadata_types(handler, ctx)?); } Array { elem_type: _, contents, } => { for content in contents.iter() { - res.append(&mut content.collect_types_metadata(handler, ctx)?); + res.append(&mut content.collect_metadata_types(handler, ctx)?); } } ArrayIndex { prefix, index } => { - res.append(&mut (**prefix).collect_types_metadata(handler, ctx)?); - res.append(&mut (**index).collect_types_metadata(handler, ctx)?); + res.append(&mut (**prefix).collect_metadata_types(handler, ctx)?); + res.append(&mut (**index).collect_metadata_types(handler, ctx)?); } CodeBlock(block) => { for content in block.contents.iter() { - res.append(&mut content.collect_types_metadata(handler, ctx)?); + res.append(&mut content.collect_metadata_types(handler, ctx)?); } } MatchExp { desugared, .. } => { - res.append(&mut desugared.collect_types_metadata(handler, ctx)?) + res.append(&mut desugared.collect_metadata_types(handler, ctx)?) } IfExp { condition, then, r#else, } => { - res.append(&mut condition.collect_types_metadata(handler, ctx)?); - res.append(&mut then.collect_types_metadata(handler, ctx)?); + res.append(&mut condition.collect_metadata_types(handler, ctx)?); + res.append(&mut then.collect_metadata_types(handler, ctx)?); if let Some(r#else) = r#else { - res.append(&mut r#else.collect_types_metadata(handler, ctx)?); + res.append(&mut r#else.collect_metadata_types(handler, ctx)?); } } StructFieldAccess { @@ -230,16 +230,16 @@ impl CollectTypesMetadata for TyExpression { resolved_type_of_parent, .. } => { - res.append(&mut prefix.collect_types_metadata(handler, ctx)?); - res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?); + res.append(&mut prefix.collect_metadata_types(handler, ctx)?); + res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?); } TupleElemAccess { prefix, resolved_type_of_parent, .. } => { - res.append(&mut prefix.collect_types_metadata(handler, ctx)?); - res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?); + res.append(&mut prefix.collect_metadata_types(handler, ctx)?); + res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?); } EnumInstantiation { enum_ref, @@ -252,55 +252,55 @@ impl CollectTypesMetadata for TyExpression { ctx.call_site_insert(type_param.type_id, call_path_binding.inner.suffix.span()) } if let Some(contents) = contents { - res.append(&mut contents.collect_types_metadata(handler, ctx)?); + res.append(&mut contents.collect_metadata_types(handler, ctx)?); } for variant in enum_decl.variants.iter() { res.append( &mut variant .type_argument .type_id - .collect_types_metadata(handler, ctx)?, + .collect_metadata_types(handler, ctx)?, ); } for type_param in enum_decl.type_parameters.iter() { - res.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?); + res.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?); } } AbiCast { address, .. } => { - res.append(&mut address.collect_types_metadata(handler, ctx)?); + res.append(&mut address.collect_metadata_types(handler, ctx)?); } IntrinsicFunction(kind) => { - res.append(&mut kind.collect_types_metadata(handler, ctx)?); + res.append(&mut kind.collect_metadata_types(handler, ctx)?); } EnumTag { exp } => { - res.append(&mut exp.collect_types_metadata(handler, ctx)?); + res.append(&mut exp.collect_metadata_types(handler, ctx)?); } UnsafeDowncast { exp, variant, call_path_decl: _, } => { - res.append(&mut exp.collect_types_metadata(handler, ctx)?); + res.append(&mut exp.collect_metadata_types(handler, ctx)?); res.append( &mut variant .type_argument .type_id - .collect_types_metadata(handler, ctx)?, + .collect_metadata_types(handler, ctx)?, ); } WhileLoop { condition, body } => { - res.append(&mut condition.collect_types_metadata(handler, ctx)?); + res.append(&mut condition.collect_metadata_types(handler, ctx)?); for content in body.contents.iter() { - res.append(&mut content.collect_types_metadata(handler, ctx)?); + res.append(&mut content.collect_metadata_types(handler, ctx)?); } } ForLoop { desugared } => { - res.append(&mut desugared.collect_types_metadata(handler, ctx)?); + res.append(&mut desugared.collect_metadata_types(handler, ctx)?); } ImplicitReturn(exp) | Return(exp) => { - res.append(&mut exp.collect_types_metadata(handler, ctx)?) + res.append(&mut exp.collect_metadata_types(handler, ctx)?) } - Ref(exp) | Deref(exp) => res.append(&mut exp.collect_types_metadata(handler, ctx)?), + Ref(exp) | Deref(exp) => res.append(&mut exp.collect_metadata_types(handler, ctx)?), // storage access can never be generic // variable expressions don't ever have return types themselves, they're stored in // `TyExpression::return_type`. Variable expressions are just names of variables. @@ -314,7 +314,7 @@ impl CollectTypesMetadata for TyExpression { | Continue | FunctionParameter => {} Reassignment(reassignment) => { - res.append(&mut reassignment.rhs.collect_types_metadata(handler, ctx)?); + res.append(&mut reassignment.rhs.collect_metadata_types(handler, ctx)?); } } Ok(res) diff --git a/sway-core/src/language/ty/expression/intrinsic_function.rs b/sway-core/src/language/ty/expression/intrinsic_function.rs index 681fa6da873..5433fc18a03 100644 --- a/sway-core/src/language/ty/expression/intrinsic_function.rs +++ b/sway-core/src/language/ty/expression/intrinsic_function.rs @@ -99,23 +99,23 @@ impl DebugWithEngines for TyIntrinsicFunctionKind { } impl CollectTypesMetadata for TyIntrinsicFunctionKind { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { - let mut types_metadata = vec![]; + let mut metadata_types = vec![]; for type_arg in self.type_arguments.iter() { - types_metadata.append(&mut type_arg.type_id.collect_types_metadata(handler, ctx)?); + metadata_types.append(&mut type_arg.type_id.collect_metadata_types(handler, ctx)?); } for arg in self.arguments.iter() { - types_metadata.append(&mut arg.collect_types_metadata(handler, ctx)?); + metadata_types.append(&mut arg.collect_metadata_types(handler, ctx)?); } match self.kind { Intrinsic::Log => { let logged_type = self.get_logged_type(ctx.experimental.new_encoding).unwrap(); - types_metadata.push(TypeMetadata::LoggedType( + metadata_types.push(TypeMetadata::LoggedType( LogId::new(logged_type.get_abi_type_str( &AbiStrContext { program_name: ctx.program_name.clone(), @@ -130,7 +130,7 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind { )); } Intrinsic::Smo => { - types_metadata.push(TypeMetadata::MessageType( + metadata_types.push(TypeMetadata::MessageType( MessageId::new(ctx.message_id_counter()), self.arguments[1].return_type, )); @@ -139,6 +139,6 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind { _ => {} } - Ok(types_metadata) + Ok(metadata_types) } } diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs index 92d273f1526..c356c12605e 100644 --- a/sway-core/src/language/ty/program.rs +++ b/sway-core/src/language/ty/program.rs @@ -451,7 +451,7 @@ impl TyProgram { impl CollectTypesMetadata for TyProgram { /// Collect various type information such as unresolved types and types of logged data - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -472,7 +472,7 @@ impl CollectTypesMetadata for TyProgram { .. } => { let main_function = decl_engine.get_function(main_function); - metadata.append(&mut main_function.collect_types_metadata(handler, ctx)?); + metadata.append(&mut main_function.collect_metadata_types(handler, ctx)?); } // For contracts, collect metadata for all the types starting with each ABI method as // an entry point. @@ -482,12 +482,12 @@ impl CollectTypesMetadata for TyProgram { } => { if let Some(main_function) = main_function { let entry = decl_engine.get_function(main_function); - metadata.append(&mut entry.collect_types_metadata(handler, ctx)?); + metadata.append(&mut entry.collect_metadata_types(handler, ctx)?); } for entry in abi_entries.iter() { let entry = decl_engine.get_function(entry); - metadata.append(&mut entry.collect_types_metadata(handler, ctx)?); + metadata.append(&mut entry.collect_metadata_types(handler, ctx)?); } } // For libraries, collect metadata for all the types starting with each `pub` node as @@ -502,7 +502,7 @@ impl CollectTypesMetadata for TyProgram { for node in module.all_nodes.iter() { let is_generic_function = node.is_generic_function(decl_engine); if node.is_public(decl_engine) { - let node_metadata = node.collect_types_metadata(handler, ctx)?; + let node_metadata = node.collect_metadata_types(handler, ctx)?; metadata.append( &mut node_metadata .iter() @@ -530,7 +530,7 @@ impl CollectTypesMetadata for TyProgram { ) { for node in module.all_nodes.iter() { if node.is_test_function(decl_engine) { - metadata.append(&mut node.collect_types_metadata(handler, ctx)?); + metadata.append(&mut node.collect_metadata_types(handler, ctx)?); } } } diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs index ed82946c3c0..5bfcde77d4c 100644 --- a/sway-core/src/lib.rs +++ b/sway-core/src/lib.rs @@ -34,8 +34,6 @@ pub use debug_generation::write_dwarf; use indexmap::IndexMap; use metadata::MetadataManager; use query_engine::{ModuleCacheKey, ModulePath, ProgramsCacheEntry}; -use semantic_analysis::symbol_resolve::ResolveSymbols; -use semantic_analysis::symbol_resolve_context::SymbolResolveContext; use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; use std::path::{Path, PathBuf}; @@ -539,13 +537,9 @@ pub fn parsed_to_ast( let namespace = Namespace::init_root(initial_namespace); // Collect the program symbols. - let mut symbol_collection_ctx = + let _collection_ctx = ty::TyProgram::collect(handler, engines, parse_program, namespace.clone())?; - // Resolve the program symbols. - let resolve_ctx = SymbolResolveContext::new(engines, &mut symbol_collection_ctx); - parse_program.resolve_symbols(handler, resolve_ctx); - // Type check the program. let typed_program_opt = ty::TyProgram::type_check( handler, @@ -579,36 +573,34 @@ pub fn parsed_to_ast( } }; - // Skip collecting type metadata and control-flow analysis - // if we triggered an optimised build from LSP. - - let is_lsp_optimized_build = lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build); - let types_metadata = if !is_lsp_optimized_build { + // Skip collecting metadata if we triggered an optimised build from LSP. + let metadata_types = if !lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build) { // Collect information about the types used in this program - let types_metadata_result = typed_program.collect_types_metadata( + let metadata_types_result = typed_program.collect_metadata_types( handler, &mut CollectTypesMetadataContext::new(engines, experimental, package_name.to_string()), ); - - let types_metadata = match types_metadata_result { - Ok(types_metadata) => types_metadata, + let metadata_types = match metadata_types_result { + Ok(metadata_types) => metadata_types, Err(e) => { handler.dedup(); return Err(e); } }; - let logged_types = types_metadata.iter().filter_map(|m| match m { - TypeMetadata::LoggedType(log_id, type_id) => Some((*log_id, *type_id)), - _ => None, - }); - typed_program.logged_types.extend(logged_types); + typed_program + .logged_types + .extend(metadata_types.iter().filter_map(|m| match m { + TypeMetadata::LoggedType(log_id, type_id) => Some((*log_id, *type_id)), + _ => None, + })); - let message_types = types_metadata.iter().filter_map(|m| match m { - TypeMetadata::MessageType(message_id, type_id) => Some((*message_id, *type_id)), - _ => None, - }); - typed_program.messages_types.extend(message_types); + typed_program + .messages_types + .extend(metadata_types.iter().filter_map(|m| match m { + TypeMetadata::MessageType(message_id, type_id) => Some((*message_id, *type_id)), + _ => None, + })); let (print_graph, print_graph_url_format) = match build_config { Some(cfg) => ( @@ -629,7 +621,7 @@ pub fn parsed_to_ast( print_graph_url_format, ); - types_metadata + metadata_types } else { vec![] }; @@ -677,7 +669,7 @@ pub fn parsed_to_ast( }; // All unresolved types lead to compile errors. - for err in types_metadata.iter().filter_map(|m| match m { + for err in metadata_types.iter().filter_map(|m| match m { TypeMetadata::UnresolvedType(name, call_site_span_opt) => { Some(CompileError::UnableToInferGeneric { ty: name.as_str().to_string(), @@ -836,13 +828,10 @@ pub(crate) fn compile_ast_to_ir_to_asm( program: &ty::TyProgram, build_config: &BuildConfig, ) -> Result { - // IR generaterion requires type information to be fully resolved. - // - // If type information is found to still be generic inside of - // IR, this is considered an internal compiler error. - // - // But, there are genuine cases for types be unknown here, like `let a = []`. These should - // have friendly errors. + // The IR pipeline relies on type information being fully resolved. + // If type information is found to still be generic or unresolved inside of + // IR, this is considered an internal compiler error. To resolve this situation, + // we need to explicitly ensure all types are resolved before going into IR. // // We _could_ introduce a new type here that uses TypeInfo instead of TypeId and throw away // the engine, since we don't need inference for IR. That'd be a _lot_ of copy-pasted code, diff --git a/sway-core/src/type_system/ast_elements/trait_constraint.rs b/sway-core/src/type_system/ast_elements/trait_constraint.rs index 67e56d481c6..51e52db8756 100644 --- a/sway-core/src/type_system/ast_elements/trait_constraint.rs +++ b/sway-core/src/type_system/ast_elements/trait_constraint.rs @@ -113,7 +113,7 @@ impl From<&Supertrait> for TraitConstraint { } impl CollectTypesMetadata for TraitConstraint { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -122,7 +122,7 @@ impl CollectTypesMetadata for TraitConstraint { handler.scope(|handler| { for type_arg in &self.type_arguments { res.extend( - match type_arg.type_id.collect_types_metadata(handler, ctx) { + match type_arg.type_id.collect_metadata_types(handler, ctx) { Ok(res) => res, Err(_) => continue, }, diff --git a/sway-core/src/type_system/id.rs b/sway-core/src/type_system/id.rs index 9410fd2d6ac..652bab9f4ba 100644 --- a/sway-core/src/type_system/id.rs +++ b/sway-core/src/type_system/id.rs @@ -55,7 +55,7 @@ impl From for TypeId { } impl CollectTypesMetadata for TypeId { - fn collect_types_metadata( + fn collect_metadata_types( &self, _handler: &Handler, ctx: &mut CollectTypesMetadataContext, diff --git a/sway-core/src/types/collect_types_metadata.rs b/sway-core/src/types/collect_metadata_types.rs similarity index 99% rename from sway-core/src/types/collect_types_metadata.rs rename to sway-core/src/types/collect_metadata_types.rs index 7f535787f9a..518fab8063d 100644 --- a/sway-core/src/types/collect_types_metadata.rs +++ b/sway-core/src/types/collect_metadata_types.rs @@ -127,7 +127,7 @@ impl<'cx> CollectTypesMetadataContext<'cx> { } pub(crate) trait CollectTypesMetadata { - fn collect_types_metadata( + fn collect_metadata_types( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, diff --git a/sway-core/src/types/mod.rs b/sway-core/src/types/mod.rs index 6cf2ec6d39e..c0558956b86 100644 --- a/sway-core/src/types/mod.rs +++ b/sway-core/src/types/mod.rs @@ -1,3 +1,3 @@ -mod collect_types_metadata; +mod collect_metadata_types; -pub(crate) use collect_types_metadata::*; +pub(crate) use collect_metadata_types::*; diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json index 6ba89864136..fc33fb8071d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json index 06288f6470b..b2ca88cc80b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json index 06288f6470b..b2ca88cc80b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 2a56bd4ce5a..334a84c571a 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 @@ -153,7 +153,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 d505ce86cc5..4db6630875f 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 9a9f92029fb..330ceb1e84d 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 fdae20048cd..f94cd99c92e 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 @@ -7,5 +7,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 1f8a5a19847..80f291cf109 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 @@ -58,7 +58,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json index 06288f6470b..b2ca88cc80b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 2cf5f86404a..1044d63d4c3 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 @@ -25,7 +25,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 82c8d31ddf0..f71f93cafcf 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 @@ -24,5 +24,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6aef6e46eab..a830bfd39f5 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 @@ -29,7 +29,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 912a245e98d..bb4676c683e 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 @@ -33,7 +33,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 2e3cb6d4100..26468e616e0 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 @@ -33,7 +33,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 c31b63b5240..0ba63ef8536 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 @@ -28,5 +28,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 c9aac407b0a..be7e97e7f52 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 @@ -34,7 +34,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json index 06288f6470b..b2ca88cc80b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 89d8954c067..fb9d4d4ab94 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 d2219886527..2d7d57bc176 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "str[9]" 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 aae05f0c143..b95944759fd 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 b8a07c4dfdd..915de2faf91 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 ca2bc452800..dc7b9e7e0da 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 c501244c889..c596fc0e6de 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 af2d550d3d5..5d65a024e7a 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 @@ -24,5 +24,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 f0e5f9c18e2..3d2edd2aa4a 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 @@ -127,7 +127,7 @@ ], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 491a3c63853..1a79bfff333 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 @@ -24,5 +24,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6d7e7a9eda4..ad2fd6feca9 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 @@ -30,5 +30,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 0af8ce821c9..d8e35ed289f 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 @@ -20,7 +20,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 e6cbe62d615..cd145340441 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 46476e699bd..41ddd5a6526 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 @@ -27,5 +27,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 27dd3a2ed67..ae14caf80c4 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 27dd3a2ed67..ae14caf80c4 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 27dd3a2ed67..ae14caf80c4 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 06288f6470b..b2ca88cc80b 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json index 06288f6470b..b2ca88cc80b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6d6731dad31..65fcd7aaea0 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 @@ -105,7 +105,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 c0493d35b2c..efb4ef4b143 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 @@ -28,5 +28,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6d6731dad31..65fcd7aaea0 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 @@ -105,7 +105,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 c0493d35b2c..efb4ef4b143 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 @@ -28,5 +28,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 6ba89864136..fc33fb8071d 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 c2438d6380b..85ec72672c3 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 d21a750855b..ebd75034c4b 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 @@ -37,7 +37,7 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "b256" 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 620a27423d0..97a56d311e8 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "script", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 5fb0761e122..418cfaa4979 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 @@ -25,5 +25,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 0ceadc76a66..e3502f78711 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 @@ -37,5 +37,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 0ceadc76a66..e3502f78711 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 @@ -37,5 +37,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 dcb0dea516c..911d784b957 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 @@ -25,5 +25,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 d4a41d5f0b6..56defcd1f97 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 0013f8a7747..9140e64735d 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 @@ -25,5 +25,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 29a536c5dea..e43352e9d6b 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 @@ -134,7 +134,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 7ff27cfea77..e699e6906ad 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 @@ -54,7 +54,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 f72bc7ef1ef..e9265a8add4 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 @@ -56,7 +56,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 2fb87bc80c3..be3bb9d37a0 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 @@ -61,7 +61,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 019dd46ee95..f65bed29897 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 2304727e1be..9a1f83acb28 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 @@ -19,5 +19,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 90d3e3df19d..07cff93f9ef 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 @@ -205,7 +205,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 d1c28f4bec4..895831dce1c 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 @@ -79,7 +79,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "b256" 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 ed9ba29007b..7ddc25fe910 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 @@ -76,7 +76,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 1813c7befe0..2f12abbb6d3 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 @@ -72,7 +72,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 0f079c86b6a..316945eb3e2 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 @@ -33,7 +33,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 89be1b69e12..9921a4d70c5 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 @@ -28,5 +28,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 48b700f51af..dfa9bacceab 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 @@ -38,7 +38,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 f8b0d6f1a18..c56ec218b21 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 @@ -34,7 +34,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "()" 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 11f306577a5..ec7dcab571e 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 @@ -694,7 +694,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 720dd728f3f..16a5fa137e2 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 @@ -27,5 +27,5 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [] + "metadataTypes": [] } \ No newline at end of file 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 0f6f8c622f1..0c63c92aede 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 @@ -197,7 +197,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "components": [ { 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 7c82826b9ad..c49fb864e2b 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 @@ -68,7 +68,7 @@ "messagesTypes": [], "programType": "contract", "specVersion": "1", - "typesMetadata": [ + "metadataTypes": [ { "metadataTypeId": 0, "type": "b256" From 40d3b1197a40987f91fc93ae1ffcec57357b969c Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 23 Jul 2024 10:20:51 +0100 Subject: [PATCH 25/47] Fixes fuel-abi-types version. --- Cargo.lock | 31 +++++++------------------------ Cargo.toml | 3 +++ test/src/sdk-harness/Cargo.lock | 2 +- test/src/sdk-harness/Cargo.toml | 3 +++ 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 778ce29b4be..446d270a6d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2020,7 +2020,7 @@ dependencies = [ "forc-tx", "forc-util", "forc-wallet", - "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", + "fuel-abi-types", "fuel-core-client", "fuel-core-types", "fuel-crypto", @@ -2159,7 +2159,7 @@ dependencies = [ "cid", "forc-tracing 0.62.0", "forc-util", - "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", + "fuel-abi-types", "futures", "git2", "gix-url", @@ -2192,7 +2192,7 @@ version = "0.62.0" dependencies = [ "anyhow", "forc-pkg", - "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", + "fuel-abi-types", "fuel-tx", "fuel-vm", "fuels-core", @@ -2329,23 +2329,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fuel-abi-types" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb98391d7df3963bc3f30d3c8bfce301573a115fa92a35bed55e4c94b836be2" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.71", - "thiserror", -] - [[package]] name = "fuel-abi-types" version = "0.6.0" @@ -2719,7 +2702,7 @@ version = "0.65.1" source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "Inflector", - "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-abi-types", "itertools 0.12.1", "proc-macro2", "quote", @@ -2736,7 +2719,7 @@ dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-abi-types", "fuel-asm", "fuel-core-chain-config", "fuel-core-client", @@ -2773,7 +2756,7 @@ version = "0.65.1" source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" dependencies = [ "async-trait", - "fuel-abi-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuel-abi-types", "fuel-asm", "fuel-tx", "fuel-types", @@ -6579,7 +6562,7 @@ dependencies = [ "derivative", "dirs 3.0.2", "either", - "fuel-abi-types 0.6.0 (git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2)", + "fuel-abi-types", "fuel-ethabi", "fuel-etk-asm", "fuel-etk-ops", diff --git a/Cargo.toml b/Cargo.toml index e614760e753..7242f6f6955 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,6 +54,9 @@ forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } +[patch.crates-io] +fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } + [workspace.package] edition = "2021" authors = ["Fuel Labs "] diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index 86e982d4f19..10f6d48ea3f 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -1509,7 +1509,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fuel-abi-types" version = "0.6.0" -source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#25010513ad66c01b03a22474ae6ff1bd3ee04614" +source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#ec2182cfcc66908041d7305511dbc6d4ee3d9e8a" dependencies = [ "itertools 0.10.5", "lazy_static", diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml index 32c4b51c7f2..4906925cc49 100644 --- a/test/src/sdk-harness/Cargo.toml +++ b/test/src/sdk-harness/Cargo.toml @@ -29,6 +29,9 @@ sha3 = "0.10.1" tai64 = { version = "4.0", features = ["serde"] } tokio = { version = "1.12", features = ["rt", "macros"] } +[patch.crates-io] +fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } + [[test]] harness = true name = "integration_tests" From 3de40c980e13b6c56e01796b4598a45c0c710f96 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 23 Jul 2024 10:48:08 +0100 Subject: [PATCH 26/47] Adds missing fields to TEST_JSON_ABI. --- forc-plugins/forc-client/src/op/run/encode.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forc-plugins/forc-client/src/op/run/encode.rs b/forc-plugins/forc-client/src/op/run/encode.rs index 9fe7979c7e4..99473403312 100644 --- a/forc-plugins/forc-client/src/op/run/encode.rs +++ b/forc-plugins/forc-client/src/op/run/encode.rs @@ -62,7 +62,8 @@ impl ScriptCallHandler { mod tests { use super::{ScriptCallHandler, Type}; - const TEST_JSON_ABI: &str = r#"{"concreteTypes":[{"concreteTypeId":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + const TEST_JSON_ABI: &str = r#"{"programType": "contract","specVersion": "1","encodingVersion": "1","metadataTypes":[], + "concreteTypes":[{"concreteTypeId":"2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", "type":"()"},{"concreteTypeId":"b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903","type":"bool"}, {"concreteTypeId":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b","type":"u8"}], "functions":[{"inputs":[{"name":"test_u8","concreteTypeId":"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"}, From ab5bc184b40737c7c9bcf254d3497289e228e103 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 23 Jul 2024 11:28:10 +0100 Subject: [PATCH 27/47] Updates json_abi files. --- .../data/standalone_contract/standalone_contract-abi.json | 4 ++-- .../slice_intrinsics/json_abi_oracle_new_encoding.json | 4 ++-- .../blanket_impl/json_abi_oracle_new_encoding.json | 4 ++-- .../blanket_impl_u16/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../aliased_imports/json_abi_oracle_new_encoding.json | 4 ++-- .../language/array_basics/json_abi_oracle_new_encoding.json | 4 ++-- .../array_generics/json_abi_oracle_new_encoding.json | 4 ++-- .../asm_expr_basic/json_abi_oracle_new_encoding.json | 4 ++-- .../b256_bad_jumps/json_abi_oracle_new_encoding.json | 4 ++-- .../b256_bitwise_ops/json_abi_oracle_new_encoding.json | 4 ++-- .../language/b256_ops/json_abi_oracle_new_encoding.json | 4 ++-- .../basic_func_decl/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../binop_intrinsics/json_abi_oracle_new_encoding.json | 4 ++-- .../language/bitwise_not/json_abi_oracle_new_encoding.json | 4 ++-- .../blanket_trait/json_abi_oracle_new_encoding.json | 4 ++-- .../language/bool_and_or/json_abi_oracle_new_encoding.json | 4 ++-- .../break_and_continue/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../chained_if_let/json_abi_oracle_new_encoding.json | 4 ++-- .../configurable_consts/json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 4 ++-- .../const_decl_in_library/json_abi_oracle_new_encoding.json | 4 ++-- .../language/const_inits/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../diverging_exprs/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../enum_destructuring/json_abi_oracle_new_encoding.json | 4 ++-- .../language/enum_if_let/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../enum_in_fn_decl/json_abi_oracle_new_encoding.json | 4 ++-- .../enum_init_fn_call/json_abi_oracle_new_encoding.json | 4 ++-- .../enum_instantiation/json_abi_oracle_new_encoding.json | 4 ++-- .../language/enum_padding/json_abi_oracle_new_encoding.json | 6 +++--- .../enum_type_inference/json_abi_oracle_new_encoding.json | 4 ++-- .../enum_variant_imports/json_abi_oracle_new_encoding.json | 4 ++-- .../language/eq_and_neq/json_abi_oracle_new_encoding.json | 4 ++-- .../language/eq_intrinsic/json_abi_oracle_new_encoding.json | 4 ++-- .../fallback_only/json_abi_oracle_new_encoding.json | 4 ++-- .../fix_opcode_bug/json_abi_oracle_new_encoding.json | 4 ++-- .../language/for_loops/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../generic_functions/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_impl_self/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../generic_result_method/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_struct/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_structs/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_traits/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_transpose/json_abi_oracle_new_encoding.json | 4 ++-- .../generic_tuple_trait/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../gtf_intrinsic/json_abi_oracle_new_encoding.json | 4 ++-- .../if_elseif_enum/json_abi_oracle_new_encoding.json | 4 ++-- .../if_implicit_unit/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../implicit_casting/json_abi_oracle_new_encoding.json | 4 ++-- .../implicit_return/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../import_trailing_comma/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../language/impure_ifs/json_abi_oracle_new_encoding.json | 4 ++-- .../inline_if_expr_const/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../language/is_prime/json_abi_oracle_new_encoding.json | 4 ++-- .../is_reference_type/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../local_impl_for_ord/json_abi_oracle_new_encoding.json | 4 ++-- .../language/logging/json_abi_oracle_new_encoding.json | 6 +++--- .../main_args_empty/json_abi_oracle_new_encoding.json | 4 ++-- .../main_args_generics/json_abi_oracle_new_encoding.json | 6 +++--- .../main_args_one_u64/json_abi_oracle_new_encoding.json | 4 ++-- .../main_args_ref/json_abi_oracle_new_encoding.json | 6 +++--- .../main_args_ref_copy/json_abi_oracle_new_encoding.json | 6 +++--- .../main_args_ref_ref/json_abi_oracle_new_encoding.json | 6 +++--- .../main_args_two_u64/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 6 +++--- .../main_returns_unit/json_abi_oracle_new_encoding.json | 4 ++-- .../many_stack_variables/json_abi_oracle_new_encoding.json | 4 ++-- .../match_expressions_all/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../match_expressions_or/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../modulo_uint_test/json_abi_oracle_new_encoding.json | 4 ++-- .../multi_impl_self/json_abi_oracle_new_encoding.json | 4 ++-- .../multi_item_import/json_abi_oracle_new_encoding.json | 4 ++-- .../mut_ref_empty_type/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../nested_structs/json_abi_oracle_new_encoding.json | 4 ++-- .../nested_while_and_if/json_abi_oracle_new_encoding.json | 4 ++-- .../new_allocator_test/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../numeric_constants/json_abi_oracle_new_encoding.json | 4 ++-- .../op_precedence/json_abi_oracle_new_encoding.json | 4 ++-- .../language/ops/json_abi_oracle_new_encoding.json | 4 ++-- .../out_of_order_decl/json_abi_oracle_new_encoding.json | 4 ++-- .../prelude_access/json_abi_oracle_new_encoding.json | 4 ++-- .../prelude_access2/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../raw_identifiers/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../redundant_return/json_abi_oracle_new_encoding.json | 4 ++-- .../reexport/aliases/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../reexport_paths/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../simple_glob_import/json_abi_oracle_new_encoding.json | 4 ++-- .../simple_item_import/json_abi_oracle_new_encoding.json | 4 ++-- .../reexport/visibility/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../ret_small_string/json_abi_oracle_new_encoding.json | 4 ++-- .../ret_string_in_struct/json_abi_oracle_new_encoding.json | 6 +++--- .../language/retd_b256/json_abi_oracle_new_encoding.json | 4 ++-- .../retd_small_array/json_abi_oracle_new_encoding.json | 6 +++--- .../language/retd_struct/json_abi_oracle_new_encoding.json | 6 +++--- .../retd_zero_len_array/json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 4 ++-- .../language/size_of/json_abi_oracle_new_encoding.json | 4 ++-- .../slice_intrinsics/json_abi_oracle_new_encoding.json | 4 ++-- .../slice/slice_script/json_abi_oracle_new_encoding.json | 4 ++-- .../language/smo/json_abi_oracle_new_encoding.json | 6 +++--- .../string_slice_features/json_abi_oracle_new_encoding.json | 4 ++-- .../string_slice_script/json_abi_oracle_new_encoding.json | 4 ++-- .../struct_destructuring/json_abi_oracle_new_encoding.json | 4 ++-- .../struct_field_access/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../struct_instantiation/json_abi_oracle_new_encoding.json | 4 ++-- .../language/supertraits/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../language/tuple_access/json_abi_oracle_new_encoding.json | 4 ++-- .../tuple_desugaring/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../tuple_in_struct/json_abi_oracle_new_encoding.json | 4 ++-- .../tuple_indexing/json_abi_oracle_new_encoding.json | 4 ++-- .../tuple_single_element/json_abi_oracle_new_encoding.json | 4 ++-- .../language/tuple_trait/json_abi_oracle_new_encoding.json | 4 ++-- .../language/tuple_types/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../u256/u256_abi/json_abi_oracle_new_encoding.json | 4 ++-- .../unary_not_basic/json_abi_oracle_new_encoding.json | 4 ++-- .../unary_not_basic_2/json_abi_oracle_new_encoding.json | 4 ++-- .../unit_type_variants/json_abi_oracle_new_encoding.json | 6 +++--- .../use_absolute_path/json_abi_oracle_new_encoding.json | 4 ++-- .../use_full_path_names/json_abi_oracle_new_encoding.json | 4 ++-- .../valid_impurity/json_abi_oracle_new_encoding.json | 4 ++-- .../where_clause_enums/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../where_clause_impls/json_abi_oracle_new_encoding.json | 4 ++-- .../where_clause_methods/json_abi_oracle_new_encoding.json | 4 ++-- .../where_clause_structs/json_abi_oracle_new_encoding.json | 4 ++-- .../where_clause_traits/json_abi_oracle_new_encoding.json | 4 ++-- .../language/while_loops/json_abi_oracle_new_encoding.json | 4 ++-- .../zero_field_types/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/address_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/alloc_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/assert_eq/json_abi_oracle_new_encoding.json | 6 +++--- .../assert_eq_revert/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/assert_ne/json_abi_oracle_new_encoding.json | 6 +++--- .../assert_ne_revert/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/assert_test/json_abi_oracle_new_encoding.json | 4 ++-- .../b512_struct_alignment/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/b512_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/block_height/json_abi_oracle_new_encoding.json | 4 ++-- .../contract_id_test/json_abi_oracle_new_encoding.json | 4 ++-- .../contract_id_type/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/eq_custom_type/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/eq_generic/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/ge_test/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/identity_eq/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/intrinsics/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/option/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/option_eq/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/raw_ptr/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/raw_slice/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/require/json_abi_oracle_new_encoding.json | 6 +++--- .../stdlib/result/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/sha256/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/u128_div_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/u128_log_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/u128_mul_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/u128_root_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/u128_test/json_abi_oracle_new_encoding.json | 4 ++-- .../stdlib/vec/json_abi_oracle_new_encoding.json | 4 ++-- .../should_pass/superabi/json_abi_oracle_new_encoding.json | 4 ++-- .../superabi_diamond/json_abi_oracle_new_encoding.json | 4 ++-- .../superabi_diamond_impl/json_abi_oracle_new_encoding.json | 4 ++-- .../supertraits_for_abis/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../auth_testing_contract/json_abi_oracle_new_encoding.json | 4 ++-- .../balance_test_contract/json_abi_oracle_new_encoding.json | 4 ++-- .../basic_storage/json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../increment_contract/json_abi_oracle_new_encoding.json | 6 +++--- .../issue_1512_repro/json_abi_oracle_new_encoding.json | 6 +++--- .../multiple_impl/json_abi_oracle_new_encoding.json | 4 ++-- .../json_abi_oracle_new_encoding.json | 6 +++--- .../return_struct/json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- .../storage_enum_contract/json_abi_oracle_new_encoding.json | 4 ++-- .../storage_namespace/json_abi_oracle_new_encoding.json | 6 +++--- .../json_abi_oracle_new_encoding.json | 6 +++--- 239 files changed, 509 insertions(+), 509 deletions(-) diff --git a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json +++ b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json index fc33fb8071d..aab161b0506 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_fail/slice/slice_intrinsics/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 334a84c571a..45a5454be80 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 @@ -151,8 +151,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -220,5 +218,7 @@ "metadataTypeId": 5, "type": "u64" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 4db6630875f..25b210026bf 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 330ceb1e84d..e4d28997902 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -85,5 +83,7 @@ "metadataTypeId": 5, "type": "u32" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 f94cd99c92e..d3062bbc070 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 @@ -5,7 +5,7 @@ "functions": [], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 80f291cf109..542c8009c36 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 @@ -56,8 +56,6 @@ } ], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -204,5 +202,7 @@ "metadataTypeId": 12, "type": "u8" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 1044d63d4c3..6d485af4964 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 @@ -23,8 +23,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -117,5 +115,7 @@ "metadataTypeId": 8, "type": "u8" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 f71f93cafcf..92ddbbb270c 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 @@ -22,7 +22,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 a830bfd39f5..a339f6ef46e 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 @@ -27,8 +27,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -40,5 +38,7 @@ "metadataTypeId": 0, "type": "struct TestStruct" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 bb4676c683e..611b6c13c6d 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 @@ -31,8 +31,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -44,5 +42,7 @@ "metadataTypeId": 0, "type": "struct TestStruct" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 26468e616e0..4320edea528 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 @@ -31,8 +31,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -44,5 +42,7 @@ "metadataTypeId": 0, "type": "struct TestStruct" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 0ba63ef8536..44236844825 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 @@ -26,7 +26,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 be7e97e7f52..6d95b04580f 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 @@ -32,8 +32,6 @@ } ], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -87,5 +85,7 @@ "metadataTypeId": 4, "type": "struct OpName" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fb9d4d4ab94..2785b32ab24 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 2d7d57bc176..6166d46c699 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -35,5 +33,7 @@ "metadataTypeId": 1, "type": "struct Wrapper" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 b95944759fd..36d7f625c38 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 915de2faf91..4e7e23a6f3a 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -35,5 +33,7 @@ "metadataTypeId": 1, "type": "u32" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 dc7b9e7e0da..70d0e8d8ab3 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -61,5 +59,7 @@ "metadataTypeId": 4, "type": "u8" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 c596fc0e6de..983f51b0a4b 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -35,5 +33,7 @@ "metadataTypeId": 1, "type": "u32" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 5d65a024e7a..dfbd54db3a4 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 @@ -22,7 +22,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 3d2edd2aa4a..2ab312180d3 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 @@ -125,8 +125,6 @@ "messageId": "9" } ], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -198,5 +196,7 @@ 4 ] } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 1a79bfff333..79842b24ed9 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 @@ -22,7 +22,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 ad2fd6feca9..49a75d8d5c1 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 @@ -28,7 +28,7 @@ } ], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 d8e35ed289f..022cfe8ab4c 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 @@ -18,8 +18,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -43,5 +41,7 @@ "metadataTypeId": 1, "type": "enum E" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 cd145340441..ea0a762cd2d 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 41ddd5a6526..be319f53762 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 @@ -25,7 +25,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 ae14caf80c4..d59478ab357 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 ae14caf80c4..d59478ab357 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 ae14caf80c4..d59478ab357 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 b2ca88cc80b..05b0f04b2d3 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json index b2ca88cc80b..05b0f04b2d3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 65fcd7aaea0..2543df7733e 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 @@ -103,8 +103,6 @@ } ], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -192,5 +190,7 @@ "metadataTypeId": 7, "type": "struct std::contract_id::ContractId" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 efb4ef4b143..bf5debeec20 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 @@ -26,7 +26,7 @@ } ], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 65fcd7aaea0..2543df7733e 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 @@ -103,8 +103,6 @@ } ], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -192,5 +190,7 @@ "metadataTypeId": 7, "type": "struct std::contract_id::ContractId" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 efb4ef4b143..bf5debeec20 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 @@ -26,7 +26,7 @@ } ], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 fc33fb8071d..aab161b0506 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 85ec72672c3..ad33ec5b9e4 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 ebd75034c4b..384c6b19008 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 @@ -35,8 +35,6 @@ } ], "messagesTypes": [], - "programType": "script", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -60,5 +58,7 @@ "metadataTypeId": 1, "type": "struct CustomError" } - ] + ], + "programType": "script", + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 97a56d311e8..668a88f2e07 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "script", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 418cfaa4979..2ddcfc0101a 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 @@ -23,7 +23,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 e3502f78711..59b99c5020b 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 @@ -35,7 +35,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 e3502f78711..59b99c5020b 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 @@ -35,7 +35,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 911d784b957..3c91baf4830 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 @@ -23,7 +23,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 56defcd1f97..97235341a02 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 9140e64735d..b9405753ac8 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 @@ -23,7 +23,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 e43352e9d6b..8c5867d2d6a 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 @@ -132,8 +132,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -382,5 +380,7 @@ 16 ] } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 e699e6906ad..2612bacc0d7 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 @@ -52,8 +52,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -120,5 +118,7 @@ "metadataTypeId": 6, "type": "struct dep_2::MyStructDuplicated" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 e9265a8add4..def96385449 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 @@ -54,8 +54,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -133,5 +131,7 @@ "metadataTypeId": 7, "type": "u64" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 be3bb9d37a0..900b92717f2 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 @@ -59,8 +59,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -106,5 +104,7 @@ "metadataTypeId": 4, "type": "u64" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 f65bed29897..68a28651188 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 9a1f83acb28..6b05e8ae081 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 @@ -17,7 +17,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 07cff93f9ef..2f821ed58f1 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 @@ -203,8 +203,6 @@ } ], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -293,5 +291,7 @@ 1 ] } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 895831dce1c..f977048eae3 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 @@ -77,8 +77,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -104,5 +102,7 @@ "metadataTypeId": 2, "type": "struct std::contract_id::ContractId" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 7ddc25fe910..e687a917725 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 @@ -74,8 +74,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -198,5 +196,7 @@ "metadataTypeId": 8, "type": "struct std::contract_id::ContractId" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 2f12abbb6d3..edd98a1f3d1 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 @@ -70,8 +70,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -98,5 +96,7 @@ "metadataTypeId": 2, "type": "generic T" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 316945eb3e2..6da9ef90fa3 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 @@ -31,8 +31,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -48,5 +46,7 @@ "metadataTypeId": 0, "type": "(_, _)" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 9921a4d70c5..08401781dda 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 @@ -26,7 +26,7 @@ } ], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 dfa9bacceab..874368e84fd 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 @@ -36,8 +36,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -69,5 +67,7 @@ "metadataTypeId": 2, "type": "struct nested_struct_args_abi::StructTwo" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 c56ec218b21..7f2920780b5 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 @@ -32,8 +32,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -60,5 +58,7 @@ "metadataTypeId": 2, "type": "generic T" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 ec7dcab571e..9a1f9ebd31e 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 @@ -692,8 +692,6 @@ } ], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -765,5 +763,7 @@ "metadataTypeId": 2, "type": "struct storage_access_abi::T" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 16a5fa137e2..32bd4e374ca 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 @@ -25,7 +25,7 @@ ], "loggedTypes": [], "messagesTypes": [], + "metadataTypes": [], "programType": "contract", - "specVersion": "1", - "metadataTypes": [] + "specVersion": "1" } \ No newline at end of file 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 0c63c92aede..a7b039e5eeb 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 @@ -195,8 +195,6 @@ } ], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "components": [ @@ -285,5 +283,7 @@ 1 ] } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file 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 c49fb864e2b..09fce104773 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 @@ -66,8 +66,6 @@ ], "loggedTypes": [], "messagesTypes": [], - "programType": "contract", - "specVersion": "1", "metadataTypes": [ { "metadataTypeId": 0, @@ -93,5 +91,7 @@ "metadataTypeId": 2, "type": "struct std::contract_id::ContractId" } - ] + ], + "programType": "contract", + "specVersion": "1" } \ No newline at end of file From d22361cc1ff1acf29c6fdb4d7a46c213a040bc3f Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 24 Jul 2024 14:17:12 +0100 Subject: [PATCH 28/47] Makes json-abi-with-callpaths true by default and removed flag. The flag json_abi_with_callpaths was removed because its is now supported by the SDKs and because not using it is unsafe, as names can collide. --- docs/book/src/forc/manifest_reference.md | 1 - forc-pkg/src/manifest/build_profile.rs | 5 ----- forc-pkg/src/pkg.rs | 5 +---- forc-plugins/forc-client/src/op/deploy.rs | 1 - forc-plugins/forc-client/src/op/run/mod.rs | 1 - forc/src/cli/commands/test.rs | 1 - forc/src/cli/shared.rs | 3 --- forc/src/ops/forc_build.rs | 1 - forc/src/ops/forc_contract_id.rs | 1 - forc/src/ops/forc_predicate_root.rs | 1 - test/src/e2e_vm_tests/harness.rs | 1 - 11 files changed, 1 insertion(+), 20 deletions(-) diff --git a/docs/book/src/forc/manifest_reference.md b/docs/book/src/forc/manifest_reference.md index 55539866850..a7ca42a5b2c 100644 --- a/docs/book/src/forc/manifest_reference.md +++ b/docs/book/src/forc/manifest_reference.md @@ -76,7 +76,6 @@ The following fields can be provided for a build-profile: * `terse` - Terse mode. Limited warning and error output, defaults to false. * `time_phases` - Whether to output the time elapsed over each part of the compilation process, defaults to false. * `include_tests` - Whether or not to include test functions in parsing, type-checking, and code generation. This is set to true by invocations like `forc test`, but defaults to false. -* `json_abi_with_callpaths` - Whether to generate a JSON ABI with `callpaths` instead of names for structs and enums, defaults to false. This option can help prevent conflicting struct or enum definitions by using the full path instead of the name. * `error_on_warnings` - Whether to treat errors as warnings, defaults to false. There are two default `[build-profile]` available with every manifest file. These are `debug` and `release` profiles. If you want to override these profiles, you can provide them explicitly in the manifest file like the following example: diff --git a/forc-pkg/src/manifest/build_profile.rs b/forc-pkg/src/manifest/build_profile.rs index def146b7295..59610ee8bf9 100644 --- a/forc-pkg/src/manifest/build_profile.rs +++ b/forc-pkg/src/manifest/build_profile.rs @@ -34,8 +34,6 @@ pub struct BuildProfile { #[serde(default)] pub include_tests: bool, #[serde(default)] - pub json_abi_with_callpaths: bool, - #[serde(default)] pub error_on_warnings: bool, #[serde(default)] pub reverse_results: bool, @@ -64,7 +62,6 @@ impl BuildProfile { time_phases: false, metrics_outfile: None, include_tests: false, - json_abi_with_callpaths: false, error_on_warnings: false, reverse_results: false, optimization_level: OptLevel::Opt0, @@ -88,7 +85,6 @@ impl BuildProfile { time_phases: false, metrics_outfile: None, include_tests: false, - json_abi_with_callpaths: false, error_on_warnings: false, reverse_results: false, optimization_level: OptLevel::Opt1, @@ -161,7 +157,6 @@ mod tests { time_phases: true, metrics_outfile: Some("metrics_outfile".into()), include_tests: true, - json_abi_with_callpaths: true, error_on_warnings: true, reverse_results: true, optimization_level: OptLevel::Opt0, diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 6e66f94b3e4..71cb69e2dae 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -241,8 +241,6 @@ pub struct PkgOpts { /// /// By default, this is `/out`. pub output_directory: Option, - /// Outputs json abi with callpath instead of struct and enum names. - pub json_abi_with_callpaths: bool, /// The IPFS node to be used for fetching IPFS sources. pub ipfs_node: IPFSNode, } @@ -1845,7 +1843,7 @@ pub fn compile( &handler, &mut AbiContext { program: typed_program, - abi_with_callpaths: profile.json_abi_with_callpaths, + abi_with_callpaths: true, type_ids_to_full_type_str: HashMap::::new(), }, engines, @@ -2109,7 +2107,6 @@ fn build_profile_from_opts( profile.metrics_outfile.clone_from(metrics_outfile); } profile.include_tests |= tests; - profile.json_abi_with_callpaths |= pkg.json_abi_with_callpaths; profile.error_on_warnings |= error_on_warnings; profile.experimental = ExperimentalFlags { new_encoding: experimental.new_encoding, diff --git a/forc-plugins/forc-client/src/op/deploy.rs b/forc-plugins/forc-client/src/op/deploy.rs index f41fd80532c..a9a1f340c8f 100644 --- a/forc-plugins/forc-client/src/op/deploy.rs +++ b/forc-plugins/forc-client/src/op/deploy.rs @@ -526,7 +526,6 @@ fn build_opts_from_cmd(cmd: &cmd::Deploy) -> pkg::BuildOpts { terse: cmd.pkg.terse, locked: cmd.pkg.locked, output_directory: cmd.pkg.output_directory.clone(), - json_abi_with_callpaths: cmd.pkg.json_abi_with_callpaths, ipfs_node: cmd.pkg.ipfs_node.clone().unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/forc-plugins/forc-client/src/op/run/mod.rs b/forc-plugins/forc-client/src/op/run/mod.rs index 6144399dfb9..cda23fb14cf 100644 --- a/forc-plugins/forc-client/src/op/run/mod.rs +++ b/forc-plugins/forc-client/src/op/run/mod.rs @@ -221,7 +221,6 @@ fn build_opts_from_cmd(cmd: &cmd::Run) -> pkg::BuildOpts { terse: cmd.pkg.terse, locked: cmd.pkg.locked, output_directory: cmd.pkg.output_directory.clone(), - json_abi_with_callpaths: cmd.pkg.json_abi_with_callpaths, ipfs_node: cmd.pkg.ipfs_node.clone().unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/forc/src/cli/commands/test.rs b/forc/src/cli/commands/test.rs index 34245c803df..b4dcf9c524c 100644 --- a/forc/src/cli/commands/test.rs +++ b/forc/src/cli/commands/test.rs @@ -233,7 +233,6 @@ fn opts_from_cmd(cmd: Command) -> forc_test::TestOpts { terse: cmd.build.pkg.terse, locked: cmd.build.pkg.locked, output_directory: cmd.build.pkg.output_directory, - json_abi_with_callpaths: cmd.build.pkg.json_abi_with_callpaths, ipfs_node: cmd.build.pkg.ipfs_node.unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/forc/src/cli/shared.rs b/forc/src/cli/shared.rs index 313edcd08b1..28b38465df3 100644 --- a/forc/src/cli/shared.rs +++ b/forc/src/cli/shared.rs @@ -150,9 +150,6 @@ pub struct Pkg { /// If the lock file is missing, or it needs to be updated, Forc will exit with an error. #[clap(long)] pub locked: bool, - /// Outputs JSON ABI with callpaths instead of only names for structs and enums. - #[clap(long)] - pub json_abi_with_callpaths: bool, /// The IPFS node to use for fetching IPFS sources. /// /// [possible values: PUBLIC, LOCAL, ] diff --git a/forc/src/ops/forc_build.rs b/forc/src/ops/forc_build.rs index 91e316c37ba..49c0c27f955 100644 --- a/forc/src/ops/forc_build.rs +++ b/forc/src/ops/forc_build.rs @@ -17,7 +17,6 @@ fn opts_from_cmd(cmd: BuildCommand) -> pkg::BuildOpts { terse: cmd.build.pkg.terse, locked: cmd.build.pkg.locked, output_directory: cmd.build.pkg.output_directory, - json_abi_with_callpaths: cmd.build.pkg.json_abi_with_callpaths, ipfs_node: cmd.build.pkg.ipfs_node.unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/forc/src/ops/forc_contract_id.rs b/forc/src/ops/forc_contract_id.rs index f64a73386ee..f81441637a5 100644 --- a/forc/src/ops/forc_contract_id.rs +++ b/forc/src/ops/forc_contract_id.rs @@ -52,7 +52,6 @@ fn build_opts_from_cmd(cmd: &ContractIdCommand) -> pkg::BuildOpts { terse: cmd.pkg.terse, locked: cmd.pkg.locked, output_directory: cmd.pkg.output_directory.clone(), - json_abi_with_callpaths: cmd.pkg.json_abi_with_callpaths, ipfs_node: cmd.pkg.ipfs_node.clone().unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/forc/src/ops/forc_predicate_root.rs b/forc/src/ops/forc_predicate_root.rs index efca0f92bec..1381aec392e 100644 --- a/forc/src/ops/forc_predicate_root.rs +++ b/forc/src/ops/forc_predicate_root.rs @@ -21,7 +21,6 @@ fn build_opts_from_cmd(cmd: PredicateRootCommand) -> pkg::BuildOpts { terse: cmd.pkg.terse, locked: cmd.pkg.locked, output_directory: cmd.pkg.output_directory.clone(), - json_abi_with_callpaths: cmd.pkg.json_abi_with_callpaths, ipfs_node: cmd.pkg.ipfs_node.unwrap_or_default(), }, print: pkg::PrintOpts { diff --git a/test/src/e2e_vm_tests/harness.rs b/test/src/e2e_vm_tests/harness.rs index cb839dc2608..a77a01acd84 100644 --- a/test/src/e2e_vm_tests/harness.rs +++ b/test/src/e2e_vm_tests/harness.rs @@ -288,7 +288,6 @@ pub(crate) async fn compile_to_bytes(file_name: &str, run_config: &RunConfig) -> )), locked: run_config.locked, terse: false, - json_abi_with_callpaths: true, ..Default::default() }, experimental: ExperimentalFlags { From 9f64110d82747b8b46a216f5804e3550a940d380 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 24 Jul 2024 16:19:05 +0100 Subject: [PATCH 29/47] Updates fuel-abi-types version. --- Cargo.lock | 19 ++++++++++--------- Cargo.toml | 5 +---- test/src/sdk-harness/Cargo.lock | 19 ++++++++++--------- test/src/sdk-harness/Cargo.toml | 3 --- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 446d270a6d6..d7c0f36b0dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2331,8 +2331,9 @@ dependencies = [ [[package]] name = "fuel-abi-types" -version = "0.6.0" -source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#ec2182cfcc66908041d7305511dbc6d4ee3d9e8a" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bce44ac13b1971be7cea024a2003cf944522093dafec454fea9ff792f0ff2577" dependencies = [ "itertools 0.10.5", "lazy_static", @@ -2660,7 +2661,7 @@ dependencies = [ [[package]] name = "fuels" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2675,7 +2676,7 @@ dependencies = [ [[package]] name = "fuels-accounts" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "chrono", @@ -2699,7 +2700,7 @@ dependencies = [ [[package]] name = "fuels-code-gen" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "Inflector", "fuel-abi-types", @@ -2714,7 +2715,7 @@ dependencies = [ [[package]] name = "fuels-core" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "bech32", @@ -2741,7 +2742,7 @@ dependencies = [ [[package]] name = "fuels-macros" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2753,7 +2754,7 @@ dependencies = [ [[package]] name = "fuels-programs" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "fuel-abi-types", @@ -2771,7 +2772,7 @@ dependencies = [ [[package]] name = "fuels-test-helpers" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#55e07435caec45ee6bf57eee9f0a989fe953cb10" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuel-core-chain-config", "fuel-core-client", diff --git a/Cargo.toml b/Cargo.toml index 7242f6f6955..d931452fe73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,10 +52,7 @@ fuels-accounts = "0.66.0" forc-wallet = "0.9.0" # Dependencies from the `fuel-abi-types` repository: -fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } - -[patch.crates-io] -fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } +fuel-abi-types = "0.7.0" [workspace.package] edition = "2021" diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index 10f6d48ea3f..f9fd9d29f68 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -1508,8 +1508,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fuel-abi-types" -version = "0.6.0" -source = "git+https://github.com/FuelLabs/fuel-abi-types?branch=esdrubal/abi_changes2#ec2182cfcc66908041d7305511dbc6d4ee3d9e8a" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bce44ac13b1971be7cea024a2003cf944522093dafec454fea9ff792f0ff2577" dependencies = [ "itertools 0.10.5", "lazy_static", @@ -2005,7 +2006,7 @@ dependencies = [ [[package]] name = "fuels" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuel-core", "fuel-core-client", @@ -2021,7 +2022,7 @@ dependencies = [ [[package]] name = "fuels-accounts" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "chrono", @@ -2045,7 +2046,7 @@ dependencies = [ [[package]] name = "fuels-code-gen" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "Inflector", "fuel-abi-types", @@ -2060,7 +2061,7 @@ dependencies = [ [[package]] name = "fuels-core" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "bech32", @@ -2087,7 +2088,7 @@ dependencies = [ [[package]] name = "fuels-macros" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2099,7 +2100,7 @@ dependencies = [ [[package]] name = "fuels-programs" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "async-trait", "fuel-abi-types", @@ -2117,7 +2118,7 @@ dependencies = [ [[package]] name = "fuels-test-helpers" version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#b48f5adbfb03348fb02bbd20bbd939fcedf8f646" +source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" dependencies = [ "fuel-core", "fuel-core-chain-config", diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml index 4906925cc49..32c4b51c7f2 100644 --- a/test/src/sdk-harness/Cargo.toml +++ b/test/src/sdk-harness/Cargo.toml @@ -29,9 +29,6 @@ sha3 = "0.10.1" tai64 = { version = "4.0", features = ["serde"] } tokio = { version = "1.12", features = ["rt", "macros"] } -[patch.crates-io] -fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" } - [[test]] harness = true name = "integration_tests" From f7553bf12e449ff89ad11f8900b79e9d9d76059e Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 24 Jul 2024 17:09:31 +0100 Subject: [PATCH 30/47] Reverts wrong renaming. --- sway-core/src/language/ty/ast_node.rs | 10 +-- .../language/ty/declaration/declaration.rs | 12 ++-- .../src/language/ty/declaration/function.rs | 10 +-- .../src/language/ty/expression/expression.rs | 70 +++++++++---------- .../ty/expression/intrinsic_function.rs | 14 ++-- sway-core/src/language/ty/program.rs | 12 ++-- sway-core/src/lib.rs | 16 ++--- .../ast_elements/trait_constraint.rs | 4 +- sway-core/src/type_system/id.rs | 2 +- ...ata_types.rs => collect_types_metadata.rs} | 2 +- sway-core/src/types/mod.rs | 4 +- 11 files changed, 78 insertions(+), 78 deletions(-) rename sway-core/src/types/{collect_metadata_types.rs => collect_types_metadata.rs} (99%) diff --git a/sway-core/src/language/ty/ast_node.rs b/sway-core/src/language/ty/ast_node.rs index 09bfe0f0b4f..f988836d757 100644 --- a/sway-core/src/language/ty/ast_node.rs +++ b/sway-core/src/language/ty/ast_node.rs @@ -125,12 +125,12 @@ impl TypeCheckFinalization for TyAstNode { } impl CollectTypesMetadata for TyAstNode { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { - self.content.collect_metadata_types(handler, ctx) + self.content.collect_types_metadata(handler, ctx) } } @@ -409,15 +409,15 @@ impl TypeCheckFinalization for TyAstNodeContent { } impl CollectTypesMetadata for TyAstNodeContent { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { use TyAstNodeContent::*; match self { - Declaration(decl) => decl.collect_metadata_types(handler, ctx), - Expression(expr) => expr.collect_metadata_types(handler, ctx), + Declaration(decl) => decl.collect_types_metadata(handler, ctx), + Expression(expr) => expr.collect_types_metadata(handler, ctx), SideEffect(_) => Ok(vec![]), Error(_, _) => Ok(vec![]), } diff --git a/sway-core/src/language/ty/declaration/declaration.rs b/sway-core/src/language/ty/declaration/declaration.rs index 4e711fa619c..61363124c11 100644 --- a/sway-core/src/language/ty/declaration/declaration.rs +++ b/sway-core/src/language/ty/declaration/declaration.rs @@ -396,7 +396,7 @@ impl DebugWithEngines for TyDecl { impl CollectTypesMetadata for TyDecl { // this is only run on entry nodes, which must have all well-formed types - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -404,24 +404,24 @@ impl CollectTypesMetadata for TyDecl { let decl_engine = ctx.engines.de(); let metadata = match self { TyDecl::VariableDecl(decl) => { - let mut body = decl.body.collect_metadata_types(handler, ctx)?; + let mut body = decl.body.collect_types_metadata(handler, ctx)?; body.append( &mut decl .type_ascription .type_id - .collect_metadata_types(handler, ctx)?, + .collect_types_metadata(handler, ctx)?, ); body } TyDecl::FunctionDecl(FunctionDecl { decl_id, .. }) => { let decl = decl_engine.get_function(decl_id); - decl.collect_metadata_types(handler, ctx)? + decl.collect_types_metadata(handler, ctx)? } TyDecl::ConstantDecl(ConstantDecl { decl_id, .. }) => { let decl = decl_engine.get_constant(decl_id); let TyConstantDecl { value, .. } = &*decl; if let Some(value) = value { - value.collect_metadata_types(handler, ctx)? + value.collect_types_metadata(handler, ctx)? } else { return Ok(vec![]); } @@ -430,7 +430,7 @@ impl CollectTypesMetadata for TyDecl { let decl = decl_engine.get_configurable(decl_id); let TyConfigurableDecl { value, .. } = &*decl; if let Some(value) = value { - value.collect_metadata_types(handler, ctx)? + value.collect_types_metadata(handler, ctx)? } else { return Ok(vec![]); } diff --git a/sway-core/src/language/ty/declaration/function.rs b/sway-core/src/language/ty/declaration/function.rs index a6dba082b1e..f6304845c35 100644 --- a/sway-core/src/language/ty/declaration/function.rs +++ b/sway-core/src/language/ty/declaration/function.rs @@ -249,30 +249,30 @@ impl MonomorphizeHelper for TyFunctionDecl { } impl CollectTypesMetadata for TyFunctionDecl { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { let mut body = vec![]; for content in self.body.contents.iter() { - body.append(&mut content.collect_metadata_types(handler, ctx)?); + body.append(&mut content.collect_types_metadata(handler, ctx)?); } body.append( &mut self .return_type .type_id - .collect_metadata_types(handler, ctx)?, + .collect_types_metadata(handler, ctx)?, ); for type_param in self.type_parameters.iter() { - body.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?); + body.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?); } for param in self.parameters.iter() { body.append( &mut param .type_argument .type_id - .collect_metadata_types(handler, ctx)?, + .collect_types_metadata(handler, ctx)?, ); } Ok(body) diff --git a/sway-core/src/language/ty/expression/expression.rs b/sway-core/src/language/ty/expression/expression.rs index ab66b852e65..762b3fd2384 100644 --- a/sway-core/src/language/ty/expression/expression.rs +++ b/sway-core/src/language/ty/expression/expression.rs @@ -128,14 +128,14 @@ impl TypeCheckFinalization for TyExpression { } impl CollectTypesMetadata for TyExpression { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { use TyExpressionVariant::*; let decl_engine = ctx.engines.de(); - let mut res = self.return_type.collect_metadata_types(handler, ctx)?; + let mut res = self.return_type.collect_types_metadata(handler, ctx)?; match &self.expression { FunctionApplication { arguments, @@ -144,7 +144,7 @@ impl CollectTypesMetadata for TyExpression { .. } => { for arg in arguments.iter() { - res.append(&mut arg.1.collect_metadata_types(handler, ctx)?); + res.append(&mut arg.1.collect_types_metadata(handler, ctx)?); } let function_decl = decl_engine.get_function(fn_ref); @@ -154,19 +154,19 @@ impl CollectTypesMetadata for TyExpression { } for content in function_decl.body.contents.iter() { - res.append(&mut content.collect_metadata_types(handler, ctx)?); + res.append(&mut content.collect_types_metadata(handler, ctx)?); } ctx.call_site_pop(); } Tuple { fields } => { for field in fields.iter() { - res.append(&mut field.collect_metadata_types(handler, ctx)?); + res.append(&mut field.collect_types_metadata(handler, ctx)?); } } AsmExpression { registers, .. } => { for register in registers.iter() { if let Some(init) = register.initializer.as_ref() { - res.append(&mut init.collect_metadata_types(handler, ctx)?); + res.append(&mut init.collect_types_metadata(handler, ctx)?); } } } @@ -187,42 +187,42 @@ impl CollectTypesMetadata for TyExpression { } } for field in fields.iter() { - res.append(&mut field.value.collect_metadata_types(handler, ctx)?); + res.append(&mut field.value.collect_types_metadata(handler, ctx)?); } } LazyOperator { lhs, rhs, .. } => { - res.append(&mut lhs.collect_metadata_types(handler, ctx)?); - res.append(&mut rhs.collect_metadata_types(handler, ctx)?); + res.append(&mut lhs.collect_types_metadata(handler, ctx)?); + res.append(&mut rhs.collect_types_metadata(handler, ctx)?); } Array { elem_type: _, contents, } => { for content in contents.iter() { - res.append(&mut content.collect_metadata_types(handler, ctx)?); + res.append(&mut content.collect_types_metadata(handler, ctx)?); } } ArrayIndex { prefix, index } => { - res.append(&mut (**prefix).collect_metadata_types(handler, ctx)?); - res.append(&mut (**index).collect_metadata_types(handler, ctx)?); + res.append(&mut (**prefix).collect_types_metadata(handler, ctx)?); + res.append(&mut (**index).collect_types_metadata(handler, ctx)?); } CodeBlock(block) => { for content in block.contents.iter() { - res.append(&mut content.collect_metadata_types(handler, ctx)?); + res.append(&mut content.collect_types_metadata(handler, ctx)?); } } MatchExp { desugared, .. } => { - res.append(&mut desugared.collect_metadata_types(handler, ctx)?) + res.append(&mut desugared.collect_types_metadata(handler, ctx)?) } IfExp { condition, then, r#else, } => { - res.append(&mut condition.collect_metadata_types(handler, ctx)?); - res.append(&mut then.collect_metadata_types(handler, ctx)?); + res.append(&mut condition.collect_types_metadata(handler, ctx)?); + res.append(&mut then.collect_types_metadata(handler, ctx)?); if let Some(r#else) = r#else { - res.append(&mut r#else.collect_metadata_types(handler, ctx)?); + res.append(&mut r#else.collect_types_metadata(handler, ctx)?); } } StructFieldAccess { @@ -230,16 +230,16 @@ impl CollectTypesMetadata for TyExpression { resolved_type_of_parent, .. } => { - res.append(&mut prefix.collect_metadata_types(handler, ctx)?); - res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?); + res.append(&mut prefix.collect_types_metadata(handler, ctx)?); + res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?); } TupleElemAccess { prefix, resolved_type_of_parent, .. } => { - res.append(&mut prefix.collect_metadata_types(handler, ctx)?); - res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?); + res.append(&mut prefix.collect_types_metadata(handler, ctx)?); + res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?); } EnumInstantiation { enum_ref, @@ -252,55 +252,55 @@ impl CollectTypesMetadata for TyExpression { ctx.call_site_insert(type_param.type_id, call_path_binding.inner.suffix.span()) } if let Some(contents) = contents { - res.append(&mut contents.collect_metadata_types(handler, ctx)?); + res.append(&mut contents.collect_types_metadata(handler, ctx)?); } for variant in enum_decl.variants.iter() { res.append( &mut variant .type_argument .type_id - .collect_metadata_types(handler, ctx)?, + .collect_types_metadata(handler, ctx)?, ); } for type_param in enum_decl.type_parameters.iter() { - res.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?); + res.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?); } } AbiCast { address, .. } => { - res.append(&mut address.collect_metadata_types(handler, ctx)?); + res.append(&mut address.collect_types_metadata(handler, ctx)?); } IntrinsicFunction(kind) => { - res.append(&mut kind.collect_metadata_types(handler, ctx)?); + res.append(&mut kind.collect_types_metadata(handler, ctx)?); } EnumTag { exp } => { - res.append(&mut exp.collect_metadata_types(handler, ctx)?); + res.append(&mut exp.collect_types_metadata(handler, ctx)?); } UnsafeDowncast { exp, variant, call_path_decl: _, } => { - res.append(&mut exp.collect_metadata_types(handler, ctx)?); + res.append(&mut exp.collect_types_metadata(handler, ctx)?); res.append( &mut variant .type_argument .type_id - .collect_metadata_types(handler, ctx)?, + .collect_types_metadata(handler, ctx)?, ); } WhileLoop { condition, body } => { - res.append(&mut condition.collect_metadata_types(handler, ctx)?); + res.append(&mut condition.collect_types_metadata(handler, ctx)?); for content in body.contents.iter() { - res.append(&mut content.collect_metadata_types(handler, ctx)?); + res.append(&mut content.collect_types_metadata(handler, ctx)?); } } ForLoop { desugared } => { - res.append(&mut desugared.collect_metadata_types(handler, ctx)?); + res.append(&mut desugared.collect_types_metadata(handler, ctx)?); } ImplicitReturn(exp) | Return(exp) => { - res.append(&mut exp.collect_metadata_types(handler, ctx)?) + res.append(&mut exp.collect_types_metadata(handler, ctx)?) } - Ref(exp) | Deref(exp) => res.append(&mut exp.collect_metadata_types(handler, ctx)?), + Ref(exp) | Deref(exp) => res.append(&mut exp.collect_types_metadata(handler, ctx)?), // storage access can never be generic // variable expressions don't ever have return types themselves, they're stored in // `TyExpression::return_type`. Variable expressions are just names of variables. @@ -314,7 +314,7 @@ impl CollectTypesMetadata for TyExpression { | Continue | FunctionParameter => {} Reassignment(reassignment) => { - res.append(&mut reassignment.rhs.collect_metadata_types(handler, ctx)?); + res.append(&mut reassignment.rhs.collect_types_metadata(handler, ctx)?); } } Ok(res) diff --git a/sway-core/src/language/ty/expression/intrinsic_function.rs b/sway-core/src/language/ty/expression/intrinsic_function.rs index 5433fc18a03..681fa6da873 100644 --- a/sway-core/src/language/ty/expression/intrinsic_function.rs +++ b/sway-core/src/language/ty/expression/intrinsic_function.rs @@ -99,23 +99,23 @@ impl DebugWithEngines for TyIntrinsicFunctionKind { } impl CollectTypesMetadata for TyIntrinsicFunctionKind { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, ) -> Result, ErrorEmitted> { - let mut metadata_types = vec![]; + let mut types_metadata = vec![]; for type_arg in self.type_arguments.iter() { - metadata_types.append(&mut type_arg.type_id.collect_metadata_types(handler, ctx)?); + types_metadata.append(&mut type_arg.type_id.collect_types_metadata(handler, ctx)?); } for arg in self.arguments.iter() { - metadata_types.append(&mut arg.collect_metadata_types(handler, ctx)?); + types_metadata.append(&mut arg.collect_types_metadata(handler, ctx)?); } match self.kind { Intrinsic::Log => { let logged_type = self.get_logged_type(ctx.experimental.new_encoding).unwrap(); - metadata_types.push(TypeMetadata::LoggedType( + types_metadata.push(TypeMetadata::LoggedType( LogId::new(logged_type.get_abi_type_str( &AbiStrContext { program_name: ctx.program_name.clone(), @@ -130,7 +130,7 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind { )); } Intrinsic::Smo => { - metadata_types.push(TypeMetadata::MessageType( + types_metadata.push(TypeMetadata::MessageType( MessageId::new(ctx.message_id_counter()), self.arguments[1].return_type, )); @@ -139,6 +139,6 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind { _ => {} } - Ok(metadata_types) + Ok(types_metadata) } } diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs index c356c12605e..92d273f1526 100644 --- a/sway-core/src/language/ty/program.rs +++ b/sway-core/src/language/ty/program.rs @@ -451,7 +451,7 @@ impl TyProgram { impl CollectTypesMetadata for TyProgram { /// Collect various type information such as unresolved types and types of logged data - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -472,7 +472,7 @@ impl CollectTypesMetadata for TyProgram { .. } => { let main_function = decl_engine.get_function(main_function); - metadata.append(&mut main_function.collect_metadata_types(handler, ctx)?); + metadata.append(&mut main_function.collect_types_metadata(handler, ctx)?); } // For contracts, collect metadata for all the types starting with each ABI method as // an entry point. @@ -482,12 +482,12 @@ impl CollectTypesMetadata for TyProgram { } => { if let Some(main_function) = main_function { let entry = decl_engine.get_function(main_function); - metadata.append(&mut entry.collect_metadata_types(handler, ctx)?); + metadata.append(&mut entry.collect_types_metadata(handler, ctx)?); } for entry in abi_entries.iter() { let entry = decl_engine.get_function(entry); - metadata.append(&mut entry.collect_metadata_types(handler, ctx)?); + metadata.append(&mut entry.collect_types_metadata(handler, ctx)?); } } // For libraries, collect metadata for all the types starting with each `pub` node as @@ -502,7 +502,7 @@ impl CollectTypesMetadata for TyProgram { for node in module.all_nodes.iter() { let is_generic_function = node.is_generic_function(decl_engine); if node.is_public(decl_engine) { - let node_metadata = node.collect_metadata_types(handler, ctx)?; + let node_metadata = node.collect_types_metadata(handler, ctx)?; metadata.append( &mut node_metadata .iter() @@ -530,7 +530,7 @@ impl CollectTypesMetadata for TyProgram { ) { for node in module.all_nodes.iter() { if node.is_test_function(decl_engine) { - metadata.append(&mut node.collect_metadata_types(handler, ctx)?); + metadata.append(&mut node.collect_types_metadata(handler, ctx)?); } } } diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs index 5bfcde77d4c..bdc7e683ceb 100644 --- a/sway-core/src/lib.rs +++ b/sway-core/src/lib.rs @@ -574,14 +574,14 @@ pub fn parsed_to_ast( }; // Skip collecting metadata if we triggered an optimised build from LSP. - let metadata_types = if !lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build) { + let types_metadata = if !lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build) { // Collect information about the types used in this program - let metadata_types_result = typed_program.collect_metadata_types( + let types_metadata_result = typed_program.collect_types_metadata( handler, &mut CollectTypesMetadataContext::new(engines, experimental, package_name.to_string()), ); - let metadata_types = match metadata_types_result { - Ok(metadata_types) => metadata_types, + let types_metadata = match types_metadata_result { + Ok(types_metadata) => types_metadata, Err(e) => { handler.dedup(); return Err(e); @@ -590,14 +590,14 @@ pub fn parsed_to_ast( typed_program .logged_types - .extend(metadata_types.iter().filter_map(|m| match m { + .extend(types_metadata.iter().filter_map(|m| match m { TypeMetadata::LoggedType(log_id, type_id) => Some((*log_id, *type_id)), _ => None, })); typed_program .messages_types - .extend(metadata_types.iter().filter_map(|m| match m { + .extend(types_metadata.iter().filter_map(|m| match m { TypeMetadata::MessageType(message_id, type_id) => Some((*message_id, *type_id)), _ => None, })); @@ -621,7 +621,7 @@ pub fn parsed_to_ast( print_graph_url_format, ); - metadata_types + types_metadata } else { vec![] }; @@ -669,7 +669,7 @@ pub fn parsed_to_ast( }; // All unresolved types lead to compile errors. - for err in metadata_types.iter().filter_map(|m| match m { + for err in types_metadata.iter().filter_map(|m| match m { TypeMetadata::UnresolvedType(name, call_site_span_opt) => { Some(CompileError::UnableToInferGeneric { ty: name.as_str().to_string(), diff --git a/sway-core/src/type_system/ast_elements/trait_constraint.rs b/sway-core/src/type_system/ast_elements/trait_constraint.rs index 51e52db8756..67e56d481c6 100644 --- a/sway-core/src/type_system/ast_elements/trait_constraint.rs +++ b/sway-core/src/type_system/ast_elements/trait_constraint.rs @@ -113,7 +113,7 @@ impl From<&Supertrait> for TraitConstraint { } impl CollectTypesMetadata for TraitConstraint { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, @@ -122,7 +122,7 @@ impl CollectTypesMetadata for TraitConstraint { handler.scope(|handler| { for type_arg in &self.type_arguments { res.extend( - match type_arg.type_id.collect_metadata_types(handler, ctx) { + match type_arg.type_id.collect_types_metadata(handler, ctx) { Ok(res) => res, Err(_) => continue, }, diff --git a/sway-core/src/type_system/id.rs b/sway-core/src/type_system/id.rs index 652bab9f4ba..9410fd2d6ac 100644 --- a/sway-core/src/type_system/id.rs +++ b/sway-core/src/type_system/id.rs @@ -55,7 +55,7 @@ impl From for TypeId { } impl CollectTypesMetadata for TypeId { - fn collect_metadata_types( + fn collect_types_metadata( &self, _handler: &Handler, ctx: &mut CollectTypesMetadataContext, diff --git a/sway-core/src/types/collect_metadata_types.rs b/sway-core/src/types/collect_types_metadata.rs similarity index 99% rename from sway-core/src/types/collect_metadata_types.rs rename to sway-core/src/types/collect_types_metadata.rs index 518fab8063d..7f535787f9a 100644 --- a/sway-core/src/types/collect_metadata_types.rs +++ b/sway-core/src/types/collect_types_metadata.rs @@ -127,7 +127,7 @@ impl<'cx> CollectTypesMetadataContext<'cx> { } pub(crate) trait CollectTypesMetadata { - fn collect_metadata_types( + fn collect_types_metadata( &self, handler: &Handler, ctx: &mut CollectTypesMetadataContext, diff --git a/sway-core/src/types/mod.rs b/sway-core/src/types/mod.rs index c0558956b86..6cf2ec6d39e 100644 --- a/sway-core/src/types/mod.rs +++ b/sway-core/src/types/mod.rs @@ -1,3 +1,3 @@ -mod collect_metadata_types; +mod collect_types_metadata; -pub(crate) use collect_metadata_types::*; +pub(crate) use collect_types_metadata::*; From b711f40a277edf5f95f2d15ca56d23cd856fe4c5 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Thu, 25 Jul 2024 12:52:22 +0100 Subject: [PATCH 31/47] Removes remaining json-abi-with-callpaths flag. --- docs/book/src/forc/manifest_reference.md | 1 - forc-pkg/tests/sections/Forc.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/book/src/forc/manifest_reference.md b/docs/book/src/forc/manifest_reference.md index a7ca42a5b2c..e9be681e5c8 100644 --- a/docs/book/src/forc/manifest_reference.md +++ b/docs/book/src/forc/manifest_reference.md @@ -110,7 +110,6 @@ print-asm = { virtual = true, allocated = true, final = true } terse = false time-phases = false include-tests = false -json-abi-with-callpaths = false error-on-warnings = false experimental-private-modules = false ``` diff --git a/forc-pkg/tests/sections/Forc.toml b/forc-pkg/tests/sections/Forc.toml index e4d70be8857..88b012cd138 100644 --- a/forc-pkg/tests/sections/Forc.toml +++ b/forc-pkg/tests/sections/Forc.toml @@ -17,7 +17,6 @@ terse = true time-phases = true metrics-outfile = "metrics_outfile" include-tests = true -json-abi-with-callpaths = true error-on-warnings = true reverse-results = true optimization-level = 0 From 5bad022649c51dff431e1b7ae5c21da66570346f Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 09:40:58 +0100 Subject: [PATCH 32/47] Fixes abi generation. --- sway-core/src/abi_generation/abi_str.rs | 4 ++- sway-core/src/abi_generation/fuel_abi.rs | 43 ++++++++++-------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/sway-core/src/abi_generation/abi_str.rs b/sway-core/src/abi_generation/abi_str.rs index 56d43fbf317..339a9453f81 100644 --- a/sway-core/src/abi_generation/abi_str.rs +++ b/sway-core/src/abi_generation/abi_str.rs @@ -59,7 +59,9 @@ impl TypeId { } (TypeInfo::Slice(type_arg), TypeInfo::Slice(_)) => { let inner_type = if ctx.abi_with_fully_specified_types { - type_engine.get(type_arg.type_id).abi_str(ctx, engines) + type_engine + .get(type_arg.type_id) + .abi_str(ctx, engines, false) } else { "_".to_string() }; diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs index 0f641830dc9..447d29341cb 100644 --- a/sway-core/src/abi_generation/fuel_abi.rs +++ b/sway-core/src/abi_generation/fuel_abi.rs @@ -776,40 +776,33 @@ impl TypeId { } TypeInfo::Slice(..) => { if let TypeInfo::Slice(elem_ty) = &*type_engine.get(resolved_type_id) { - // The `program_abi::TypeDeclaration`s needed for the slice element type - let elem_abi_ty = program_abi::TypeDeclaration { - type_id: elem_ty.initial_type_id.index(), - type_field: elem_ty.initial_type_id.get_abi_type_str( - &ctx.to_str_context(engines, false), - engines, - elem_ty.type_id, - ), - components: elem_ty.initial_type_id.get_abi_type_components( - ctx, - engines, - types, - elem_ty.type_id, - ), - type_parameters: elem_ty.initial_type_id.get_abi_type_parameters( - ctx, - engines, - types, - elem_ty.type_id, - ), - }; - types.push(elem_abi_ty); + generate_type_metadata_declaration( + handler, + ctx, + engines, + metadata_types, + concrete_types, + elem_ty.initial_type_id, + elem_ty.type_id, + metadata_types_to_add, + )?; // Generate the JSON data for the array. This is basically a single // `program_abi::TypeApplication` for the array element type Some(vec![program_abi::TypeApplication { name: "__slice_element".to_string(), - type_id: elem_ty.initial_type_id.index(), + type_id: program_abi::TypeId::Metadata(MetadataTypeId( + elem_ty.initial_type_id.index(), + )), type_arguments: elem_ty.initial_type_id.get_abi_type_arguments( + handler, ctx, engines, - types, + metadata_types, + concrete_types, elem_ty.type_id, - ), + metadata_types_to_add, + )?, }]) } else { unreachable!(); From 0a7757f6f460546ff9738f644ff717aee4530fd4 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 11:29:09 +0100 Subject: [PATCH 33/47] Adds missing fuels entry in Cargo.toml. --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index d931452fe73..592051aa9f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,6 +47,7 @@ fuel-vm = "0.56.0" # Dependencies from the `fuels-rs` repository: fuels-core = "0.66.0" fuels-accounts = "0.66.0" +fuels = "0.66.0" # Dependencies from the `forc-wallet` repository: forc-wallet = "0.9.0" From 48911385273dedd9a3bffd2a1a33c7aba23f9066 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 11:29:51 +0100 Subject: [PATCH 34/47] Updates proxy_contract-abi.json --- .../proxy_abi/proxy_contract-abi.json | 306 ++++++++---------- 1 file changed, 128 insertions(+), 178 deletions(-) diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json index 10ad2eeedc4..22c39233bae 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json @@ -1,188 +1,194 @@ { - "encoding": "1", - "types": [ + "programType": "contract", + "specVersion": "1", + "encodingVersion": "1", + "concreteTypes": [ { - "typeId": 0, "type": "()", - "components": [], - "typeParameters": null + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { - "typeId": 1, + "type": "enum standards::src5::AccessError", + "concreteTypeId": "3f702ea3351c9c1ece2b84048006c8034a24cbc2bad2e740d0412b4172951d3d", + "metadataTypeId": 1 + }, + { + "type": "enum standards::src5::State", + "concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c", + "metadataTypeId": 2 + }, + { + "type": "enum std::option::Option", + "concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", + "metadataTypeId": 4, + "typeArguments": [ + "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54" + ] + }, + { + "type": "enum sway_libs::ownership::errors::InitializationError", + "concreteTypeId": "1dfe7feadc1d9667a4351761230f948744068a090fe91b1bc6763a90ed5d3893", + "metadataTypeId": 5 + }, + { + "type": "enum sway_libs::upgradability::errors::SetProxyOwnerError", + "concreteTypeId": "3c6e90ae504df6aad8b34a93ba77dc62623e00b777eecacfa034a8ac6e890c74", + "metadataTypeId": 6 + }, + { + "type": "str", + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a" + }, + { + "type": "struct std::contract_id::ContractId", + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54", + "metadataTypeId": 9 + }, + { + "type": "struct sway_libs::upgradability::events::ProxyOwnerSet", + "concreteTypeId": "96dd838b44f99d8ccae2a7948137ab6256c48ca4abc6168abc880de07fba7247", + "metadataTypeId": 10 + }, + { + "type": "struct sway_libs::upgradability::events::ProxyTargetSet", + "concreteTypeId": "1ddc0adda1270a016c08ffd614f29f599b4725407c8954c8b960bdf651a9a6c8", + "metadataTypeId": 11 + } + ], + "metadataTypes": [ + { "type": "b256", - "components": null, - "typeParameters": null + "metadataTypeId": 0 }, { - "typeId": 2, - "type": "enum AccessError", + "type": "enum standards::src5::AccessError", + "metadataTypeId": 1, "components": [ { "name": "NotOwner", - "type": 0, - "typeArguments": null + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } - ], - "typeParameters": null + ] }, { - "typeId": 3, - "type": "enum Identity", + "type": "enum standards::src5::State", + "metadataTypeId": 2, "components": [ { - "name": "Address", - "type": 10, - "typeArguments": null + "name": "Uninitialized", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { - "name": "ContractId", - "type": 11, - "typeArguments": null + "name": "Initialized", + "typeId": 3 + }, + { + "name": "Revoked", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } - ], - "typeParameters": null + ] }, { - "typeId": 4, - "type": "enum InitializationError", + "type": "enum std::identity::Identity", + "metadataTypeId": 3, "components": [ { - "name": "CannotReinitialized", - "type": 0, - "typeArguments": null + "name": "Address", + "typeId": 8 + }, + { + "name": "ContractId", + "typeId": 9 } - ], - "typeParameters": null + ] }, { - "typeId": 5, - "type": "enum Option", + "type": "enum std::option::Option", + "metadataTypeId": 4, "components": [ { "name": "None", - "type": 0, - "typeArguments": null + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" }, { "name": "Some", - "type": 8, - "typeArguments": null + "typeId": 7 } ], "typeParameters": [ - 8 + 7 ] }, { - "typeId": 6, - "type": "enum SetProxyOwnerError", + "type": "enum sway_libs::ownership::errors::InitializationError", + "metadataTypeId": 5, "components": [ { - "name": "CannotUninitialize", - "type": 0, - "typeArguments": null + "name": "CannotReinitialized", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } - ], - "typeParameters": null + ] }, { - "typeId": 7, - "type": "enum State", + "type": "enum sway_libs::upgradability::errors::SetProxyOwnerError", + "metadataTypeId": 6, "components": [ { - "name": "Uninitialized", - "type": 0, - "typeArguments": null - }, - { - "name": "Initialized", - "type": 3, - "typeArguments": null - }, - { - "name": "Revoked", - "type": 0, - "typeArguments": null + "name": "CannotUninitialize", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" } - ], - "typeParameters": null + ] }, { - "typeId": 8, "type": "generic T", - "components": null, - "typeParameters": null - }, - { - "typeId": 9, - "type": "str", - "components": null, - "typeParameters": null + "metadataTypeId": 7 }, { - "typeId": 10, - "type": "struct Address", + "type": "struct std::address::Address", + "metadataTypeId": 8, "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": 0 } - ], - "typeParameters": null + ] }, { - "typeId": 11, - "type": "struct ContractId", + "type": "struct std::contract_id::ContractId", + "metadataTypeId": 9, "components": [ { "name": "bits", - "type": 1, - "typeArguments": null + "typeId": 0 } - ], - "typeParameters": null + ] }, { - "typeId": 12, - "type": "struct ProxyOwnerSet", + "type": "struct sway_libs::upgradability::events::ProxyOwnerSet", + "metadataTypeId": 10, "components": [ { "name": "new_proxy_owner", - "type": 7, - "typeArguments": null + "typeId": 2 } - ], - "typeParameters": null + ] }, { - "typeId": 13, - "type": "struct ProxyTargetSet", + "type": "struct sway_libs::upgradability::events::ProxyTargetSet", + "metadataTypeId": 11, "components": [ { "name": "new_target", - "type": 11, - "typeArguments": null + "typeId": 9 } - ], - "typeParameters": null + ] } ], "functions": [ { "inputs": [], "name": "proxy_target", - "output": { - "name": "", - "type": 5, - "typeArguments": [ - { - "name": "", - "type": 11, - "typeArguments": null - } - ] - }, + "output": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", "attributes": [ { "name": "doc-comment", @@ -250,16 +256,11 @@ "inputs": [ { "name": "new_target", - "type": 11, - "typeArguments": null + "concreteTypeId": "29c10735d33b5159f0c71ee1dbd17b36a3e69e41f00fab0d42e1bd9f428d8a54" } ], "name": "set_proxy_target", - "output": { - "name": "", - "type": 0, - "typeArguments": null - }, + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", "attributes": [ { "name": "doc-comment", @@ -381,11 +382,7 @@ { "inputs": [], "name": "proxy_owner", - "output": { - "name": "", - "type": 7, - "typeArguments": null - }, + "output": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c", "attributes": [ { "name": "doc-comment", @@ -452,11 +449,7 @@ { "inputs": [], "name": "initialize_proxy", - "output": { - "name": "", - "type": 0, - "typeArguments": null - }, + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", "attributes": [ { "name": "doc-comment", @@ -560,16 +553,11 @@ "inputs": [ { "name": "new_proxy_owner", - "type": 7, - "typeArguments": null + "concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c" } ], "name": "set_proxy_owner", - "output": { - "name": "", - "type": 0, - "typeArguments": null - }, + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", "attributes": [ { "name": "doc-comment", @@ -697,78 +685,40 @@ "loggedTypes": [ { "logId": "4571204900286667806", - "loggedType": { - "name": "", - "type": 2, - "typeArguments": [] - } + "concreteTypeId": "3f702ea3351c9c1ece2b84048006c8034a24cbc2bad2e740d0412b4172951d3d" }, { "logId": "2151606668983994881", - "loggedType": { - "name": "", - "type": 13, - "typeArguments": [] - } + "concreteTypeId": "1ddc0adda1270a016c08ffd614f29f599b4725407c8954c8b960bdf651a9a6c8" }, { "logId": "2161305517876418151", - "loggedType": { - "name": "", - "type": 4, - "typeArguments": [] - } + "concreteTypeId": "1dfe7feadc1d9667a4351761230f948744068a090fe91b1bc6763a90ed5d3893" }, { "logId": "4354576968059844266", - "loggedType": { - "name": "", - "type": 6, - "typeArguments": [] - } + "concreteTypeId": "3c6e90ae504df6aad8b34a93ba77dc62623e00b777eecacfa034a8ac6e890c74" }, { "logId": "10870989709723147660", - "loggedType": { - "name": "", - "type": 12, - "typeArguments": [] - } + "concreteTypeId": "96dd838b44f99d8ccae2a7948137ab6256c48ca4abc6168abc880de07fba7247" }, { "logId": "10098701174489624218", - "loggedType": { - "name": "", - "type": 9, - "typeArguments": null - } + "concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a" } ], "messagesTypes": [], "configurables": [ { "name": "INITIAL_TARGET", - "configurableType": { - "name": "", - "type": 5, - "typeArguments": [ - { - "name": "", - "type": 11, - "typeArguments": [] - } - ] - }, - "offset": 16224 + "concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", + "offset": 17240 }, { "name": "INITIAL_OWNER", - "configurableType": { - "name": "", - "type": 7, - "typeArguments": [] - }, - "offset": 16264 + "concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c", + "offset": 17192 } ] } \ No newline at end of file From db0ace8af07bc5990da9b0ed31703debb29bfb8a Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 11:31:17 +0100 Subject: [PATCH 35/47] Updates vm opcodes in std and parser. --- sway-ast/src/expr/op_code.rs | 2 +- sway-lib-std/src/ecr.sw | 2 +- sway-lib-std/src/execution.sw | 6 +++--- sway-parse/src/expr/op_code.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sway-ast/src/expr/op_code.rs b/sway-ast/src/expr/op_code.rs index 00c7a5e8e30..3bb40b2b91c 100644 --- a/sway-ast/src/expr/op_code.rs +++ b/sway-ast/src/expr/op_code.rs @@ -319,7 +319,7 @@ define_op_codes!( /* Cryptographic Instructions */ (Eck1, Eck1Opcode, "eck1", (addr: reg, sig: reg, hash: reg)), (Ecr1, Ecr1Opcode, "ecr1", (addr: reg, sig: reg, hash: reg)), - (Ed19, Ed19Opcode, "ed19", (addr: reg, sig: reg, hash: reg)), + (Ed19, Ed19Opcode, "ed19", (addr: reg, sig: reg, hash: reg, len: reg)), (K256, K256Opcode, "k256", (addr: reg, data: reg, size: reg)), (S256, S256Opcode, "s256", (addr: reg, data: reg, size: reg)), /* Other Instructions */ diff --git a/sway-lib-std/src/ecr.sw b/sway-lib-std/src/ecr.sw index 1bff86d3be9..78078e0db2f 100644 --- a/sway-lib-std/src/ecr.sw +++ b/sway-lib-std/src/ecr.sw @@ -164,7 +164,7 @@ pub fn ed_verify( sig: __addr_of(signature), hash: msg_hash, ) { - ed19 buffer sig hash; + ed19 buffer sig hash i32; err }; // check the $err register to see if the `ed19` opcode succeeded diff --git a/sway-lib-std/src/execution.sw b/sway-lib-std/src/execution.sw index 095a65c2bc5..8bd4f558418 100644 --- a/sway-lib-std/src/execution.sw +++ b/sway-lib-std/src/execution.sw @@ -23,7 +23,7 @@ pub fn run_external(load_target: ContractId) -> ! { move ssp_saved ssp; sub cur_stack_size sp ssp; cfs cur_stack_size; - ldc load_target zero length; + ldc load_target zero length i0; addi word zero i64; aloc word; sw hp ssp_saved i0; @@ -59,8 +59,8 @@ pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { cfs cur_stack_size; // Do the loads - ldc load_target1 zero length1; - ldc load_target2_heap zero length2; + ldc load_target1 zero length1 i0; + ldc load_target2_heap zero length2 i0; // __jmp_mem jumps to $MEM[$hp], so set that up. addi heap_alloc_size zero i64; diff --git a/sway-parse/src/expr/op_code.rs b/sway-parse/src/expr/op_code.rs index fd2c0de6114..f1819e6223b 100644 --- a/sway-parse/src/expr/op_code.rs +++ b/sway-parse/src/expr/op_code.rs @@ -108,7 +108,7 @@ define_op_codes!( /* Cryptographic Instructions */ (Eck1, Eck1Opcode, "eck1", (addr, sig, hash)), (Ecr1, Ecr1Opcode, "ecr1", (addr, sig, hash)), - (Ed19, Ed19Opcode, "ed19", (addr, sig, hash)), + (Ed19, Ed19Opcode, "ed19", (addr, sig, hash, len)), (K256, K256Opcode, "k256", (addr, data, size)), (S256, S256Opcode, "s256", (addr, data, size)), /* Other Instructions */ From 92e17ad64d4b044f89896bb02850785d0f13d1bd Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 11:33:26 +0100 Subject: [PATCH 36/47] Updates Cargo.lock. --- Cargo.lock | 608 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 454 insertions(+), 154 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7c0f36b0dd..1f59d935970 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,6 +238,12 @@ dependencies = [ "critical-section", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -401,28 +407,6 @@ dependencies = [ "constant_time_eq 0.1.5", ] -[[package]] -name = "blake2b_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", -] - -[[package]] -name = "blake2s_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", -] - [[package]] name = "blake3" version = "1.5.3" @@ -640,15 +624,14 @@ dependencies = [ [[package]] name = "cid" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" dependencies = [ "core2", "multibase", - "multihash 0.18.1", - "serde", - "unsigned-varint", + "multihash 0.19.1", + "unsigned-varint 0.8.0", ] [[package]] @@ -834,6 +817,12 @@ dependencies = [ "unreachable", ] +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + [[package]] name = "common-multipart-rfc7578" version = "0.6.0" @@ -843,7 +832,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.12", "mime", "mime_guess", "rand", @@ -897,6 +886,7 @@ dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", + "unicode-width", "windows-sys 0.52.0", ] @@ -1187,7 +1177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1afa0591b1021e427e548a1f0f147fe6168f6c7c7f7006bace77f28856051b8" dependencies = [ "cynic-proc-macros", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "static_assertions", @@ -1412,6 +1402,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "shell-words", + "tempfile", + "thiserror", + "zeroize", +] + [[package]] name = "diff" version = "0.1.13" @@ -1813,8 +1816,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29" dependencies = [ "futures", - "hyper", - "hyper-rustls", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "hyper-timeout", "log", "pin-project", @@ -1859,6 +1862,12 @@ dependencies = [ "regex", ] +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" + [[package]] name = "fastrand" version = "2.1.0" @@ -2014,6 +2023,7 @@ dependencies = [ "chrono", "clap 4.5.9", "devault", + "dialoguer", "forc", "forc-pkg", "forc-tracing 0.62.0", @@ -2026,12 +2036,14 @@ dependencies = [ "fuel-crypto", "fuel-tx", "fuel-vm", + "fuels", "fuels-accounts", "fuels-core", "futures", "hex", "portpicker", "rand", + "rexpect 0.5.0", "rpassword", "serde", "serde_json", @@ -2086,7 +2098,7 @@ dependencies = [ "fuel-vm", "portpicker", "rayon", - "rexpect", + "rexpect 0.4.0", "serde", "serde_json", "shellfish", @@ -2167,7 +2179,7 @@ dependencies = [ "ipfs-api-backend-hyper", "petgraph", "regex", - "reqwest", + "reqwest 0.12.5", "semver", "serde", "serde_ignored", @@ -2179,7 +2191,7 @@ dependencies = [ "sway-utils", "sysinfo", "tar", - "toml 0.7.8", + "toml 0.8.15", "tracing", "url", "vec1", @@ -2267,8 +2279,9 @@ dependencies = [ [[package]] name = "forc-wallet" -version = "0.8.2" -source = "git+https://github.com/FuelLabs/forc-wallet?branch=esdrubal/abi_changes#5ccd3694103d0775e6f844561cc2606aefa13352" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fb8dd372e7141efc5a63a1e6036e4ae0789774087ec9936b6cf426ef19bb16" dependencies = [ "anyhow", "clap 4.5.9", @@ -2348,9 +2361,9 @@ dependencies = [ [[package]] name = "fuel-asm" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" +checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" dependencies = [ "bitflags 2.6.0", "fuel-types", @@ -2360,9 +2373,9 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" +checksum = "db93098b2f39a7eab8c408eb6beb5b4580883a988b76377414eefe4b405455de" dependencies = [ "anyhow", "bech32", @@ -2380,9 +2393,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" +checksum = "eeec47aa62e9418a61a9936b6ec30474b918000879e5f556980e0648390b1c10" dependencies = [ "anyhow", "cynic", @@ -2391,9 +2404,9 @@ dependencies = [ "fuel-core-types", "futures", "hex", - "hyper-rustls", + "hyper-rustls 0.24.2", "itertools 0.12.1", - "reqwest", + "reqwest 0.11.27", "schemafy_lib", "serde", "serde_json", @@ -2404,9 +2417,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e2f22f6c4ce2696c29c14083c465f276c8d8eca67f051cb7d09a72442ceb5e" +checksum = "f69ff33d722268ab0533a75b260195169a3761e2ca1d13cdd8469a59c2826927" dependencies = [ "parking_lot 0.12.3", "pin-project-lite", @@ -2417,9 +2430,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" +checksum = "b3444c6b2ed6a7878e1a3b317f9922be41064cfafaf863bc7ab25823bcfbd749" dependencies = [ "anyhow", "async-trait", @@ -2434,9 +2447,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8a175199e0e7b1373ac10d45eb26563c1e8299298c9589ab60efb1c7cae6ac" +checksum = "e85c2a19cd58cf541409c94ef77ef9b2e742f196b9a0209fb6b9310184cec92f" dependencies = [ "anyhow", "async-trait", @@ -2449,9 +2462,9 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" +checksum = "54f244ffed0818fc7f63ff46ea4087ea2c509876b32e733f22e9b7836aebece4" dependencies = [ "anyhow", "derive_more", @@ -2471,9 +2484,9 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" +checksum = "044371366fb644733dd0452ced749b0d926d81c1959fad5f19f81a28f13125ee" dependencies = [ "anyhow", "bs58", @@ -2490,9 +2503,9 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" +checksum = "33548590131674e8f272a3e056be4dbaa1de7cb364eab2b17987cd5c0dc31cb0" dependencies = [ "coins-bip32", "coins-bip39", @@ -2511,9 +2524,9 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" +checksum = "3f49fdbfc1615d88d2849650afc2b0ac2fecd69661ebadd31a073d8416747764" dependencies = [ "proc-macro2", "quote", @@ -2570,9 +2583,9 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" +checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" dependencies = [ "derive_more", "digest 0.10.7", @@ -2585,15 +2598,15 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" +checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" [[package]] name = "fuel-tx" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" +checksum = "13aae44611588d199dd119e4a0ebd8eb7ae4cde6bf8b4d12715610b1f5e5b731" dependencies = [ "bitflags 2.6.0", "derivative", @@ -2614,9 +2627,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" +checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" dependencies = [ "fuel-derive", "hex", @@ -2626,9 +2639,9 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" +checksum = "64fc4695efac9207276f6229f2dd9811848b328a13604a698f7bce1d452bd986" dependencies = [ "anyhow", "async-trait", @@ -2660,8 +2673,9 @@ dependencies = [ [[package]] name = "fuels" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0921f0318576c0eff424a4d0f23c09fc7116880b7fc643a8012df519555b90a6" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2675,8 +2689,9 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409f2c0acdb512c19973e20253eda39b075c2b6c2378781679279072f65d78ce" dependencies = [ "async-trait", "chrono", @@ -2699,8 +2714,9 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f4f9ef364fe74a7079a6ad8e239ce424b754ff0e168ffcddb0da60d4069008" dependencies = [ "Inflector", "fuel-abi-types", @@ -2714,8 +2730,9 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c7a1b18a60af04579eff687e76fac419fb060b7309a35675fac22a132af00" dependencies = [ "async-trait", "bech32", @@ -2741,8 +2758,9 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf58bac268a3ee1dec31ec1b6273e326c8650fa805dad600a03329716d17c29" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2753,8 +2771,9 @@ dependencies = [ [[package]] name = "fuels-programs" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "313e13af93d629778f514cb876befdc30d5c030df58ab96885a39bdaeeddcff6" dependencies = [ "async-trait", "fuel-abi-types", @@ -2771,8 +2790,9 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c9690c345c4ab5f368fb9309e3df3f745f44109f5e40aed87d184f8af0a3c" dependencies = [ "fuel-core-chain-config", "fuel-core-client", @@ -2948,11 +2968,11 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.17.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2963,39 +2983,49 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.28.1" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" +checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" dependencies = [ "gix-hash", + "gix-trace", "libc", ] [[package]] name = "gix-hash" -version = "0.10.4" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ - "hex", + "faster-hex", "thiserror", ] [[package]] name = "gix-path" -version = "0.7.3" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" +checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" dependencies = [ "bstr", + "gix-trace", + "home", + "once_cell", "thiserror", ] +[[package]] +name = "gix-trace" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" + [[package]] name = "gix-url" -version = "0.16.0" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5" +checksum = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156" dependencies = [ "bstr", "gix-features", @@ -3055,7 +3085,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -3252,6 +3301,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3259,7 +3319,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -3291,9 +3374,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3305,6 +3388,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-multipart-rfc7578" version = "0.8.0" @@ -3314,8 +3417,8 @@ dependencies = [ "bytes", "common-multipart-rfc7578", "futures-core", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", ] [[package]] @@ -3325,23 +3428,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", "log", - "rustls", + "rustls 0.21.12", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "webpki-roots", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.30", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -3349,15 +3469,38 @@ dependencies = [ [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -3595,8 +3738,8 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", "hyper-multipart-rfc7578", "ipfs-api-prelude", "thiserror", @@ -3614,7 +3757,7 @@ dependencies = [ "common-multipart-rfc7578", "dirs 4.0.0", "futures", - "http", + "http 0.2.12", "multiaddr", "multibase", "serde", @@ -3772,9 +3915,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -4190,7 +4333,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", "url", ] @@ -4213,24 +4356,7 @@ checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "multihash-derive", - "unsigned-varint", -] - -[[package]] -name = "multihash" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" -dependencies = [ - "blake2b_simd 1.0.2", - "blake2s_simd", - "blake3", - "core2", - "digest 0.10.7", - "multihash-derive", - "sha2 0.10.8", - "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4240,7 +4366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4309,6 +4435,20 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.2.1", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", + "pin-utils", +] + [[package]] name = "nix" version = "0.26.4" @@ -4504,7 +4644,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.71", @@ -5510,12 +5650,55 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", + "hyper-rustls 0.24.2", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -5524,23 +5707,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls-pemfile 2.1.3", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -5590,6 +5770,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "rexpect" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" +dependencies = [ + "comma", + "nix 0.25.1", + "regex", + "tempfile", + "thiserror", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -5725,7 +5918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ "base64 0.13.1", - "blake2b_simd 0.5.11", + "blake2b_simd", "constant_time_eq 0.1.5", "crossbeam-utils", ] @@ -5794,10 +5987,23 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -5805,7 +6011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -5819,6 +6025,22 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5829,6 +6051,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.17" @@ -6669,7 +6902,6 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "ropey", "serde", "serde_json", "sway-ast", @@ -6815,6 +7047,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -7266,7 +7504,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] @@ -7315,6 +7564,18 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "toml" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.16", +] + [[package]] name = "toml_datetime" version = "0.6.6" @@ -7334,7 +7595,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -7345,7 +7606,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] @@ -7364,6 +7638,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", + "tokio", "tower-layer", "tower-service", ] @@ -7521,7 +7796,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "static_assertions", ] @@ -7647,6 +7922,12 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "untrusted" version = "0.9.0" @@ -8178,6 +8459,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -8188,6 +8478,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "winsafe" version = "0.0.19" From 67b8ac019799af778e93b9e4164d68ff7b3d8fc1 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 12:29:38 +0100 Subject: [PATCH 37/47] Revert "feat: create and deploy a reference proxy contract for contracts with `[proxy]` enabled (#6069)" This reverts commit ebb030b2eb48fd5afd062b36511ddfe324414f1a. --- Cargo.lock | 1 - docs/book/src/forc/plugins/forc_client/index.md | 14 ++++++++------ forc-plugins/forc-client/tests/deploy.rs | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f59d935970..41ba01bb113 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2036,7 +2036,6 @@ dependencies = [ "fuel-crypto", "fuel-tx", "fuel-vm", - "fuels", "fuels-accounts", "fuels-core", "futures", diff --git a/docs/book/src/forc/plugins/forc_client/index.md b/docs/book/src/forc/plugins/forc_client/index.md index fc552e6bece..8f35fd1b121 100644 --- a/docs/book/src/forc/plugins/forc_client/index.md +++ b/docs/book/src/forc/plugins/forc_client/index.md @@ -1,6 +1,8 @@ # `forc-client` -Forc plugin for interacting with a Fuel node. Since transactions are going to require some gas, you need to sign them with an account that has enough tokens to pay for them. +The forc plugin for interacting with a Fuel node. + +Since transactions are going to require some gas, you need to sign them with an account that has enough coins to pay for them. We offer multiple ways to sign the transaction: @@ -8,7 +10,7 @@ We offer multiple ways to sign the transaction: 2. Use the default signer to deploy to a local node 3. Use `forc-wallet` to manually sign transactions, and copy the signed transaction back to `forc-client`. -The easiest and recommended way to interact with deployed networks such as our testnets is option 1, using `forc-client` to sign your transactions which reads your default `forc-wallet` vault. For interacting with local node, we recommend using the second option, which leads `forc-client` to sign transactions with the a private key that comes pre-funded in local environments. +The easiest and recommended way to interact with deployed networks such as our testnets is option 1, using `forc-client` to sign your transactions which reads your default `forc-wallet` vault. For interacting with local node, we recommend using the second option, which leads `forc-client` to sign transactions with the private key that comes pre-funded in local environments. ## Option 1: Sign transactions via forc-client using your local forc-wallet vault @@ -37,7 +39,7 @@ As it can be seen from the example, `forc-client` asks for your password to decr ## Option 2: Using default signer -If you are not interacting with a deployed network, such as testnets, your local `fuel-core` environment can be structured such that it funds an account by default. Using `--default-signer` flag with `forc-client` binaries (run, deploy) will instruct `forc-client` to sign transactions with this pre-funded account. Which makes it a useful command while working against a local node. +If you are not interacting with a deployed network, such as testnets, your local `fuel-core` environment can be structured such that it funds an account by default. Using `--default-signer` flag with `forc-client` binaries (run, deploy) will instruct `forc-client` to sign transactions with this pre-funded account. This makes it a useful command while working against a local node. Example: @@ -54,7 +56,7 @@ Example: ## Option 3: Manually signing through forc-wallet (Deprecated) -This option is for creating the transaction first, signing it manually and supplying the signed transaction back to forc-client. Since it requires multiple steps, it is more error-prone and not recommended for general use case. Also this will be deprecated soon. +This option is for creating the transaction first, signing it manually, and supplying the signed transaction back to forc-client. Since it requires multiple steps, it is more error-prone and not recommended for general use cases. Also this will be deprecated soon. 1. Construct the transaction by using either `forc deploy` or `forc run`. To do so simply run `forc deploy --manual-sign` or `forc run --manual-sign` with your desired parameters. For a list of parameters please refer to the [forc-deploy](./forc_deploy.md) or [forc-run](./forc_run.md) section of the book. Once you run either command you will be asked the address of the wallet you are going to be signing with. After the address is given the transaction will be generated and you will be given a transaction ID. At this point CLI will actively wait for you to insert the signature. 2. Take the transaction ID generated in the first step and sign it with `forc wallet sign --account tx-id `. This will generate a signature. @@ -144,9 +146,9 @@ implicit-std = false enabled = true ``` -If there is no `address` field present under the proxy table, like the example above, `forc` will automatically create a proxy contract based on the [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) implementation from [sway-standards](https://github.com/FuelLabs/sway-standards). After generating and deploying the proxy contract, the target is set to the current contract, and owner of the proxy is set to the account that is signing the transaction for deployment. +If there is no `address` field present under the proxy table, like the example above, `forc` will automatically create a proxy contract based on the [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) implementation from [sway-standards](https://github.com/FuelLabs/sway-standards). After generating and deploying the proxy contract, the target is set to the current contract, and the owner of the proxy is set to the account that is signing the transaction for deployment. -This means that if you simply enable proxy in the `Forc.toml`, forc will automatically deploy a proxy contract for you and you do not need to do anything manually aside from signing the deployment transactions for the proxy contract. After deploying the proxy contract, the its address is added into the `address` field of the proxy table. +This means that if you simply enable proxy in the `Forc.toml`, forc will automatically deploy a proxy contract for you and you do not need to do anything manually aside from signing the deployment transactions for the proxy contract. After deploying the proxy contract, the address is added into the `address` field of the proxy table. If you want to update the target of an [SRC-14](https://github.com/FuelLabs/sway-standards/blob/master/docs/src/src-14-simple-upgradeable-proxies.md) compliant proxy contract rather than deploying a new one, simply add its `address` in the `address` field, like the following example: diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index 8f45d4a3478..e65e5e4f3cb 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -141,7 +141,7 @@ async fn test_simple_deploy() { node.kill().unwrap(); let expected = vec![DeployedContract { id: ContractId::from_str( - "822c8d3672471f64f14f326447793c7377b6e430122db23b622880ccbd8a33ef", + "ad0bba17e0838ef859abe2693d8a5e3bc4e7cfb901601e30f4dc34999fda6335", ) .unwrap(), proxy: None, @@ -185,12 +185,12 @@ async fn test_deploy_fresh_proxy() { node.kill().unwrap(); let impl_contract = DeployedContract { id: ContractId::from_str( - "822c8d3672471f64f14f326447793c7377b6e430122db23b622880ccbd8a33ef", + "ad0bba17e0838ef859abe2693d8a5e3bc4e7cfb901601e30f4dc34999fda6335", ) .unwrap(), proxy: Some( ContractId::from_str( - "3da2f8ee967c62496db4b71df0acd7c3fea1e494fee1de0cd16e7abd22e6057f", + "5237df8db3edbe825ce83f4292094923c989efe3265b0115ed050925593a3488", ) .unwrap(), ), From 10cd8ecbc76886440c0ace561186697619c8c3af Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 12:52:15 +0100 Subject: [PATCH 38/47] Fixes build. --- Cargo.lock | 1 + .../standalone_contract-abi.json | 20 +- sway-lib-std/src/ecr.sw | 3 +- sway-lib-std/src/execution.sw | 2 +- .../template/Cargo.toml | 2 +- .../sway-script-test-rs/template/Cargo.toml | 2 +- templates/sway-test-rs/template/Cargo.toml | 2 +- .../predicate_invalid_opcodes/src/main.sw | 2 +- .../predicate_invalid_opcodes/test.toml | 2 +- test/src/ir_generation/tests/jmp_mem.sw | 6 +- test/src/sdk-harness/Cargo.lock | 752 +++++++++++++++--- test/src/sdk-harness/Cargo.toml | 9 +- 12 files changed, 663 insertions(+), 140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41ba01bb113..1f59d935970 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2036,6 +2036,7 @@ dependencies = [ "fuel-crypto", "fuel-tx", "fuel-vm", + "fuels", "fuels-accounts", "fuels-core", "futures", diff --git a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json index 05b0f04b2d3..a2d797817fc 100644 --- a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json +++ b/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json @@ -1,23 +1,23 @@ { + "programType": "contract", + "specVersion": "1", + "encodingVersion": "1", "concreteTypes": [ { - "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", - "type": "u64" + "type": "bool", + "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], - "configurables": [], - "encodingVersion": "1", + "metadataTypes": [], "functions": [ { - "attributes": null, "inputs": [], - "name": "main", - "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + "name": "test_function", + "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", + "attributes": null } ], "loggedTypes": [], "messagesTypes": [], - "metadataTypes": [], - "programType": "script", - "specVersion": "1" + "configurables": [] } \ No newline at end of file diff --git a/sway-lib-std/src/ecr.sw b/sway-lib-std/src/ecr.sw index 78078e0db2f..ce1beb8f4d2 100644 --- a/sway-lib-std/src/ecr.sw +++ b/sway-lib-std/src/ecr.sw @@ -163,8 +163,9 @@ pub fn ed_verify( buffer: public_key, sig: __addr_of(signature), hash: msg_hash, + len: 32, ) { - ed19 buffer sig hash i32; + ed19 buffer sig hash len; err }; // check the $err register to see if the `ed19` opcode succeeded diff --git a/sway-lib-std/src/execution.sw b/sway-lib-std/src/execution.sw index 8bd4f558418..ad4770992af 100644 --- a/sway-lib-std/src/execution.sw +++ b/sway-lib-std/src/execution.sw @@ -68,4 +68,4 @@ pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { sw hp ssp_saved i0; } __jmp_mem() -} \ No newline at end of file +} diff --git a/templates/sway-predicate-test-rs/template/Cargo.toml b/templates/sway-predicate-test-rs/template/Cargo.toml index 2b33a5d631b..360e8b4b8c5 100644 --- a/templates/sway-predicate-test-rs/template/Cargo.toml +++ b/templates/sway-predicate-test-rs/template/Cargo.toml @@ -7,7 +7,7 @@ authors = ["{{authors}}"] license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62", features = ["fuel-core-lib"] } +fuels = { version = "0.66", features = ["fuel-core-lib"] } tokio = { version = "1.12", features = ["rt", "macros"] } [[test]] diff --git a/templates/sway-script-test-rs/template/Cargo.toml b/templates/sway-script-test-rs/template/Cargo.toml index 2b33a5d631b..360e8b4b8c5 100644 --- a/templates/sway-script-test-rs/template/Cargo.toml +++ b/templates/sway-script-test-rs/template/Cargo.toml @@ -7,7 +7,7 @@ authors = ["{{authors}}"] license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62", features = ["fuel-core-lib"] } +fuels = { version = "0.66", features = ["fuel-core-lib"] } tokio = { version = "1.12", features = ["rt", "macros"] } [[test]] diff --git a/templates/sway-test-rs/template/Cargo.toml b/templates/sway-test-rs/template/Cargo.toml index 416feb395ab..b613603727e 100644 --- a/templates/sway-test-rs/template/Cargo.toml +++ b/templates/sway-test-rs/template/Cargo.toml @@ -7,7 +7,7 @@ authors = ["{{authors}}"] license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { version = "0.66.0", features = ["fuel-core-lib"] } tokio = { version = "1.12", features = ["rt", "macros"] } [[test]] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/src/main.sw index c4afb3c6574..1475bcf18f3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/src/main.sw @@ -57,7 +57,7 @@ fn main() -> bool { }; asm(r1: 0, r2: 0, r3: 0) { - ldc r1 r2 r3; + ldc r1 r2 r3 i0; } asm(r1: 0, r2: 0, r3: 0, r4: 0) { diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/test.toml index b384ae9f5a9..05d73f3c66d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/predicate_invalid_opcodes/test.toml @@ -35,7 +35,7 @@ category = "fail" # not: $()The GM (get-metadata) opcode, when called from an external context, will cause the VM to panic. -# check: ldc r1 r2 r3; +# check: ldc r1 r2 r3 i0; # nextln: $()The LDC opcode cannot be used in a predicate. # check: log r1 r2 r3 r4; diff --git a/test/src/ir_generation/tests/jmp_mem.sw b/test/src/ir_generation/tests/jmp_mem.sw index fd5f10a2a65..7861956060b 100644 --- a/test/src/ir_generation/tests/jmp_mem.sw +++ b/test/src/ir_generation/tests/jmp_mem.sw @@ -19,7 +19,7 @@ impl MyContract for Contract { csiz length code_id; // Save the old ssp move ssp_saved ssp; - ldc code_id zero length; + ldc code_id zero length i0; // Store the old ssp to MEM[$hp] so that we can jump to it. // allocate a word the stack addi word zero i64; @@ -40,7 +40,7 @@ impl MyContract for Contract { // check: pub entry fn test_function // not: local // check: csiz length code_id -// check: ldc code_id zero length, +// check: ldc code_id zero length i0, // check: jmp_mem // ::check-asm:: @@ -48,7 +48,7 @@ impl MyContract for Contract { // regex: REG=.r\d+\b // check: csiz $(len=$REG) $REG -// check: ldc $REG $$zero $len +// check: ldc $REG $$zero $len i0 // check: lw $(target=$REG) $$hp i0 // check: sub $(jmp_target_4=$REG) $target $$is // check: divi $(jmp_target=$REG) $jmp_target_4 i4 diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index f9fd9d29f68..cc65fdcd40b 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -521,6 +521,21 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -1530,7 +1545,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" dependencies = [ "bitflags 2.5.0", - "fuel-types", + "fuel-types 0.55.0", + "serde", + "strum 0.24.1", +] + +[[package]] +name = "fuel-asm" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" +dependencies = [ + "bitflags 2.5.0", + "fuel-types 0.56.0", "serde", "strum 0.24.1", ] @@ -1548,21 +1575,69 @@ dependencies = [ "clap", "derive_more", "enum-iterator", - "fuel-core-chain-config", - "fuel-core-consensus-module", - "fuel-core-database", - "fuel-core-executor", - "fuel-core-gas-price-service", - "fuel-core-importer", - "fuel-core-metrics", + "fuel-core-chain-config 0.31.0", + "fuel-core-consensus-module 0.31.0", + "fuel-core-database 0.31.0", + "fuel-core-executor 0.31.0", + "fuel-core-gas-price-service 0.31.0", + "fuel-core-importer 0.31.0", + "fuel-core-metrics 0.31.0", + "fuel-core-poa 0.31.0", + "fuel-core-producer 0.31.0", + "fuel-core-services 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-txpool 0.31.0", + "fuel-core-types 0.31.0", + "fuel-core-upgradable-executor 0.31.0", + "futures", + "hex", + "hyper", + "indicatif", + "itertools 0.12.1", + "postcard", + "rand", + "serde", + "serde_json", + "strum 0.25.0", + "strum_macros 0.25.3", + "thiserror", + "tokio", + "tokio-rayon", + "tokio-stream", + "tokio-util", + "tower-http", + "tracing", + "uuid 1.8.0", +] + +[[package]] +name = "fuel-core" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce6cfa410a9a45a691e30b23098b550749a24bcbbde1f81057d85ab6b81cfb3" +dependencies = [ + "anyhow", + "async-graphql", + "async-trait", + "axum", + "clap", + "derive_more", + "enum-iterator", + "fuel-core-chain-config 0.32.1", + "fuel-core-consensus-module 0.32.1", + "fuel-core-database 0.32.1", + "fuel-core-executor 0.32.1", + "fuel-core-gas-price-service 0.32.1", + "fuel-core-importer 0.32.1", + "fuel-core-metrics 0.32.1", "fuel-core-p2p", - "fuel-core-poa", - "fuel-core-producer", - "fuel-core-services", - "fuel-core-storage", - "fuel-core-txpool", - "fuel-core-types", - "fuel-core-upgradable-executor", + "fuel-core-poa 0.32.1", + "fuel-core-producer 0.32.1", + "fuel-core-services 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-txpool 0.32.1", + "fuel-core-types 0.32.1", + "fuel-core-upgradable-executor 0.32.1", "futures", "hex", "hyper", @@ -1593,8 +1668,27 @@ dependencies = [ "anyhow", "bech32", "derivative", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "itertools 0.12.1", + "postcard", + "serde", + "serde_json", + "serde_with", + "tracing", +] + +[[package]] +name = "fuel-core-chain-config" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db93098b2f39a7eab8c408eb6beb5b4580883a988b76377414eefe4b405455de" +dependencies = [ + "anyhow", + "bech32", + "derivative", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "itertools 0.12.1", "postcard", "rand", @@ -1609,12 +1703,33 @@ name = "fuel-core-client" version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" +dependencies = [ + "anyhow", + "cynic", + "derive_more", + "fuel-core-types 0.31.0", + "hex", + "itertools 0.12.1", + "reqwest", + "schemafy_lib", + "serde", + "serde_json", + "tai64", + "thiserror", + "tracing", +] + +[[package]] +name = "fuel-core-client" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeec47aa62e9418a61a9936b6ec30474b918000879e5f556980e0648390b1c10" dependencies = [ "anyhow", "cynic", "derive_more", "eventsource-client", - "fuel-core-types", + "fuel-core-types 0.32.1", "futures", "hex", "hyper-rustls", @@ -1635,10 +1750,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b2e7b793cd76350fc8da9386ad0e8b15eb1fc45c75cc223761af1ed730736c7" dependencies = [ "anyhow", - "fuel-core-chain-config", - "fuel-core-poa", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-chain-config 0.31.0", + "fuel-core-poa 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", +] + +[[package]] +name = "fuel-core-consensus-module" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dea31560d3d499a11ec1022b4eb625a26d86547c95519d1be66c6e232424069" +dependencies = [ + "anyhow", + "fuel-core-chain-config 0.32.1", + "fuel-core-poa 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", ] [[package]] @@ -1649,8 +1777,20 @@ checksum = "8e030f58d7b41fbebe984f6cd53b18e448eae3433fa8af7f39ec5f13fd917e04" dependencies = [ "anyhow", "derive_more", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", +] + +[[package]] +name = "fuel-core-database" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1380dc6f68a2e5658e730ef4815e21861305dfc319b5f9695f5661a5ee6fca" +dependencies = [ + "anyhow", + "derive_more", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", ] [[package]] @@ -1660,8 +1800,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "862f492af8ce138f3fd607eadfa3ef22a66f64773f451b55181b59f624265cfc" dependencies = [ "anyhow", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "hex", + "parking_lot", + "serde", + "tracing", +] + +[[package]] +name = "fuel-core-executor" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8bccb069b9f8a9c8df9826b0ded1104a87492939e59646c1981679db3c57ead" +dependencies = [ + "anyhow", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "hex", "parking_lot", "serde", @@ -1676,12 +1831,36 @@ checksum = "7d3d418865a81e23b212894f77ef6a697ea3c8c6f19d09c1923c4db245f5af01" dependencies = [ "anyhow", "async-trait", - "fuel-core-services", - "fuel-core-types", - "fuel-gas-price-algorithm", + "fuel-core-services 0.31.0", + "fuel-core-types 0.31.0", + "fuel-gas-price-algorithm 0.31.0", + "futures", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "fuel-core-gas-price-service" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43359fb62763f2c7f6449c9a9d48f872b87b0a4f1bb674cf6ed7313b988500a1" +dependencies = [ + "anyhow", + "async-trait", + "enum-iterator", + "fuel-core-services 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", + "fuel-gas-price-algorithm 0.32.1", "futures", + "num_enum", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", "thiserror", "tokio", + "tokio-stream", "tracing", ] @@ -1693,9 +1872,26 @@ checksum = "dc96f6d33842303b97cf586dc028d32c03e5fb7a9f35a109002c51c3f5fbc67a" dependencies = [ "anyhow", "derive_more", - "fuel-core-metrics", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-metrics 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "parking_lot", + "rayon", + "tokio", + "tracing", +] + +[[package]] +name = "fuel-core-importer" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a47d3ae71a4995899f5427e0179811bae2809ecb0a8c43ee1fad2c667fc27a" +dependencies = [ + "anyhow", + "derive_more", + "fuel-core-metrics 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "parking_lot", "rayon", "tokio", @@ -1715,19 +1911,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "fuel-core-metrics" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f69ff33d722268ab0533a75b260195169a3761e2ca1d13cdd8469a59c2826927" +dependencies = [ + "parking_lot", + "pin-project-lite", + "prometheus-client", + "regex", + "tracing", +] + [[package]] name = "fuel-core-p2p" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462fc6e7a911329ee5370274e7a3c5a111ab2a744e7878c3907d7724f3dddca" +checksum = "6c71c01bc15433956791000b9256db6b8065eabe401e91be99d6157326dbe358" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config", - "fuel-core-metrics", - "fuel-core-services", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-chain-config 0.32.1", + "fuel-core-metrics 0.32.1", + "fuel-core-services 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "futures", "hex", "ip_network", @@ -1756,10 +1965,27 @@ checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config", - "fuel-core-services", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-chain-config 0.31.0", + "fuel-core-services 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "fuel-core-poa" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3444c6b2ed6a7878e1a3b317f9922be41064cfafaf863bc7ab25823bcfbd749" +dependencies = [ + "anyhow", + "async-trait", + "fuel-core-chain-config 0.32.1", + "fuel-core-services 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "tokio", "tokio-stream", "tracing", @@ -1774,8 +2000,24 @@ dependencies = [ "anyhow", "async-trait", "derive_more", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "tokio", + "tokio-rayon", + "tracing", +] + +[[package]] +name = "fuel-core-producer" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73e24d506698afd4cae5421d3df3083ce26eb2efee672eaf54fa12b01aef924" +dependencies = [ + "anyhow", + "async-trait", + "derive_more", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "tokio", "tokio-rayon", "tracing", @@ -1789,7 +2031,22 @@ checksum = "ff8a175199e0e7b1373ac10d45eb26563c1e8299298c9589ab60efb1c7cae6ac" dependencies = [ "anyhow", "async-trait", - "fuel-core-metrics", + "fuel-core-metrics 0.31.0", + "futures", + "parking_lot", + "tokio", + "tracing", +] + +[[package]] +name = "fuel-core-services" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e85c2a19cd58cf541409c94ef77ef9b2e742f196b9a0209fb6b9310184cec92f" +dependencies = [ + "anyhow", + "async-trait", + "fuel-core-metrics 0.32.1", "futures", "parking_lot", "tokio", @@ -1805,8 +2062,30 @@ dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types", - "fuel-vm", + "fuel-core-types 0.31.0", + "fuel-vm 0.55.0", + "impl-tools", + "itertools 0.12.1", + "num_enum", + "paste", + "postcard", + "primitive-types", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", +] + +[[package]] +name = "fuel-core-storage" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54f244ffed0818fc7f63ff46ea4087ea2c509876b32e733f22e9b7836aebece4" +dependencies = [ + "anyhow", + "derive_more", + "enum-iterator", + "fuel-core-types 0.32.1", + "fuel-vm 0.56.0", "impl-tools", "itertools 0.12.1", "mockall", @@ -1828,10 +2107,30 @@ checksum = "c7b359054dda9026718b9b23e82c172dbb52eb6d29c1b9589b9d2edac6714e31" dependencies = [ "anyhow", "async-trait", - "fuel-core-metrics", - "fuel-core-services", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-metrics 0.31.0", + "fuel-core-services 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", + "num-rational", + "parking_lot", + "tokio", + "tokio-rayon", + "tokio-stream", + "tracing", +] + +[[package]] +name = "fuel-core-txpool" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5b1fdb43167b38acdf6732c45e1d406b5b36ee6d58fb7721aa1efa781123bb" +dependencies = [ + "anyhow", + "async-trait", + "fuel-core-metrics 0.32.1", + "fuel-core-services 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", "mockall", "num-rational", "parking_lot", @@ -1851,7 +2150,25 @@ dependencies = [ "bs58", "derivative", "derive_more", - "fuel-vm", + "fuel-vm 0.55.0", + "secrecy", + "serde", + "tai64", + "thiserror", + "zeroize", +] + +[[package]] +name = "fuel-core-types" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "044371366fb644733dd0452ced749b0d926d81c1959fad5f19f81a28f13125ee" +dependencies = [ + "anyhow", + "bs58", + "derivative", + "derive_more", + "fuel-vm 0.56.0", "rand", "secrecy", "serde", @@ -1866,9 +2183,20 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aec85090083710f81142760b897289b4852cbba10b3d2e24236bf9e19987d87b" dependencies = [ - "fuel-core-executor", - "fuel-core-storage", - "fuel-core-types", + "fuel-core-executor 0.31.0", + "fuel-core-storage 0.31.0", + "fuel-core-types 0.31.0", +] + +[[package]] +name = "fuel-core-upgradable-executor" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72101a6ce5cafbdfaf7cd9d142c9e7626b5f7e87bfe6cde177c5f0d3acd07c7e" +dependencies = [ + "fuel-core-executor 0.32.1", + "fuel-core-storage 0.32.1", + "fuel-core-types 0.32.1", ] [[package]] @@ -1881,7 +2209,28 @@ dependencies = [ "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types", + "fuel-types 0.55.0", + "k256", + "lazy_static", + "p256", + "rand", + "secp256k1", + "serde", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "fuel-crypto" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33548590131674e8f272a3e056be4dbaa1de7cb364eab2b17987cd5c0dc31cb0" +dependencies = [ + "coins-bip32", + "coins-bip39", + "ecdsa", + "ed25519-dalek", + "fuel-types 0.56.0", "k256", "lazy_static", "p256", @@ -1904,6 +2253,18 @@ dependencies = [ "synstructure 0.13.1", ] +[[package]] +name = "fuel-derive" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f49fdbfc1615d88d2849650afc2b0ac2fecd69661ebadd31a073d8416747764" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.63", + "synstructure 0.13.1", +] + [[package]] name = "fuel-gas-price-algorithm" version = "0.31.0" @@ -1913,6 +2274,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "fuel-gas-price-algorithm" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675c0ced6dbab8d2184c4caa966169594ba1e80e3abdeaecc5c73dcf86b4f03a" +dependencies = [ + "proptest", + "serde", + "thiserror", +] + [[package]] name = "fuel-merkle" version = "0.55.0" @@ -1921,7 +2293,22 @@ checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage", + "fuel-storage 0.55.0", + "hashbrown 0.13.2", + "hex", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "fuel-merkle" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" +dependencies = [ + "derive_more", + "digest 0.10.7", + "fuel-storage 0.56.0", "hashbrown 0.13.2", "hex", "serde", @@ -1934,6 +2321,12 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" +[[package]] +name = "fuel-storage" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" + [[package]] name = "fuel-tx" version = "0.55.0" @@ -1943,10 +2336,33 @@ dependencies = [ "bitflags 2.5.0", "derivative", "derive_more", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-types", + "fuel-asm 0.55.0", + "fuel-crypto 0.55.0", + "fuel-merkle 0.55.0", + "fuel-types 0.55.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "postcard", + "rand", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", +] + +[[package]] +name = "fuel-tx" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aae44611588d199dd119e4a0ebd8eb7ae4cde6bf8b4d12715610b1f5e5b731" +dependencies = [ + "bitflags 2.5.0", + "derivative", + "derive_more", + "fuel-asm 0.56.0", + "fuel-crypto 0.56.0", + "fuel-merkle 0.56.0", + "fuel-types 0.56.0", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -1963,7 +2379,18 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" dependencies = [ - "fuel-derive", + "fuel-derive 0.55.0", + "hex", + "serde", +] + +[[package]] +name = "fuel-types" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" +dependencies = [ + "fuel-derive 0.56.0", "hex", "rand", "serde", @@ -1974,6 +2401,37 @@ name = "fuel-vm" version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" +dependencies = [ + "async-trait", + "backtrace", + "bitflags 2.5.0", + "derivative", + "derive_more", + "ethnum", + "fuel-asm 0.55.0", + "fuel-crypto 0.55.0", + "fuel-merkle 0.55.0", + "fuel-storage 0.55.0", + "fuel-tx 0.55.0", + "fuel-types 0.55.0", + "hashbrown 0.14.5", + "itertools 0.10.5", + "libm", + "paste", + "percent-encoding", + "primitive-types", + "serde", + "serde_with", + "sha3", + "static_assertions", + "strum 0.24.1", +] + +[[package]] +name = "fuel-vm" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fc4695efac9207276f6229f2dd9811848b328a13604a698f7bce1d452bd986" dependencies = [ "anyhow", "async-trait", @@ -1982,12 +2440,12 @@ dependencies = [ "derivative", "derive_more", "ethnum", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-storage", - "fuel-tx", - "fuel-types", + "fuel-asm 0.56.0", + "fuel-crypto 0.56.0", + "fuel-merkle 0.56.0", + "fuel-storage 0.56.0", + "fuel-tx 0.56.0", + "fuel-types 0.56.0", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2005,13 +2463,14 @@ dependencies = [ [[package]] name = "fuels" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0921f0318576c0eff424a4d0f23c09fc7116880b7fc643a8012df519555b90a6" dependencies = [ - "fuel-core", - "fuel-core-client", - "fuel-crypto", - "fuel-tx", + "fuel-core 0.32.1", + "fuel-core-client 0.32.1", + "fuel-crypto 0.56.0", + "fuel-tx 0.56.0", "fuels-accounts", "fuels-core", "fuels-macros", @@ -2021,18 +2480,19 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409f2c0acdb512c19973e20253eda39b075c2b6c2378781679279072f65d78ce" dependencies = [ "async-trait", "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", + "fuel-core-client 0.32.1", + "fuel-core-types 0.32.1", + "fuel-crypto 0.56.0", + "fuel-tx 0.56.0", + "fuel-types 0.56.0", "fuels-core", "itertools 0.12.1", "rand", @@ -2045,8 +2505,9 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f4f9ef364fe74a7079a6ad8e239ce424b754ff0e168ffcddb0da60d4069008" dependencies = [ "Inflector", "fuel-abi-types", @@ -2060,21 +2521,22 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c7a1b18a60af04579eff687e76fac419fb060b7309a35675fac22a132af00" dependencies = [ "async-trait", "bech32", "chrono", "fuel-abi-types", - "fuel-asm", - "fuel-core-chain-config", - "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuel-vm", + "fuel-asm 0.56.0", + "fuel-core-chain-config 0.32.1", + "fuel-core-client 0.32.1", + "fuel-core-types 0.32.1", + "fuel-crypto 0.56.0", + "fuel-tx 0.56.0", + "fuel-types 0.56.0", + "fuel-vm 0.56.0", "fuels-macros", "hex", "itertools 0.12.1", @@ -2087,8 +2549,9 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf58bac268a3ee1dec31ec1b6273e326c8650fa805dad600a03329716d17c29" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2099,14 +2562,15 @@ dependencies = [ [[package]] name = "fuels-programs" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "313e13af93d629778f514cb876befdc30d5c030df58ab96885a39bdaeeddcff6" dependencies = [ "async-trait", "fuel-abi-types", - "fuel-asm", - "fuel-tx", - "fuel-types", + "fuel-asm 0.56.0", + "fuel-tx 0.56.0", + "fuel-types 0.56.0", "fuels-accounts", "fuels-core", "itertools 0.12.1", @@ -2117,17 +2581,18 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.65.1" -source = "git+https://github.com/FuelLabs/fuels-rs?branch=esdrubal/abi_changes2#3966fd95b8702a7700802160ee6dad2f4b3832e1" -dependencies = [ - "fuel-core", - "fuel-core-chain-config", - "fuel-core-client", - "fuel-core-poa", - "fuel-core-services", - "fuel-crypto", - "fuel-tx", - "fuel-types", +version = "0.66.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c9690c345c4ab5f368fb9309e3df3f745f44109f5e40aed87d184f8af0a3c" +dependencies = [ + "fuel-core 0.32.1", + "fuel-core-chain-config 0.32.1", + "fuel-core-client 0.32.1", + "fuel-core-poa 0.32.1", + "fuel-core-services 0.32.1", + "fuel-crypto 0.56.0", + "fuel-tx 0.56.0", + "fuel-types 0.56.0", "fuels-accounts", "fuels-core", "futures", @@ -3780,6 +4245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -4196,6 +4662,26 @@ dependencies = [ "syn 2.0.63", ] +[[package]] +name = "proptest" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.5.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "psl-types" version = "2.0.11" @@ -4333,6 +4819,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + [[package]] name = "rayon" version = "1.10.0" @@ -4612,6 +5107,18 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "rw-stream-sink" version = "0.4.0" @@ -5205,9 +5712,9 @@ name = "tests" version = "0.0.0" dependencies = [ "assert_matches", - "fuel-core", - "fuel-core-client", - "fuel-vm", + "fuel-core 0.31.0", + "fuel-core-client 0.31.0", + "fuel-vm 0.56.0", "fuels", "hex", "paste", @@ -5510,6 +6017,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -5638,6 +6151,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "want" version = "0.3.1" diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml index 32c4b51c7f2..eef4714b329 100644 --- a/test/src/sdk-harness/Cargo.toml +++ b/test/src/sdk-harness/Cargo.toml @@ -10,15 +10,14 @@ publish = false assert_matches = "1.5.0" # Dependencies from the `fuel-core` repository: -fuel-core = { version = "0.31.0", default-features = false } -fuel-core-client = { version = "0.31.0", default-features = false } +fuel-core = { version = "0.32.0", default-features = false } +fuel-core-client = { version = "0.32.0", default-features = false } # Dependencies from the `fuel-vm` repository: -fuel-vm = { version = "0.55.0", features = ["random"] } +fuel-vm = { version = "0.56.0", features = ["random"] } # Dependencies from the `fuels-rs` repository: -fuels = { git = "https://github.com/FuelLabs/fuels-rs", branch = "esdrubal/abi_changes2", features = ["fuel-core-lib"]} -#fuels = { version = "0.65.1", features = ["fuel-core-lib"] } +fuels = { version = "0.66.0", features = ["fuel-core-lib"] } hex = "0.4.3" paste = "1.0.14" From 93866ff5271fa02fc1eeb21cbee4c0546c8e20fe Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 15:41:12 +0100 Subject: [PATCH 39/47] Moved comments up because of sway formatter. --- sway-lib-std/src/execution.sw | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sway-lib-std/src/execution.sw b/sway-lib-std/src/execution.sw index ad4770992af..d80207fb096 100644 --- a/sway-lib-std/src/execution.sw +++ b/sway-lib-std/src/execution.sw @@ -32,6 +32,12 @@ pub fn run_external(load_target: ContractId) -> ! { } pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { + // Get lengths of both chunks + // Store load_target2 on the heap as it'll be overwritten with the first LDC we do. + // Save the old $ssp value as that's were the contract will be loaded. + // Shrink the stack since LDC wants $ssp == $sp + // Do the loads + // __jmp_mem jumps to $MEM[$hp], so set that up. asm( load_target1: load_target1, load_target2: load_target2, @@ -42,27 +48,22 @@ pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { ssp_saved, cur_stack_size, ) { - // Get lengths of both chunks csiz length1 load_target1; csiz length2 load_target2; - // Store load_target2 on the heap as it'll be overwritten with the first LDC we do. addi heap_alloc_size zero i32; aloc heap_alloc_size; mcp hp load_target2 heap_alloc_size; move load_target2_heap hp; - // Save the old $ssp value as that's were the contract will be loaded. move ssp_saved ssp; - // Shrink the stack since LDC wants $ssp == $sp + sub cur_stack_size sp ssp; cfs cur_stack_size; - // Do the loads ldc load_target1 zero length1 i0; ldc load_target2_heap zero length2 i0; - // __jmp_mem jumps to $MEM[$hp], so set that up. addi heap_alloc_size zero i64; aloc heap_alloc_size; sw hp ssp_saved i0; From 6217d38d78572e941514396e7e2d915c4291dc26 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 15:48:02 +0100 Subject: [PATCH 40/47] Fixes build. --- test/src/sdk-harness/Cargo.lock | 632 +++++--------------------------- 1 file changed, 99 insertions(+), 533 deletions(-) diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index cc65fdcd40b..b23aa3e2c7c 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -1538,18 +1538,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fuel-asm" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491f1777538b0e1d479609d0d75bca5242c7fd3394f2ddd4ea55b8c96bcc8387" -dependencies = [ - "bitflags 2.5.0", - "fuel-types 0.55.0", - "serde", - "strum 0.24.1", -] - [[package]] name = "fuel-asm" version = "0.56.0" @@ -1557,59 +1545,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" dependencies = [ "bitflags 2.5.0", - "fuel-types 0.56.0", + "fuel-types", "serde", "strum 0.24.1", ] -[[package]] -name = "fuel-core" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a3327a090d1275bd49922b30a73d6833e79221cae62656f896fc6d3bb716a4" -dependencies = [ - "anyhow", - "async-graphql", - "async-trait", - "axum", - "clap", - "derive_more", - "enum-iterator", - "fuel-core-chain-config 0.31.0", - "fuel-core-consensus-module 0.31.0", - "fuel-core-database 0.31.0", - "fuel-core-executor 0.31.0", - "fuel-core-gas-price-service 0.31.0", - "fuel-core-importer 0.31.0", - "fuel-core-metrics 0.31.0", - "fuel-core-poa 0.31.0", - "fuel-core-producer 0.31.0", - "fuel-core-services 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-txpool 0.31.0", - "fuel-core-types 0.31.0", - "fuel-core-upgradable-executor 0.31.0", - "futures", - "hex", - "hyper", - "indicatif", - "itertools 0.12.1", - "postcard", - "rand", - "serde", - "serde_json", - "strum 0.25.0", - "strum_macros 0.25.3", - "thiserror", - "tokio", - "tokio-rayon", - "tokio-stream", - "tokio-util", - "tower-http", - "tracing", - "uuid 1.8.0", -] - [[package]] name = "fuel-core" version = "0.32.1" @@ -1623,21 +1563,21 @@ dependencies = [ "clap", "derive_more", "enum-iterator", - "fuel-core-chain-config 0.32.1", - "fuel-core-consensus-module 0.32.1", - "fuel-core-database 0.32.1", - "fuel-core-executor 0.32.1", - "fuel-core-gas-price-service 0.32.1", - "fuel-core-importer 0.32.1", - "fuel-core-metrics 0.32.1", + "fuel-core-chain-config", + "fuel-core-consensus-module", + "fuel-core-database", + "fuel-core-executor", + "fuel-core-gas-price-service", + "fuel-core-importer", + "fuel-core-metrics", "fuel-core-p2p", - "fuel-core-poa 0.32.1", - "fuel-core-producer 0.32.1", - "fuel-core-services 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-txpool 0.32.1", - "fuel-core-types 0.32.1", - "fuel-core-upgradable-executor 0.32.1", + "fuel-core-poa", + "fuel-core-producer", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-txpool", + "fuel-core-types", + "fuel-core-upgradable-executor", "futures", "hex", "hyper", @@ -1659,25 +1599,6 @@ dependencies = [ "uuid 1.8.0", ] -[[package]] -name = "fuel-core-chain-config" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c13f888fb9b705b64bbcb56d022345cf85a86535d646bf53e20771eb4b986a" -dependencies = [ - "anyhow", - "bech32", - "derivative", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "itertools 0.12.1", - "postcard", - "serde", - "serde_json", - "serde_with", - "tracing", -] - [[package]] name = "fuel-core-chain-config" version = "0.32.1" @@ -1687,8 +1608,8 @@ dependencies = [ "anyhow", "bech32", "derivative", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-storage", + "fuel-core-types", "itertools 0.12.1", "postcard", "rand", @@ -1698,27 +1619,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-client" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1910fce3eebe33b5acba656e092e5ede267acb4b1c3f17c122a0477270091" -dependencies = [ - "anyhow", - "cynic", - "derive_more", - "fuel-core-types 0.31.0", - "hex", - "itertools 0.12.1", - "reqwest", - "schemafy_lib", - "serde", - "serde_json", - "tai64", - "thiserror", - "tracing", -] - [[package]] name = "fuel-core-client" version = "0.32.1" @@ -1729,7 +1629,7 @@ dependencies = [ "cynic", "derive_more", "eventsource-client", - "fuel-core-types 0.32.1", + "fuel-core-types", "futures", "hex", "hyper-rustls", @@ -1743,19 +1643,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-consensus-module" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2e7b793cd76350fc8da9386ad0e8b15eb1fc45c75cc223761af1ed730736c7" -dependencies = [ - "anyhow", - "fuel-core-chain-config 0.31.0", - "fuel-core-poa 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", -] - [[package]] name = "fuel-core-consensus-module" version = "0.32.1" @@ -1763,22 +1650,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dea31560d3d499a11ec1022b4eb625a26d86547c95519d1be66c6e232424069" dependencies = [ "anyhow", - "fuel-core-chain-config 0.32.1", - "fuel-core-poa 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", -] - -[[package]] -name = "fuel-core-database" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e030f58d7b41fbebe984f6cd53b18e448eae3433fa8af7f39ec5f13fd917e04" -dependencies = [ - "anyhow", - "derive_more", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", + "fuel-core-chain-config", + "fuel-core-poa", + "fuel-core-storage", + "fuel-core-types", ] [[package]] @@ -1789,23 +1664,8 @@ checksum = "9b1380dc6f68a2e5658e730ef4815e21861305dfc319b5f9695f5661a5ee6fca" dependencies = [ "anyhow", "derive_more", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", -] - -[[package]] -name = "fuel-core-executor" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862f492af8ce138f3fd607eadfa3ef22a66f64773f451b55181b59f624265cfc" -dependencies = [ - "anyhow", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "hex", - "parking_lot", - "serde", - "tracing", + "fuel-core-storage", + "fuel-core-types", ] [[package]] @@ -1815,31 +1675,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8bccb069b9f8a9c8df9826b0ded1104a87492939e59646c1981679db3c57ead" dependencies = [ "anyhow", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-storage", + "fuel-core-types", "hex", "parking_lot", "serde", "tracing", ] -[[package]] -name = "fuel-core-gas-price-service" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3d418865a81e23b212894f77ef6a697ea3c8c6f19d09c1923c4db245f5af01" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-services 0.31.0", - "fuel-core-types 0.31.0", - "fuel-gas-price-algorithm 0.31.0", - "futures", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "fuel-core-gas-price-service" version = "0.32.1" @@ -1849,10 +1692,10 @@ dependencies = [ "anyhow", "async-trait", "enum-iterator", - "fuel-core-services 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", - "fuel-gas-price-algorithm 0.32.1", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", + "fuel-gas-price-algorithm", "futures", "num_enum", "serde", @@ -1864,23 +1707,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-importer" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc96f6d33842303b97cf586dc028d32c03e5fb7a9f35a109002c51c3f5fbc67a" -dependencies = [ - "anyhow", - "derive_more", - "fuel-core-metrics 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "parking_lot", - "rayon", - "tokio", - "tracing", -] - [[package]] name = "fuel-core-importer" version = "0.32.1" @@ -1889,28 +1715,15 @@ checksum = "81a47d3ae71a4995899f5427e0179811bae2809ecb0a8c43ee1fad2c667fc27a" dependencies = [ "anyhow", "derive_more", - "fuel-core-metrics 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-metrics", + "fuel-core-storage", + "fuel-core-types", "parking_lot", "rayon", "tokio", "tracing", ] -[[package]] -name = "fuel-core-metrics" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e2f22f6c4ce2696c29c14083c465f276c8d8eca67f051cb7d09a72442ceb5e" -dependencies = [ - "parking_lot", - "pin-project-lite", - "prometheus-client", - "regex", - "tracing", -] - [[package]] name = "fuel-core-metrics" version = "0.32.1" @@ -1932,11 +1745,11 @@ checksum = "6c71c01bc15433956791000b9256db6b8065eabe401e91be99d6157326dbe358" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config 0.32.1", - "fuel-core-metrics 0.32.1", - "fuel-core-services 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-chain-config", + "fuel-core-metrics", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", "futures", "hex", "ip_network", @@ -1957,23 +1770,6 @@ dependencies = [ "void", ] -[[package]] -name = "fuel-core-poa" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c646e9246bc333e365d130f5a854fb9c33f9237e178d87c75a7d136d1f3211f9" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-chain-config 0.31.0", - "fuel-core-services 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "tokio", - "tokio-stream", - "tracing", -] - [[package]] name = "fuel-core-poa" version = "0.32.1" @@ -1982,31 +1778,15 @@ checksum = "b3444c6b2ed6a7878e1a3b317f9922be41064cfafaf863bc7ab25823bcfbd749" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config 0.32.1", - "fuel-core-services 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-chain-config", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", "tokio", "tokio-stream", "tracing", ] -[[package]] -name = "fuel-core-producer" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bae5851da4bb97f440f003fa517d23aa32505ec51cfdd0eb87644c4c7621a9" -dependencies = [ - "anyhow", - "async-trait", - "derive_more", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "tokio", - "tokio-rayon", - "tracing", -] - [[package]] name = "fuel-core-producer" version = "0.32.1" @@ -2016,28 +1796,13 @@ dependencies = [ "anyhow", "async-trait", "derive_more", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-storage", + "fuel-core-types", "tokio", "tokio-rayon", "tracing", ] -[[package]] -name = "fuel-core-services" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8a175199e0e7b1373ac10d45eb26563c1e8299298c9589ab60efb1c7cae6ac" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-metrics 0.31.0", - "futures", - "parking_lot", - "tokio", - "tracing", -] - [[package]] name = "fuel-core-services" version = "0.32.1" @@ -2046,35 +1811,13 @@ checksum = "e85c2a19cd58cf541409c94ef77ef9b2e742f196b9a0209fb6b9310184cec92f" dependencies = [ "anyhow", "async-trait", - "fuel-core-metrics 0.32.1", + "fuel-core-metrics", "futures", "parking_lot", "tokio", "tracing", ] -[[package]] -name = "fuel-core-storage" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3ee3b462cc9b7e62b3ae04d5e3b792e6742c479bd75d6bc0987443a92b5299" -dependencies = [ - "anyhow", - "derive_more", - "enum-iterator", - "fuel-core-types 0.31.0", - "fuel-vm 0.55.0", - "impl-tools", - "itertools 0.12.1", - "num_enum", - "paste", - "postcard", - "primitive-types", - "serde", - "strum 0.25.0", - "strum_macros 0.25.3", -] - [[package]] name = "fuel-core-storage" version = "0.32.1" @@ -2084,8 +1827,8 @@ dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types 0.32.1", - "fuel-vm 0.56.0", + "fuel-core-types", + "fuel-vm", "impl-tools", "itertools 0.12.1", "mockall", @@ -2099,26 +1842,6 @@ dependencies = [ "strum_macros 0.25.3", ] -[[package]] -name = "fuel-core-txpool" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b359054dda9026718b9b23e82c172dbb52eb6d29c1b9589b9d2edac6714e31" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-metrics 0.31.0", - "fuel-core-services 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", - "num-rational", - "parking_lot", - "tokio", - "tokio-rayon", - "tokio-stream", - "tracing", -] - [[package]] name = "fuel-core-txpool" version = "0.32.1" @@ -2127,10 +1850,10 @@ checksum = "db5b1fdb43167b38acdf6732c45e1d406b5b36ee6d58fb7721aa1efa781123bb" dependencies = [ "anyhow", "async-trait", - "fuel-core-metrics 0.32.1", - "fuel-core-services 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", + "fuel-core-metrics", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", "mockall", "num-rational", "parking_lot", @@ -2140,24 +1863,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-types" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615783f63b40075d1bf64a42b4fd4edce076458c94b0fab2278a570b2b7a8e0e" -dependencies = [ - "anyhow", - "bs58", - "derivative", - "derive_more", - "fuel-vm 0.55.0", - "secrecy", - "serde", - "tai64", - "thiserror", - "zeroize", -] - [[package]] name = "fuel-core-types" version = "0.32.1" @@ -2168,7 +1873,7 @@ dependencies = [ "bs58", "derivative", "derive_more", - "fuel-vm 0.56.0", + "fuel-vm", "rand", "secrecy", "serde", @@ -2177,47 +1882,15 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-core-upgradable-executor" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec85090083710f81142760b897289b4852cbba10b3d2e24236bf9e19987d87b" -dependencies = [ - "fuel-core-executor 0.31.0", - "fuel-core-storage 0.31.0", - "fuel-core-types 0.31.0", -] - [[package]] name = "fuel-core-upgradable-executor" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72101a6ce5cafbdfaf7cd9d142c9e7626b5f7e87bfe6cde177c5f0d3acd07c7e" dependencies = [ - "fuel-core-executor 0.32.1", - "fuel-core-storage 0.32.1", - "fuel-core-types 0.32.1", -] - -[[package]] -name = "fuel-crypto" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74f03ba9b27f375a0482b1afe20d5b8cfd032fedba683a584cdbd6d10147439" -dependencies = [ - "coins-bip32", - "coins-bip39", - "ecdsa", - "ed25519-dalek", - "fuel-types 0.55.0", - "k256", - "lazy_static", - "p256", - "rand", - "secp256k1", - "serde", - "sha2 0.10.8", - "zeroize", + "fuel-core-executor", + "fuel-core-storage", + "fuel-core-types", ] [[package]] @@ -2230,7 +1903,7 @@ dependencies = [ "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types 0.56.0", + "fuel-types", "k256", "lazy_static", "p256", @@ -2241,18 +1914,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-derive" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.63", - "synstructure 0.13.1", -] - [[package]] name = "fuel-derive" version = "0.56.0" @@ -2265,15 +1926,6 @@ dependencies = [ "synstructure 0.13.1", ] -[[package]] -name = "fuel-gas-price-algorithm" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d5a513428ce53a7713261c01059c2f5f376d86eeb23a6a6befb778da561da1" -dependencies = [ - "thiserror", -] - [[package]] name = "fuel-gas-price-algorithm" version = "0.32.1" @@ -2285,21 +1937,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fuel-merkle" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5433c41ffbf531eed1380148cd68e37f9dd7e25966a9c59518f6b09e346e80e2" -dependencies = [ - "derive_more", - "digest 0.10.7", - "fuel-storage 0.55.0", - "hashbrown 0.13.2", - "hex", - "serde", - "sha2 0.10.8", -] - [[package]] name = "fuel-merkle" version = "0.56.0" @@ -2308,48 +1945,19 @@ checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage 0.56.0", + "fuel-storage", "hashbrown 0.13.2", "hex", "serde", "sha2 0.10.8", ] -[[package]] -name = "fuel-storage" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3fc3cd96fe312442cdf35966b96d66becd02582b505f856f74953f57adf020" - [[package]] name = "fuel-storage" version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" -[[package]] -name = "fuel-tx" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00cc42ae3121b1881a6ae8306696d1bea73adca424216d9f676ee91d3927c74" -dependencies = [ - "bitflags 2.5.0", - "derivative", - "derive_more", - "fuel-asm 0.55.0", - "fuel-crypto 0.55.0", - "fuel-merkle 0.55.0", - "fuel-types 0.55.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "postcard", - "rand", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", -] - [[package]] name = "fuel-tx" version = "0.56.0" @@ -2359,10 +1967,10 @@ dependencies = [ "bitflags 2.5.0", "derivative", "derive_more", - "fuel-asm 0.56.0", - "fuel-crypto 0.56.0", - "fuel-merkle 0.56.0", - "fuel-types 0.56.0", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2373,60 +1981,18 @@ dependencies = [ "strum_macros 0.24.3", ] -[[package]] -name = "fuel-types" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae98e143dec4e6cb114a92435e314f1d4815e17e8fded24332fb285319d60167" -dependencies = [ - "fuel-derive 0.55.0", - "hex", - "serde", -] - [[package]] name = "fuel-types" version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" dependencies = [ - "fuel-derive 0.56.0", + "fuel-derive", "hex", "rand", "serde", ] -[[package]] -name = "fuel-vm" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641a2ee5a3398633fa243fba3343cbe2225ae335a09141f6b94041720cfc3520" -dependencies = [ - "async-trait", - "backtrace", - "bitflags 2.5.0", - "derivative", - "derive_more", - "ethnum", - "fuel-asm 0.55.0", - "fuel-crypto 0.55.0", - "fuel-merkle 0.55.0", - "fuel-storage 0.55.0", - "fuel-tx 0.55.0", - "fuel-types 0.55.0", - "hashbrown 0.14.5", - "itertools 0.10.5", - "libm", - "paste", - "percent-encoding", - "primitive-types", - "serde", - "serde_with", - "sha3", - "static_assertions", - "strum 0.24.1", -] - [[package]] name = "fuel-vm" version = "0.56.0" @@ -2440,12 +2006,12 @@ dependencies = [ "derivative", "derive_more", "ethnum", - "fuel-asm 0.56.0", - "fuel-crypto 0.56.0", - "fuel-merkle 0.56.0", - "fuel-storage 0.56.0", - "fuel-tx 0.56.0", - "fuel-types 0.56.0", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-storage", + "fuel-tx", + "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2467,10 +2033,10 @@ version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0921f0318576c0eff424a4d0f23c09fc7116880b7fc643a8012df519555b90a6" dependencies = [ - "fuel-core 0.32.1", - "fuel-core-client 0.32.1", - "fuel-crypto 0.56.0", - "fuel-tx 0.56.0", + "fuel-core", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", "fuels-accounts", "fuels-core", "fuels-macros", @@ -2488,11 +2054,11 @@ dependencies = [ "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client 0.32.1", - "fuel-core-types 0.32.1", - "fuel-crypto 0.56.0", - "fuel-tx 0.56.0", - "fuel-types 0.56.0", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", "fuels-core", "itertools 0.12.1", "rand", @@ -2529,14 +2095,14 @@ dependencies = [ "bech32", "chrono", "fuel-abi-types", - "fuel-asm 0.56.0", - "fuel-core-chain-config 0.32.1", - "fuel-core-client 0.32.1", - "fuel-core-types 0.32.1", - "fuel-crypto 0.56.0", - "fuel-tx 0.56.0", - "fuel-types 0.56.0", - "fuel-vm 0.56.0", + "fuel-asm", + "fuel-core-chain-config", + "fuel-core-client", + "fuel-core-types", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuel-vm", "fuels-macros", "hex", "itertools 0.12.1", @@ -2568,9 +2134,9 @@ checksum = "313e13af93d629778f514cb876befdc30d5c030df58ab96885a39bdaeeddcff6" dependencies = [ "async-trait", "fuel-abi-types", - "fuel-asm 0.56.0", - "fuel-tx 0.56.0", - "fuel-types 0.56.0", + "fuel-asm", + "fuel-tx", + "fuel-types", "fuels-accounts", "fuels-core", "itertools 0.12.1", @@ -2585,14 +2151,14 @@ version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c9690c345c4ab5f368fb9309e3df3f745f44109f5e40aed87d184f8af0a3c" dependencies = [ - "fuel-core 0.32.1", - "fuel-core-chain-config 0.32.1", - "fuel-core-client 0.32.1", - "fuel-core-poa 0.32.1", - "fuel-core-services 0.32.1", - "fuel-crypto 0.56.0", - "fuel-tx 0.56.0", - "fuel-types 0.56.0", + "fuel-core", + "fuel-core-chain-config", + "fuel-core-client", + "fuel-core-poa", + "fuel-core-services", + "fuel-crypto", + "fuel-tx", + "fuel-types", "fuels-accounts", "fuels-core", "futures", @@ -5712,9 +5278,9 @@ name = "tests" version = "0.0.0" dependencies = [ "assert_matches", - "fuel-core 0.31.0", - "fuel-core-client 0.31.0", - "fuel-vm 0.56.0", + "fuel-core", + "fuel-core-client", + "fuel-vm", "fuels", "hex", "paste", From dbe53c332c01fe35904b3f1ced1d997824ef03e1 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 16:29:26 +0100 Subject: [PATCH 41/47] Updates changed json abis. --- .../json_abi_oracle_new_encoding.json | 36 ++++++++++--------- .../json_abi_oracle_new_encoding.json | 35 +++++++++++++++++- .../json_abi_oracle_new_encoding.json | 13 +++++-- 3 files changed, 65 insertions(+), 19 deletions(-) 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 45a5454be80..fb14cd4d3c7 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 @@ -62,82 +62,82 @@ { "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", "name": "BOOL", - "offset": 6968 + "offset": 7400 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "U8", - "offset": 7112 + "offset": 7592 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "ANOTHER_U8", - "offset": 6896 + "offset": 7328 }, { "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", "name": "U16", - "offset": 7056 + "offset": 7536 }, { "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "name": "U32", - "offset": 7096 + "offset": 7576 }, { "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "name": "U64", - "offset": 7104 + "offset": 7584 }, { "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", "name": "U256", - "offset": 7064 + "offset": 7544 }, { "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", "name": "B256", - "offset": 6936 + "offset": 7368 }, { "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff", "name": "CONFIGURABLE_STRUCT", - "offset": 7008 + "offset": 7488 }, { "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "name": "CONFIGURABLE_ENUM_A", - "offset": 6976 + "offset": 7408 }, { "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "name": "CONFIGURABLE_ENUM_B", - "offset": 6992 + "offset": 7448 }, { "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6", "name": "ARRAY_BOOL", - "offset": 6904 + "offset": 7336 }, { "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199", "name": "ARRAY_U64", - "offset": 6912 + "offset": 7344 }, { "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be", "name": "TUPLE_BOOL_U64", - "offset": 7040 + "offset": 7520 }, { "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a", "name": "STR_4", - "offset": 7032 + "offset": 7512 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "name": "NOT_USED", - "offset": 7024 + "offset": 7504 } ], "encodingVersion": "1", @@ -195,6 +195,10 @@ { "name": "B", "typeId": 5 + }, + { + "name": "C", + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" } ], "metadataTypeId": 3, 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 668a88f2e07..9fcae28cf1f 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 @@ -3,6 +3,22 @@ { "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", "type": "bool" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "type": "u16" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "type": "u32" + }, + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "type": "u64" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "type": "u8" } ], "configurables": [], @@ -15,7 +31,24 @@ "output": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903" } ], - "loggedTypes": [], + "loggedTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" + }, + { + "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", + "logId": "15520703124961489725" + }, + { + "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", + "logId": "2992671284987479467" + }, + { + "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", + "logId": "14454674236531057292" + } + ], "messagesTypes": [], "metadataTypes": [], "programType": "script", 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 05b0f04b2d3..bf5debeec20 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 @@ -1,5 +1,9 @@ { "concreteTypes": [ + { + "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d", + "type": "()" + }, { "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", "type": "u64" @@ -12,10 +16,15 @@ "attributes": null, "inputs": [], "name": "main", - "output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" + "output": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" + } + ], + "loggedTypes": [ + { + "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", + "logId": "1515152261580153489" } ], - "loggedTypes": [], "messagesTypes": [], "metadataTypes": [], "programType": "script", From 627523475726da13ade2899b4e2582a4eb451cfb Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 19:31:49 +0100 Subject: [PATCH 42/47] Replaces static_gas_price with starting_gas_price. --- test/src/sdk-harness/test_projects/auth/mod.rs | 4 ++-- .../test_projects/ec_recover_and_match_predicate/mod.rs | 2 +- .../sdk-harness/test_projects/predicate_data_simple/mod.rs | 2 +- .../sdk-harness/test_projects/predicate_data_struct/mod.rs | 2 +- test/src/sdk-harness/test_projects/storage_string/mod.rs | 2 +- test/src/sdk-harness/test_projects/string_slice/mod.rs | 2 +- test/src/sdk-harness/test_projects/tx_fields/mod.rs | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/src/sdk-harness/test_projects/auth/mod.rs b/test/src/sdk-harness/test_projects/auth/mod.rs index dd7f85559d8..bb40b3f68b6 100644 --- a/test/src/sdk-harness/test_projects/auth/mod.rs +++ b/test/src/sdk-harness/test_projects/auth/mod.rs @@ -187,7 +187,7 @@ async fn can_get_predicate_address() { }], ); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let wallets = &launch_custom_provider_and_get_wallets(wallets_config, Some(node_config), None) .await .unwrap(); @@ -356,7 +356,7 @@ async fn can_get_predicate_address_in_message() { let mut wallet = WalletUnlocked::new_random(None); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let provider = setup_test_provider(coin_vec, message_vec, Some(node_config), None) .await .unwrap(); diff --git a/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs b/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs index a40e9b3a1a7..a9e61a540eb 100644 --- a/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs +++ b/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs @@ -44,7 +44,7 @@ async fn ec_recover_and_match_predicate_test() -> Result<()> { .collect::>(); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let provider = setup_test_provider(all_coins, vec![], Some(node_config), None) .await .unwrap(); diff --git a/test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs b/test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs index 96a2403ae30..6d5b4e78fcb 100644 --- a/test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs +++ b/test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs @@ -16,7 +16,7 @@ async fn setup() -> (Vec, Address, WalletUnlocked, u64, AssetId) { let predicate_address = fuel_tx::Input::predicate_owner(&predicate_code); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let mut wallets = launch_custom_provider_and_get_wallets( WalletsConfig::new(Some(1), None, None), Some(node_config), diff --git a/test/src/sdk-harness/test_projects/predicate_data_struct/mod.rs b/test/src/sdk-harness/test_projects/predicate_data_struct/mod.rs index 6069a2ac98d..8836491428a 100644 --- a/test/src/sdk-harness/test_projects/predicate_data_struct/mod.rs +++ b/test/src/sdk-harness/test_projects/predicate_data_struct/mod.rs @@ -16,7 +16,7 @@ async fn setup() -> (Vec, Address, WalletUnlocked, u64, AssetId) { let predicate_address = fuel_tx::Input::predicate_owner(&predicate_code); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let mut wallets = launch_custom_provider_and_get_wallets( WalletsConfig::new(Some(1), None, None), Some(node_config), diff --git a/test/src/sdk-harness/test_projects/storage_string/mod.rs b/test/src/sdk-harness/test_projects/storage_string/mod.rs index 2d3a4b55d24..b84cb090c1c 100644 --- a/test/src/sdk-harness/test_projects/storage_string/mod.rs +++ b/test/src/sdk-harness/test_projects/storage_string/mod.rs @@ -8,7 +8,7 @@ abigen!(Contract( async fn setup() -> TestStorageStringContract { let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let mut wallets = launch_custom_provider_and_get_wallets( WalletsConfig::new(Some(1), None, None), Some(node_config), diff --git a/test/src/sdk-harness/test_projects/string_slice/mod.rs b/test/src/sdk-harness/test_projects/string_slice/mod.rs index 1383b72e325..5f56b0f1ce4 100644 --- a/test/src/sdk-harness/test_projects/string_slice/mod.rs +++ b/test/src/sdk-harness/test_projects/string_slice/mod.rs @@ -23,7 +23,7 @@ async fn setup() -> (Vec, Address, WalletUnlocked, u64, AssetId) { let predicate_address = fuel_tx::Input::predicate_owner(&predicate_code); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let mut wallets = launch_custom_provider_and_get_wallets( WalletsConfig::new(Some(1), None, None), Some(node_config), diff --git a/test/src/sdk-harness/test_projects/tx_fields/mod.rs b/test/src/sdk-harness/test_projects/tx_fields/mod.rs index 1eb4dda1a61..212a84c46cb 100644 --- a/test/src/sdk-harness/test_projects/tx_fields/mod.rs +++ b/test/src/sdk-harness/test_projects/tx_fields/mod.rs @@ -158,7 +158,7 @@ async fn setup_output_predicate() -> (WalletUnlocked, WalletUnlocked, Predicate, ); let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let mut wallets = launch_custom_provider_and_get_wallets(wallets_config, Some(node_config), None) .await @@ -915,7 +915,7 @@ mod outputs { async fn can_get_tx_output_type_for_contract_deployment() { // Setup Wallet let mut node_config = NodeConfig::default(); - node_config.static_gas_price = 0; + node_config.starting_gas_price = 0; let wallet = launch_custom_provider_and_get_wallets( WalletsConfig::new( Some(1), /* Single wallet */ From 7c3dae2d697fd8c97714de3e346d4abae18a18f4 Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Tue, 13 Aug 2024 20:14:29 +0100 Subject: [PATCH 43/47] Replaces Contract::new with Contract::regular. --- test/src/sdk-harness/test_projects/tx_fields/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/sdk-harness/test_projects/tx_fields/mod.rs b/test/src/sdk-harness/test_projects/tx_fields/mod.rs index 212a84c46cb..e5a48b37058 100644 --- a/test/src/sdk-harness/test_projects/tx_fields/mod.rs +++ b/test/src/sdk-harness/test_projects/tx_fields/mod.rs @@ -967,7 +967,7 @@ mod outputs { let binary = fs::read(TX_CONTRACT_BYTECODE_PATH).unwrap(); let salt = Salt::new([2u8; 32]); let storage_slots = Vec::::new(); - let contract = Contract::new(binary.clone(), salt, storage_slots.clone()); + let contract = Contract::regular(binary.clone(), salt, storage_slots.clone()); // Start building the transaction let tb: CreateTransactionBuilder = From 1d5563870409752249658fe4d92d6d317f92bd4e Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 14 Aug 2024 09:22:55 +0100 Subject: [PATCH 44/47] Partially reverts LDC changes. --- sway-lib-std/src/execution.sw | 40 ------------------- .../test_projects/run_external_proxy/mod.rs | 32 +++------------ .../run_external_proxy/src/main.sw | 14 +++---- 3 files changed, 12 insertions(+), 74 deletions(-) diff --git a/sway-lib-std/src/execution.sw b/sway-lib-std/src/execution.sw index d80207fb096..759053a8b1d 100644 --- a/sway-lib-std/src/execution.sw +++ b/sway-lib-std/src/execution.sw @@ -30,43 +30,3 @@ pub fn run_external(load_target: ContractId) -> ! { } __jmp_mem() } - -pub fn run_external2(load_target1: ContractId, load_target2: ContractId) -> ! { - // Get lengths of both chunks - // Store load_target2 on the heap as it'll be overwritten with the first LDC we do. - // Save the old $ssp value as that's were the contract will be loaded. - // Shrink the stack since LDC wants $ssp == $sp - // Do the loads - // __jmp_mem jumps to $MEM[$hp], so set that up. - asm( - load_target1: load_target1, - load_target2: load_target2, - load_target2_heap, - heap_alloc_size, - length1, - length2, - ssp_saved, - cur_stack_size, - ) { - csiz length1 load_target1; - csiz length2 load_target2; - - addi heap_alloc_size zero i32; - aloc heap_alloc_size; - mcp hp load_target2 heap_alloc_size; - move load_target2_heap hp; - - move ssp_saved ssp; - - sub cur_stack_size sp ssp; - cfs cur_stack_size; - - ldc load_target1 zero length1 i0; - ldc load_target2_heap zero length2 i0; - - addi heap_alloc_size zero i64; - aloc heap_alloc_size; - sw hp ssp_saved i0; - } - __jmp_mem() -} diff --git a/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs b/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs index 6cb5a33ddc9..d5a25c3e5bb 100644 --- a/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs +++ b/test/src/sdk-harness/test_projects/run_external_proxy/mod.rs @@ -9,8 +9,8 @@ abigen!(Contract( async fn run_external_can_proxy_call() { let wallet = launch_provider_and_get_wallet().await.unwrap(); - let target_id1 = Contract::load_from( - "test_projects/run_external_target/out/release/part-1.bin", + let target_id = Contract::load_from( + "test_projects/run_external_target/out/release/run_external_target.bin", LoadConfiguration::default() .with_storage_configuration(StorageConfiguration::default().with_autoload(false)), ) @@ -19,22 +19,8 @@ async fn run_external_can_proxy_call() { .await .unwrap(); - let target_id2 = Contract::load_from( - "test_projects/run_external_target/out/release/part-2.bin", - LoadConfiguration::default() - .with_storage_configuration(StorageConfiguration::default().with_autoload(false)), - ) - .unwrap() - .deploy(&wallet, TxPolicies::default()) - .await - .unwrap(); - - dbg!(&target_id1, &target_id2); - let configurables = RunExternalProxyContractConfigurables::default() - .with_TARGET_1(target_id1.clone().into()) - .unwrap() - .with_TARGET_2(target_id2.clone().into()) + .with_TARGET(target_id.clone().into()) .unwrap(); let id = Contract::load_from( "test_projects/run_external_proxy/out/release/run_external_proxy.bin", @@ -44,9 +30,7 @@ async fn run_external_can_proxy_call() { .deploy(&wallet, TxPolicies::default()) .await .unwrap(); - let instance = RunExternalProxyContract::new(id.clone(), wallet); - // Call "large_value" // Will call run_external_proxy::large_value // that will call run_external_target::large_value @@ -54,7 +38,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .large_value() - .with_contract_ids(&[target_id1.clone().into(), target_id2.clone().into()]) + .with_contract_ids(&[target_id.clone().into()]) .call() .await .unwrap(); @@ -67,7 +51,6 @@ async fn run_external_can_proxy_call() { print!("{:?} ", s); } } - println!("{:?}", data); } } @@ -78,7 +61,6 @@ async fn run_external_can_proxy_call() { Bits256::from_hex_str("0x00000000000000000000000059F2f1fCfE2474fD5F0b9BA1E73ca90b143Eb8d0") .unwrap(); assert_eq!(result.value, expected_large); - // Call "double_value" // Will call run_external_proxy::double_value // that will call run_external_target::double_value @@ -86,7 +68,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .double_value(42) - .with_contract_ids(&[target_id1.clone().into(), target_id2.clone().into()]) + .with_contract_ids(&[target_id.clone().into()]) .call() .await .unwrap(); @@ -99,7 +81,6 @@ async fn run_external_can_proxy_call() { print!("{:?} ", s); } } - println!("{:?}", data); } } @@ -107,7 +88,6 @@ async fn run_external_can_proxy_call() { } } assert_eq!(result.value, 84); - // Call "does_not_exist_in_the_target" // Will call run_external_proxy::does_not_exist_in_the_target // it will proxy the call to run_external_target, @@ -115,7 +95,7 @@ async fn run_external_can_proxy_call() { let result = instance .methods() .does_not_exist_in_the_target(42) - .with_contract_ids(&[target_id1.into(), target_id2.into()]) + .with_contract_ids(&[target_id.into()]) .call() .await .unwrap(); diff --git a/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw b/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw index 89cf10fcf57..05dc44f0473 100644 --- a/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw +++ b/test/src/sdk-harness/test_projects/run_external_proxy/src/main.sw @@ -1,10 +1,9 @@ contract; -use std::execution::run_external2; +use std::execution::run_external; configurable { - TARGET_1: ContractId = ContractId::zero(), - TARGET_2: ContractId = ContractId::zero(), + TARGET: ContractId = ContractId::zero(), } abi RunExternalTest { @@ -12,20 +11,19 @@ abi RunExternalTest { fn large_value() -> b256; fn does_not_exist_in_the_target(foo: u64) -> u64; } - impl RunExternalTest for Contract { fn double_value(_foo: u64) -> u64 { __log(1); - run_external2(TARGET_1, TARGET_2) + run_external(TARGET) } fn large_value() -> b256 { - run_external2(TARGET_1, TARGET_2) + run_external(TARGET) } // ANCHOR: does_not_exist_in_the_target fn does_not_exist_in_the_target(_foo: u64) -> u64 { - run_external2(TARGET_1, TARGET_2) + run_external(TARGET) } // ANCHOR_END: does_not_exist_in_the_target -} +} \ No newline at end of file From 0d3f7773f99b06577c8f403d88398dc2b082e92d Mon Sep 17 00:00:00 2001 From: Marcos Henrich Date: Wed, 14 Aug 2024 09:47:02 +0100 Subject: [PATCH 45/47] Updates proxy-abi contract .bin .json. --- .../proxy_abi/proxy_contract-abi.json | 4 ++-- .../proxy_contract-storage_slots.json | 8 ++++---- .../forc-client/proxy_abi/proxy_contract.bin | Bin 16680 -> 13752 bytes forc-plugins/forc-client/tests/deploy.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json index 22c39233bae..011be5632e1 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json @@ -713,12 +713,12 @@ { "name": "INITIAL_TARGET", "concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", - "offset": 17240 + "offset": 13272 }, { "name": "INITIAL_OWNER", "concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c", - "offset": 17192 + "offset": 13224 } ] } \ No newline at end of file diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json index 72849c97055..7dcdfa67c09 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json @@ -1,18 +1,18 @@ [ { - "key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd55", + "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe7", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd56", + "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe8", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "bb79927b15d9259ea316f2ecb2297d6cc8851888a98278c0a2e03e1a091ea754", + "key": "dd1352527e2ee01f3fff7946c7c316b4e551db9056e31664aeae6f96735601f7", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "bb79927b15d9259ea316f2ecb2297d6cc8851888a98278c0a2e03e1a091ea755", + "key": "dd1352527e2ee01f3fff7946c7c316b4e551db9056e31664aeae6f96735601f8", "value": "0000000000000000000000000000000000000000000000000000000000000000" } ] \ No newline at end of file diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract.bin b/forc-plugins/forc-client/proxy_abi/proxy_contract.bin index ea52800465d15de0e1ecd19085568823d1b464c6..4d139a0ffd05a422caf72bf35c323050254a4d75 100644 GIT binary patch literal 13752 zcmd5?4Qw3Oaej9^QYT8b*5Z%pm1M4MN?IwhytXKnlI>_O$I~5sVz@N*Lr1yZ$(C&? zb}gEbWH~{iL)sKf>!Ng;x;UZ#0eq7g8#O?k-1q6X*X|*SB2E z_0F6aOobgS(U{k-Xl3$hp45{wB0GP_W_4d`iTnE1eUCWFbF-Cl!k6^)jBt7i{ezB( zn%zy1X>7q*Gv~MC`*YWM+%qXM-I~z4+w<9kC7k4BYH%;^Nlp|iW!CJWH6b&Vo!2%& z-exE1YJ(}lJ>2v)&x2v(}qzfI{d9iWO7AtWzo%opG-(qd}?dm2)EB zqdA!_f&Gh6rdNbB`!Rk3J$%T;_mYeF=0cWF#Nf0 zhb@E?AI~{45p|MpM+f%_!%WoLuwxPSna<8z=d$zm+fI67NT1VqfBGe(O#jG>WYT6>ogVVWm3ys!MhAx0;~)EYAg~YkO6ABvg2v!{Vs%j|6e{?9^x;~FsX zQ|SLb^k0yet%kK_-)31JW=U4hgHfygb z`%t_o-;QaJ^)V+sm4htHB)(2g4fA+O9Mxt>4!DnW9f6+Pl%DORXC}R{UF$N6nVy9m zTDMhn`o?k|e_<`hiP*p zx7m<)$Vmtj`$4QB?{wP2Nl#Nuq{vQAe41k3A{)t^QqFDB=0ME-TEM3keEJN0x(e54 z;ZqxOfE~(NljH|Y+G=uy$4lBO^h&^|9(N2?_m6m0`DeuUPl51D`h!QN-|)tj_+9>= z-aZz`ME&OwFEf?**VNNmnMH9n6-AuAlbtudgFSy2{EpmGHO@SaI}d%lIGf`!>p5k6 z#XN8 zPfw{M^h?i*EPSV5LyX)oy!)4_`_FjyzbZm=Jm(Phb#PWx`a^tzY~6r*<5WsKhO3S1 z3gAB65Nl*E+QB|>7oc+(__&*Si1q@VPYAISdmqVO)f%eEj_as98@df~YOlDnq01oI zA(oeR&tuMAs2^?VQ>!e_MJMB=2X&l-*zT?s;JYY~V^p&ia?sHweTTv59&O8 zueg+df1(jS$-$4X`whqQ%NgaD65gaAXJyXpGN|qp*jrTV-Y&8+3o;D&RrBV1I4I4> zIV8t2((o&=N^#7#nQwxwuFc~l>Us6OmO#xP(-2FrCvhjR$5+A~)&lNwRd5$v54m-; zJU#}zc+@W~j*pWlVxLfqUYNyx zmdA^w_sr1VHRMl?>Mp9W7Uu%7QSYO8+>U=>%t8L%E7m$at_9m^6l28qWpg$wx%MsO z-a~%G+J?M`a(BhrQS#TO-gZa7X4Af%0B`O7CF~Zuh22U#`MXFFJhAPO$f3t&hJ!j`EzlWBL0G2Z8r2cq|V=x zGw_?kXYcV2=*DM%+-sWqiQ^n#4nDnsf>q{L4|Bm-OZl;u2d@sW|AA@Z7@Q@w2=q1~ zlWR|KOv>z;Kpb0y=TsHhH~lyc`TThZvJWDbQ)IVBvY)ASwH0w~RoB{9`8je|rm=|i zV51W@-DnA9%hm!__v46T~guE3vFCQNx&g zZ;#3?l#k;D;tkkhy+E#%I&^Vv9{5IgFh%M!gNYH)iJtn%M78kS{sEf}>0M^`_#FRldE2?fVk768IngwfL_?K3ax# z<(|Q%Y_lZ!Q6oRv0bW{FE;lHX^`p9faSi6pITO%j*q=wZ;@XnV$1TLu*jI}=k35uQ z9&RxyZy$2&G6&sdh%?G-QLVR0H1#HIyFrZ|A5eXkJ#B> z)B!f`N9_iADfD-iqt8>1J+Hu?TQIN1jB$;S<8gv9(?T_lssn}tx$jK*{=us%MhL$V z;m5q&lASkd=sR55*6=I##eTJ5s}?goQRFLpsyG}mQ>t-1y9ML%sBbsetjBd&XNhx? z4Gbb4NjB=ZOpjZO_}7q!5UW9*-yiGC;b&9HYqzjcxhbY@|{!QV#%{`NTG!{m`$ zm$ft-;C zj?se}bMgIw7gN+DLA+2bc2g`)Qa=~*OtCnTld)f(*TX-d+8pynOY^!^4Mp?16#sJW zI7@kl^TG)cT6GwDG@!0TtyZ^~f2Rg?Tcer_eMTA!QFdRcPkPu1)!@F+VTbCoLJs@c zf<6G9dzrWOoDj{iFAD6p4L#2h>bH5nf%o52>#oH3CDn&0$%bvoUXZCBL0_X(+hM)i z@Y}S^5ob?Bp3LRRu?txLkVE_Tc#!7N`GRZzsRbU(+W${*o(4xEjxU$z`S7R6cU0S{ zeXoEI!wrcD)wMWFW6rx;S#1#htp3!DKrOsW&AE@~#4rbOyu_Rr)SM)2H;a8fayan? z8-Bka^+!%fPM`)es`O&R16-@6JqovyP9R74vRPMk z21Jh_%4^2j5$lYXTsdC!PS!J|cjCO!DZWZ`(CcdP?!#X5OT=V5$0VJrJj~D5UiuOo-ulQNA71xA_ zrFz5?$uf}JF;CmzB)A_LC2r+=Rh@>oF7XHE40$r3-xZ~ws^7+kly1e+-V(WJX^cJ= ze2n!^*svSn1DtdOJ`+`NF4$+@{;9VDoq^}6quAs35g*0s^YF|~*4kuW$`g6$Z1R}x zyU>Q5{4{z=&jfo()#EhuTQW{V4@#^B_^m1zgifpbAN{gG-YC^KA+Nq^^=pdIY$-SP zaV<%`CFqJ8qExq|F68@3u8!>M7{1Es}aGclQ{O-w-AXl>0gEs>dpNdf=T~$jSv|<$r;!Wh6`1 zl<<{*?r5!2Q!T1hSuXXcyc!jDdOeQbr|cJ0t4{+pQ&{5S;4q(E(4V3_Cu@#$!Ib=F zEXqMAMfmI@zD*Wpy*YG$*_q+bWPHGuB~C7+Jl?E)o+&=6;>loKay*UYc#L=gr-1{J zi%1s7mm5WVEvL`b&z57wz}a#dv3w_Zi_T;nsvk*b%RKl> z5dRfVfjtN^2n@zG- z43o|zpVkV<@cM&6-Ho6e_G9Il)(FV(^a#qp*?v^@c9Bac-$Mr1u_|Y%7?Aa`e|9pf z$UPItQGU;Z&Od!PzfpbPi?~mM_e;Fw&Q#~6nu}$;)bGtH=Oxt7pI1CXd0W+rE^0E3 zYqD})Iw>ODlT+No@r?X1in(0hU_A57@ls)CXIJ|SZ0B=Mk9&HspK9p@oy~Br!MQ3~ zn0Yu68K!y!&j^A&j58`P1UMr+Qu0eSFZ4rxo>#sRr)=^2$cRB)Jrn4mNhu*94&XocEU5oj*Z;bjT20b5k`sm#w1MePLo6#fs z2-Y8!>)X}Ve~PfQczyJ&JX!EJWbJ~ihan5^QMq$VzgHueHy7KdFbDf=f_*$a`%AL> zP#@158z6flWSfwU_kRR%Syj*9tD>jB=XhZRvbI51J7jH#EW{4v;M`H}N9a@K{hz`d za<0IC3x3ytbHa;Bj@#4y}C7kX)#yA zwEvv7rDUr(ut|L}yc>Z0iXIR8A93&ojj4`37ZcPMgN=?3eiE2TB#P*f2_E-0QGdlC-X(vaPj(0TWUJ99YruLPh*#2q=2Cy8 z1@CdeX6RLV-_w|M@}Hm01^Q;*z5`qs7NvdrT!{B$mRecBlyTuvZ%!o_ zhTf4}SV-X>j|&yYl5Z>OzfFoe4czZ>q03{g(F(J$1O4_PYqY{_6)wz!3oXTkScAE6 z*5^Xlr*z&C9vANRbBV~8?1vnUoQqm^aZl@{sNF=*sxrNn$n3Z9zMB;e@MMrn9K45z zo~VQOsjQWdrTMt8koh9x9`yj;3zY8z9(0dl-ffU^JMgj!xUlsr4#!}yR)#(g(OmE& z-m~OBGrdcx&IH(x|J;7J;{H~Dzai8lc=nWB*s1ZmKkiZD>&5cxzNw>!$6P#5wJh~} zwdKI&8eHq)vwmKi>s*(5LnifL(T4|-)AK&Yw|XvQRpXDXggMBi9xM8ZjYY_m{TnHB zxEfXwhjl8yq5csb7qnLHQK;I5^BO&uhmT!h;XO=!uZ_k+ulR~1#6vdDwYIP~P;Ipi zzO@I05vvi8$3)~Ye1|#<^-Zad?5z`sz0kCeoxJS7AL8d2n)w85(1#r6=b`&l-T&+0 z7#dSf3SdXRudvt;wfz1l;)D1KXBu~w$MK0gY^U-gpXW})j^LHHA~5l;Q3DAnV!{Co#y3)^E~ErTOnWiK3>S9mLU!T zH`1O9{a&qAW}EjEx6r-NhwqK@7~FzqtDCU5d!W<3)K8IhW}!u$<41r~@HTO8VTAbF z=Ue#He^18ai(pObNT1I#ek)^V*=K^W1AR<-PNmM+P5@6{y&S+(jXW=)9z%TYqWHu+ zZx5??-X4+fydn0uwrH}mSHTep_0C&jy$!ovz>-sS@SM33{uv|RrMPd3JeIwxH7@RPkI}g=B{^a2DAqx( z+9b$U`sH%j;cLJN$%9_(LvS7fFYx~RNm2JD=1RmbzemmQf#STZ?7+_}=8Xg3&V#^N zKYR*Kv#}Ox^h@QkP64!m`_d~V&a!dwdaD$KcaJeHW- z49u+q=I$oUNv?uV{kp}&Q!xK5czA-ZA635osPZ+{v8YMcldtQYF6Ha4?KWcj4YqMt zCwQ0MWvOP{$Z>^5^ziT;m~ya>MVt{z+_qbBXaI}hBI_lwxLaY-CjGFU!Pueq{jcI( zrG#b5c)~NHBtM%42HUG)@Gbb7`lPo3e-wl0n;-`J3g@v;ey3ON!!GlG?MA{My&tdM zk?(}hZS05F!MR}wwxD+aiq-N4`cP@CJHq>Cj8P3@ zPd|Mk8~jd=kH7T7(}S$Uu@{b=ICl8?W1o3i-ZuF2?B@60TKB~2d+z(fg@+#g$B%#M zE1UjyeplWY7v|B3Lr56=Ai57xc*>`nd?;j5nJ(n09JU+N<*FN6Z$B&=rliL%otpB?m zzrAPcAFumC{l(We)`woZ_?y4mdE@J^Jo3Wun@;yn|6E#n+t=jP+9$6MsLxwh%Fp*t ztE;Q7mb#kiDlcNobvf8FB(H5F@>-842=rIisIE$G-ShHu#8B53d96|NYx44Q==y&H D+jI;t literal 16680 zcmd5@e{dY-dHznilTWgV7bIh`hIpOWW&vY1AR7TG-s|bO6SBA!vd8k+*OQ?%CZ$-Y zvLl*ie1Xu>w4~#ZgnBv&Bg!;!(=@YZ%RjNF*J=N7re#J+GmV>ssYuP#Zmd=?b;br- z_j$h`d*AKt$v8u2>KV`O-R*w+zR&yXdEakk&N*z1u_ngA6oEDONFihFPI+?nWciQ8LdP%(`?B8+w1H$$Nh$KE|3qZf2)harXMj;)U3& z-nLWBJU<+|X3;LXrqDYaGkRCLg?_9zFdSRvEn!CgI_3@fR&mye7iW!xmp`>{bQ3e| z{)}7PYQ?<1Q~SL9QFqj%?^a=LC$x6UPP1>Cd3oO`&RR`aquI-zoEy#I`b<}e&Wp2* zL6@aC#=Lad=f9<=N?zZQ(&$E9*V|F?vPbsu^Gv*Ap0}9!c397*|1{InY>&%g!030q z^r0E^JPXOv{8_rj%T67r$EoeRgn`$0$iZ`LyEk4br2XG&Pcd5a4teh4ya}>)u6G&3 zGaN6)l91EKJ)J_%L#NGi2IPZ`Z-r%SUMX-kSfSsD6*5MXH~9J-@U-lKgzKeG0;3hr z6=y&7JnZ!)FMD{xJnv#H*t~A7>;8juDP(|MFN+oWSrhI*1KkZAE5NYRPIUm^L%w+q z_eZYL%mf}M&(yASv;sR_g1s)o?(YFFo3O0Md_h^ha#*b4q}G_YNSt)5l)z*Z9q+j?9UKBC#m)oisBHtGkqCXSE5 zR$>iqtK$@BGPX|~&&Q2|cGO^%%5%OXP*u4`5A)o&g)3!8yejeDd&!uzggFE_#L54Pq;W7|kC& zgV=f>vGoBk`EM^h)lE5*;xlBgpGfS3Sc1Jg*lR@DuU^)~b?P42i!kB%*4wM?=bF9J zn!RQq({>qK1>`rz*WmU#nN#Z_4zChhu@^}W8C!2)y&h?=4A~2{>LH`osuc2bS)<>n z6pC{>qcBn_Y@6#fwhmWNZ)Q|Zggq@U<=XsnYKaSb4hehqkUhs6*i+`UGWkQdH+bYU z?sr6vJ#vYkV=a|iYjJP7TVQz9#=UPxuODxRFIy@Oab3>KFdKHUL`^$11RWnH9f6r` zXDBxv9EaWW$S=rS2H8>gKmYCUX|g5Nj9OXZHw)i8b`I<0xbNks&Io@C=bF~y|$@SrUvqU+6pLLftCgcr?hX^>G=$Ro#QQq&(6fE?Ym);&Nj( zE)Rhhu*VQbt8siBacS{2L|jg)^$?dnKW~^v*|$gz8JCY>y?z;&kI0(m)#r+MLEwCf zaONBjHP7<$hv%a0()@wAzDzaE5jC%Dd-?K^umP`mch%Os6X)Pt4%IX-`+6sE%~2dh z$6o7?ku#GGZ1Y8lbC4rpn-SP%QrW8BHq8}v4{UQ(@2g=ZHC~A16!7W?uU60f8xE)Ynm%03!z&`Ra4MPR*ZF_W&cReU1Egqrzw<`joFT*8Fl3brJoFnVw{3 zc7_$er_GD_f7xLB@!Ox^nujm(Yd5HCzXED4uHVPZz8S`!Hw)hX3qO<}nPcX`*#~_C zIo+@aL{6`bS9Ys8IL+G8$F%o5%=EzLH?o_-!HAQ=pQG|5yIrp9&a>_cZfEpH;+h0< znj4lcNx0oM(B+vIUG@^`b=gvSZ;*N~(DXJGPTUr=@sgSL39}eshWiZ-w*}X5KgYbm z{d=|N=c>4un3sU_EeI*q3-M=gL0y z9>aEe3eWLLUU!e^kI?h_H^|Q&IA0`nq25XT#37uqHSMXmy1$w3SKrC& zVrCD=;ReVs>`@<`#W7q>R4rk&=NNoEetgyOz=+T4bj%LN2{ z`d}w8wFy&mJ7YJdc9($B3i=-UQe6T+jF*5M&rz;! z$9!Q=4{TbsXOiD@)(GjG{7bVq&2}?(FV+>;)b%up^`ed(bd}x$hw^FlxxV%!|Bmhf zW~iYD!4Jyg>RRZ1I=cR`2jp`)q5mY0Szc@XbE>|EYQ$Z#W_Jg;rNLLEKZtv3Yb^Bq znv`n+3e9fYq?X>N%kkd_?*|gX=fR>;L#A2A{j^s$6*`!oO>B z4%Z!V&TT2Iv7%<6X&I~r*P)i9QP6M3cX_ZNsepr-k#WtP2pRSEv&@blhG z3G2?iHn8bc)SPKvi+Xvkn)3$B#%lvBEqXTWik#9@0^Y$n{|>bsvo$_b1%{6OIAK_# z{54`;9+CEqDf{XeR`XX87;XbUBHzJ!(#8}kw8yFbCnY%Ce0dw37S~GEHbQ z*@CxPb?ZQ;+aqK;R+Y)eY{gmznQn$mw?L+$d1R`c%}AMw1%nj}R;*ZXz)eQT9;gAs z^Tk_DTp$Nf-jCrwX5Flr_#2OvYMe#H2-7)WP5i1laBZ9+_88%fT%=oBY^c^Z zwlj!V@Nm@RZuog4&iu6G%sJQtTs(>oxAgG5JSaID_myzWwXEgWey?9;GdpN7s0 zTjuUI1~SyQfY+>ZizzoYPmWgj=>FHJ2Z4+Ydk_uZSm*rsCVr&hy8<}7z!{v8_+l63 zE`c>TA#(m2#PTBGbqq0t`CYsM3^8x_o#F+f1>YlY!!O>hvqOgakg$Wz=YF&XEK2kl?{dPBN{t5Lb#gxU0z>sXE^(LyGYj$GCu41RpYIbTA2gv#L_(RvM zhQFxEuoZNMEqEM&$081}57GduE&TpGIEn{9rXE1uUmr8aBJ88<3HyNSWA=bLV}xk3K`O}AHa{2rq=y>hY5gRRZ^SV5jEiM$yBX(g zviDK_B>m=6e@OWN*He$^sU8RYp)GsFnZQ5NWya4N^oWR$5^;xl)|#xY#d}Ziw&;En zYkig0lKrM$&zB26{-HT<*N5c1T^|+a1&3Noek*dPQDI)G2x&z$Y$+ zxUcS2ng8n7VZP>KzQ)viZCIPHDLJlGV;S=|KA%ON>fCR1J96{ZLbW0-bZ~6*SuYI%VRkAd1H)7!a z2G7mesS0eh4>q*rtdHh~m|tVBJxle6V!*2FHO5#A?|)D;Mz9X{mOC)3_jB~@`u89b zGsMr)|DM)-OXdQm`BrSGiZkca`ymV8tAj5&(LHF>KgxPA17FBR^Xldmyj~9ak(&LcZ0)-&I-$6atwG)= z9?Rb;0?yO?ococSMWANXK8t;fW8R0F&G$#?{lU3)*r#bN z@0E0Zqh#)eEv~|Eny2Wwe0E6ljc9%YOzU#5CWkh67Ck!k4XW-o@Go{z`j;*ID{7t< zOLLnKqF<187x9TaiG<2$TXl95*XJ?s^jNprdybfEeNtkL8mRg)nhV#>wU$?NI+Jr3 z9;fS9=MaOr5mubFC~nu|$Y+vfpI_7K7E=yp2H=V*3tW+Nm`=? zunzEyz;dtV3*gL?n0eI19r1Y{cL9zeZn&EXzK429HAdp-kK^+J4aaui*wGkA|G<3% zn?26UGMii@gZK2dVDDoHId}7_lGv|0?FwP*L|_~BzE3uEG8y z#<+T zn!O*-MXxO8Cc2!MO&_3{5%y?lw!(X5ti6-V*)M9ms4-4R))@5(;$0c!3GCa8bDDED z?jL_4V}6)(Lfi*VcrRjn5jf#>;Dm#c6Ao*Bv7x@7i0xN)MStR9t(4Z$^P zb!>W&p38Z4AMw>%u8R5PbApGLEnzG4Z1}qbfqmVzuZe4UFJa3WN(C~Ym*Vr@Iewm| zcju#IX|*^8ebiTid-DB)@H1LB3LKzky*~!|8u5`-IPA!=SbM)kJyW8+*K#rY8Tsw~Oi-6hNs>3&*|_Wv{+skqZ+ zld&t-L9YhC#{7CCTZkj=A+~JKzjGSzL{;`kjs#y=!)0~RgQEYzIsS&nPns@dN6wJ* zO2m7>`x?j&&PVU+P>z7!wEp(KcZNdotz-`L4%boKPxoHa`)S||_ww9W-D|!d{{1Vw zpQg_`O1xLl<{Wz8-wB_ko`IR?fD!TRIv&&3MKWEbXF&Z5I7US7W0SgHz&>?-7FzTVUHHqsJIWm_pzI`z06}jTkh1~{eYjV z_dX6l5BYaRupHAPaq$US9`GV zTFD;2v3i-_kh(d#ZV~T~n>yZQAfLwr{0eK`lH`sX2-gcI10Wkgu=j`kbUXMT2oSn6ZIuSW%*L6Y7A%EvQ ziuT(}#G@Q=B6FjQKPVbtU-KBd+r_-kW$tRqx3@T~;EpgW)yy7EvG~LIPQ1?+)QzYd zF%)4tL;0o3$%vn&h^Ho%U$t1u!Pl^V+(CUncY|K?2C^;sP~w9w?tMVduku|!gJz+) zhUQh^i8PO9Lt1`QIYIY3U_uy)dWHOknUNFX5%Hy3e&bvl@j+Zk!4Z1bD# z)DsmiOnsD*FIIy<4 zP4Razm>uM7yqjWPbjY^IDX!w}%C->?6J zht~e7`1!$MaeQDx9=qgmjX2(qH`nRkee(DFO8g`1J}Hj(o{`6Cc|0eNGxB&$9({TI lhB&VOkvMjpl}A?|yT$RIA#uFxyW+S^UU#D-KF5Fme*sN7MkD|L diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index e65e5e4f3cb..d3744ade2ee 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -190,7 +190,7 @@ async fn test_deploy_fresh_proxy() { .unwrap(), proxy: Some( ContractId::from_str( - "5237df8db3edbe825ce83f4292094923c989efe3265b0115ed050925593a3488", + "153a2fb18a40fc42abb3f5a377cfdc7e83a7ea2a270dbaeddaa94acb532fee0f", ) .unwrap(), ), From fa2fe1be91e9da98dbc4dae781a494c7809388b1 Mon Sep 17 00:00:00 2001 From: Kaya Gokalp Date: Wed, 14 Aug 2024 16:23:37 +0300 Subject: [PATCH 46/47] add updated .abi .json files --- .../proxy_contract-storage_slots.json | 8 ++++---- .../forc-client/proxy_abi/proxy_contract.bin | Bin 13752 -> 13752 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json index 7dcdfa67c09..1c084e813ee 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json @@ -1,18 +1,18 @@ [ { - "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe7", + "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3e", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe8", + "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3f", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "dd1352527e2ee01f3fff7946c7c316b4e551db9056e31664aeae6f96735601f7", + "key": "b18f98389493a4aa04e99cbbb64c21d6e36d6f4cedecaa693fbaeea0cf660e8a", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "dd1352527e2ee01f3fff7946c7c316b4e551db9056e31664aeae6f96735601f8", + "key": "b18f98389493a4aa04e99cbbb64c21d6e36d6f4cedecaa693fbaeea0cf660e8b", "value": "0000000000000000000000000000000000000000000000000000000000000000" } ] \ No newline at end of file diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract.bin b/forc-plugins/forc-client/proxy_abi/proxy_contract.bin index 4d139a0ffd05a422caf72bf35c323050254a4d75..19d93cac46ac2d65693cc85423254aae5e96b020 100644 GIT binary patch delta 77 zcmV-T0J8tMYq)E$Kr}!#`df7})jalx;XXaE6zcK_#kj>Zt7$#g2@PHXXJ072W^Od;0eZEsBN?5b%$y6&LQW)6z8fHXJ(&QK;Z delta 77 zcmV-T0J8tMYq)E$Kr}#d{9h{buN_$uAtQp=GCR{wiIgeCCwUz1R4A)$cdzH&6H-!s jF5n+O|9M8o!xpsVQQMGK;}&GDu5XreRsr|3fHXJ(Z{Z{J From 49604c17b776b2e0c1adc88c9c537b710f24840c Mon Sep 17 00:00:00 2001 From: Kaya Gokalp Date: Wed, 14 Aug 2024 16:31:21 +0300 Subject: [PATCH 47/47] fix tests by pinning storage slot --- .../proxy_contract-storage_slots.json | 8 ++++---- .../forc-client/proxy_abi/proxy_contract.bin | Bin 13752 -> 13752 bytes forc-plugins/forc-client/tests/deploy.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json index 1c084e813ee..c648477bc2a 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json @@ -1,18 +1,18 @@ [ { - "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3e", + "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe7", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3f", + "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe8", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "b18f98389493a4aa04e99cbbb64c21d6e36d6f4cedecaa693fbaeea0cf660e8a", + "key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd55", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "b18f98389493a4aa04e99cbbb64c21d6e36d6f4cedecaa693fbaeea0cf660e8b", + "key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd56", "value": "0000000000000000000000000000000000000000000000000000000000000000" } ] \ No newline at end of file diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract.bin b/forc-plugins/forc-client/proxy_abi/proxy_contract.bin index 19d93cac46ac2d65693cc85423254aae5e96b020..44b17e30c4ceecbb9e0085d7aaf078e8781672bf 100644 GIT binary patch delta 210 zcmdmyy(4>rF%zTWW)r5_?1D*l``)_G*;)9uYW#yg^7Z~UE!dhI=u(-_Wvv0 zjvp4=@-*=Fgs{hADeKndPb&^%{64wCL}T&^lXgar$pNO~oGTc>KqX*ufvG&B%H#>A F8UR5^Nnii~ delta 209 zcmdmyy(4>rF%zTgW)r5_?1FN!?i;dVy*Ff=FtP;2I)9Mg{D8BXmr-_djCeFq%?@#C zW*~J%Dx8r~ezT6ud=8-08I}D&u^v@#79e#))0&A@*35x{VX}h0*k(PQN;aU%6-F}{ z9ZY{kml|EQ`PTl>&US;yt4|z9cN{fYooRcWlQ)hjJ>G6({|t*Mlb5Vwc{ykIHXp@n zk8|^V-o9CtX}{~;g7ay7U6U7>XiQEpQJ8$fq@7V?a)7BgX9oiqsLYsLU@Fg;GkJok F1^}r`OPBxv diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index d3744ade2ee..ee246af1385 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -190,7 +190,7 @@ async fn test_deploy_fresh_proxy() { .unwrap(), proxy: Some( ContractId::from_str( - "153a2fb18a40fc42abb3f5a377cfdc7e83a7ea2a270dbaeddaa94acb532fee0f", + "ca196e29217545f6e676d93bbd03219aef6ee4adf96ce960b5005a67aa04fb5d", ) .unwrap(), ),