cr suggestions

Author: Thorian1te

claude/utxo-expert-development-agent.md

@@ -203,15 +203,21 @@ class UTXOManager {
     targetAmount: number, 
     feeRate: number
   ): { inputs: UTXO[]; fee: number; change: number } {
-    // Implementation using coinselect algorithm
-    const accumulative = require('coinselect/accumulative')
+    // Implementation using first-party UtxoSelector with multi-strategy approach
+    const { UtxoSelector } = require('@xchainjs/xchain-utxo')
+    const selector = new UtxoSelector()
 
-    const targets = [{ address: 'target-address', value: targetAmount }]
-    const { inputs, outputs, fee } = accumulative(availableUTXOs, targets, feeRate)
-    
-    const change = outputs.find(output => !output.address)?.value || 0
-    
-    return { inputs: inputs || [], fee, change }
+    try {
+      const result = selector.selectOptimal(availableUTXOs, targetAmount, feeRate)
+      return { 
+        inputs: result.inputs, 
+        fee: result.fee, 
+        change: result.changeAmount 
+      }
+    } catch (error) {
+      // Handle selection failure
+      throw new Error(`UTXO selection failed: ${error.message}`)
+    }
   }
 
   private async getCurrentBlockHeight(): Promise<number> {
@@ -262,11 +268,12 @@ class TransactionBuilder {
           index: utxo.index,
           witnessUtxo: utxo.witnessUtxo
         })
-      } else if (utxo.nonWitnessUtxo) {
+      } else if (utxo.txHex) {
+        // Use full transaction hex when witnessUtxo is not available
         psbt.addInput({
           hash: utxo.hash,
           index: utxo.index,
-          nonWitnessUtxo: utxo.nonWitnessUtxo
+          nonWitnessUtxo: Buffer.from(utxo.txHex, 'hex')
         })
       }
     }

packages/xchain-bitcoin/__e2e__/bitcoin-ledger-client.e2e.ts

@@ -74,7 +74,7 @@ describe('Bitcoin Client Ledger', () => {
       fail()
     }
   })
