Add tx options param to prepare_claim_outputs()

iotaledger · Apr 26, 2024 · b545495 · b545495
1 parent e046ae5
commit b545495
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 21 deletions.
diff --git a/bindings/core/src/method/wallet.rs b/bindings/core/src/method/wallet.rs
@@ -226,7 +226,11 @@ pub enum WalletMethod {
     /// Claim outputs.
     /// Expected response: [`PreparedTransaction`](crate::Response::PreparedTransaction)
     #[serde(rename_all = "camelCase")]
-    PrepareClaimOutputs { output_ids_to_claim: Vec<OutputId> },
+    PrepareClaimOutputs {
+        output_ids_to_claim: Vec<OutputId>,
+        #[serde(default)]
+        options: Option<TransactionOptions>,
+    },
     /// Consolidate outputs.
     /// Expected response: [`PreparedTransaction`](crate::Response::PreparedTransaction)
     PrepareConsolidateOutputs { params: ConsolidationParams },

diff --git a/bindings/core/src/method_handler/wallet.rs b/bindings/core/src/method_handler/wallet.rs
@@ -234,8 +234,11 @@ pub(crate) async fn call_wallet_method_internal(
             let data = wallet.prepare_burn(burn, options).await?;
             Response::PreparedTransaction(data)
         }
-        WalletMethod::PrepareClaimOutputs { output_ids_to_claim } => {
-            let data = wallet.prepare_claim_outputs(output_ids_to_claim).await?;
+        WalletMethod::PrepareClaimOutputs {
+            output_ids_to_claim,
+            options,
+        } => {
+            let data = wallet.prepare_claim_outputs(output_ids_to_claim, options).await?;
             Response::PreparedTransaction(data)
         }
         WalletMethod::PrepareConsolidateOutputs { params } => {

diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md
@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
+## 2.0.0-alpha.9 - 2024-04-DD
+
+### Added
+
+- `Wallet::prepareClaimOutputs()` optional transactionOptions parameter;
+
 ## 2.0.0-alpha.8 - 2024-04-22
 
 ### Fixed

diff --git a/bindings/nodejs/lib/types/wallet/bridge/wallet.ts b/bindings/nodejs/lib/types/wallet/bridge/wallet.ts
@@ -153,6 +153,7 @@ export type __PrepareClaimOutputsMethod__ = {
     name: 'prepareClaimOutputs';
     data: {
         outputIdsToClaim: OutputId[];
+        options?: TransactionOptions;
     };
 };
 

diff --git a/bindings/nodejs/lib/wallet/wallet.ts b/bindings/nodejs/lib/wallet/wallet.ts
@@ -419,8 +419,11 @@ export class Wallet {
      */
     async claimOutputs(
         outputIds: OutputId[],
+        transactionOptions?: TransactionOptions,
     ): Promise<TransactionWithMetadata> {
-        return (await this.prepareClaimOutputs(outputIds)).send();
+        return (
+            await this.prepareClaimOutputs(outputIds, transactionOptions)
+        ).send();
     }
 
     /**
@@ -431,11 +434,13 @@ export class Wallet {
      */
     async prepareClaimOutputs(
         outputIds: OutputId[],
+        transactionOptions?: TransactionOptions,
     ): Promise<PreparedTransaction> {
         const response = await this.methodHandler.callMethod({
             name: 'prepareClaimOutputs',
             data: {
                 outputIdsToClaim: outputIds,
+                options: transactionOptions,
             },
         });
         const parsed = JSON.parse(

diff --git a/bindings/python/iota_sdk/wallet/wallet.py b/bindings/python/iota_sdk/wallet/wallet.py
@@ -286,18 +286,19 @@ def prepare_burn_nft(self,
         return PreparedTransaction(self, prepared)
 
     def claim_outputs(
-            self, output_ids_to_claim: List[OutputId]) -> TransactionWithMetadata:
+            self, output_ids_to_claim: List[OutputId], options: Optional[TransactionOptions] = None) -> TransactionWithMetadata:
         """Claim outputs.
         """
-        return self.prepare_claim_outputs(output_ids_to_claim).send()
+        return self.prepare_claim_outputs(output_ids_to_claim, options).send()
 
     def prepare_claim_outputs(
-            self, output_ids_to_claim: List[OutputId]) -> PreparedTransaction:
+            self, output_ids_to_claim: List[OutputId], options: Optional[TransactionOptions] = None) -> PreparedTransaction:
         """Claim outputs.
         """
         return PreparedTransaction(self, PreparedTransactionData.from_dict(self._call_method(
             'prepareClaimOutputs', {
-                'outputIdsToClaim': output_ids_to_claim
+                'outputIdsToClaim': output_ids_to_claim,
+                'options': options
             }
         )))
 

diff --git a/sdk/src/wallet/operations/output_claiming.rs b/sdk/src/wallet/operations/output_claiming.rs
@@ -230,12 +230,15 @@ where
     pub async fn claim_outputs<I: IntoIterator<Item = OutputId> + Send>(
         &self,
         output_ids_to_claim: I,
+        transaction_options: impl Into<Option<TransactionOptions>> + Send,
     ) -> Result<TransactionWithMetadata, WalletError>
     where
         I::IntoIter: Send,
     {
         log::debug!("[OUTPUT_CLAIMING] claim_outputs");
-        let prepared_transaction = self.prepare_claim_outputs(output_ids_to_claim).await?;
+        let prepared_transaction = self
+            .prepare_claim_outputs(output_ids_to_claim, transaction_options)
+            .await?;
 
         let claim_tx = self.sign_and_submit_transaction(prepared_transaction, None).await?;
 
@@ -251,6 +254,7 @@ where
     pub async fn prepare_claim_outputs<I: IntoIterator<Item = OutputId> + Send>(
         &self,
         output_ids_to_claim: I,
+        transaction_options: impl Into<Option<TransactionOptions>> + Send,
     ) -> Result<PreparedTransactionData, WalletError>
     where
         I::IntoIter: Send,
@@ -278,7 +282,8 @@ where
             ));
         }
 
-        let wallet_address = self.address().await;
+        let transaction_options = transaction_options.into();
+        let remainder_address = self.get_remainder_address(transaction_options.clone()).await?;
         drop(wallet_ledger);
 
         let mut nft_outputs_to_send = Vec::new();
@@ -301,31 +306,39 @@ where
                     // deposit for the remaining amount and possible native tokens
                     NftOutputBuilder::from(nft_output)
                         .with_nft_id(nft_output.nft_id_non_null(&output_data.output_id))
-                        .with_unlock_conditions([AddressUnlockCondition::new(&wallet_address)])
+                        .with_unlock_conditions([AddressUnlockCondition::new(remainder_address.clone())])
                         .finish_output()?
                 } else {
                     NftOutputBuilder::from(nft_output)
                         .with_minimum_amount(storage_score_params)
                         .with_nft_id(nft_output.nft_id_non_null(&output_data.output_id))
-                        .with_unlock_conditions([AddressUnlockCondition::new(&wallet_address)])
+                        .with_unlock_conditions([AddressUnlockCondition::new(remainder_address.clone())])
                         .finish_output()?
                 };
 
                 nft_outputs_to_send.push(nft_output);
             }
         }
 
