Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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.43.1
FUEL_CORE_PATCH_BRANCH: ""
FUEL_CORE_PATCH_BRANCH: "master"

FUEL_CORE_PATCH_REVISION: ""
RUST_VERSION: 1.85.0
FORC_VERSION: 0.68.0
Expand Down Expand Up @@ -147,7 +148,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
Expand Down Expand Up @@ -187,8 +198,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
Expand Down
13 changes: 7 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,15 @@ 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.1", 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.1", default-features = false }
fuel-core-client = { version = "0.43.1", default-features = false }
fuel-core-poa = { version = "0.43.1", default-features = false }
fuel-core-services = { version = "0.43.1", default-features = false }
fuel-core-types = { version = "0.43.1", 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.2" }
Expand Down
4 changes: 3 additions & 1 deletion packages/fuels-accounts/src/provider/retryable_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ impl RetryableClient {
}

pub async fn balance(&self, owner: &Address, asset_id: Option<&AssetId>) -> RequestResult<u64> {
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(
Expand Down
Loading