From 4726af57017f6f85460962a6654a32cac0d31a8c Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 20:51:14 +0530 Subject: [PATCH 01/14] chore(deps): bump fuel-core to master --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 15f0a71d61..f2989ab5e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,14 +95,14 @@ testcontainers = { version = "0.23", default-features = false } k256 = { version = "0.13", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { version = "0.42.0", default-features = false, features = [ +fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false, features = [ "wasm-executor", ] } -fuel-core-chain-config = { version = "0.42.0", default-features = false } -fuel-core-client = { version = "0.42.0", default-features = false } -fuel-core-poa = { version = "0.42.0", default-features = false } -fuel-core-services = { version = "0.42.0", default-features = false } -fuel-core-types = { version = "0.42.0", default-features = false } +fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.60.0" } From 66a31268057593751caa5687f4fbf46fd3fd683d Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 20:53:18 +0530 Subject: [PATCH 02/14] fix: patch branch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75e24eeda9..656260f689 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ env: DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" FUEL_CORE_VERSION: 0.42.0 - FUEL_CORE_PATCH_BRANCH: "" + FUEL_CORE_PATCH_BRANCH: "master" FUEL_CORE_PATCH_REVISION: "" RUST_VERSION: 1.85.0 FORC_VERSION: 0.67.0 From 33e3863231152670ad5b99e424900a1af0e57009 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:13:38 +0530 Subject: [PATCH 03/14] fix: feature for fault-proving --- packages/fuels-accounts/Cargo.toml | 1 + packages/fuels-core/Cargo.toml | 1 + packages/fuels-programs/Cargo.toml | 1 + packages/fuels-test-helpers/Cargo.toml | 1 + packages/fuels/Cargo.toml | 1 + 5 files changed, 5 insertions(+) diff --git a/packages/fuels-accounts/Cargo.toml b/packages/fuels-accounts/Cargo.toml index d06b716b6e..360e2f7897 100644 --- a/packages/fuels-accounts/Cargo.toml +++ b/packages/fuels-accounts/Cargo.toml @@ -51,3 +51,4 @@ test-helpers = [] keystore = ["dep:eth-keystore"] signer-aws-kms = ["dep:aws-sdk-kms", "dep:aws-config"] signer-google-kms = ["dep:google-cloud-kms"] +fault-proving = ["fuel-core-chain-config/fault-proving", "fuel-core-types/fault-proving", "fuel-core-client?/fault-proving", "fuels-core?/fault-proving"] diff --git a/packages/fuels-core/Cargo.toml b/packages/fuels-core/Cargo.toml index 11e2b930d7..2669843f75 100644 --- a/packages/fuels-core/Cargo.toml +++ b/packages/fuels-core/Cargo.toml @@ -41,3 +41,4 @@ tokio = { workspace = true, features = ["test-util", "macros"] } [features] default = ["std"] std = ["dep:fuel-core-client", "fuel-core-types/std"] +fault-proving = ["fuel-core-chain-config/fault-proving", "fuel-core-types/fault-proving", "fuel-core-client?/fault-proving"] diff --git a/packages/fuels-programs/Cargo.toml b/packages/fuels-programs/Cargo.toml index 91011dcda8..4e847bc06f 100644 --- a/packages/fuels-programs/Cargo.toml +++ b/packages/fuels-programs/Cargo.toml @@ -29,3 +29,4 @@ test-case = { workspace = true } [features] default = ["std"] std = ["fuels-core/std", "fuels-accounts/std"] +fault-proving = ["fuels-core/fault-proving", "fuels-accounts/fault-proving"] diff --git a/packages/fuels-test-helpers/Cargo.toml b/packages/fuels-test-helpers/Cargo.toml index 5d3db165b4..46744f0fd3 100644 --- a/packages/fuels-test-helpers/Cargo.toml +++ b/packages/fuels-test-helpers/Cargo.toml @@ -36,3 +36,4 @@ default = ["fuels-accounts", "std"] std = ["fuels-accounts?/std", "fuels-core/std", "fuel-core-chain-config/std"] fuel-core-lib = ["dep:fuel-core"] rocksdb = ["fuel-core?/rocksdb"] +fault-proving = ["fuel-core?/fault-proving", "fuel-core-chain-config?/fault-proving", "fuel-core-client?/fault-proving", "fuel-core-poa?/fault-proving", "fuel-core-services?/fault-proving", "fuels-accounts?/fault-proving", "fuels-core/fault-proving"] diff --git a/packages/fuels/Cargo.toml b/packages/fuels/Cargo.toml index 2686a4b229..e61f7ea5e6 100644 --- a/packages/fuels/Cargo.toml +++ b/packages/fuels/Cargo.toml @@ -44,3 +44,4 @@ rocksdb = ["fuels-test-helpers?/rocksdb"] accounts-signer-aws-kms = ["fuels-accounts/signer-aws-kms"] accounts-signer-google-kms = ["fuels-accounts/signer-google-kms"] accounts-keystore = ["fuels-accounts/keystore"] +fault-proving = ["fuel-core-client?/fault-proving", "fuels-test-helpers?/fault-proving"] From 8d59eb40ff013d4570acfa57769120273c263d04 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:15:02 +0530 Subject: [PATCH 04/14] fix: deps --- packages/fuels-accounts/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuels-accounts/Cargo.toml b/packages/fuels-accounts/Cargo.toml index 360e2f7897..775a8c07ee 100644 --- a/packages/fuels-accounts/Cargo.toml +++ b/packages/fuels-accounts/Cargo.toml @@ -51,4 +51,4 @@ test-helpers = [] keystore = ["dep:eth-keystore"] signer-aws-kms = ["dep:aws-sdk-kms", "dep:aws-config"] signer-google-kms = ["dep:google-cloud-kms"] -fault-proving = ["fuel-core-chain-config/fault-proving", "fuel-core-types/fault-proving", "fuel-core-client?/fault-proving", "fuels-core?/fault-proving"] +fault-proving = ["fuel-core-types/fault-proving", "fuel-core-client?/fault-proving", "fuels-core?/fault-proving"] From 84bf90e6ad2a997d84004ed81befaa3a55efdc62 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:17:54 +0530 Subject: [PATCH 05/14] fix: more deps --- packages/fuels-accounts/Cargo.toml | 2 +- packages/fuels-test-helpers/Cargo.toml | 2 +- packages/fuels/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fuels-accounts/Cargo.toml b/packages/fuels-accounts/Cargo.toml index 775a8c07ee..3690ec671c 100644 --- a/packages/fuels-accounts/Cargo.toml +++ b/packages/fuels-accounts/Cargo.toml @@ -51,4 +51,4 @@ test-helpers = [] keystore = ["dep:eth-keystore"] signer-aws-kms = ["dep:aws-sdk-kms", "dep:aws-config"] signer-google-kms = ["dep:google-cloud-kms"] -fault-proving = ["fuel-core-types/fault-proving", "fuel-core-client?/fault-proving", "fuels-core?/fault-proving"] +fault-proving = ["fuel-core-types/fault-proving", "fuel-core-client?/fault-proving", "fuels-core/fault-proving"] diff --git a/packages/fuels-test-helpers/Cargo.toml b/packages/fuels-test-helpers/Cargo.toml index 46744f0fd3..890518b5bd 100644 --- a/packages/fuels-test-helpers/Cargo.toml +++ b/packages/fuels-test-helpers/Cargo.toml @@ -36,4 +36,4 @@ default = ["fuels-accounts", "std"] std = ["fuels-accounts?/std", "fuels-core/std", "fuel-core-chain-config/std"] fuel-core-lib = ["dep:fuel-core"] rocksdb = ["fuel-core?/rocksdb"] -fault-proving = ["fuel-core?/fault-proving", "fuel-core-chain-config?/fault-proving", "fuel-core-client?/fault-proving", "fuel-core-poa?/fault-proving", "fuel-core-services?/fault-proving", "fuels-accounts?/fault-proving", "fuels-core/fault-proving"] +fault-proving = ["fuel-core?/fault-proving", "fuel-core-chain-config/fault-proving", "fuel-core-client/fault-proving", "fuel-core-poa/fault-proving", "fuels-accounts?/fault-proving", "fuels-core/fault-proving"] diff --git a/packages/fuels/Cargo.toml b/packages/fuels/Cargo.toml index e61f7ea5e6..ee8fe674fa 100644 --- a/packages/fuels/Cargo.toml +++ b/packages/fuels/Cargo.toml @@ -44,4 +44,4 @@ rocksdb = ["fuels-test-helpers?/rocksdb"] accounts-signer-aws-kms = ["fuels-accounts/signer-aws-kms"] accounts-signer-google-kms = ["fuels-accounts/signer-google-kms"] accounts-keystore = ["fuels-accounts/keystore"] -fault-proving = ["fuel-core-client?/fault-proving", "fuels-test-helpers?/fault-proving"] +fault-proving = ["fuel-core-client?/fault-proving", "fuels-test-helpers?/fault-proving", "fuels-accounts/fault-proving", "fuels-core/fault-proving", "fuels-programs/fault-proving"] From 57311ba57c47a485ede9d4ce625d0c62a03b1c27 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 22:19:41 +0530 Subject: [PATCH 06/14] test: bugfix branch on fuel-core --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f2989ab5e1..1ff0acde90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,14 +95,14 @@ testcontainers = { version = "0.23", default-features = false } k256 = { version = "0.13", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false, features = [ +fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false, features = [ "wasm-executor", ] } -fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } +fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } +fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } +fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } +fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.60.0" } From bf5724fbe83e98735552a80e0827a29c4cc3069f Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 22:26:40 +0530 Subject: [PATCH 07/14] ci: bump rev --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 656260f689..359e0df4c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,8 @@ env: DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" FUEL_CORE_VERSION: 0.42.0 - FUEL_CORE_PATCH_BRANCH: "master" - FUEL_CORE_PATCH_REVISION: "" + FUEL_CORE_PATCH_BRANCH: "" + FUEL_CORE_PATCH_REVISION: "d50bb13" RUST_VERSION: 1.85.0 FORC_VERSION: 0.67.0 FORC_PATCH_BRANCH: "" From 85523cc6e52ca9396f5d80a7b542cf3bda65ac20 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 22:48:42 +0530 Subject: [PATCH 08/14] fix: conditionally run the publish crates check --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 359e0df4c4..94fc2c910f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,7 +147,17 @@ jobs: with: toolchain: ${{ env.RUST_VERSION }} + - name: Conditional check + id: conditional_check # We add an ID to reference this step + run: | + if [[ -n "${{ env.FUEL_CORE_PATCH_BRANCH }}" || -n "${{ env.FUEL_CORE_PATCH_REVISION }}" ]]; then + echo "should_publish=false" >> $GITHUB_OUTPUT + else + echo "should_publish=true" >> $GITHUB_OUTPUT + fi + - name: Publish crate check + if: steps.conditional_check.outputs.should_publish == 'true' uses: FuelLabs/publish-crates@v1 with: dry-run: true From 861ad84a33f740f64bad47b047734a765d7e92a3 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 23:13:03 +0530 Subject: [PATCH 09/14] fix: pr on fuel-cor emerged, revert to master --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94fc2c910f..fcb1d04f25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,8 @@ env: DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" FUEL_CORE_VERSION: 0.42.0 - FUEL_CORE_PATCH_BRANCH: "" - FUEL_CORE_PATCH_REVISION: "d50bb13" + FUEL_CORE_PATCH_BRANCH: "master" + FUEL_CORE_PATCH_REVISION: "" RUST_VERSION: 1.85.0 FORC_VERSION: 0.67.0 FORC_PATCH_BRANCH: "" From 2070f56716ac55445e62d5fb70556a0d234192f9 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 23:16:14 +0530 Subject: [PATCH 10/14] fix: dep versions --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1ff0acde90..f2989ab5e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,14 +95,14 @@ testcontainers = { version = "0.23", default-features = false } k256 = { version = "0.13", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false, features = [ +fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false, features = [ "wasm-executor", ] } -fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } -fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } -fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } -fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } -fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "chore/fix-compilation-on-rust-sdk", default-features = false } +fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.60.0" } From 4358e1fe7348fa9e51b2451ef13fcb9ddb6d4ae3 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Wed, 9 Apr 2025 23:50:03 +0530 Subject: [PATCH 11/14] fix: remove check_fuel_core_version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcb1d04f25..71db6202a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -197,8 +197,8 @@ jobs: args: --skip-target-dir - command: test_wasm args: - - command: check_fuel_core_version - args: + # - command: check_fuel_core_version # this will fail for sure + # args: - command: check_doc_anchors_valid args: - command: check_doc_unresolved_links From d9f9f7e5872b5c975f4d621466623ddd0e5388e2 Mon Sep 17 00:00:00 2001 From: green Date: Wed, 9 Apr 2025 23:37:16 -0400 Subject: [PATCH 12/14] Use 0.43.0 release --- .github/workflows/ci.yml | 18 ++++-------------- Cargo.toml | 12 ++++++------ 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71db6202a5..0d5fc85718 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ env: CARGO_TERM_COLOR: always DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" - FUEL_CORE_VERSION: 0.42.0 - FUEL_CORE_PATCH_BRANCH: "master" + FUEL_CORE_VERSION: 0.43.0 + FUEL_CORE_PATCH_BRANCH: "" FUEL_CORE_PATCH_REVISION: "" RUST_VERSION: 1.85.0 FORC_VERSION: 0.67.0 @@ -147,17 +147,7 @@ jobs: with: toolchain: ${{ env.RUST_VERSION }} - - name: Conditional check - id: conditional_check # We add an ID to reference this step - run: | - if [[ -n "${{ env.FUEL_CORE_PATCH_BRANCH }}" || -n "${{ env.FUEL_CORE_PATCH_REVISION }}" ]]; then - echo "should_publish=false" >> $GITHUB_OUTPUT - else - echo "should_publish=true" >> $GITHUB_OUTPUT - fi - - name: Publish crate check - if: steps.conditional_check.outputs.should_publish == 'true' uses: FuelLabs/publish-crates@v1 with: dry-run: true @@ -197,8 +187,8 @@ jobs: args: --skip-target-dir - command: test_wasm args: - # - command: check_fuel_core_version # this will fail for sure - # args: + - command: check_fuel_core_version + args: - command: check_doc_anchors_valid args: - command: check_doc_unresolved_links diff --git a/Cargo.toml b/Cargo.toml index f2989ab5e1..c79b7db36b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,14 +95,14 @@ testcontainers = { version = "0.23", default-features = false } k256 = { version = "0.13", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false, features = [ +fuel-core = { version = "0.43.0", default-features = false, features = [ "wasm-executor", ] } -fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } -fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-chain-config = { version = "0.43.0", default-features = false } +fuel-core-client = { version = "0.43.0", default-features = false } +fuel-core-poa = { version = "0.43.0", default-features = false } +fuel-core-services = { version = "0.43.0", default-features = false } +fuel-core-types = { version = "0.43.0", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.60.0" } From 347cb68d8d2f0242b3290c6f1bd2ca0eec212867 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Thu, 10 Apr 2025 19:26:56 +0530 Subject: [PATCH 13/14] Revert "Use 0.43.0 release" This reverts commit d9f9f7e5872b5c975f4d621466623ddd0e5388e2. --- .github/workflows/ci.yml | 18 ++++++++++++++---- Cargo.toml | 12 ++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d5fc85718..71db6202a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ env: CARGO_TERM_COLOR: always DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" - FUEL_CORE_VERSION: 0.43.0 - FUEL_CORE_PATCH_BRANCH: "" + FUEL_CORE_VERSION: 0.42.0 + FUEL_CORE_PATCH_BRANCH: "master" FUEL_CORE_PATCH_REVISION: "" RUST_VERSION: 1.85.0 FORC_VERSION: 0.67.0 @@ -147,7 +147,17 @@ jobs: with: toolchain: ${{ env.RUST_VERSION }} + - name: Conditional check + id: conditional_check # We add an ID to reference this step + run: | + if [[ -n "${{ env.FUEL_CORE_PATCH_BRANCH }}" || -n "${{ env.FUEL_CORE_PATCH_REVISION }}" ]]; then + echo "should_publish=false" >> $GITHUB_OUTPUT + else + echo "should_publish=true" >> $GITHUB_OUTPUT + fi + - name: Publish crate check + if: steps.conditional_check.outputs.should_publish == 'true' uses: FuelLabs/publish-crates@v1 with: dry-run: true @@ -187,8 +197,8 @@ jobs: args: --skip-target-dir - command: test_wasm args: - - command: check_fuel_core_version - args: + # - command: check_fuel_core_version # this will fail for sure + # args: - command: check_doc_anchors_valid args: - command: check_doc_unresolved_links diff --git a/Cargo.toml b/Cargo.toml index c79b7db36b..f2989ab5e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,14 +95,14 @@ testcontainers = { version = "0.23", default-features = false } k256 = { version = "0.13", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { version = "0.43.0", default-features = false, features = [ +fuel-core = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false, features = [ "wasm-executor", ] } -fuel-core-chain-config = { version = "0.43.0", default-features = false } -fuel-core-client = { version = "0.43.0", default-features = false } -fuel-core-poa = { version = "0.43.0", default-features = false } -fuel-core-services = { version = "0.43.0", default-features = false } -fuel-core-types = { version = "0.43.0", default-features = false } +fuel-core-chain-config = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-client = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-poa = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-services = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } +fuel-core-types = { git = "https://github.com/fuellabs/fuel-core", branch = "master", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.60.0" } From 8a35e4382b826ac8633b71a8dc31be5b965d35e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Blankfors?= Date: Thu, 24 Apr 2025 14:34:00 +0200 Subject: [PATCH 14/14] hotfix: Unsafe conversion of balance to u64 --- packages/fuels-accounts/src/provider/retryable_client.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/fuels-accounts/src/provider/retryable_client.rs b/packages/fuels-accounts/src/provider/retryable_client.rs index 056108bec0..f625b33093 100644 --- a/packages/fuels-accounts/src/provider/retryable_client.rs +++ b/packages/fuels-accounts/src/provider/retryable_client.rs @@ -255,7 +255,9 @@ impl RetryableClient { } pub async fn balance(&self, owner: &Address, asset_id: Option<&AssetId>) -> RequestResult { - self.wrap(|| self.client.balance(owner, asset_id)).await + self.wrap(|| self.client.balance(owner, asset_id)) + .await + .map(|balance| balance as u64) } pub async fn contract_balance(