Update to fuel-abi-types version 0.15.2.

tritao · tritao · commit cb6eee105709 · 2025-09-16T13:32:21.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,7 +74,7 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros", version = "0.69.1" }
 #
 
 # Dependencies from the `fuel-abi-types` repository:
-fuel-abi-types = "0.12"
+fuel-abi-types = "0.15.2"
 
 # Dependencies from the `fuel-core` repository:
 #
diff --git a/forc-plugins/forc-client/src/op/call/call_function.rs b/forc-plugins/forc-client/src/op/call/call_function.rs
@@ -8,18 +8,17 @@ use crate::{
 };
 use anyhow::{anyhow, bail, Result};
 use fuel_abi_types::abi::unified_program::UnifiedProgramABI;
-use fuel_core_client::client::types::TransactionStatus;
+use fuel_core_client::client::{types::TransactionStatus, FuelClient};
 use fuel_core_types::services::executor::{TransactionExecutionResult, TransactionExecutionStatus};
 use fuels::{
-    accounts::ViewOnlyAccount,
-    client::FuelClient,
     programs::calls::{
         receipt_parser::ReceiptParser,
         traits::{ContractDependencyConfigurator, TransactionTuner},
         ContractCall,
     },
     types::transaction::Transaction,
 };
+use fuels_accounts::ViewOnlyAccount;
 use fuels_core::{
     codec::{
         encode_fn_selector, log_formatters_lookup, ABIDecoder, ABIEncoder, DecoderConfig,
@@ -157,16 +156,31 @@ pub async fn call_function(
     };
 
     // Execute the call based on execution mode
-    let client = FuelClient::new(wallet.provider().url())
-        .map_err(|e| anyhow!("Failed to create client: {e}"))?;
-    let consensus_params = wallet.provider().consensus_parameters().await?;
+    let provider = wallet.provider();
+    let client =
+        FuelClient::new(provider.url()).map_err(|e| anyhow!("Failed to create client: {e}"))?;
+    let consensus_params = provider.consensus_parameters().await?;
     let chain_id = consensus_params.chain_id();
 
+    let required_asset_amounts = call.required_assets(*consensus_params.base_asset_id());
+    let mut asset_inputs = Vec::new();
+    for &(asset_id, amount) in &required_asset_amounts {
+        let resources = wallet
+            .get_asset_inputs_for_amount(asset_id, amount, None)
+            .await?;
+        asset_inputs.extend(resources);
+    }
+
     let tb = call
         .clone()
         .with_external_contracts(external_contracts)
-        .transaction_builder(tx_policies, variable_output_policy, &wallet)
-        .await
+        .transaction_builder(
+            tx_policies,
+            variable_output_policy,
+            &consensus_params,
+            asset_inputs,
+            &wallet,
+        )
         .map_err(|e| anyhow!("Failed to initialize transaction builder: {e}"))?;
 
     #[cfg_attr(test, allow(unused_variables))]
@@ -305,7 +319,7 @@ pub async fn call_function(
     let trace_events = {
         use crate::op::call::trace::interpret_execution_trace;
         interpret_execution_trace(
-            wallet.provider(),
+            provider,
             &mode,
             &consensus_params,
             script,
diff --git a/forc-plugins/forc-client/src/op/call/missing_contracts.rs b/forc-plugins/forc-client/src/op/call/missing_contracts.rs
@@ -7,6 +7,7 @@ use fuels_accounts::{
     provider::Provider,
     signers::private_key::PrivateKeySigner,
     wallet::{Unlocked, Wallet},
+    ViewOnlyAccount,
 };
 use fuels_core::types::{transaction::TxPolicies, transaction_builders::VariableOutputPolicy};
 
@@ -21,10 +22,26 @@ pub async fn determine_missing_contracts(
     log_decoder: &fuels_core::codec::LogDecoder,
     account: &Wallet<Unlocked<PrivateKeySigner>>,
 ) -> Result<Vec<ContractId>> {
-    let tb = call
-        .transaction_builder(*tx_policies, *variable_output_policy, account)
-        .await
-        .expect("Failed to initialize transaction builder");
+    let consensus_parameters = account.provider().consensus_parameters().await?;
+
+    let required_asset_amounts = call.required_assets(*consensus_parameters.base_asset_id());
+
+    // Find the spendable resources required for those calls
+    let mut asset_inputs = vec![];
+    for &(asset_id, amount) in &required_asset_amounts {
+        let resources = account
+            .get_asset_inputs_for_amount(asset_id, amount, None)
+            .await?;
+        asset_inputs.extend(resources);
+    }
+
+    let tb = call.transaction_builder(
+        *tx_policies,
+        *variable_output_policy,
+        &consensus_parameters,
+        asset_inputs,
+        account,
+    )?;
 
     let tx = call
         .build_tx(tb, account)
diff --git a/forc-plugins/forc-client/src/op/run/mod.rs b/forc-plugins/forc-client/src/op/run/mod.rs
@@ -152,9 +152,16 @@ pub async fn run_pkg(
         external_contracts,
     };
     let tx_policies = tx_policies_from_cmd(command);
-    let mut tb = call
-        .transaction_builder(tx_policies, VariableOutputPolicy::EstimateMinimum, &account)
-        .await?;
+    let provider = account.try_provider()?;
+    let consensus_parameters = provider.consensus_parameters().await?;
+
+    let mut tb = call.transaction_builder(
+        tx_policies,
+        VariableOutputPolicy::EstimateMinimum,
+        &consensus_parameters,
+        vec![],
+        &account,
+    )?;
 
     account.add_witnesses(&mut tb)?;
     account.adjust_for_fee(&mut tb, 0).await?;
diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs
@@ -324,6 +324,7 @@ pub fn generate_program_abi(
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
             let error_codes = generate_error_codes(ctx.panic_occurrences);
             Ok(program_abi::ProgramABI {
+                panicking_calls: None,
                 program_type: "contract".to_string(),
                 spec_version,
                 encoding_version,
@@ -353,6 +354,7 @@ pub fn generate_program_abi(
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
             let error_codes = generate_error_codes(ctx.panic_occurrences);
             Ok(program_abi::ProgramABI {
+                panicking_calls: None,
                 program_type: "script".to_string(),
                 spec_version,
                 encoding_version,
@@ -382,6 +384,7 @@ pub fn generate_program_abi(
                 generate_configurables(handler, ctx, engines, metadata_types, concrete_types)?;
             let error_codes = generate_error_codes(ctx.panic_occurrences);
             Ok(program_abi::ProgramABI {
+                panicking_calls: None,
                 program_type: "predicate".to_string(),
                 spec_version,
                 encoding_version,
@@ -401,6 +404,7 @@ pub fn generate_program_abi(
                 generate_messages_types(handler, ctx, engines, metadata_types, concrete_types)?;
             let error_codes = generate_error_codes(ctx.panic_occurrences);
             Ok(program_abi::ProgramABI {
+                panicking_calls: None,
                 program_type: "library".to_string(),
                 spec_version,
                 encoding_version,
@@ -650,6 +654,7 @@ fn generate_concrete_type_declaration(
     let (type_field, concrete_type_id) =
         type_id.get_abi_type_field_and_concrete_id(handler, ctx, engines, resolved_type_id)?;
     let concrete_type_decl = TypeConcreteDeclaration {
+        alias_of: None,
         type_field,
         concrete_type_id: concrete_type_id.clone(),
         metadata_type_id,
@@ -818,6 +823,7 @@ fn generate_error_codes(panic_occurrences: &PanicOccurrences) -> BTreeMap<u64, E
                         file: panic_occurrence.loc.file.clone(),
                         line: panic_occurrence.loc.loc.line as u64,
                         column: panic_occurrence.loc.loc.col as u64,
+                        function: String::default(),
                     },
                     log_id: panic_occurrence
                         .log_id
@@ -918,6 +924,7 @@ impl TypeId {
                             type_id: program_abi::TypeId::Metadata(MetadataTypeId(
                                 x.type_argument.initial_type_id().index(),
                             )),
+                            offset: None,
                             error_message: x.attributes.error_message().cloned(),
                             type_arguments: x
                                 .type_argument
@@ -972,6 +979,7 @@ impl TypeId {
                                 x.type_argument.initial_type_id().index(),
                             )),
                             error_message: None,
+                            offset: None,
                             type_arguments: x
                                 .type_argument
                                 .initial_type_id()

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros", version = "0.69.1" }`
`74`	`74`	`#`
`75`	`75`
`76`	`76`	# Dependencies from the `fuel-abi-types` repository:
`77`		`-fuel-abi-types = "0.12"`
	`77`	`+fuel-abi-types = "0.15.2"`
`78`	`78`
`79`	`79`	# Dependencies from the `fuel-core` repository:
`80`	`80`	`#`