diff --git a/Cargo.lock b/Cargo.lock index 87ab65e..1f2ed97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -483,7 +483,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.3", + "object", "rustc-demangle", "serde", ] @@ -530,30 +530,6 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[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" @@ -929,21 +905,32 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496c993b62bdfbe9b4c518b8b3e1fdba9f89ef89fcccc050ab61d91dfba9fbaf" +checksum = "305d51c180ebdc46ef61bc60c54ae6512db3bc9a05842a1f1e762e45977019ab" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3247afacd9b13d620033f3190d9e49d1beefc1acb33d5604a249956c9c13709" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b922abb6be41fc383f5e9da65b58d32d0d0a32c87dfe3bbbcb61a09119506c" +checksum = "bd7ca95e831c18d1356da783765c344207cbdffea91e13e47fa9327dbb2e0719" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", @@ -953,49 +940,51 @@ dependencies = [ "hashbrown 0.14.5", "log", "regalloc2", + "rustc-hash 1.1.0", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634c2ed9ef8a04ca42535a3e2e7917e4b551f2f306f4df2d935a6e71e346c167" +checksum = "450c105fa1e51bfba4e95a86e926504a867ad5639d63f31d43fe3b7ec1f1c9ef" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00cde1425b4da28bb0d5ff010030ea9cc9be7aded342ae099b394284f17cefce" +checksum = "5479117cd1266881479908d383086561cee37e49affbea9b1e6b594cc21cc220" [[package]] name = "cranelift-control" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1622125c99f1864aaf44e57971770c4a918d081d4b4af0bb597bdf624660ed66" +checksum = "34378804f0abfdd22c068a741cfeed86938b92375b2a96fb0b42c878e0141bfb" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea97887aca1c0cbe7f8513874dc3603e9744fb1cfa78840ca8897bd2766bd35b" +checksum = "a48cb0a194c9ba82fec35a1e492055388d89b2e3c03dee9dcf2488892be8004d" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdade4c14183fe41482071ed77d6a38cb95a17c7a0a05e629152e6292c4f8cb" +checksum = "8327afc6c1c05f4be62fefce5b439fa83521c65363a322e86ea32c85e7ceaf64" dependencies = [ "cranelift-codegen", "log", @@ -1005,15 +994,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbbe4d3ad7bd4bf4a8d916c8460b441cf92417f5cdeacce4dd1d96eee70b18a2" +checksum = "56b08621c00321efcfa3eee6a3179adc009e21ea8d24ca7adc3c326184bc3f48" [[package]] name = "cranelift-native" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46be4ed1fc8f36df4e2a442b8c30a39d8c03c1868182978f4c04ba2c25c9d4f" +checksum = "d51180b147c8557c1196c77b098f04140c91962e135ea152cd2fcabf40cf365c" dependencies = [ "cranelift-codegen", "libc", @@ -1022,14 +1011,14 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.105.4" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d4c4a785a7866da89d20df159e3c4f96a5f14feb83b1f5998cfd5fe2e74d06" +checksum = "019e3dccb7f15e0bc14f0ddc034ec608a66df8e05c9e1e16f75a7716f8461799" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools 0.10.5", + "itertools 0.12.1", "log", "smallvec", "wasmparser", @@ -1705,16 +1694,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "122c27ab46707017063bf1c6e0b4f3de881e22e81b4059750a0dc95033d9cc26" dependencies = [ "bitflags 2.6.0", - "fuel-types", + "fuel-types 0.56.0", + "serde", + "strum 0.24.1", +] + +[[package]] +name = "fuel-asm" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b83807968cd62babe6cd70c94b76c86f302c8573da18b3c69135688eceecd" +dependencies = [ + "bitflags 2.6.0", + "fuel-types 0.57.1", "serde", "strum 0.24.1", ] [[package]] name = "fuel-core" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa3d4784eef8ce261206684bde30c9c0370dcc886fafe310989f83a4be46353" +checksum = "a36ed389d86361845a354d4d0e80620e811c575f937840a11c616e6e409021f8" dependencies = [ "anyhow", "async-graphql", @@ -1736,14 +1737,13 @@ dependencies = [ "fuel-core-services", "fuel-core-storage", "fuel-core-txpool", - "fuel-core-types", + "fuel-core-types 0.36.0", "fuel-core-upgradable-executor", "futures", "hex", "hyper", "indicatif", "itertools 0.12.1", - "postcard", "rand", "serde", "serde_json", @@ -1761,15 +1761,15 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4222290796ea3d5074614a911619127fc95f91e4e01bf105a5c24277c33a931" +checksum = "7a4c5a71702426b8354bff2010131c0abb4a4f0b608cc7a6dfd72f9e785ba478" dependencies = [ "anyhow", "bech32", "derivative", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "itertools 0.12.1", "postcard", "rand", @@ -1781,15 +1781,15 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b8c38f4b08094712137651cdf941b47b6c6f3245e080e53a5988337be36638b" +checksum = "5770dbda6220e641eb57ee204dd5914fa15170afe3009473f57cdf15e2339fd8" dependencies = [ "anyhow", "cynic", "derive_more", "eventsource-client", - "fuel-core-types", + "fuel-core-types 0.36.0", "futures", "hex", "hyper-rustls", @@ -1805,38 +1805,38 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4add16af84dfa5c37484c2b3fd0d9c5a9e4e265208cd9e1d6cb029fa2f5a14d2" +checksum = "9f97a3fc636d057db88cf7087aa996de9825335980092c4e894749674d599f7d" dependencies = [ "anyhow", "fuel-core-chain-config", "fuel-core-poa", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", ] [[package]] name = "fuel-core-database" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42894b75ed336629096d5ff3eb024fcd178ffb6a18de96737f850e2df8b160cb" +checksum = "5844c2cf72d4a29d512bcb295f5528c9b8ddbf8ecbf82c3f41001451f5f4ec6f" dependencies = [ "anyhow", "derive_more", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", ] [[package]] name = "fuel-core-executor" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c969c849a0bda6e562ab6c06a9a700574654e8a38352356f6366f13634f52f3" +checksum = "e46400b0e816da2efeee58e5822dfe7ffc1218516456159939968a59417a20af" dependencies = [ "anyhow", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "hex", "parking_lot", "serde", @@ -1845,19 +1845,20 @@ dependencies = [ [[package]] name = "fuel-core-gas-price-service" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55fb3322e220002233536a75017c3878949097edede1ded0e057fbae407cb6b" +checksum = "390c5c33743633c1c70eaa5aaef27f87ad2ab9a79adba7a321c4899fad4c53ee" dependencies = [ "anyhow", "async-trait", "enum-iterator", "fuel-core-services", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "fuel-gas-price-algorithm", "futures", "num_enum", + "reqwest", "serde", "strum 0.25.0", "strum_macros 0.25.3", @@ -1869,15 +1870,15 @@ dependencies = [ [[package]] name = "fuel-core-importer" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ccba7cee5da23a9cc97d954cb1abbb668a258912b7855067ceeb2c52664caa" +checksum = "8d6710d343bf04f100f8c3bd4324ce60164e7ca3a8c167915a907180abf23332" dependencies = [ "anyhow", "derive_more", "fuel-core-metrics", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "parking_lot", "rayon", "tokio", @@ -1886,9 +1887,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42bbd79ae78b6dd30c345a0e09660cb4d8d689264fe442d73c92977204029161" +checksum = "8f671e9e813b81873ef07e1cfe8697ba3f9fd0f05313879ed0933446da4c1c14" dependencies = [ "parking_lot", "pin-project-lite", @@ -1899,9 +1900,9 @@ dependencies = [ [[package]] name = "fuel-core-p2p" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665347289036863caad6b97ed39a455892d919e78765bb003c3f3770c2e4f2d" +checksum = "2453df795ce5e9a22f7ac10bc3436974612d0d698dcb918b2179c5e24b4bfb4a" dependencies = [ "anyhow", "async-trait", @@ -1909,9 +1910,10 @@ dependencies = [ "fuel-core-metrics", "fuel-core-services", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "futures", "hex", + "hickory-resolver", "ip_network", "libp2p", "libp2p-mplex", @@ -1932,16 +1934,16 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7d90523fdbba5b1b6273519bf2d1f0e40f1349796add0542236cdad8d117e3" +checksum = "9b698e7c184ab4acbaabe7bad73fdc7dfc9ebfc3a6856b1d719a4fd4c1921873" dependencies = [ "anyhow", "async-trait", "fuel-core-chain-config", "fuel-core-services", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "serde", "serde_json", "tokio", @@ -1951,15 +1953,15 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0818b86c3ca6d697edb7ffcc2a7014267575752628b51ecfcc20a88057de1151" +checksum = "ff23a51239988a9aaf451afa05a1ca7920b4e900319d511bd40bf1e04e414ce1" dependencies = [ "anyhow", "async-trait", "derive_more", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "tokio", "tokio-rayon", "tracing", @@ -1967,9 +1969,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47e4bffb8cfe6986060fd60f537d530b9fc5050b643ada08f11310f5531695c" +checksum = "998a4f9d057bf3efe43be574bd200ef64c3318007fd04523ce6bd51cc7bb963c" dependencies = [ "anyhow", "async-trait", @@ -1982,15 +1984,15 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2119ad6f8fbf046e8bf0c2737015c4cf19a7f6d44bd1fda414707db24302c4a2" +checksum = "1daa7422e48120b1623b53fe1a1152d11314f30fb290a73dc80f7e128c1f9014" dependencies = [ "anyhow", "derive_more", "enum-iterator", - "fuel-core-types", - "fuel-vm", + "fuel-core-types 0.36.0", + "fuel-vm 0.57.1", "impl-tools", "itertools 0.12.1", "mockall", @@ -2006,9 +2008,9 @@ dependencies = [ [[package]] name = "fuel-core-txpool" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559eec4bbee19649b87bcf96fb015095f298520de1b52df5dcf812029cea07f8" +checksum = "bc5d2c7d515be53c36070fadbae61a59025ef4a41d20d38e7f2ad71237c4dded" dependencies = [ "anyhow", "async-trait", @@ -2016,7 +2018,7 @@ dependencies = [ "fuel-core-metrics", "fuel-core-services", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "mockall", "num-rational", "parking_lot", @@ -2028,34 +2030,49 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.33.0" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fda0c6dc7b3bd24a993b3902f55862b8db0fa6de5b0f1d45f5942bc59792eb" +dependencies = [ + "anyhow", + "derivative", + "derive_more", + "fuel-vm 0.56.0", + "secrecy", + "serde", + "tai64", + "zeroize", +] + +[[package]] +name = "fuel-core-types" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceaa6bd06f31b407b08f8bfe5ea073cf0a87db82cc843d56780779cccb8d8b40" +checksum = "7aa1c54f09cc7c29a11ca1129f73105745f8374a192e3e24040c10822871d83f" dependencies = [ "anyhow", "bs58", "derivative", "derive_more", - "fuel-vm", + "fuel-vm 0.57.1", "rand", "secrecy", "serde", "tai64", - "thiserror", "zeroize", ] [[package]] name = "fuel-core-upgradable-executor" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dedcf15e7668549a9ce6a9ff2839a5cdbd9d6cdb39d8dcc40bff6ee97907093" +checksum = "89c636782a522cc49f9e5d43e29b15632a5db930959b8bca9dbf8a6adac76415" dependencies = [ "anyhow", "derive_more", "fuel-core-executor", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.36.0", "fuel-core-wasm-executor", "parking_lot", "postcard", @@ -2065,16 +2082,18 @@ dependencies = [ [[package]] name = "fuel-core-wasm-executor" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa95e4c322fe7befc0150b0a6d61ff4e1477ec40df772d699e26e9ed27ecc77b" +checksum = "52d69a92fba4ccba773b207dd740f04893dbdd0c76dffbebddfebb13c69eea0c" dependencies = [ "anyhow", "fuel-core-executor", "fuel-core-storage", - "fuel-core-types", + "fuel-core-types 0.35.0", + "fuel-core-types 0.36.0", "postcard", "serde", + "serde_json", ] [[package]] @@ -2082,12 +2101,28 @@ name = "fuel-crypto" version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33548590131674e8f272a3e056be4dbaa1de7cb364eab2b17987cd5c0dc31cb0" +dependencies = [ + "ecdsa", + "ed25519-dalek", + "fuel-types 0.56.0", + "k256", + "p256", + "serde", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "fuel-crypto" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a4ca62d0a8a361b66a6eab3456285883d0aa92c407e249fc76f195c332fbb2" dependencies = [ "coins-bip32", "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types", + "fuel-types 0.57.1", "k256", "lazy_static", "p256", @@ -2110,13 +2145,24 @@ dependencies = [ "synstructure", ] +[[package]] +name = "fuel-derive" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca99d9c264fec231a01e55bbdb6adb3080266dc44c4cc88de870b089ee2a015" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "synstructure", +] + [[package]] name = "fuel-gas-price-algorithm" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce04f61f9ba9baccb0ad1488a3609ccd0b2cf7f28382c80265e5feeec5d1b918" +checksum = "3a69655b9d140ad98d3e8a333e64814876c63ffe6097fd80e68cdd427514912d" dependencies = [ - "proptest", "serde", "thiserror", ] @@ -2129,7 +2175,22 @@ checksum = "cf17ce8ee5e8b573ea584c223635ff09f1288ad022bcf662954fdccb907602eb" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage", + "fuel-storage 0.56.0", + "hashbrown 0.13.2", + "hex", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "fuel-merkle" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f3c08f22f7c24170a4ac255e7dfe52d52ae2e85c4a8e26ed6df4f1bd380210" +dependencies = [ + "derive_more", + "digest 0.10.7", + "fuel-storage 0.57.1", "hashbrown 0.13.2", "hex", "serde", @@ -2142,6 +2203,12 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791" +[[package]] +name = "fuel-storage" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d676ea5d926bf90c8ea442e5f6fc23c0e86c2e4d663f303842b4afe5b7928084" + [[package]] name = "fuel-tx" version = "0.56.0" @@ -2151,10 +2218,32 @@ dependencies = [ "bitflags 2.6.0", "derivative", "derive_more", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-types", + "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", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", +] + +[[package]] +name = "fuel-tx" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86158d08fe2a936ac765a1e2cb9bf60be704203b3085882e7cc6cd4c48de38ef" +dependencies = [ + "bitflags 2.6.0", + "derivative", + "derive_more", + "fuel-asm 0.57.1", + "fuel-crypto 0.57.1", + "fuel-merkle 0.57.1", + "fuel-types 0.57.1", "hashbrown 0.14.5", "itertools 0.10.5", "postcard", @@ -2171,7 +2260,18 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b6fb26bcb408b6897e603f68cf60bbbaf6d15381c99f54a69ea743a58235ac1" dependencies = [ - "fuel-derive", + "fuel-derive 0.56.0", + "hex", + "serde", +] + +[[package]] +name = "fuel-types" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42b4430c6a20669fffd8f2c17d2be6809a356f623243a78b5eedf8ba7897c036" +dependencies = [ + "fuel-derive 0.57.1", "hex", "rand", "serde", @@ -2182,6 +2282,37 @@ name = "fuel-vm" version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fc4695efac9207276f6229f2dd9811848b328a13604a698f7bce1d452bd986" +dependencies = [ + "async-trait", + "backtrace", + "bitflags 2.6.0", + "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", + "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.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b04a4e971d58b3662ff8b84b3176094e25f4b372728a13ea903fdf79c7e426" dependencies = [ "anyhow", "async-trait", @@ -2190,12 +2321,12 @@ dependencies = [ "derivative", "derive_more", "ethnum", - "fuel-asm", - "fuel-crypto", - "fuel-merkle", - "fuel-storage", - "fuel-tx", - "fuel-types", + "fuel-asm 0.57.1", + "fuel-crypto 0.57.1", + "fuel-merkle 0.57.1", + "fuel-storage 0.57.1", + "fuel-tx 0.57.1", + "fuel-types 0.57.1", "hashbrown 0.14.5", "itertools 0.10.5", "libm", @@ -2213,13 +2344,13 @@ dependencies = [ [[package]] name = "fuels" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe775479432ca9cf928b46ab31b8db70522995d76eee57f8454afd3c2fa93f7" +checksum = "aaf7ca0443308f4c3d3e9dd7ed67cb18369ae63d208302056d6d5f3a09efb031" dependencies = [ "fuel-core-client", - "fuel-crypto", - "fuel-tx", + "fuel-crypto 0.57.1", + "fuel-tx 0.57.1", "fuels-accounts", "fuels-core", "fuels-macros", @@ -2229,19 +2360,19 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4458456fe121b996121bbc32bd1db062324b7516a896b18fc99a4824ad266c1e" +checksum = "92ea69afa418ba67b9572a5b4cb612b80ee2113c9f755e93acf7adc9fc1454d1" dependencies = [ "async-trait", "chrono", "elliptic-curve", "eth-keystore", "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", + "fuel-core-types 0.36.0", + "fuel-crypto 0.57.1", + "fuel-tx 0.57.1", + "fuel-types 0.57.1", "fuels-core", "itertools 0.12.1", "rand", @@ -2254,9 +2385,9 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093f36e3b663a4d25929e501ae420ddddaa212f50515c3b524c4bff5cff842ee" +checksum = "d8d1949debe40c9eb731a93b22a50da560007d85f6f7983679d217c01b9dc867" dependencies = [ "Inflector", "fuel-abi-types", @@ -2270,22 +2401,22 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6126579bc5c7c27bdba2601859eb878d5e1be66eea651780dadbfcb5d72fd51" +checksum = "e720a87a7c99fcc5477cbb251738406de752a10eb237e15c79c1d99b64f4679f" dependencies = [ "async-trait", "bech32", "chrono", "fuel-abi-types", - "fuel-asm", + "fuel-asm 0.57.1", "fuel-core-chain-config", "fuel-core-client", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", - "fuel-vm", + "fuel-core-types 0.36.0", + "fuel-crypto 0.57.1", + "fuel-tx 0.57.1", + "fuel-types 0.57.1", + "fuel-vm 0.57.1", "fuels-macros", "hex", "itertools 0.12.1", @@ -2298,9 +2429,9 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8ecb63c040c5efe78e48f8168ca97229939491267d2d2ca35ebd8336c05e00" +checksum = "f4f7b391259fceb75331bcbde2878cd9765b579e9167abd818641205b4c96b9a" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2311,15 +2442,15 @@ dependencies = [ [[package]] name = "fuels-programs" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519dd708b35a6fd06ec2874c59dc3af25fea384bf35fa87e911eda824df89731" +checksum = "cbf719a68184ad4999c24dd53cf68bdd247d02fe16a9d67ccba177c8e44771b9" dependencies = [ "async-trait", "fuel-abi-types", - "fuel-asm", - "fuel-tx", - "fuel-types", + "fuel-asm 0.57.1", + "fuel-tx 0.57.1", + "fuel-types 0.57.1", "fuels-accounts", "fuels-core", "itertools 0.12.1", @@ -2330,19 +2461,19 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.66.2" +version = "0.66.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db040c96a40c3bd06a5f0e5a3fba393f751ecbf8fd1be853a8a66a9c0ff1a6b" +checksum = "8a615a59644d3cfce8dc1089db0764b4cca2bcea42b2a08eca826e2b8f892936" dependencies = [ "fuel-core", "fuel-core-chain-config", "fuel-core-client", "fuel-core-poa", "fuel-core-services", - "fuel-core-types", - "fuel-crypto", - "fuel-tx", - "fuel-types", + "fuel-core-types 0.36.0", + "fuel-crypto 0.57.1", + "fuel-tx 0.57.1", + "fuel-types 0.57.1", "fuels-accounts", "fuels-core", "futures", @@ -2906,6 +3037,12 @@ dependencies = [ "cc", ] +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + [[package]] name = "ident_case" version = "1.0.1" @@ -3883,10 +4020,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -3918,15 +4055,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -4200,7 +4328,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -4242,9 +4369,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "crc32fast", "hashbrown 0.14.5", @@ -4252,15 +4379,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "object" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" -dependencies = [ - "memchr", -] - [[package]] name = "oid-registry" version = "0.7.0" @@ -4564,7 +4682,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -4622,26 +4740,6 @@ dependencies = [ "syn 2.0.74", ] -[[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.6.0", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", - "rusty-fork", - "tempfile", - "unarray", -] - [[package]] name = "psl-types" version = "2.0.11" @@ -4789,15 +4887,6 @@ 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" @@ -5147,18 +5236,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" -[[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" @@ -5264,9 +5341,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", "secp256k1-sys", @@ -5274,9 +5351,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -5351,6 +5428,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5477,6 +5563,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "snow" @@ -5765,6 +5854,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "termtree" version = "0.4.1" @@ -5932,11 +6030,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.22", ] [[package]] @@ -5944,6 +6045,9 @@ name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -5953,7 +6057,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.3.0", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.3.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.20", ] [[package]] @@ -6079,12 +6196,6 @@ 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" @@ -6112,6 +6223,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" @@ -6207,15 +6324,6 @@ 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" @@ -6300,76 +6408,100 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" -version = "0.41.2" +version = "0.212.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" +checksum = "501940df4418b8929eb6d52f1aade1fdd15a5b86c92453cb696e3c906bd3fc33" dependencies = [ "leb128", ] [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.212.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8" dependencies = [ + "ahash", "bitflags 2.6.0", + "hashbrown 0.14.5", "indexmap 2.3.0", "semver", + "serde", +] + +[[package]] +name = "wasmprinter" +version = "0.212.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfac65326cc561112af88c3028f6dfdb140acff67ede33a8e86be2dc6b8956f7" +dependencies = [ + "anyhow", + "termcolor", + "wasmparser", ] [[package]] name = "wasmtime" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69472708b96ee90579a482bdbb908ce97e53a9e5ebbcab59cc29c3977bcab512" +checksum = "07232e0b473af36112da7348f51e73fa8b11047a6cb546096da3812930b7c93a" dependencies = [ "anyhow", - "bincode", + "bitflags 2.6.0", "bumpalo", + "cc", "cfg-if", - "gimli 0.28.1", + "hashbrown 0.14.5", "indexmap 2.3.0", "libc", + "libm", "log", - "object 0.32.2", + "mach2", + "memfd", + "object", "once_cell", "paste", + "postcard", + "psm", "rayon", "rustix", "serde", "serde_derive", - "serde_json", + "smallvec", + "sptr", "target-lexicon", "wasmparser", + "wasmtime-asm-macros", "wasmtime-cache", + "wasmtime-component-macro", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-slab", + "wasmtime-versioned-export-macros", "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86292d6a9bf30c669582a40c4a4b8e0b8640e951f3635ee8e0acf7f87809961e" +checksum = "e5a9c42562d879c749288d9a26acc0d95d2ca069e30c2ec2efce84461c4d62b3" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a180017db1233c902b992fea9484640d265f2fedf03db60eed57894cb2effcc" +checksum = "38d5d5aac98c8ae87cf5244495da7722e3fa022aa6f3f4fcd5e3d6e5699ce422" dependencies = [ "anyhow", "base64 0.21.7", - "bincode", "directories-next", "log", + "postcard", "rustix", "serde", "serde_derive", @@ -6379,11 +6511,32 @@ dependencies = [ "zstd", ] +[[package]] +name = "wasmtime-component-macro" +version = "23.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0c3f57c4bc96f9b4a6ff4d6cb6e837913eff32e98d09e2b6d79b5c4647b415b" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.74", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "23.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1da707969bc31a565da9b32d087eb2370c95c6f2087c5539a15f2e3b27e77203" + [[package]] name = "wasmtime-cranelift" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57d58e220ae223855c5d030ef20753377bc716d0c81b34c1fe74c9f44268774" +checksum = "62cb6135ec46994299be711b78b03acaa9480de3715f827d450f0c947a84977c" dependencies = [ "anyhow", "cfg-if", @@ -6395,108 +6548,74 @@ dependencies = [ "cranelift-wasm", "gimli 0.28.1", "log", - "object 0.32.2", + "object", "target-lexicon", "thiserror", "wasmparser", - "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", ] -[[package]] -name = "wasmtime-cranelift-shared" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba2cfdfdbde42f0f3baeddb62f3555524dee9f836c96da8d466e299f75f5eee" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli 0.28.1", - "object 0.32.2", - "target-lexicon", - "wasmtime-environ", -] - [[package]] name = "wasmtime-environ" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbf3075d9ee7eb1263dc67949aced64d0f0bf27be8098d34d8e5826cf0ff0f2" +checksum = "9bcaa3b42a0718e9123da7fb75e8e13fc95df7db2a7e32e2f2f4f0d3333b7d6f" dependencies = [ "anyhow", - "bincode", + "cranelift-bitset", "cranelift-entity", "gimli 0.28.1", "indexmap 2.3.0", "log", - "object 0.32.2", + "object", + "postcard", "serde", "serde_derive", "target-lexicon", - "thiserror", + "wasm-encoder", "wasmparser", + "wasmprinter", "wasmtime-types", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dacd2aa30fb20fd8cd0eb4e664024a1ab28a02958529fa05bf52117532a098fc" +checksum = "2cfee42dac5148fc2664ab1f5cb8d7fa77a28d1a2cf1d9483abc2c3d751a58b9" dependencies = [ + "anyhow", "cfg-if", "libc", "windows-sys 0.52.0", ] [[package]] -name = "wasmtime-runtime" -version = "18.0.4" +name = "wasmtime-slab" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14e97c4bb36d91bcdd194745446d595e67ce8b89916806270fdbee640c747fd" -dependencies = [ - "anyhow", - "cc", - "cfg-if", - "indexmap 2.3.0", - "libc", - "log", - "mach", - "memfd", - "memoffset", - "paste", - "psm", - "rustix", - "sptr", - "wasm-encoder", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", - "windows-sys 0.52.0", -] +checksum = "42eb8f6515708ec67974998c3e644101db4186308985f5ef7c2ef324ff33c948" [[package]] name = "wasmtime-types" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "530b94c627a454d24f520173d3145112d1b807c44c82697a57e1d8e28390cde4" +checksum = "046873fb8fb3e9652f3fd76fe99c8c8129007695c3d73b2e307fdae40f6e324c" dependencies = [ + "anyhow", "cranelift-entity", "serde", "serde_derive", - "thiserror", + "smallvec", "wasmparser", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "18.0.4" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5399c175ddba4a471b9da45105dea3493059d52b2d54860eadb0df04c813948d" +checksum = "99c02af2e9dbeb427304d1a08787d70ed0dbfec1af2236616f84c9f1f03e7969" dependencies = [ "proc-macro2", "quote", @@ -6504,10 +6623,16 @@ dependencies = [ ] [[package]] -name = "wasmtime-wmemcheck" -version = "18.0.4" +name = "wasmtime-wit-bindgen" +version = "23.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1711f429111e782fac0537e0b3eb2ab6f821613cf1ec3013f2a0ff3fde41745" +checksum = "75f528f8b8a2376a3dacaf497d960216dd466d324425361e1e00e26de0a7705c" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.3.0", + "wit-parser", +] [[package]] name = "web-sys" @@ -6569,6 +6694,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -6760,6 +6894,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -6776,6 +6919,24 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "wit-parser" +version = "0.212.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceeb0424aa8679f3fcf2d6e3cfa381f3d6fa6179976a2c05a6249dd2bb426716" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.3.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + [[package]] name = "wyz" version = "0.5.1" @@ -6912,20 +7073,19 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 651b94a..1d1d663 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,5 +15,5 @@ members = [ ] [workspace.dependencies] -fuels = { version = "0.66.2", features = ["fuel-core-lib"] } +fuels = { version = "0.66.5", features = ["fuel-core-lib"] } tokio = { version = "1.12", features = ["rt", "macros"] } diff --git a/Forc.lock b/Forc.lock index 1ac051e..5ff2155 100644 --- a/Forc.lock +++ b/Forc.lock @@ -10,7 +10,7 @@ dependencies = [ [[package]] name = "core" -source = "path+from-root-4BB20845430AF9CF" +source = "path+from-root-4BA3A18A2D620E67" [[package]] name = "create_pool_and_add_liquidity_script" @@ -47,7 +47,7 @@ dependencies = [ [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.63.5#31a1d6f98395f571cd3674b492d9bf4773c55f65" +source = "git+https://github.com/fuellabs/sway?tag=v0.64.0#2156bfbbee01ffb85bfca2aae8f185f8e7c715a4" dependencies = ["core"] [[package]] diff --git a/fixtures/mira-amm/mira_amm_contract-abi.json b/fixtures/mira-amm/mira_amm_contract-abi.json index cd33707..c06547f 100644 --- a/fixtures/mira-amm/mira_amm_contract-abi.json +++ b/fixtures/mira-amm/mira_amm_contract-abi.json @@ -63,6 +63,14 @@ "44a0560c7eea4ea134ff419f7d7735d4cde25c72966cff31ad934e76a41bdfac" ] }, + { + "type": "enum std::option::Option", + "concreteTypeId": "50b87f43f0097a720c18f3fb2100c4502484b716128f2706b3e187aa35a6dfe8", + "metadataTypeId": 9, + "typeArguments": [ + "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb" + ] + }, { "type": "enum std::option::Option", "concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", @@ -1031,7 +1039,7 @@ }, { "name": "data", - "concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb" + "concreteTypeId": "50b87f43f0097a720c18f3fb2100c4502484b716128f2706b3e187aa35a6dfe8" } ], "name": "swap", @@ -1137,12 +1145,12 @@ { "name": "LP_FEE_VOLATILE", "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", - "offset": 75344 + "offset": 61520 }, { "name": "LP_FEE_STABLE", "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0", - "offset": 75336 + "offset": 61512 } ] } \ No newline at end of file diff --git a/fixtures/mira-amm/mira_amm_contract.bin b/fixtures/mira-amm/mira_amm_contract.bin index ba60b93..c005c7b 100644 Binary files a/fixtures/mira-amm/mira_amm_contract.bin and b/fixtures/mira-amm/mira_amm_contract.bin differ diff --git a/fixtures/mock-token/mock_token-abi.json b/fixtures/mock-token/mock_token-abi.json index e9c0605..ef24941 100644 --- a/fixtures/mock-token/mock_token-abi.json +++ b/fixtures/mock-token/mock_token-abi.json @@ -14,7 +14,7 @@ { "type": "enum std::option::Option", "concreteTypeId": "0c2beb9013490c4f753f2757dfe2d8340b22ce3827d596d81d249b7038033cb6", - "metadataTypeId": 0, + "metadataTypeId": 1, "typeArguments": [ "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" ] @@ -22,7 +22,7 @@ { "type": "enum std::option::Option", "concreteTypeId": "7c06d929390a9aeeb8ffccf8173ac0d101a9976d99dda01cce74541a81e75ac0", - "metadataTypeId": 0, + "metadataTypeId": 1, "typeArguments": [ "9a7f1d3e963c10e0a4ea70a8e20a4813d1dc5682e28f74cb102ae50d32f7f98c" ] @@ -30,7 +30,7 @@ { "type": "enum std::option::Option", "concreteTypeId": "d852149004cc9ec0bbe7dc4e37bffea1d41469b759512b6136f2e865a4c06e7d", - "metadataTypeId": 0, + "metadataTypeId": 1, "typeArguments": [ "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0" ] @@ -38,20 +38,40 @@ { "type": "enum std::option::Option", "concreteTypeId": "2da102c46c7263beeed95818cd7bee801716ba8303dddafdcd0f6c9efda4a0f1", - "metadataTypeId": 0, + "metadataTypeId": 1, "typeArguments": [ "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" ] }, + { + "type": "enum sway_libs::asset::errors::SetMetadataError", + "concreteTypeId": "c6c09c148c1a1341c7ab81697b3545cc695fa67668a169cddc59790a9a0b6b44", + "metadataTypeId": 2 + }, + { + "type": "struct standards::src20::SetDecimalsEvent", + "concreteTypeId": "fbe071a6e7ca2b2b5e503e82638f9f11c861a6fb452b65473eca8260db87392d", + "metadataTypeId": 5 + }, + { + "type": "struct standards::src20::SetNameEvent", + "concreteTypeId": "6ce295b0fb4c1c15e8ed1cfa4babda47d8a04940a5266a3229e12243a2e37c2c", + "metadataTypeId": 6 + }, + { + "type": "struct standards::src20::SetSymbolEvent", + "concreteTypeId": "a8a4b78066c51a50da6349bd395fe1c67e774d75c1db2c5c22288a432d7a363d", + "metadataTypeId": 7 + }, { "type": "struct std::asset_id::AssetId", "concreteTypeId": "c0710b6731b1dd59799cf6bef33eee3b3b04a2e40e80a0724090215bbf2ca974", - "metadataTypeId": 3 + "metadataTypeId": 9 }, { "type": "struct std::string::String", "concreteTypeId": "9a7f1d3e963c10e0a4ea70a8e20a4813d1dc5682e28f74cb102ae50d32f7f98c", - "metadataTypeId": 6 + "metadataTypeId": 13 }, { "type": "u64", @@ -64,8 +84,22 @@ ], "metadataTypes": [ { - "type": "enum std::option::Option", + "type": "enum std::identity::Identity", "metadataTypeId": 0, + "components": [ + { + "name": "Address", + "typeId": 8 + }, + { + "name": "ContractId", + "typeId": 12 + } + ] + }, + { + "type": "enum std::option::Option", + "metadataTypeId": 1, "components": [ { "name": "None", @@ -73,24 +107,114 @@ }, { "name": "Some", - "typeId": 1 + "typeId": 3 } ], "typeParameters": [ - 1 + 3 + ] + }, + { + "type": "enum sway_libs::asset::errors::SetMetadataError", + "metadataTypeId": 2, + "components": [ + { + "name": "EmptyString", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" + }, + { + "name": "EmptyBytes", + "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d" + } ] }, { "type": "generic T", - "metadataTypeId": 1 + "metadataTypeId": 3 }, { "type": "raw untyped ptr", - "metadataTypeId": 2 + "metadataTypeId": 4 + }, + { + "type": "struct standards::src20::SetDecimalsEvent", + "metadataTypeId": 5, + "components": [ + { + "name": "asset", + "typeId": 9 + }, + { + "name": "decimals", + "typeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b" + }, + { + "name": "sender", + "typeId": 0 + } + ] + }, + { + "type": "struct standards::src20::SetNameEvent", + "metadataTypeId": 6, + "components": [ + { + "name": "asset", + "typeId": 9 + }, + { + "name": "name", + "typeId": 1, + "typeArguments": [ + { + "name": "", + "typeId": 13 + } + ] + }, + { + "name": "sender", + "typeId": 0 + } + ] + }, + { + "type": "struct standards::src20::SetSymbolEvent", + "metadataTypeId": 7, + "components": [ + { + "name": "asset", + "typeId": 9 + }, + { + "name": "symbol", + "typeId": 1, + "typeArguments": [ + { + "name": "", + "typeId": 13 + } + ] + }, + { + "name": "sender", + "typeId": 0 + } + ] + }, + { + "type": "struct std::address::Address", + "metadataTypeId": 8, + "components": [ + { + "name": "bits", + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" + } + ] }, { "type": "struct std::asset_id::AssetId", - "metadataTypeId": 3, + "metadataTypeId": 9, "components": [ { "name": "bits", @@ -100,11 +224,11 @@ }, { "type": "struct std::bytes::Bytes", - "metadataTypeId": 4, + "metadataTypeId": 10, "components": [ { "name": "buf", - "typeId": 5 + "typeId": 11 }, { "name": "len", @@ -114,11 +238,11 @@ }, { "type": "struct std::bytes::RawBytes", - "metadataTypeId": 5, + "metadataTypeId": 11, "components": [ { "name": "ptr", - "typeId": 2 + "typeId": 4 }, { "name": "cap", @@ -126,13 +250,23 @@ } ] }, + { + "type": "struct std::contract_id::ContractId", + "metadataTypeId": 12, + "components": [ + { + "name": "bits", + "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b" + } + ] + }, { "type": "struct std::string::String", - "metadataTypeId": 6, + "metadataTypeId": 13, "components": [ { "name": "bytes", - "typeId": 4 + "typeId": 10 } ] } @@ -292,7 +426,24 @@ ] } ], - "loggedTypes": [], + "loggedTypes": [ + { + "logId": "14321618427101975361", + "concreteTypeId": "c6c09c148c1a1341c7ab81697b3545cc695fa67668a169cddc59790a9a0b6b44" + }, + { + "logId": "7845998088195677205", + "concreteTypeId": "6ce295b0fb4c1c15e8ed1cfa4babda47d8a04940a5266a3229e12243a2e37c2c" + }, + { + "logId": "12152039456660331088", + "concreteTypeId": "a8a4b78066c51a50da6349bd395fe1c67e774d75c1db2c5c22288a432d7a363d" + }, + { + "logId": "18149631459970394923", + "concreteTypeId": "fbe071a6e7ca2b2b5e503e82638f9f11c861a6fb452b65473eca8260db87392d" + } + ], "messagesTypes": [], "configurables": [] } \ No newline at end of file diff --git a/fixtures/mock-token/mock_token.bin b/fixtures/mock-token/mock_token.bin index 9caea71..65e0ccb 100644 Binary files a/fixtures/mock-token/mock_token.bin and b/fixtures/mock-token/mock_token.bin differ diff --git a/scripts/add_liquidity_script/src/main.sw b/scripts/add_liquidity_script/src/main.sw index db65bdb..d9a83d3 100644 --- a/scripts/add_liquidity_script/src/main.sw +++ b/scripts/add_liquidity_script/src/main.sw @@ -6,7 +6,7 @@ use utils::blockchain_utils::check_deadline; use std::asset::transfer; configurable { - AMM_CONTRACT_ID: ContractId = ContractId::from(0x0000000000000000000000000000000000000000000000000000000000000000), + AMM_CONTRACT_ID: ContractId = ContractId::zero(), } fn main( diff --git a/scripts/add_liquidity_script/tests/utils/mod.rs b/scripts/add_liquidity_script/tests/utils/mod.rs index 371b316..dc6fe49 100644 --- a/scripts/add_liquidity_script/tests/utils/mod.rs +++ b/scripts/add_liquidity_script/tests/utils/mod.rs @@ -1,9 +1,9 @@ use std::str::FromStr; use fuels::accounts::wallet::WalletUnlocked; -use fuels::types::ContractId; +use fuels::types::{Address, ContractId, Identity}; use test_harness::data_structures::{MiraAMMContract, WalletAssetConfiguration}; -use test_harness::interface::amm::create_pool; +use test_harness::interface::amm::{create_pool, initialize_ownership}; use test_harness::interface::mock::{add_token, deploy_mock_token_contract}; use test_harness::interface::mock::{get_sub_id, mint_tokens}; use test_harness::interface::AddLiquidityScript; @@ -23,6 +23,7 @@ pub async fn setup() -> ( let (wallet, _asset_ids, provider) = setup_wallet_and_provider(&WalletAssetConfiguration::default()).await; let amm = deploy_amm(&wallet).await; + initialize_ownership(&amm.instance, Identity::Address(Address::default())).await; let (token_contract_id, token_contract) = deploy_mock_token_contract(&wallet).await; let token_a_id = add_token(&token_contract, "TOKEN_A".to_string(), "TKA".to_string(), 9) diff --git a/scripts/create_pool_and_add_liquidity_script/src/main.sw b/scripts/create_pool_and_add_liquidity_script/src/main.sw index 4a50604..6c9f630 100644 --- a/scripts/create_pool_and_add_liquidity_script/src/main.sw +++ b/scripts/create_pool_and_add_liquidity_script/src/main.sw @@ -5,7 +5,7 @@ use std::asset::transfer; use utils::blockchain_utils::check_deadline; configurable { - AMM_CONTRACT_ID: ContractId = ContractId::from(0x0000000000000000000000000000000000000000000000000000000000000000), + AMM_CONTRACT_ID: ContractId = ContractId::zero(), } fn main( diff --git a/scripts/remove_liquidity_script/src/main.sw b/scripts/remove_liquidity_script/src/main.sw index de0c496..97babcd 100644 --- a/scripts/remove_liquidity_script/src/main.sw +++ b/scripts/remove_liquidity_script/src/main.sw @@ -6,7 +6,7 @@ use utils::blockchain_utils::{check_deadline, get_lp_asset}; use std::asset::transfer; configurable { - AMM_CONTRACT_ID: ContractId = ContractId::from(0x0000000000000000000000000000000000000000000000000000000000000000), + AMM_CONTRACT_ID: ContractId = ContractId::zero(), } fn main( diff --git a/scripts/remove_liquidity_script/tests/utils/mod.rs b/scripts/remove_liquidity_script/tests/utils/mod.rs index 9945e0a..74b2cff 100644 --- a/scripts/remove_liquidity_script/tests/utils/mod.rs +++ b/scripts/remove_liquidity_script/tests/utils/mod.rs @@ -1,9 +1,10 @@ use std::str::FromStr; use fuels::accounts::wallet::WalletUnlocked; -use fuels::types::ContractId; +use fuels::prelude::Address; +use fuels::types::{ContractId, Identity}; use test_harness::data_structures::{MiraAMMContract, WalletAssetConfiguration}; -use test_harness::interface::amm::create_pool; +use test_harness::interface::amm::{create_pool, initialize_ownership}; use test_harness::interface::mock::{ add_token, deploy_mock_token_contract, get_sub_id, mint_tokens, }; @@ -27,6 +28,7 @@ pub async fn setup() -> ( let (wallet, _asset_ids, provider) = setup_wallet_and_provider(&WalletAssetConfiguration::default()).await; let amm = deploy_amm(&wallet).await; + initialize_ownership(&amm.instance, Identity::Address(Address::default())).await; let (token_contract_id, token_contract) = deploy_mock_token_contract(&wallet).await; let token_a_id = add_token(&token_contract, "TOKEN_A".to_string(), "TKA".to_string(), 9) diff --git a/scripts/swap_exact_input_script/src/main.sw b/scripts/swap_exact_input_script/src/main.sw index 0fcb321..9d457ee 100644 --- a/scripts/swap_exact_input_script/src/main.sw +++ b/scripts/swap_exact_input_script/src/main.sw @@ -6,7 +6,7 @@ use utils::blockchain_utils::check_deadline; use std::{asset::transfer, bytes::Bytes}; configurable { - AMM_CONTRACT_ID: ContractId = ContractId::from(0x0000000000000000000000000000000000000000000000000000000000000000), + AMM_CONTRACT_ID: ContractId = ContractId::zero(), } fn main( diff --git a/scripts/swap_exact_output_script/src/main.sw b/scripts/swap_exact_output_script/src/main.sw index 9d87a2e..2ffc62d 100644 --- a/scripts/swap_exact_output_script/src/main.sw +++ b/scripts/swap_exact_output_script/src/main.sw @@ -6,7 +6,7 @@ use utils::blockchain_utils::check_deadline; use std::{asset::transfer, bytes::Bytes}; configurable { - AMM_CONTRACT_ID: ContractId = ContractId::from(0x0000000000000000000000000000000000000000000000000000000000000000), + AMM_CONTRACT_ID: ContractId = ContractId::zero(), } fn main(