+        let required_inputs = outputs_to_claim
+            .iter()
+            .map(|o| o.output_id)
+            // add additional inputs
+            .chain(possible_additional_inputs.iter().map(|o| o.output_id))
+            .collect();
+
         self.prepare_send_outputs(
             // We only need to provide the NFT outputs, ISA automatically creates basic outputs as remainder outputs
             nft_outputs_to_send,
-            TransactionOptions {
-                required_inputs: outputs_to_claim
-                    .iter()
-                    .map(|o| o.output_id)
-                    // add additional inputs
-                    .chain(possible_additional_inputs.iter().map(|o| o.output_id))
-                    .collect(),
-                ..Default::default()
+            match transaction_options {
+                Some(mut tx_options) => {
+                    tx_options.required_inputs = required_inputs;
+                    tx_options
+                }
+                None => TransactionOptions {
+                    required_inputs,
+                    ..Default::default()
+                },
             },
         )
         .await

diff --git a/sdk/src/wallet/operations/transaction/prepare_output.rs b/sdk/src/wallet/operations/transaction/prepare_output.rs
@@ -259,7 +259,7 @@ impl<S: 'static + SecretManage> Wallet<S> {
     }
 
     // Get a remainder address based on transaction_options or use the first account address
-    async fn get_remainder_address(
+    pub(crate) async fn get_remainder_address(
         &self,
         transaction_options: impl Into<Option<TransactionOptions>> + Send,
     ) -> Result<Address, WalletError> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,6 +153,7 @@ export type __PrepareClaimOutputsMethod__ = { @@
         name: 'prepareClaimOutputs';
         data: {
             outputIdsToClaim: OutputId[];
+            options?: TransactionOptions;
         };
     };
@@ Expand Down @@