Add logging and support for account key wallets in tests

satran004 · satran004 · commit 2bfa053606a9 · 2025-01-11T14:26:17.000+08:00
diff --git a/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/QuickTxBuilderIT.java b/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/QuickTxBuilderIT.java
@@ -9,6 +9,7 @@
 import com.bloxbean.cardano.client.backend.api.BackendService;
 import com.bloxbean.cardano.client.cip.cip20.MessageMetadata;
 import com.bloxbean.cardano.client.common.model.Networks;
+import com.bloxbean.cardano.client.crypto.Bech32;
 import com.bloxbean.cardano.client.exception.CborSerializationException;
 import com.bloxbean.cardano.client.function.helper.SignerProviders;
 import com.bloxbean.cardano.client.metadata.Metadata;
@@ -39,6 +40,7 @@ public class QuickTxBuilderIT extends QuickTxBaseIT {
     DefaultWalletUtxoSupplier walletUtxoSupplier;
     Wallet wallet1;
     Wallet wallet2;
+    Wallet wallet3;
 
     static Account topupAccount;
 
@@ -58,9 +60,12 @@ void setup() {
         utxoSupplier = getUTXOSupplier();
 
         String wallet1Mnemonic = "clog book honey force cricket stamp until seed minimum margin denial kind volume undo simple federal then jealous solid legal crucial crazy acoustic thank";
-        wallet1 = new Wallet(Networks.testnet(), wallet1Mnemonic);
+        wallet1 = Wallet.createFromMnemonic(Networks.testnet(), wallet1Mnemonic);
         String wallet2Mnemonic = "theme orphan remind output arrive lobster decorate ten gap piece casual distance attend total blast dilemma damp punch pride file limit soldier plug canoe";
-        wallet2 = new Wallet(Networks.testnet(), wallet2Mnemonic);
+        wallet2 = Wallet.createFromMnemonic(Networks.testnet(), wallet2Mnemonic);
+
+        String acctSk = "acct_xsk1azc6gn5zkdprp4gkapmhdckykphjl62rm9224699ut5z6xcaa9p4hv5hmjfgcrzk72tnsqh6dw0njekdjpsv8nv5h5hk6lpd4ag62zenwhzqs205kfurd7kgs8fm5gx4l4j8htutwj060kyp5y5kgw55qc8lsltd";
+        wallet3 = Wallet.createFromAccountKey(Networks.testnet(), Bech32.decode(acctSk).data);
 
         walletUtxoSupplier = new DefaultWalletUtxoSupplier(backendService.getUtxoService(), wallet1);
     }
@@ -71,15 +76,15 @@ void simplePayment() {
         metadata.put(BigInteger.valueOf(100), "This is first metadata");
         metadata.putNegative(200, -900);
 
+        wallet1.setSearchUtxoByAddrVkh(true);
         //topup wallet
-        splitPaymentBetweenAddress(topupAccount, wallet1, 20, Double.valueOf(50000));
-
+        splitPaymentBetweenAddress(topupAccount, wallet1, 20, Double.valueOf(3000), true);
 
         UtxoSupplier walletUtxoSupplier = new DefaultWalletUtxoSupplier(backendService.getUtxoService(), wallet1);
         QuickTxBuilder quickTxBuilder = new QuickTxBuilder(backendService, walletUtxoSupplier);
 
         Tx tx = new Tx()
-                .payToAddress(wallet2.getBaseAddress(0).getAddress(), Amount.ada(50000))
+                .payToAddress(wallet2.getBaseAddress(0).getAddress(), Amount.ada(2000))
                 .from(wallet1);
 
         Result<String> result = quickTxBuilder.compose(tx)
@@ -99,7 +104,7 @@ void simplePayment() {
     @Test
     void simplePayment_withIndexesToScan() {
         String mnemonic = "buzz sentence empty coffee manage grid claw street misery deputy direct seek tortoise wedding stay twist crew august omit taste expect obscure abandon iron";
-        Wallet wallet = new Wallet(Networks.testnet(), mnemonic);
+        Wallet wallet = Wallet.createFromMnemonic(Networks.testnet(), mnemonic);
         wallet.setIndexesToScan(new int[]{5, 30, 45});
 
         //topup index 5, 45
@@ -169,7 +174,7 @@ void utxoTest() {
         assertTrue(!utxos.isEmpty());
     }
 
-    void splitPaymentBetweenAddress(Account topupAccount, Wallet receiverWallet, int totalAddresses, Double adaAmount) {
+    void splitPaymentBetweenAddress(Account topupAccount, Wallet receiverWallet, int totalAddresses, Double adaAmount, boolean enableEntAddrPayment) {
         // Create an amount array with no of totalAddresses with random distribution of split amounts
         Double[] amounts = new Double[totalAddresses];
         Double remainingAmount = adaAmount;
@@ -187,7 +192,15 @@ void splitPaymentBetweenAddress(Account topupAccount, Wallet receiverWallet, int
         int currentIndex = 0;
 
         for (int i = 0; i < totalAddresses; i++) {
-            addresses[i] = receiverWallet.getBaseAddressString(currentIndex);
+            if (enableEntAddrPayment) {
+                if (i % 2 == 0)
+                    addresses[i] = receiverWallet.getBaseAddressString(currentIndex);
+                else
+                    addresses[i] = receiverWallet.getEntAddress(currentIndex).toBech32();
+            } else {
+                addresses[i] = receiverWallet.getBaseAddressString(currentIndex);
+            }
+
             currentIndex += random.nextInt(20) + 1;
         }
 
@@ -205,4 +218,34 @@ void splitPaymentBetweenAddress(Account topupAccount, Wallet receiverWallet, int
 
         System.out.println(result);
     }
+
+    @Test
+    void simplePayment_fromAccountKey() {
+        Metadata metadata = MetadataBuilder.createMetadata();
+        metadata.put(BigInteger.valueOf(100), "This is first metadata");
+        metadata.putNegative(200, -900);
+
+        //topup wallet
+        splitPaymentBetweenAddress(topupAccount, wallet3, 20, Double.valueOf(3000), false);
+
+        UtxoSupplier walletUtxoSupplier = new DefaultWalletUtxoSupplier(backendService.getUtxoService(), wallet3);
+        QuickTxBuilder quickTxBuilder = new QuickTxBuilder(backendService, walletUtxoSupplier);
+
+        Tx tx = new Tx()
+                .payToAddress(wallet2.getBaseAddress(0).getAddress(), Amount.ada(2000))
+                .from(wallet3);
+
+        Result<String> result = quickTxBuilder.compose(tx)
+                .withSigner(SignerProviders.signerFrom(wallet3))
+                .withTxInspector(txn -> {
+                    System.out.println(JsonUtil.getPrettyJson(txn));
+                })
+                .complete();
+
+        System.out.println(result);
+        assertTrue(result.isSuccessful());
+        waitForTransaction(result);
+
+        checkIfUtxoAvailable(result.getValue(), wallet2.getBaseAddress(0).getAddress());
+    }
 }
diff --git a/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/StakeTxIT.java b/hd-wallet/src/it/java/com/bloxbean/cardano/hdwallet/StakeTxIT.java
@@ -59,9 +59,9 @@ static void beforeAll() {
         quickTxBuilder = new QuickTxBuilder(backendService);
 
         String wallet1Mnemonic = "clog book honey force cricket stamp until seed minimum margin denial kind volume undo simple federal then jealous solid legal crucial crazy acoustic thank";
-        wallet1 = new Wallet(Networks.testnet(), wallet1Mnemonic);
+        wallet1 = Wallet.createFromMnemonic(Networks.testnet(), wallet1Mnemonic);
         String wallet2Mnemonic = "theme orphan remind output arrive lobster decorate ten gap piece casual distance attend total blast dilemma damp punch pride file limit soldier plug canoe";
-        wallet2 = new Wallet(Networks.testnet(), wallet2Mnemonic);
+        wallet2 = Wallet.createFromMnemonic(Networks.testnet(), wallet2Mnemonic);
 
         if (backendType.equals(DEVKIT)) {
             poolId = "pool1wvqhvyrgwch4jq9aa84hc8q4kzvyq2z3xr6mpafkqmx9wce39zy";
diff --git a/hd-wallet/src/it/resources/log4j.xml b/hd-wallet/src/it/resources/log4j.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
+    <!-- Console Appender -->
+    <appender name="console" class="org.apache.log4j.ConsoleAppender">
+        <param name="Target" value="System.out" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-5p | %d{yyyy-MM-dd HH:mm:ss} | [%t] %C{2} (%F:%L) - %m%n" />
+        </layout>
+    </appender>
+    <!-- Info Log File Appender -->
+    <appender name="info-log" class="org.apache.log4j.FileAppender">
+        <param name="File" value="info.log" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-5p | %d{yyyy-MM-dd HH:mm:ss} | [%t] %C{2} (%F:%L) - %m%n" />
+        </layout>
+        <filter class="org.apache.log4j.varia.LevelRangeFilter">
+            <param name="LevelMin" value="debug" />
+            <param name="LevelMax" value="info" />
+            <param name="AcceptOnMatch" value="true" />
+        </filter>
+    </appender>
+    <!-- Error Log File Appender -->
+    <appender name="error-log" class="org.apache.log4j.FileAppender">
+        <param name="Append" value="false" />
+        <param name="File" value="yaci_error.log" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-5p | %d{yyyy-MM-dd HH:mm:ss} | [%t] %C{2} (%F:%L) - %m%n" />
+        </layout>
+        <filter class="org.apache.log4j.varia.LevelRangeFilter">
+            <param name="LevelMin" value="warn" />
+            <param name="LevelMax" value="fatal" />
+            <param name="AcceptOnMatch" value="true" />
+        </filter>
+    </appender>
+<!--    <logger name="com.bloxbean.cardano">-->
+<!--        <appender-ref ref="info-log" />-->
+<!--        <appender-ref ref="error-log" />-->
+<!--    </logger>-->
+    <root>
+        <level value="debug" />
+        <appender-ref ref="console" />
+    </root>
+</log4j:configuration>
diff --git a/hd-wallet/src/main/java/com/bloxbean/cardano/hdwallet/supplier/DefaultWalletUtxoSupplier.java b/hd-wallet/src/main/java/com/bloxbean/cardano/hdwallet/supplier/DefaultWalletUtxoSupplier.java
@@ -14,13 +14,15 @@
 import com.bloxbean.cardano.hdwallet.WalletException;
 import com.bloxbean.cardano.hdwallet.model.WalletUtxo;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+@Slf4j
 public class DefaultWalletUtxoSupplier implements WalletUtxoSupplier {
     private final UtxoService utxoService;
     @Setter
@@ -33,7 +35,11 @@ public DefaultWalletUtxoSupplier(UtxoService utxoService, Wallet wallet) {
 
     @Override
     public List<Utxo> getPage(String address, Integer nrOfItems, Integer page, OrderEnum order) {
-        return getAll(address); // todo get Page of utxo over multipe addresses - find a good way to aktually do something with page, nrOfItems and order
+        //All utxos should be fetched at page=0
+        if (page == 0)
+            return getAll(address); // todo get Page of utxo over multipe addresses - find a good way to aktually do something with page, nrOfItems and order
+        else
+            return Collections.emptyList();
     }
 
     @Override
@@ -84,6 +90,10 @@ public List<WalletUtxo> getUtxosForAccountAndIndex(int account, int index) {
         checkIfWalletIsSet();
 
         Address address = getBaseAddress(account, index);
+
+        if (log.isDebugEnabled())
+            log.debug("Scanning address for account: {}, index: {}", account, index);
+
         String addrStr = address.getAddress();
         String addrVkh =  address.getBech32VerificationKeyHash().orElse(null);
 
@@ -115,7 +125,7 @@ public List<WalletUtxo> getUtxosForAccountAndIndex(int account, int index) {
             }).collect(Collectors.toList());
 
             utxos.addAll(utxoList);
-            if(utxoPage.size() < 100)
+            if(utxoPage.size() < DEFAULT_NR_OF_ITEMS_TO_FETCH)
                 break;
             page++;
         }
