#490 Extract Wallet interface and related changes

bloxbean · Feb 26, 2025 · 7511055 · 7511055
1 parent 8da8425
commit 7511055
Show file tree

Hide file tree

Showing 8 changed files with 622 additions and 347 deletions.
diff --git a/...on/src/main/java/com/bloxbean/cardano/client/function/helper/ChangeOutputAdjustments.java b/...on/src/main/java/com/bloxbean/cardano/client/function/helper/ChangeOutputAdjustments.java
@@ -80,6 +80,25 @@ public static TxBuilder adjustChangeOutput(String changeAddress, int noOfSigners
         return adjustChangeOutput(AddressIterators.of(changeAddress), changeAddress, noOfSigners);
     }
 
+    /**
+     * Function to adjust change output in a <code>Transaction</code> to meet min ada requirement.
+     * Finds a change output specific to given change address.
+     * If multiple change outputs with less than min required ada are found for the change address, it throws <code>{@link TxBuildException}</code>
+     * Get additional utxos from sender address and update the change output.
+     * Re-calculates fee and checks min ada in change output.
+     * Retry if required, upto 3 times
+     *
+     * @param senderAddress Address to select additional utxos
+     * @param changeAddress Address for change output selection
+     * @param noOfSigners   No of required signers. Required for fee calculation after adjustment
+     * @return <code>TxBuilder</code> function
+     * @throws TxBuildException If multiple change outputs with less than min required ada are found for the change address.
+     * @throws ApiRuntimeException If api call error
+     */
+    public static TxBuilder adjustChangeOutput(String senderAddress, String changeAddress, int noOfSigners) {
+        return adjustChangeOutput(AddressIterators.of(senderAddress), changeAddress, noOfSigners);
+    }
+
     /**
      * Function to adjust change output in a <code>Transaction</code> to meet min ada requirement.
      * Finds a change output specific to given change address.

diff --git a/...rc/test/java/com/bloxbean/cardano/client/function/helper/ChangeOutputAdjustmentsTest.java b/...rc/test/java/com/bloxbean/cardano/client/function/helper/ChangeOutputAdjustmentsTest.java
@@ -1,5 +1,6 @@
 package com.bloxbean.cardano.client.function.helper;
 
+import com.bloxbean.cardano.client.api.AddressIterator;
 import com.bloxbean.cardano.client.api.UtxoSupplier;
 import com.bloxbean.cardano.client.api.exception.ApiException;
 import com.bloxbean.cardano.client.api.helper.FeeCalculationService;
@@ -157,7 +158,9 @@ void adjustFor_onlyLovelaceOutput_withMultipleAdditionalUtxos() throws ApiExcept
         );
 
         given(utxoSelector.findFirst(eq(changeAddress), any(), any())).willReturn(Optional.empty());
-        given(utxoSelectionStrategy.selectUtxos(eq(changeAddress), eq(LOVELACE), any(), anySet())).willReturn(additionalUtxos);
+        given(utxoSelectionStrategy.selectUtxos((AddressIterator) argThat(arg -> arg instanceof AddressIterator),
+                eq(LOVELACE), any(), anySet()))
+                .willReturn(additionalUtxos);
 
         Transaction transaction = new Transaction();
         //Just adding a random input/output
@@ -287,7 +290,10 @@ void adjustFor_onlyLovelaceOutput_multipleFeeCalculationRetry() throws ApiExcept
         );
 
         given(utxoSelector.findFirst(eq(changeAddress), any(), any())).willReturn(Optional.empty());
-        given(utxoSelectionStrategy.selectUtxos(eq(changeAddress), eq(LOVELACE), any(), anySet())).willReturn(additionalUtxos);
+        given(utxoSelectionStrategy.selectUtxos(
+                (AddressIterator) argThat(arg -> arg instanceof AddressIterator),
+                eq(LOVELACE), any(), anySet()))
+                .willReturn(additionalUtxos);
 
         Transaction transaction = new Transaction();
         //Just adding a random input/output

diff --git a/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/ScriptTxIT.java b/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/ScriptTxIT.java
@@ -58,8 +58,8 @@ void setup() {
 
     @Test
     void alwaysTrueScript() throws ApiException {
-        Wallet walletA = new Wallet(Networks.testnet());
-        Wallet walletB = new Wallet(Networks.testnet());
+        Wallet walletA = Wallet.create(Networks.testnet());
+        Wallet walletB = Wallet.create(Networks.testnet());
 
         splitPaymentBetweenAddress(topupAccount, walletA, 20, Double.valueOf(3000), false);
         payToAddressAt(topupAccount, walletB, 13, Double.valueOf(5));
@@ -116,9 +116,9 @@ void alwaysTrueScript() throws ApiException {
 
     @Test
     void alwaysTrueScript_separateCollateralPayer() throws ApiException {
-        Wallet walletA = new Wallet(Networks.testnet());
-        Wallet walletB = new Wallet(Networks.testnet());
-        Wallet collaterWallet = new Wallet(Networks.testnet());
+        Wallet walletA = Wallet.create(Networks.testnet());
+        Wallet walletB = Wallet.create(Networks.testnet());
+        Wallet collaterWallet = Wallet.create(Networks.testnet());
 
         splitPaymentBetweenAddress(topupAccount, walletA, 20, Double.valueOf(3000), false);
         payToAddressAt(topupAccount, walletB, 13, Double.valueOf(5));