From eedd49a5035f1b8abec02650c9e8304831adf6c1 Mon Sep 17 00:00:00 2001 From: Kaya Gokalp Date: Tue, 13 Aug 2024 00:28:23 +0300 Subject: [PATCH] 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),