-  it('send max', async () => {
+  it('send max ledger', async () => {
     try {
       const senderAddress = await btcClient.getAddressAsync(0)
       const recipientAddress = await btcClient.getAddressAsync(1)

packages/xchain-bitcoin/__e2e__/blockcypher.bitcoin-client.e2e.ts

@@ -1,5 +1,5 @@
 import { AssetInfo, Network } from '@xchainjs/xchain-client'
-import { assetAmount, assetToBase, assetToString, baseAmount, baseToAsset } from '@xchainjs/xchain-util'
+import { assetAmount, assetToBase, assetToString, baseToAsset } from '@xchainjs/xchain-util'
 import { UtxoClientParams } from '@xchainjs/xchain-utxo'
 
 import { ClientKeystore as Client } from '../src/clientKeystore'
@@ -291,18 +291,17 @@ describe('Bitcoin Integration Tests for BlockCypher', () => {
 
       // Optional: Actually broadcast the transaction (commented out for safety)
       // Uncomment the following to actually send the transaction
-
-      console.log('Broadcasting transaction...')
-      const txHash = await btcClient.transfer({
-        walletIndex: 0,
-        asset: AssetBTC,
-        recipient: recipientAddress,
-        amount: baseAmount(sendMaxResult.maxAmount, BTC_DECIMAL),
-        memo: 'max',
-        feeRate: feeRate,
-      })
-      console.log('✅ Transaction broadcast successfully!')
-      console.log('Transaction hash:', txHash)
+      // console.log('Broadcasting transaction...')
+      // const txHash = await btcClient.transfer({
+      //   walletIndex: 0,
+      //   asset: AssetBTC,
+      //   recipient: recipientAddress,
+      //   amount: baseAmount(sendMaxResult.maxAmount, BTC_DECIMAL),
+      //   memo: 'max',
+      //   feeRate: feeRate,
+      // })
+      // console.log('✅ Transaction broadcast successfully!')
+      // console.log('Transaction hash:', txHash)
     } catch (err) {
       console.error('ERR running send max test:', err)
       if (err instanceof Error) {

packages/xchain-bitcoin/src/clientKeystore.ts

@@ -2,7 +2,7 @@ import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs'
 import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client'
 import { getSeed } from '@xchainjs/xchain-crypto'
 import { Address } from '@xchainjs/xchain-util'
-import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo'
+import { TxParams, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo'
 import { HDKey } from '@scure/bip32'
 import * as Bitcoin from 'bitcoinjs-lib'
 import { ECPairFactory, ECPairInterface } from 'ecpair'
@@ -108,7 +108,7 @@ class ClientKeystore extends Client {
    * @returns {Promise<TxHash|string>} A promise that resolves to the transaction hash or an error message.
    * @throws {"memo too long"} Thrown if the memo is longer than 80 characters.
    */
-  async transfer(params: TxParams & { feeRate?: FeeRate }): Promise<TxHash> {
+  async transfer(params: TxParams & { feeRate?: FeeRate; utxoSelectionPreferences?: UtxoSelectionPreferences }): Promise<TxHash> {
     // Set the default fee rate to `fast`
     const feeRate = params.feeRate || (await this.getFeeRates())[FeeOption.Fast]
 
@@ -121,16 +121,20 @@ class ClientKeystore extends Client {
     // Get the Bitcoin keys
     const btcKeys = this.getBtcKeys(this.phrase, fromAddressIndex)
 
+    // Merge default preferences with caller-provided preferences
+    const mergedUtxoSelectionPreferences = {
+      minimizeFee: true,
+      avoidDust: true,
+      minimizeInputs: false,
+      ...params.utxoSelectionPreferences,
+    }
+
     // Prepare the transaction
     const { rawUnsignedTx } = await this.prepareTxEnhanced({
       ...params,
       sender: this.getAddress(fromAddressIndex),
       feeRate,
-      utxoSelectionPreferences: {
-        minimizeFee: true,
-        avoidDust: true,
-        minimizeInputs: false,
-      },
+      utxoSelectionPreferences: mergedUtxoSelectionPreferences,
     })
 
     // Build the PSBT

packages/xchain-bitcoin/src/clientLedger.ts

@@ -2,7 +2,7 @@ import AppBtc from '@ledgerhq/hw-app-btc'
 import type { Transaction } from '@ledgerhq/hw-app-btc/lib/types'
 import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client'
 import { Address } from '@xchainjs/xchain-util'
-import { TxParams, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo'
+import { TxParams, UTXO, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo'
 import * as Bitcoin from 'bitcoinjs-lib'
 
 import { Client } from './client'
@@ -49,7 +49,9 @@ class ClientLedger extends Client {
   }
 
   // Transfer BTC from Ledger
-  async transfer(params: TxParams & { feeRate?: FeeRate }): Promise<TxHash> {
+  async transfer(
+    params: TxParams & { feeRate?: FeeRate; utxoSelectionPreferences?: UtxoSelectionPreferences },
+  ): Promise<TxHash> {
     const app = await this.getApp()
     const fromAddressIndex = params?.walletIndex || 0
     // Get fee rate
@@ -58,16 +60,24 @@ class ClientLedger extends Client {
     checkFeeBounds(this.feeBounds, feeRate)
     // Get sender address
     const sender = await this.getAddressAsync(fromAddressIndex)
+
+    // Create defaults and merge with caller-provided preferences
+    const defaults = {
+      minimizeFee: true,
+      avoidDust: true,
+      minimizeInputs: false,
+    }
+    const mergedUtxoSelectionPreferences = {
+      ...defaults,
+      ...params.utxoSelectionPreferences,
+    }
+
     // Prepare transaction using enhanced method with optimal UTXO selection
     const { rawUnsignedTx, inputs } = await this.prepareTxEnhanced({
       ...params,
       sender,
       feeRate,
-      utxoSelectionPreferences: {
-        minimizeFee: true,
-        avoidDust: true,
-        minimizeInputs: false,
-      },
+      utxoSelectionPreferences: mergedUtxoSelectionPreferences,
     })
     const psbt = Bitcoin.Psbt.fromBase64(rawUnsignedTx)
     // Prepare Ledger inputs

packages/xchain-utxo/src/utxo-selector.ts

@@ -44,8 +44,8 @@ export class UtxoSelector {
 
   // Constants for calculations
   public static readonly DUST_THRESHOLD = 546 // satoshis
-  public static readonly BYTES_PER_INPUT = 148 // approximate bytes per P2WPKH input
-  public static readonly BYTES_PER_OUTPUT = 34 // bytes per P2WPKH output
+  public static readonly BYTES_PER_INPUT = 68 // approximate vbytes per P2WPKH input
+  public static readonly BYTES_PER_OUTPUT = 31 // vbytes per P2WPKH output
   public static readonly BASE_TX_SIZE = 10 // base transaction overhead
 
   /**

packages/xchain-utxo/src/validators.ts

@@ -303,7 +303,20 @@ export class UtxoTransactionValidator {
 
   private static containsControlCharacters(str: string): boolean {
     // Check for control characters that might cause issues
-    return /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/.test(str)
+    // Ranges: 0x00-0x08, 0x0B, 0x0C, 0x0E-0x1F, 0x7F
+    for (let i = 0; i < str.length; i++) {
+      const code = str.charCodeAt(i)
+      if (
+        (code >= 0x00 && code <= 0x08) || // \x00-\x08
+        code === 0x0b || // \x0B (vertical tab)
+        code === 0x0c || // \x0C (form feed)
+        (code >= 0x0e && code <= 0x1f) || // \x0E-\x1F
+        code === 0x7f // \x7F (DEL)
+      ) {
+        return true
+      }
+    }
+    return false
   }
 
   private static validateBitcoinAddress(address: string, network: Network, allowedFormats?: string[]): void {