@leather.io/bitcoin 0.19.29 → 0.19.30

package/src/bip322/sign-message-bip322.spec.ts

@@ -3,7 +3,8 @@ import * as secp from '@noble/secp256k1';
 import * as btc from '@scure/btc-signer';
 import * as bitcoin from 'bitcoinjs-lib';
 
-import { ecdsaPublicKeyToSchnorr } from '../bitcoin.utils';
+import { ecdsaPublicKeyToSchnorr } from '../utils/bitcoin.utils';
+import { createBitcoinAddress } from '../validation/bitcoin-address';
 import {
   createNativeSegwitBitcoinJsSigner,
   createTaprootBitcoinJsSigner,
@@ -11,13 +12,11 @@ import {
   signBip322MessageSimple,
 } from './sign-message-bip322-bitcoinjs';
 
+const address = createBitcoinAddress('bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l');
+
 describe(createToSpendTx.name, () => {
   test('bitcoinjs example', () => {
-    const result = createToSpendTx(
-      'bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l',
-      'generatedWithBitcoinJs',
-      'mainnet'
-    );
+    const result = createToSpendTx(address, 'generatedWithBitcoinJs', 'mainnet');
 
     expect(result.script.toString('hex')).toEqual('00142b05d564e6a7a33c087f16e0f730d1440123799d');
 
@@ -33,7 +32,7 @@ describe(signBip322MessageSimple.name, () => {
   const testVectorKey = btc.WIF().decode('L3VFeEujGtevx9w18HD1fhRbCH67Az2dpCymeRE1SoPK6XQtaN2k');
 
   describe('Message signing, Native Segwit', () => {
-    const nativeSegwitAddress = btc.getAddress('wpkh', testVectorKey);
+    const rawNativeSegwitAddress = btc.getAddress('wpkh', testVectorKey);
     const payment = btc.p2wpkh(secp.getPublicKey(testVectorKey, true));
 
     function signPsbt(psbt: bitcoin.Psbt) {
@@ -41,11 +40,11 @@ describe(signBip322MessageSimple.name, () => {
       return Promise.resolve(btc.Transaction.fromPSBT(psbt.toBuffer()));
     }
 
-    if (!nativeSegwitAddress) throw new Error('nativeSegwitAddress is undefined');
-
+    if (!rawNativeSegwitAddress) throw new Error('nativeSegwitAddress is undefined');
+    const nativeSegwitAddress = createBitcoinAddress(rawNativeSegwitAddress);
     test('Addresses against native segwit test vectors', () => {
-      expect(nativeSegwitAddress).toEqual('bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l');
-      expect(payment.address).toEqual('bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l');
+      expect(nativeSegwitAddress).toEqual(address);
+      expect(payment.address).toEqual(address);
     });
 
     test('Signature: "" (empty string)', async () => {
@@ -113,10 +112,11 @@ describe(signBip322MessageSimple.name, () => {
   });
 
   describe('Message Signing, Taproot', () => {
-    const taprootAddress = btc.getAddress('tr', testVectorKey);
+    const rawTaprootAddress = btc.getAddress('tr', testVectorKey);
 
-    if (!taprootAddress) throw new Error('Could not generate taproot address');
+    if (!rawTaprootAddress) throw new Error('Could not generate taproot address');
 
+    const taprootAddress = createBitcoinAddress(rawTaprootAddress);
     const payment = btc.p2tr(
       ecdsaPublicKeyToSchnorr(secp.getPublicKey(Buffer.from(testVectorKey), true))
     );

package/src/coin-selection/calculate-max-spend.spec.ts

@@ -1,53 +1,55 @@
-import { calculateMaxBitcoinSpend } from './calculate-max-spend';
+import { createBitcoinAddress } from '../validation/bitcoin-address';
+import { calculateMaxSpend } from './calculate-max-spend';
 import { generateMockAverageFee, mockUtxos } from './coin-selection.mocks';
 
-describe(calculateMaxBitcoinSpend.name, () => {
+const recipient = createBitcoinAddress('');
+describe(calculateMaxSpend.name, () => {
   test('with 1 sat/vb fee', () => {
     const fee = 1;
-    const maxBitcoinSpend = calculateMaxBitcoinSpend({
-      address: '',
+    const maxBitcoinSpend = calculateMaxSpend({
+      recipient,
       utxos: mockUtxos,
-      fetchedFeeRates: generateMockAverageFee(fee),
+      feeRates: generateMockAverageFee(fee),
     });
     expect(maxBitcoinSpend.amount.amount.toNumber()).toEqual(50087948);
   });
 
   test('with 5 sat/vb fee', () => {
     const fee = 5;
-    const maxBitcoinSpend = calculateMaxBitcoinSpend({
-      address: '',
+    const maxBitcoinSpend = calculateMaxSpend({
+      recipient,
       utxos: mockUtxos,
-      fetchedFeeRates: generateMockAverageFee(fee),
+      feeRates: generateMockAverageFee(fee),
     });
     expect(maxBitcoinSpend.amount.amount.toNumber()).toEqual(50085342);
   });
 
   test('with 30 sat/vb fee', () => {
     const fee = 30;
-    const maxBitcoinSpend = calculateMaxBitcoinSpend({
-      address: '',
+    const maxBitcoinSpend = calculateMaxSpend({
+      recipient,
       utxos: mockUtxos,
-      fetchedFeeRates: generateMockAverageFee(fee),
+      feeRates: generateMockAverageFee(fee),
     });
     expect(maxBitcoinSpend.amount.amount.toNumber()).toEqual(50073585);
   });
 
   test('with 100 sat/vb fee', () => {
     const fee = 100;
-    const maxBitcoinSpend = calculateMaxBitcoinSpend({
-      address: '',
+    const maxBitcoinSpend = calculateMaxSpend({
+      recipient,
       utxos: mockUtxos,
-      fetchedFeeRates: generateMockAverageFee(fee),
+      feeRates: generateMockAverageFee(fee),
     });
     expect(maxBitcoinSpend.amount.amount.toNumber()).toEqual(50046950);
   });
 
   test('with 400 sat/vb fee', () => {
     const fee = 400;
-    const maxBitcoinSpend = calculateMaxBitcoinSpend({
-      address: '',
+    const maxBitcoinSpend = calculateMaxSpend({
+      recipient,
       utxos: mockUtxos,
-      fetchedFeeRates: generateMockAverageFee(fee),
+      feeRates: generateMockAverageFee(fee),
     });
     expect(maxBitcoinSpend.amount.amount.toNumber()).toEqual(49969100);
   });

package/src/coin-selection/calculate-max-spend.ts

@@ -1,48 +1,58 @@
 import BigNumber from 'bignumber.js';
 
-import type { AverageBitcoinFeeRates } from '@leather.io/models';
+import type { AverageBitcoinFeeRates, Money } from '@leather.io/models';
 import { createMoney, satToBtc } from '@leather.io/utils';
 
-import { CoinSelectionUtxo } from './coin-selection';
-import { filterUneconomicalUtxos, getSpendableAmount } from './coin-selection.utils';
+import { CoinSelectionUtxo } from '../coin-selection/coin-selection';
+import {
+  filterUneconomicalUtxos,
+  getSpendableAmount,
+} from '../coin-selection/coin-selection.utils';
+import { BitcoinAddress } from '../validation/bitcoin-address';
 
-interface CalculateMaxBitcoinSpend {
-  address: string;
+interface CalculateMaxSpendArgs {
+  recipient: BitcoinAddress;
   utxos: CoinSelectionUtxo[];
-  fetchedFeeRates?: AverageBitcoinFeeRates;
+  feeRates?: AverageBitcoinFeeRates;
   feeRate?: number;
 }
 
-export function calculateMaxBitcoinSpend({
-  address,
+interface CalculateMaxSpendResponse {
+  spendAllFee: number;
+  amount: Money;
+  spendableBtc: BigNumber;
+}
+export function calculateMaxSpend({
+  recipient,
   utxos,
   feeRate,
-  fetchedFeeRates,
-}: CalculateMaxBitcoinSpend) {
-  if (!utxos.length || !fetchedFeeRates)
+  feeRates,
+}: CalculateMaxSpendArgs): CalculateMaxSpendResponse {
+  if (!utxos.length || !feeRates)
     return {
       spendAllFee: 0,
       amount: createMoney(0, 'BTC'),
-      spendableBitcoin: new BigNumber(0),
+      spendableBtc: new BigNumber(0),
     };
 
-  const currentFeeRate = feeRate ?? fetchedFeeRates.halfHourFee.toNumber();
+  const currentFeeRate = feeRate ?? feeRates.halfHourFee.toNumber();
 
   const filteredUtxos = filterUneconomicalUtxos({
     utxos,
     feeRate: currentFeeRate,
-    recipients: [{ address, amount: createMoney(0, 'BTC') }],
+    recipients: [{ address: recipient, amount: createMoney(0, 'BTC') }],
   });
 
   const { spendableAmount, fee } = getSpendableAmount({
     utxos: filteredUtxos,
     feeRate: currentFeeRate,
-    recipients: [{ address, amount: createMoney(0, 'BTC') }],
+    recipients: [{ address: recipient, amount: createMoney(0, 'BTC') }],
+    isSendMax: true,
   });
 
   return {
     spendAllFee: fee,
     amount: createMoney(spendableAmount, 'BTC'),
-    spendableBitcoin: satToBtc(spendableAmount),
+    spendableBtc: satToBtc(spendableAmount),
   };
 }

package/src/coin-selection/coin-selection.spec.ts

@@ -1,6 +1,14 @@
 import { BTC_P2WPKH_DUST_AMOUNT } from '@leather.io/constants';
 import { createMoney, createNullArrayOfLength, sumNumbers } from '@leather.io/utils';
 
+import {
+  invalidAddress,
+  legacyAddress,
+  recipientAddress,
+  segwitAddress,
+  taprootAddress,
+} from '../mocks/mocks';
+import { isBitcoinAddress } from '../validation/bitcoin-address';
 import { determineUtxosForSpend, determineUtxosForSpendAll } from './coin-selection';
 import { filterUneconomicalUtxos, getSizeInfo } from './coin-selection.utils';
 
@@ -21,6 +29,9 @@ const demoUtxos = [
 ];
 
 function generate10kSpendWithDummyUtxoSet(recipient: string) {
+  if (!isBitcoinAddress(recipient)) {
+    throw new Error('Invalid Bitcoin address');
+  }
   return determineUtxosForSpend({
     utxos: demoUtxos as any,
     feeRate: 20,
@@ -35,7 +46,7 @@ describe(determineUtxosForSpend.name, () => {
         utxos: [{ value: 50_000 }] as any[],
         recipients: [
           {
-            address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+            address: recipientAddress,
             amount: createMoney(40_000, 'BTC'),
           },
         ],
@@ -50,7 +61,7 @@ describe(determineUtxosForSpend.name, () => {
         utxos: [{ value: 50_000 }, { value: 50_000 }] as any[],
         recipients: [
           {
-            address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+            address: recipientAddress,
             amount: createMoney(60_000, 'BTC'),
           },
         ],
@@ -76,7 +87,7 @@ describe(determineUtxosForSpend.name, () => {
         ] as any[],
         recipients: [
           {
-            address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+            address: recipientAddress,
             amount: createMoney(100_000, 'BTC'),
           },
         ],
@@ -89,13 +100,13 @@ describe(determineUtxosForSpend.name, () => {
 
   describe('sorting algorithm', () => {
     test('that it filters out dust utxos', () => {
-      const result = generate10kSpendWithDummyUtxoSet('tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m');
+      const result = generate10kSpendWithDummyUtxoSet(recipientAddress);
       const hasDust = result.filteredUtxos.some(utxo => utxo.value <= BTC_P2WPKH_DUST_AMOUNT);
       expect(hasDust).toBeFalsy();
     });
 
     test('that it sorts utxos in decending order', () => {
-      const result = generate10kSpendWithDummyUtxoSet('tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m');
+      const result = generate10kSpendWithDummyUtxoSet(recipientAddress);
       result.inputs.forEach((u, i) => {
         const nextUtxo = result.inputs[i + 1];
         if (!nextUtxo) return;
@@ -105,30 +116,24 @@ describe(determineUtxosForSpend.name, () => {
   });
 
   test('that it accepts a wrapped segwit address', () =>
-    expect(() =>
-      generate10kSpendWithDummyUtxoSet('33SVjoCHJovrXxjDKLFSXo1h3t5KgkPzfH')
-    ).not.toThrowError());
+    expect(() => generate10kSpendWithDummyUtxoSet(segwitAddress)).not.toThrowError());
 
   test('that it accepts a legacy addresses', () =>
-    expect(() =>
-      generate10kSpendWithDummyUtxoSet('15PyZveQd28E2SHZu2ugkWZBp6iER41vXj')
-    ).not.toThrowError());
+    expect(() => generate10kSpendWithDummyUtxoSet(legacyAddress)).not.toThrowError());
 
   test('that it throws an error with non-legit address', () => {
-    expect(() =>
-      generate10kSpendWithDummyUtxoSet('whoop-de-da-boop-da-de-not-a-bitcoin-address')
-    ).toThrowError();
+    expect(() => generate10kSpendWithDummyUtxoSet(invalidAddress)).toThrowError();
   });
 
   test('that given a set of utxos, legacy is more expensive', () => {
-    const legacy = generate10kSpendWithDummyUtxoSet('15PyZveQd28E2SHZu2ugkWZBp6iER41vXj');
-    const segwit = generate10kSpendWithDummyUtxoSet('33SVjoCHJovrXxjDKLFSXo1h3t5KgkPzfH');
+    const legacy = generate10kSpendWithDummyUtxoSet(legacyAddress);
+    const segwit = generate10kSpendWithDummyUtxoSet(segwitAddress);
     expect(legacy.fee.amount.isGreaterThan(segwit.fee.amount)).toBeTruthy();
   });
 
   test('that given a set of utxos, wrapped segwit is more expensive than native', () => {
-    const segwit = generate10kSpendWithDummyUtxoSet('33SVjoCHJovrXxjDKLFSXo1h3t5KgkPzfH');
-    const native = generate10kSpendWithDummyUtxoSet('tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m');
+    const segwit = generate10kSpendWithDummyUtxoSet(segwitAddress);
+    const native = generate10kSpendWithDummyUtxoSet(recipientAddress);
     expect(segwit.fee.amount.isGreaterThan(native.fee.amount)).toBeTruthy();
   });
 
@@ -136,10 +141,8 @@ describe(determineUtxosForSpend.name, () => {
     // Non-obvious behaviour.
     // P2TR outputs = 34 vBytes
     // P2WPKH outputs = 22 vBytes
-    const native = generate10kSpendWithDummyUtxoSet('tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m');
-    const taproot = generate10kSpendWithDummyUtxoSet(
-      'tb1parwmj7533de3k2fw2kntyqacspvhm67qnjcmpqnnpfvzu05l69nsczdywd'
-    );
+    const native = generate10kSpendWithDummyUtxoSet(recipientAddress);
+    const taproot = generate10kSpendWithDummyUtxoSet(taprootAddress);
     expect(taproot.fee.amount.isGreaterThan(native.fee.amount)).toBeTruthy();
   });
 
@@ -152,7 +155,7 @@ describe(determineUtxosForSpend.name, () => {
       utxos: testData as any,
       recipients: [
         {
-          address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+          address: recipientAddress,
           amount: createMoney(Number(amount), 'BTC'),
         },
       ],
@@ -172,7 +175,7 @@ describe(determineUtxosForSpend.name, () => {
     const feeRate = 3;
     const recipients = [
       {
-        address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+        address: recipientAddress,
         amount: createMoney(1, 'BTC'),
       },
     ];
@@ -188,7 +191,7 @@ describe(determineUtxosForSpend.name, () => {
       utxos: filteredUtxos as any,
       recipients: [
         {
-          address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+          address: recipientAddress,
           amount: createMoney(amount, 'BTC'),
         },
       ],
@@ -203,7 +206,7 @@ describe(determineUtxosForSpend.name, () => {
     const utxos = [{ value: 1000 }, { value: 2000 }, { value: 3000 }];
     const recipients = [
       {
-        address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+        address: recipientAddress,
         amount: createMoney(Number(1), 'BTC'),
       },
     ];

package/src/coin-selection/coin-selection.ts

@@ -5,7 +5,7 @@ import { BTC_P2WPKH_DUST_AMOUNT } from '@leather.io/constants';
 import { Money } from '@leather.io/models';
 import { createMoney, sumMoney } from '@leather.io/utils';
 
-import { BitcoinError } from '../bitcoin-error';
+import { BitcoinError } from '../validation/bitcoin-error';
 import { filterUneconomicalUtxos, getSizeInfo, getUtxoTotal } from './coin-selection.utils';
 
 export interface CoinSelectionOutput {

package/src/coin-selection/coin-selection.utils.spec.ts

@@ -1,12 +1,13 @@
 import { createMoney } from '@leather.io/utils';
 
+import { recipientAddress } from '../mocks/mocks';
 import { mockUtxos } from './coin-selection.mocks';
 import { filterUneconomicalUtxos } from './coin-selection.utils';
 
 describe(filterUneconomicalUtxos.name, () => {
   const recipients = [
     {
-      address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+      address: recipientAddress,
       amount: createMoney(0, 'BTC'),
     },
   ];

package/src/coin-selection/coin-selection.utils.ts

@@ -4,7 +4,7 @@ import validate, { AddressInfo, AddressType, getAddressInfo } from 'bitcoin-addr
 import { BTC_P2WPKH_DUST_AMOUNT } from '@leather.io/constants';
 import { sumNumbers } from '@leather.io/utils';
 
-import { BtcSizeFeeEstimator } from '../btc-size-fee-estimator';
+import { BtcSizeFeeEstimator } from '../fees/btc-size-fee-estimator';
 import { CoinSelectionRecipient, CoinSelectionUtxo } from './coin-selection';
 
 export function getUtxoTotal(utxos: CoinSelectionUtxo[]) {
@@ -57,16 +57,13 @@ export function getSizeInfo(payload: {
 
   return sizeInfo;
 }
-
-export function getSpendableAmount({
-  utxos,
-  feeRate,
-  recipients,
-}: {
+interface GetSpendableAmountArgs {
   utxos: CoinSelectionUtxo[];
   feeRate: number;
   recipients: CoinSelectionRecipient[];
-}) {
+  isSendMax?: boolean;
+}
+export function getSpendableAmount({ utxos, feeRate, recipients }: GetSpendableAmountArgs) {
   const balance = utxos
     .map(utxo => Number(utxo.value))
     .reduce((prevVal, curVal) => prevVal + curVal, 0);

package/src/fees/bitcoin-fees.spec.ts

@@ -4,17 +4,16 @@ import { AverageBitcoinFeeRates } from '@leather.io/models';
 import { createMoney } from '@leather.io/utils';
 
 import { CoinSelectionRecipient, CoinSelectionUtxo } from '../coin-selection/coin-selection';
+import { recipientAddress, taprootAddress } from '../mocks/mocks';
 import { getBitcoinFees, getBitcoinTransactionFee } from './bitcoin-fees';
 
 describe('getBitcoinTransactionFee', () => {
   it('should return the fee for a normal transaction', () => {
     const args = {
-      recipients: [
-        { address: 'tb1qsqncyhhqdtfn07t3dhupx7smv5gk83ds6k0gfa', amount: createMoney(1000, 'BTC') },
-      ],
+      recipients: [{ address: recipientAddress, amount: createMoney(1000, 'BTC') }],
       utxos: [
         {
-          address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+          address: taprootAddress,
           txid: '8192e8e20088c5f052fc7351b86b8f60a9454937860b281227e53e19f3e9c3f6',
           vout: 0,
           value: 2000,
@@ -30,12 +29,10 @@ describe('getBitcoinTransactionFee', () => {
   it('should return the fee for a max send transaction', () => {
     const args = {
       isSendingMax: true,
-      recipients: [
-        { address: 'tb1qsqncyhhqdtfn07t3dhupx7smv5gk83ds6k0gfa', amount: createMoney(2000, 'BTC') },
-      ],
+      recipients: [{ address: recipientAddress, amount: createMoney(2000, 'BTC') }],
       utxos: [
         {
-          address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+          address: taprootAddress,
           txid: '8192e8e20088c5f052fc7351b86b8f60a9454937860b281227e53e19f3e9c3f6',
           vout: 0,
           value: 2000,
@@ -67,11 +64,11 @@ describe('getBitcoinFees', () => {
       hourFee: new BigNumber(1),
     };
     const recipients: CoinSelectionRecipient[] = [
-      { address: 'tb1qsqncyhhqdtfn07t3dhupx7smv5gk83ds6k0gfa', amount: createMoney(1000, 'BTC') },
+      { address: recipientAddress, amount: createMoney(1000, 'BTC') },
     ];
     const utxos: CoinSelectionUtxo[] = [
       {
-        address: 'tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m',
+        address: taprootAddress,
         txid: '8192e8e20088c5f052fc7351b86b8f60a9454937860b281227e53e19f3e9c3f6',
         vout: 0,
         value: 2000,

package/src/index.ts

@@ -7,19 +7,31 @@ export * from './coin-selection/coin-selection.utils';
 
 export * from './fees/bitcoin-fees';
 
-export * from './transactions/generate-unsigned-transaction';
+export * from './mocks/mocks';
 
-export * from './bitcoin-error';
-export * from './bitcoin-signer';
-export * from './bitcoin.network';
-export * from './bitcoin.utils';
-export * from './p2tr-address-gen';
-export * from './p2wpkh-address-gen';
-export * from './p2wsh-p2sh-address-gen';
-export * from './lookup-derivation-by-address';
+export * from './payments/p2tr-address-gen';
+export * from './payments/p2wpkh-address-gen';
+export * from './payments/p2wsh-p2sh-address-gen';
 export * from './psbt/psbt-totals';
 export * from './psbt/psbt-inputs';
 export * from './psbt/psbt-outputs';
 export * from './psbt/psbt-totals';
 export * from './psbt/psbt-details';
 export * from './psbt/utils';
+
+export * from './signer/bitcoin-signer';
+
+export * from './transactions/generate-unsigned-transaction';
+
+export * from './validation/address-validation';
+export * from './validation/amount-validation';
+export * from './validation/bitcoin-address';
+export * from './validation/bitcoin-error';
+export * from './validation/transaction-validation';
+
+export * from './utils/bitcoin.network';
+export * from './utils/bitcoin.utils';
+export * from './utils/lookup-derivation-by-address';
+export * from './utils/bitcoin.network';
+export * from './utils/bitcoin.utils';
+export * from './utils/lookup-derivation-by-address';

package/src/mocks/mocks.ts

@@ -0,0 +1,39 @@
+import { createBitcoinAddress } from '../validation/bitcoin-address';
+
+// maybe these should be in mono/config?
+// from extension/tests/mocks/constants
+export const TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS = createBitcoinAddress(
+  'bc1q530dz4h80kwlzywlhx2qn0k6vdtftd93c499yq'
+);
+export const TEST_ACCOUNT_1_TAPROOT_ADDRESS = createBitcoinAddress(
+  'bc1putuzj9lyfcm8fef9jpy85nmh33cxuq9u6wyuk536t9kemdk37yjqmkc0pg'
+);
+export const TEST_ACCOUNT_2_TAPROOT_ADDRESS = createBitcoinAddress(
+  'bc1pmk2sacpfyy4v5phl8tq6eggu4e8laztep7fsgkkx0nc6m9vydjesaw0g2r'
+);
+
+export const TEST_TESNET_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS = createBitcoinAddress(
+  'tb1q4qgnjewwun2llgken94zqjrx5kpqqycaz5522d'
+);
+
+export const TEST_TESTNET_ACCOUNT_2_BTC_ADDRESS = createBitcoinAddress(
+  'tb1qr8me8t9gu9g6fu926ry5v44yp0wyljrespjtnz'
+);
+
+export const TEST_TESTNET_ACCOUNT_2_TAPROOT_ADDRESS = createBitcoinAddress(
+  'tb1pve00jmp43whpqj2wpcxtc7m8wqhz0azq689y4r7h8tmj8ltaj87qj2nj6w'
+);
+
+// coin-selection.spec
+export const recipientAddress = createBitcoinAddress('tb1qt28eagxcl9gvhq2rpj5slg7dwgxae2dn2hk93m');
+export const legacyAddress = createBitcoinAddress('15PyZveQd28E2SHZu2ugkWZBp6iER41vXj');
+export const segwitAddress = createBitcoinAddress('33SVjoCHJovrXxjDKLFSXo1h3t5KgkPzfH');
+export const taprootAddress = createBitcoinAddress(
+  'tb1parwmj7533de3k2fw2kntyqacspvhm67qnjcmpqnnpfvzu05l69nsczdywd'
+);
+export const invalidAddress = 'whoop-de-da-boop-da-de-not-a-bitcoin-address';
+
+export const inValidCharactersAddress = createBitcoinAddress(
+  'tb1&*%wmj7533de3k2fw2kntyqacspvhm67qnjcmpqnnpfvzu05l69nsczdywd'
+);
+export const inValidLengthAddress = createBitcoinAddress('tb1parwmj7533de3k2fw2kntyqacspvhm67wd');

package/src/{p2tr-address-gen.spec.ts → payments/p2tr-address-gen.spec.ts}

@@ -1,7 +1,7 @@
 import { HDKey } from '@scure/bip32';
 import { mnemonicToSeedSync } from '@scure/bip39';
 
-import { deriveAddressIndexKeychainFromAccount } from './bitcoin.utils';
+import { deriveAddressIndexKeychainFromAccount } from '../utils/bitcoin.utils';
 import { deriveTaprootAccount, getTaprootPaymentFromAddressIndex } from './p2tr-address-gen';
 
 // TODO: this is a SECRET_KEY from @tests/mocks folder.

package/src/{p2tr-address-gen.ts → payments/p2tr-address-gen.ts}

@@ -4,13 +4,13 @@ import * as btc from '@scure/btc-signer';
 import { DerivationPathDepth } from '@leather.io/crypto';
 import { BitcoinNetworkModes } from '@leather.io/models';
 
-import { getBtcSignerLibNetworkConfigByMode } from './bitcoin.network';
+import { getBtcSignerLibNetworkConfigByMode } from '../utils/bitcoin.network';
 import {
   BitcoinAccount,
   deriveAddressIndexZeroFromAccount,
   ecdsaPublicKeyToSchnorr,
   getBitcoinCoinTypeIndexByNetwork,
-} from './bitcoin.utils';
+} from '../utils/bitcoin.utils';
 
 export function makeTaprootAccountDerivationPath(
   network: BitcoinNetworkModes,

package/src/{p2wpkh-address-gen.ts → payments/p2wpkh-address-gen.ts}

@@ -4,12 +4,12 @@ import * as btc from '@scure/btc-signer';
 import { DerivationPathDepth } from '@leather.io/crypto';
 import { BitcoinNetworkModes } from '@leather.io/models';
 
-import { getBtcSignerLibNetworkConfigByMode } from './bitcoin.network';
+import { getBtcSignerLibNetworkConfigByMode } from '../utils/bitcoin.network';
 import {
   BitcoinAccount,
   deriveAddressIndexZeroFromAccount,
   getBitcoinCoinTypeIndexByNetwork,
-} from './bitcoin.utils';
+} from '../utils/bitcoin.utils';
 
 export function makeNativeSegwitAccountDerivationPath(
   network: BitcoinNetworkModes,

package/src/psbt/psbt-details.ts

@@ -1,8 +1,8 @@
-import { getPsbtTxInputs, getPsbtTxOutputs } from 'bitcoin.utils';
-
 import { BitcoinNetworkModes } from '@leather.io/models';
 import { createMoney, subtractMoney } from '@leather.io/utils';
 
+import { getPsbtTxInputs, getPsbtTxOutputs } from '../utils/bitcoin.utils';
+import { BitcoinAddress } from '../validation/bitcoin-address';
 import { getParsedInputs } from './psbt-inputs';
 import { getParsedOutputs } from './psbt-outputs';
 import { getPsbtTotals } from './psbt-totals';
@@ -10,7 +10,7 @@ import { getPsbtAsTransaction } from './utils';
 
 interface GetPsbtDetailsArgs {
   psbtHex: string;
-  psbtAddresses: string[];
+  psbtAddresses: BitcoinAddress[];
   networkMode: BitcoinNetworkModes;
   indexesToSign?: number[];
 }

package/src/psbt/psbt-inputs.ts

@@ -1,13 +1,15 @@
 import { bytesToHex } from '@noble/hashes/utils';
 import type { TransactionInput } from '@scure/btc-signer/psbt';
-import { getBtcSignerLibNetworkConfigByMode } from 'bitcoin.network';
-import { getBitcoinInputAddress, getBitcoinInputValue } from 'bitcoin.utils';
+import { BitcoinAddress, createBitcoinAddress } from 'validation/bitcoin-address';
 
 import type { BitcoinNetworkModes, Inscription } from '@leather.io/models';
 import { isDefined, isUndefined } from '@leather.io/utils';
 
+import { getBtcSignerLibNetworkConfigByMode } from '../utils/bitcoin.network';
+import { getBitcoinInputAddress, getBitcoinInputValue } from '../utils/bitcoin.utils';
+
 export interface PsbtInput {
-  address: string;
+  address: BitcoinAddress;
   index?: number;
   // TODO: inject inscription later on. getParsedInputs should be a pure function
   inscription?: Inscription;
@@ -23,7 +25,7 @@ interface GetParsedInputsArgs {
   inputs: TransactionInput[];
   indexesToSign?: number[];
   networkMode: BitcoinNetworkModes;
-  psbtAddresses: string[];
+  psbtAddresses: BitcoinAddress[];
 }
 
 interface GetParsedInputsResponse {
@@ -43,7 +45,8 @@ export function getParsedInputs({
     const inputAddress = isDefined(input.index)
       ? getBitcoinInputAddress(input, bitcoinNetwork)
       : '';
-    const isCurrentAddress = psbtAddresses.includes(inputAddress);
+    const bitcoinAddress = createBitcoinAddress(inputAddress);
+    const isCurrentAddress = psbtAddresses.includes(bitcoinAddress);
     // Flags when not signing ALL inputs/outputs (NONE, SINGLE, and ANYONECANPAY)
     const canChange =
       isCurrentAddress &&
@@ -53,7 +56,7 @@ export function getParsedInputs({
     const toSignIndex = isCurrentAddress && !signAll && indexesToSign.includes(i);
 
     return {
-      address: inputAddress,
+      address: bitcoinAddress,
       index: input.index,
       bip32Derivation: input.bip32Derivation,
       tapBip32Derivation: input.tapBip32Derivation,