diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23b3d33f687..c2c93f5ebab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -326,17 +326,19 @@ jobs: runs-on: ubuntu-latest needs: get-fuel-core-version steps: - - name: Install fuel-core for tests - uses: baptiste0928/cargo-install@v2 - with: - crate: fuel-core-bin - version: ${{ needs.get-fuel-core-version.outputs.fuel_core_version }} - uses: actions/checkout@v3 - name: Install toolchain uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_VERSION }} + targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown" - uses: Swatinem/rust-cache@v2 + - name: Install fuel-core for tests + run: | + curl -sSLf https://github.com/FuelLabs/fuel-core/releases/download/v${{ needs.get-fuel-core-version.outputs.fuel_core_version }}/fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu.tar.gz -L -o fuel-core.tar.gz + tar -xvf fuel-core.tar.gz + chmod +x fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core + mv fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core /usr/local/bin/fuel-core - name: Cargo Run E2E Tests (Fuel VM) run: | fuel-core run --db-type in-memory --debug --snapshot ./.github/workflows/local-testnode & @@ -347,17 +349,19 @@ jobs: runs-on: ubuntu-latest needs: get-fuel-core-version steps: - - name: Install fuel-core for tests - uses: baptiste0928/cargo-install@v2 - with: - crate: fuel-core-bin - version: ${{ needs.get-fuel-core-version.outputs.fuel_core_version }} - uses: actions/checkout@v3 - name: Install toolchain uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_VERSION }} + targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown" - uses: Swatinem/rust-cache@v2 + - name: Install fuel-core for tests + run: | + curl -sSLf https://github.com/FuelLabs/fuel-core/releases/download/v${{ needs.get-fuel-core-version.outputs.fuel_core_version }}/fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu.tar.gz -L -o fuel-core.tar.gz + tar -xvf fuel-core.tar.gz + chmod +x fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core + mv fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core /usr/local/bin/fuel-core - name: Cargo Run E2E Tests (Fuel VM) run: | fuel-core run --db-type in-memory --debug --snapshot ./.github/workflows/local-testnode & @@ -372,6 +376,7 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_VERSION }} + targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown" - uses: Swatinem/rust-cache@v2 - name: Cargo Run E2E Tests (EVM) run: cargo run --locked --release --bin test -- --target evm --locked --no-encoding-v1 @@ -502,12 +507,14 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_VERSION }} - - name: Install fuel-core for tests - uses: baptiste0928/cargo-install@v2 - with: - crate: fuel-core-bin - version: ${{ needs.get-fuel-core-version.outputs.fuel_core_version }} + targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown" - uses: Swatinem/rust-cache@v2 + - name: Install fuel-core for tests + run: | + curl -sSLf https://github.com/FuelLabs/fuel-core/releases/download/v${{ needs.get-fuel-core-version.outputs.fuel_core_version }}/fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu.tar.gz -L -o fuel-core.tar.gz + tar -xvf fuel-core.tar.gz + chmod +x fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core + mv fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core /usr/local/bin/fuel-core - name: Run tests run: cargo test --locked --release -p forc-debug cargo-test-sway-lsp: diff --git a/.github/workflows/local-testnode/chain_config.json b/.github/workflows/local-testnode/chain_config.json index cc03063912c..b7aefcab95c 100644 --- a/.github/workflows/local-testnode/chain_config.json +++ b/.github/workflows/local-testnode/chain_config.json @@ -1,5 +1,5 @@ { - "chain_name": "Local Node Test Network", + "chain_name": "Local Node Testnet", "consensus_parameters": { "V1": { "tx_params": { @@ -8,7 +8,8 @@ "max_outputs": 255, "max_witnesses": 255, "max_gas_per_tx": 1000000000, - "max_size": 17825792 + "max_size": 17825792, + "max_bytecode_subsections": 256 } }, "predicate_params": { diff --git a/.github/workflows/local-testnode/state_config.json b/.github/workflows/local-testnode/state_config.json index ff22e27d1c2..e71fabb39f0 100644 --- a/.github/workflows/local-testnode/state_config.json +++ b/.github/workflows/local-testnode/state_config.json @@ -14,7 +14,7 @@ "output_index": 0, "tx_pointer_block_height": 0, "tx_pointer_tx_idx": 0, - "owner": "54944e5b8189827e470e5a8bacfc6c3667397dc4e1eef7ef3519d16d6d6c6610", + "owner": "de97d8624a438121b86a1956544bd72ed68cd69f2c99555b08b1e8c51ffd511c", "amount": 1152921504606846976, "asset_id": "0000000000000000000000000000000000000000000000000000000000000000" }, @@ -131,6 +131,5 @@ "balances": [] } ], - "block_height": 0, - "da_block_height": 0 + "last_block": null } diff --git a/.github/workflows/local-testnode/state_transition_bytecode.wasm b/.github/workflows/local-testnode/state_transition_bytecode.wasm new file mode 100644 index 00000000000..a2802d561b2 Binary files /dev/null and b/.github/workflows/local-testnode/state_transition_bytecode.wasm differ diff --git a/Cargo.lock b/Cargo.lock index ece4cf526d4..14e99eb5120 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2316,9 +2316,9 @@ dependencies = [ [[package]] name = "forc-wallet" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527379a169e2c0d91764098473fa6029b73a7f19ed6542fedfe94f12db41478f" +checksum = "a3a20ec61c7c3a3f00e3f0144db7d62d47e928650f2da49648287c65869e9827" dependencies = [ "anyhow", "clap 4.5.4", @@ -2398,9 +2398,9 @@ dependencies = [ [[package]] name = "fuel-asm" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bc683784e35f3421aab3dc5a31a94c8ad80f1e9ec614ddddac930b4081cd92" +checksum = "42df651415e443094f86102473b7f9fa23633ab6c3c98dd3f713adde251acf0f" dependencies = [ "bitflags 2.5.0", "fuel-types", @@ -2410,12 +2410,13 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23929afd8e279a463941ed18c8a23d9e29df4c3587ba19ad56c68f24c14484f5" +checksum = "d202fe1dfeb98882bdc5a0206a58e469d76fd09d952c4050bb979102bd690398" dependencies = [ "anyhow", "bech32", + "derivative", "fuel-core-storage", "fuel-core-types", "itertools 0.12.1", @@ -2429,9 +2430,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d4a6c96cd1827d04361f8b76416273168efc9eb0951293b03bc18e52d409b6" +checksum = "bc636a8706e36c713606ee4226fdef5260e3650ba0e8a57f0fc06258d0078a34" dependencies = [ "anyhow", "cynic", @@ -2453,9 +2454,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003381d1f9f5def3685171b340c4bb56d3681897f3baa616aaf6cf7085013462" +checksum = "bacc62bc4fec2fe6a818a1a7145b892bd486d69266190ca8dd31a036a3a327b7" dependencies = [ "axum", "once_cell", @@ -2467,9 +2468,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8608758b49855f33c3e6a78917dada96265233096aae04628d6c1ff9fe6d3dca" +checksum = "68d189ecd635688ddc896b44c8497b29c04bb4a3719a24eea0ca9691a6f76d5e" dependencies = [ "anyhow", "async-trait", @@ -2484,9 +2485,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca69ccc3a055e0a645c7e76e0623feec6945d4cf95b4131a3a1bf1ffc076d1bb" +checksum = "cf2ab4d3931b8cafdb2e69fe8ca97918a168d74c73c070481ca0e552cc37bb93" dependencies = [ "anyhow", "async-trait", @@ -2499,9 +2500,9 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb47f4fabcec096b78137c782895a52aeed134f931256656511b10083cbd967" +checksum = "e039c1c6ebef314c74c34728e1f2199dcf9ede041d6f5c6e11479517c8f4d320" dependencies = [ "anyhow", "derive_more", @@ -2521,9 +2522,9 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385b3c9e9d51ca11e129ec1c713ffd2f4f2f2ad89c16b1808a4c661887a88bfb" +checksum = "cf038dd8df8d3aa665a13295c9ef888ba8118600cccdf8fb4587410e0e102fdf" dependencies = [ "anyhow", "bs58", @@ -2540,9 +2541,9 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6112c726b5254cad831e61db36dcd0d83b28c50180ea22cb8815343fb162526" +checksum = "71cef93970fb8a26d3a683ae211833c6bbf391066887f501bd5859f29992b59a" dependencies = [ "coins-bip32", "coins-bip39", @@ -2561,9 +2562,9 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5896603b839f04f27e8bddbae2990dc799fb119f5e62973d6666b2ea1a4b036b" +checksum = "2b85e8e508b26d088262075fcfe9921b7009c931fef1cc55fe1dafb116c99884" dependencies = [ "proc-macro2", "quote", @@ -2644,9 +2645,9 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f75d97f6d43fbd15aa5ca0d594b33cc59ba5fd73ce42f4a10dfa9288a9a4a4" +checksum = "5198b4eab5a19b0034971da88199dae7dd61806ebd8df366d6af1f17cda2e151" dependencies = [ "derive_more", "digest 0.10.7", @@ -2659,15 +2660,15 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6899452bbf8b09d536b0adf98d6a28d1081ce38c3490fa2d8cc1dd47ba153351" +checksum = "fa738e9c244f3f312af09faef108ec9a285f02afcefbc579c19c242cea742dd0" [[package]] name = "fuel-tx" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305c12d87f47d139505cbbaee1effa7750ce171c9a4362d212f4f7a651902121" +checksum = "8e4b4ea79ffe711af7bbf363b25f383fc6e481e652cf55a5ef8b5a458fcf4ef9" dependencies = [ "bitflags 2.5.0", "derivative", @@ -2678,6 +2679,7 @@ dependencies = [ "fuel-types", "hashbrown 0.14.3", "itertools 0.10.5", + "postcard", "rand", "serde", "serde_json", @@ -2687,9 +2689,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d92d34c6625f0c3b88463f01027e836ba561125f6ccfb1402d12743fc7b2c96" +checksum = "455cf5275d96f6907e81ed1825c4e6a9dd79f7c1c37a4e15134562f83024c7e7" dependencies = [ "fuel-derive", "hex", @@ -2699,9 +2701,9 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06f02e86ebf357689e34412af34faf7f0d35a9b8b6ccb2ec42fd369559d6914" +checksum = "8811f949db8ce61cc68dcf81644047df4ee23be55879efcfe9f1aa5adc378965" dependencies = [ "anyhow", "async-trait", @@ -2733,9 +2735,9 @@ dependencies = [ [[package]] name = "fuels" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765b5ed07397fa814e91a4a2dd76711403b931ae9dc87ddb8f39f5ba0061624f" +checksum = "13f6212d1e08a52222b7120d5a11f350720f5564f2dbf3b825619bd497fdf1bd" dependencies = [ "fuel-core-client", "fuel-crypto", @@ -2749,9 +2751,9 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f63be865265782b0b70405af3c2881d5ea91bfbc746af198689211e5b2b822" +checksum = "bf220a834d5425d3e54fe867035dafa5e5313358a505b04e48ecde460571bc0e" dependencies = [ "async-trait", "chrono", @@ -2768,15 +2770,14 @@ dependencies = [ "tai64", "thiserror", "tokio", - "tracing", "zeroize", ] [[package]] name = "fuels-code-gen" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54669c711d1c7d97a6944c13357aa5c2dda0c09d422af8a1cc99eb0752e69c15" +checksum = "b0df90f02675a65a015a5c7ed86865acb9376b34cc93b2c58208f21286badb02" dependencies = [ "Inflector", "fuel-abi-types", @@ -2790,9 +2791,9 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa642e56e3c4adcdf57c8211a0ee210eab9c08b35b12ad0f39fc78a60f04a4d" +checksum = "be24620ea84d29b56537b21723c4db0853424d3e75599c0ff7f5eaa3ca96143b" dependencies = [ "async-trait", "bech32", @@ -2810,16 +2811,15 @@ dependencies = [ "itertools 0.12.1", "serde", "serde_json", - "sha2 0.10.8", "thiserror", "uint", ] [[package]] name = "fuels-macros" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826b05edc9b48e229df70661df98f14c85f598891412e3c942bc72f16bcf29a4" +checksum = "de5713fc740bf297647cdfbed4acc65796b2a3a6e7ab28b9498de3fc89d9b824" dependencies = [ "fuels-code-gen", "itertools 0.12.1", @@ -2831,9 +2831,9 @@ dependencies = [ [[package]] name = "fuels-programs" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1983fcead46f5c9069873ff53c10a114e0aef325f4032785aef38b19190087f8" +checksum = "fcafe1b5372ed2b97c2550db28262016df80d78286eeb47e999c6bd3fa3a353a" dependencies = [ "async-trait", "bytes", @@ -2851,9 +2851,9 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcb48ed9d79d59bdae86a580a117578f0d76c97bfe8c514a66a2bd455a8ebce" +checksum = "5fb2c6749b65cb6a0e6cfd24f140ed4792df0745195c2bceb2033ad5fefc162b" dependencies = [ "fuel-core-chain-config", "fuel-core-client", diff --git a/Cargo.toml b/Cargo.toml index 97eb3db059e..f36eac7f301 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,22 +34,22 @@ exclude = [ [workspace.dependencies] # Dependencies from the `fuel-core` repository: -fuel-core-client = { version = "0.24.3", default-features = false } -fuel-core-types = { version = "0.24.3", default-features = false } +fuel-core-client = { version = "0.26.0", default-features = false } +fuel-core-types = { version = "0.26.0", default-features = false } # Dependencies from the `fuel-vm` repository: -fuel-asm = "0.48.0" -fuel-crypto = "0.48.0" -fuel-types = "0.48.0" -fuel-tx = "0.48.0" -fuel-vm = "0.48.0" +fuel-asm = "0.49.0" +fuel-crypto = "0.49.0" +fuel-types = "0.49.0" +fuel-tx = "0.49.0" +fuel-vm = "0.49.0" # Dependencies from the `fuels-rs` repository: -fuels-core = "0.58.0" -fuels-accounts = "0.58.0" +fuels-core = "0.60.0" +fuels-accounts = "0.60.0" # Dependencies from the `forc-wallet` repository: -forc-wallet = "0.6.1" +forc-wallet = "0.7.0" # Dependencies from the `fuel-abi-types` repository: fuel-abi-types = "0.4.0" diff --git a/forc-plugins/forc-tx/Cargo.toml b/forc-plugins/forc-tx/Cargo.toml index 9240e7c5185..b590c8fb3d8 100644 --- a/forc-plugins/forc-tx/Cargo.toml +++ b/forc-plugins/forc-tx/Cargo.toml @@ -20,7 +20,7 @@ anyhow = "1" clap = { version = "3", features = ["derive", "env"] } devault = "0.1" forc-util = { version = "0.56.1", path = "../../forc-util" } -fuel-tx = { workspace = true, features = ["serde", "test-helpers"] } +fuel-tx = { workspace = true, features = ["serde", "test-helpers", "random"] } fuel-types = { workspace = true, features = ["serde"] } serde = "1.0" serde_json = { version = "1" } diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs index a037b0a6517..a2c6fe5eda5 100644 --- a/forc-test/src/execute.rs +++ b/forc-test/src/execute.rs @@ -60,7 +60,10 @@ impl TestExecutor { let utxo_id = rng.gen(); let amount = 1; let maturity = 1.into(); - let asset_id = rng.gen(); + // NOTE: fuel-core is using dynamic asset id and interacting with the fuel-core, using static + // asset id is not correct. But since forc-test maintains its own interpreter instance, correct + // base asset id is indeed the static `tx::AssetId::BASE`. + let asset_id = tx::AssetId::BASE; let tx_pointer = rng.gen(); let block_height = (u32::MAX >> 1).into(); let gas_price = 0; diff --git a/forc-test/src/lib.rs b/forc-test/src/lib.rs index 8c7c46b975c..03bdc0011f2 100644 --- a/forc-test/src/lib.rs +++ b/forc-test/src/lib.rs @@ -638,7 +638,10 @@ fn deployment_transaction( let utxo_id = rng.gen(); let amount = 1; let maturity = 1u32.into(); - let asset_id = rng.gen(); + // NOTE: fuel-core is using dynamic asset id and interacting with the fuel-core, using static + // asset id is not correct. But since forc-test maintains its own interpreter instance, correct + // base asset id is indeed the static `tx::AssetId::BASE`. + let asset_id = tx::AssetId::BASE; let tx_pointer = rng.gen(); let block_height = (u32::MAX >> 1).into(); diff --git a/sway-core/src/language/call_path.rs b/sway-core/src/language/call_path.rs index 4b7d3d2b13b..7a739f5aea0 100644 --- a/sway-core/src/language/call_path.rs +++ b/sway-core/src/language/call_path.rs @@ -49,6 +49,16 @@ impl PartialEqWithEngines for CallPathTree { } } +impl EqWithEngines for Vec {} +impl PartialEqWithEngines for Vec { + fn eq(&self, other: &Self, ctx: &PartialEqWithEnginesContext) -> bool { + if self.len() != other.len() { + return false; + } + self.iter().zip(other.iter()).all(|(a, b)| a.eq(b, ctx)) + } +} + impl OrdWithEngines for CallPathTree { fn cmp(&self, other: &Self, ctx: &OrdWithEnginesContext) -> Ordering { let CallPathTree { diff --git a/test/src/sdk-harness/Cargo.lock b/test/src/sdk-harness/Cargo.lock index b0e7d6aaa8d..2dd499d5703 100644 --- a/test/src/sdk-harness/Cargo.lock +++ b/test/src/sdk-harness/Cargo.lock @@ -796,6 +796,19 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + [[package]] name = "const-oid" version = "0.9.5" @@ -1358,6 +1371,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -1559,9 +1578,9 @@ dependencies = [ [[package]] name = "fuel-asm" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bc683784e35f3421aab3dc5a31a94c8ad80f1e9ec614ddddac930b4081cd92" +checksum = "42df651415e443094f86102473b7f9fa23633ab6c3c98dd3f713adde251acf0f" dependencies = [ "bitflags 2.4.1", "fuel-types", @@ -1571,9 +1590,9 @@ dependencies = [ [[package]] name = "fuel-core" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16acbaac42aceb26c704ed078314e7e7f9d1e20d6eaf147cada559e7e9f967ae" +checksum = "6b030e12851d70598e12722886b899e28884d168367fc20d9a809951dd599004" dependencies = [ "anyhow", "async-graphql", @@ -1599,6 +1618,7 @@ dependencies = [ "futures", "hex", "hyper", + "indicatif", "itertools 0.12.0", "rand", "serde", @@ -1607,7 +1627,6 @@ dependencies = [ "strum_macros 0.25.3", "thiserror", "tokio", - "tokio-rayon", "tokio-stream", "tokio-util", "tower-http", @@ -1617,12 +1636,13 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23929afd8e279a463941ed18c8a23d9e29df4c3587ba19ad56c68f24c14484f5" +checksum = "d202fe1dfeb98882bdc5a0206a58e469d76fd09d952c4050bb979102bd690398" dependencies = [ "anyhow", "bech32", + "derivative", "fuel-core-storage", "fuel-core-types", "itertools 0.12.0", @@ -1636,9 +1656,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d4a6c96cd1827d04361f8b76416273168efc9eb0951293b03bc18e52d409b6" +checksum = "bc636a8706e36c713606ee4226fdef5260e3650ba0e8a57f0fc06258d0078a34" dependencies = [ "anyhow", "cynic", @@ -1660,9 +1680,9 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1d8ec2205453a563f9ac620867febb711c4ec7a930f063899f8c8673921417" +checksum = "0f99179c08972efffe7628f0ff8d59028218b126347a6f9eba86f71e20966eeb" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -1673,9 +1693,9 @@ dependencies = [ [[package]] name = "fuel-core-database" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a87cc2351d5a3205d4a6673904bb3b876203540595e1746a1f466d5900b3c3e" +checksum = "f5b1fd08a72609ebf0c8106359a37a4b205055be15e9f4fc30a4c0b5f0644c6b" dependencies = [ "anyhow", "derive_more", @@ -1685,12 +1705,11 @@ dependencies = [ [[package]] name = "fuel-core-executor" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e159969d168d4b7cbaa9a55efb842604f0abe116d1baa0b0486c73f2261f63a" +checksum = "1f98d89798007bc781d56e02681144683f5c645ee0725e7717e38694e8e5e31d" dependencies = [ "anyhow", - "fuel-core-chain-config", "fuel-core-storage", "fuel-core-types", "hex", @@ -1701,13 +1720,12 @@ dependencies = [ [[package]] name = "fuel-core-importer" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b858caa4d262891964f55c09f86d6f93d368f7d9a073e5828e02616db88e014" +checksum = "f51837a53f2d8b78a701aee61b99c7f1873f23e864f01f4b4d0644a06e1f7c41" dependencies = [ "anyhow", "derive_more", - "fuel-core-chain-config", "fuel-core-metrics", "fuel-core-storage", "fuel-core-types", @@ -1718,9 +1736,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003381d1f9f5def3685171b340c4bb56d3681897f3baa616aaf6cf7085013462" +checksum = "bacc62bc4fec2fe6a818a1a7145b892bd486d69266190ca8dd31a036a3a327b7" dependencies = [ "axum", "once_cell", @@ -1732,9 +1750,9 @@ dependencies = [ [[package]] name = "fuel-core-p2p" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c513afe591125230e3fd9f6cdf1add00a2aba3f11a19e9e77e020ec14b863b6e" +checksum = "d6496068f0f5736f9e51bba8f8bb04cb83f68df2f6142e410fe62854b47621b3" dependencies = [ "anyhow", "async-trait", @@ -1764,9 +1782,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8608758b49855f33c3e6a78917dada96265233096aae04628d6c1ff9fe6d3dca" +checksum = "68d189ecd635688ddc896b44c8497b29c04bb4a3719a24eea0ca9691a6f76d5e" dependencies = [ "anyhow", "async-trait", @@ -1781,9 +1799,9 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c662d29fafeeb686057f3ba1f2cd349e3c437c32d59ae4f6c61400cee26f27e7" +checksum = "4d2901a7ba2c0e724bbb88a3111fdb9844f5faf9f0bd4005944f61f093730b4d" dependencies = [ "anyhow", "async-trait", @@ -1797,9 +1815,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca69ccc3a055e0a645c7e76e0623feec6945d4cf95b4131a3a1bf1ffc076d1bb" +checksum = "cf2ab4d3931b8cafdb2e69fe8ca97918a168d74c73c070481ca0e552cc37bb93" dependencies = [ "anyhow", "async-trait", @@ -1812,9 +1830,9 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb47f4fabcec096b78137c782895a52aeed134f931256656511b10083cbd967" +checksum = "e039c1c6ebef314c74c34728e1f2199dcf9ede041d6f5c6e11479517c8f4d320" dependencies = [ "anyhow", "derive_more", @@ -1836,18 +1854,18 @@ dependencies = [ [[package]] name = "fuel-core-txpool" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e62e3bf2e4ee38e248131293ad908d8ba82b7d02dff432f68bc49b252eda509" +checksum = "985684e2d67d5018e9227a4f9ed79cac02b23b207e457ee95833ab047769c2ac" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config", "fuel-core-metrics", "fuel-core-services", "fuel-core-storage", "fuel-core-types", "futures", + "mockall", "parking_lot", "tokio", "tokio-rayon", @@ -1857,9 +1875,9 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385b3c9e9d51ca11e129ec1c713ffd2f4f2f2ad89c16b1808a4c661887a88bfb" +checksum = "cf038dd8df8d3aa665a13295c9ef888ba8118600cccdf8fb4587410e0e102fdf" dependencies = [ "anyhow", "bs58", @@ -1876,9 +1894,9 @@ dependencies = [ [[package]] name = "fuel-core-upgradable-executor" -version = "0.24.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123e31a87f925f6403cf960e04db1403c4093d0fbacb1a5a8333c2756b980a42" +checksum = "cc54c84a7dc13f76930761ebca391b167caa096dc2bdb2413b5a2400bf65f99d" dependencies = [ "fuel-core-executor", "fuel-core-storage", @@ -1887,9 +1905,9 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6112c726b5254cad831e61db36dcd0d83b28c50180ea22cb8815343fb162526" +checksum = "71cef93970fb8a26d3a683ae211833c6bbf391066887f501bd5859f29992b59a" dependencies = [ "coins-bip32", "coins-bip39", @@ -1908,9 +1926,9 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5896603b839f04f27e8bddbae2990dc799fb119f5e62973d6666b2ea1a4b036b" +checksum = "2b85e8e508b26d088262075fcfe9921b7009c931fef1cc55fe1dafb116c99884" dependencies = [ "proc-macro2", "quote", @@ -1920,9 +1938,9 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f75d97f6d43fbd15aa5ca0d594b33cc59ba5fd73ce42f4a10dfa9288a9a4a4" +checksum = "5198b4eab5a19b0034971da88199dae7dd61806ebd8df366d6af1f17cda2e151" dependencies = [ "derive_more", "digest 0.10.7", @@ -1935,15 +1953,15 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6899452bbf8b09d536b0adf98d6a28d1081ce38c3490fa2d8cc1dd47ba153351" +checksum = "fa738e9c244f3f312af09faef108ec9a285f02afcefbc579c19c242cea742dd0" [[package]] name = "fuel-tx" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305c12d87f47d139505cbbaee1effa7750ce171c9a4362d212f4f7a651902121" +checksum = "8e4b4ea79ffe711af7bbf363b25f383fc6e481e652cf55a5ef8b5a458fcf4ef9" dependencies = [ "bitflags 2.4.1", "derivative", @@ -1954,6 +1972,7 @@ dependencies = [ "fuel-types", "hashbrown 0.14.3", "itertools 0.10.5", + "postcard", "rand", "serde", "serde_json", @@ -1963,9 +1982,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d92d34c6625f0c3b88463f01027e836ba561125f6ccfb1402d12743fc7b2c96" +checksum = "455cf5275d96f6907e81ed1825c4e6a9dd79f7c1c37a4e15134562f83024c7e7" dependencies = [ "fuel-derive", "hex", @@ -1975,9 +1994,9 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06f02e86ebf357689e34412af34faf7f0d35a9b8b6ccb2ec42fd369559d6914" +checksum = "8811f949db8ce61cc68dcf81644047df4ee23be55879efcfe9f1aa5adc378965" dependencies = [ "anyhow", "async-trait", @@ -2009,8 +2028,8 @@ dependencies = [ [[package]] name = "fuels" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "fuel-core", "fuel-core-client", @@ -2025,8 +2044,8 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "async-trait", "chrono", @@ -2043,14 +2062,13 @@ dependencies = [ "tai64", "thiserror", "tokio", - "tracing", "zeroize", ] [[package]] name = "fuels-code-gen" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "Inflector", "fuel-abi-types", @@ -2064,8 +2082,8 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "async-trait", "bech32", @@ -2083,15 +2101,14 @@ dependencies = [ "itertools 0.12.0", "serde", "serde_json", - "sha2 0.10.8", "thiserror", "uint", ] [[package]] name = "fuels-macros" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "fuels-code-gen", "itertools 0.12.0", @@ -2103,8 +2120,8 @@ dependencies = [ [[package]] name = "fuels-programs" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "async-trait", "bytes", @@ -2122,8 +2139,8 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.57.0" -source = "git+https://github.com/FuelLabs/fuels-rs#b735fb7279cffc4ac8156609868f60cb224d9273" +version = "0.60.0" +source = "git+https://github.com/FuelLabs/fuels-rs?tag=v0.60.0#b5f563e9051c3cac0edb8f18137069e870f6cb31" dependencies = [ "fuel-core", "fuel-core-chain-config", @@ -2819,6 +2836,19 @@ dependencies = [ "serde", ] +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + [[package]] name = "inout" version = "0.1.3" @@ -3809,6 +3839,12 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + [[package]] name = "object" version = "0.32.1" @@ -4024,6 +4060,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "portpicker" version = "0.1.1" @@ -5537,6 +5579,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" + [[package]] name = "unicode-xid" version = "0.2.4" diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml index e97f9e2a4ca..b0fb7725c48 100644 --- a/test/src/sdk-harness/Cargo.toml +++ b/test/src/sdk-harness/Cargo.toml @@ -10,15 +10,15 @@ publish = false assert_matches = "1.5.0" # Dependencies from the `fuel-core` repository: -fuel-core = { version = "0.24.3", default-features = false } -fuel-core-client = { version = "0.24.3", default-features = false } +fuel-core = { version = "0.26.0", default-features = false } +fuel-core-client = { version = "0.26.0", default-features = false } # Dependencies from the `fuel-vm` repository: -fuel-vm = "0.48.0" +fuel-vm = { version = "0.49.0", features = ["random"] } # Dependencies from the `fuels-rs` repository: # Need to point to master until encoding v1 is default everywhere -fuels = { git = "https://github.com/FuelLabs/fuels-rs", features = [ +fuels = { git = "https://github.com/FuelLabs/fuels-rs", tag = "v0.60.0", features = [ "fuel-core-lib", ] } diff --git a/test/src/sdk-harness/test_projects/low_level_call/mod.rs b/test/src/sdk-harness/test_projects/low_level_call/mod.rs index 80d66be6bd8..ec0bf2c1184 100644 --- a/test/src/sdk-harness/test_projects/low_level_call/mod.rs +++ b/test/src/sdk-harness/test_projects/low_level_call/mod.rs @@ -10,7 +10,7 @@ use fuels::{ macro_rules! fn_selector { ( $fn_name: ident ( $($fn_arg: ty),* ) ) => { - resolve_fn_selector(stringify!($fn_name), &[$( <$fn_arg as ::fuels::core::traits::Parameterize>::param_type() ),*]).to_vec() + encode_fn_selector(stringify!($fn_name)).to_vec() } } macro_rules! calldata {