Skip to content

Commit

Permalink
chore: update fuel-core to 0.36.0, fuels-* to 0.66.5 (#6582)
Browse files Browse the repository at this point in the history
## Description
closes #6581.

Updates fuel-core version used to 0.36.0 and fuels-* version to 0.66.5
  • Loading branch information
kayagokalp authored Sep 23, 2024
1 parent 93efc18 commit a98d908
Show file tree
Hide file tree
Showing 6 changed files with 352 additions and 296 deletions.
117 changes: 49 additions & 68 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ fuel-abi-types = "0.7"
# Although ALL verions are "X.Y", we need the complete semver for
# fuel-core-client as the GitHub Actions workflow parses this value to pull down
# the correct tarball
fuel-core-client = { version = "0.35.0", default-features = false }
fuel-core-types = { version = "0.35", default-features = false }
fuel-core-client = { version = "0.36.0", default-features = false }
fuel-core-types = { version = "0.36", default-features = false }

# Dependencies from the `fuels-rs` repository:
fuels = "0.66"
fuels-core = "0.66"
fuels-accounts = "0.66"

# Dependencies from the `fuel-vm` repository:
fuel-asm = "0.56"
fuel-crypto = "0.56"
fuel-types = "0.56"
fuel-tx = "0.56"
fuel-vm = "0.56"
fuel-asm = "0.57"
fuel-crypto = "0.57"
fuel-types = "0.57"
fuel-tx = "0.57"
fuel-vm = "0.57"

# Dependencies from the `forc-wallet` repository:
forc-wallet = "0.9"
Expand Down
18 changes: 10 additions & 8 deletions forc-plugins/forc-client/src/util/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fn ask_user_yes_no_question(question: &str) -> Result<bool> {
fn collect_user_accounts(
wallet_path: &Path,
password: &str,
) -> Result<BTreeMap<usize, Bech32Address>> {
) -> Result<BTreeMap<usize, fuel_tx::Address>> {
let verification = AccountVerification::Yes(password.to_string());
let accounts = collect_accounts_with_verification(wallet_path, verification).map_err(|e| {
if e.to_string().contains("Mac Mismatch") {
Expand Down Expand Up @@ -151,7 +151,7 @@ async fn collect_account_balances(
) -> Result<AccountBalances> {
let accounts: Vec<_> = accounts_map
.values()
.map(|addr| Wallet::from_address(addr.clone(), Some(provider.clone())))
.map(|addr| Wallet::from_address((*addr).into(), Some(provider.clone())))
.collect();

futures::future::try_join_all(accounts.iter().map(|acc| acc.get_balances()))
Expand Down Expand Up @@ -437,19 +437,21 @@ mod tests {
fn test_format_base_asset_account_balances() {
let mut accounts_map: AccountsMap = BTreeMap::new();

let address1 = Bech32Address::from_str(
let address1: fuel_tx::Address = Bech32Address::from_str(
"fuel1dved7k25uxadatl7l5kql309jnw07dcn4t3a6x9hm9nxyjcpqqns50p7n2",
)
.expect("address1");
let address2 = Bech32Address::from_str(
.expect("address1")
.into();
let address2: fuel_tx::Address = Bech32Address::from_str(
"fuel1x9f3ysyk7fmey5ac23s2p4rwg4gjye2kke3nu3pvrs5p4qc4m4qqwx56k3",
)
.expect("address2");
.expect("address2")
.into();

let base_asset_id = AssetId::zeroed();

accounts_map.insert(0, address1.clone());
accounts_map.insert(1, address2.clone());
accounts_map.insert(0, address1);
accounts_map.insert(1, address2);

let mut account_balances: AccountBalances = Vec::new();
let mut balance1 = HashMap::new();
Expand Down
Loading

0 comments on commit a98d908

Please sign in to comment.