@btc-vision/transaction 1.0.113 → 1.0.114

package/src/metadata/tokens.ts

@@ -1,26 +1,31 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { ChainId } from '../network/ChainId.js';
+import { Address } from '../keypair/Address.js';
+
+function deadAddress(): Address {
+    return Address.dead();
+}
 
 // Addresses Regtest
-export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1q9pf9fnpch9z2qrp5e3dgr2avzu3mypq3km2k40';
-export const POOL_ADDRESS_REGTEST: Address = 'bcrt1qg87nx9v9ln3qyadcn0llekzjn0hx8js46ztwky';
-export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qamv2ejattjgsc6k3yf3zqrp0wpuyedqgjmwx0v';
-export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1qw8w4ejas2k22y54avv7hgrslg3cd0hme58h28r';
-export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1q9yd6mk324k0q4krmlxjky0pk65ul6hkf4u35e6';
+export const FACTORY_ADDRESS_REGTEST: Address = deadAddress();
+
+export const POOL_ADDRESS_REGTEST: Address = deadAddress();
+export const WBTC_ADDRESS_REGTEST: Address = deadAddress();
+export const MOTO_ADDRESS_REGTEST: Address = deadAddress();
+export const ROUTER_ADDRESS_REGTEST: Address = deadAddress();
 
 // Addresses Testnet
-export const FACTORY_ADDRESS_TESTNET: Address = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';
-export const POOL_ADDRESS_TESTNET: Address = 'tb1q6a7yw353hjmresphupytw5vczpqxtg4yrupayk';
-export const WBTC_ADDRESS_TESTNET: Address = 'tb1qp28xna6pv47x6wflcplhu0a9hkld5shtvjx6xv';
-export const MOTO_ADDRESS_TESTNET: Address = 'tb1q4tyhf8hpu04qjj3qaag20knun0spctultxzakw';
-export const ROUTER_ADDRESS_TESTNET: Address = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0myhxv7tllgt';
+export const FACTORY_ADDRESS_TESTNET: Address = deadAddress();
+export const POOL_ADDRESS_TESTNET: Address = deadAddress();
+export const WBTC_ADDRESS_TESTNET: Address = deadAddress();
+export const MOTO_ADDRESS_TESTNET: Address = deadAddress();
+export const ROUTER_ADDRESS_TESTNET: Address = deadAddress();
 
 // Addresses Fractal
-export const FACTORY_ADDRESS_FRACTAL: Address = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
-export const POOL_ADDRESS_FRACTAL: Address = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
-export const WBTC_ADDRESS_FRACTAL: Address = 'bc1qdtzlucslvrvu4useyh9r69supqrw3w4xn9t4yv';
-export const MOTO_ADDRESS_FRACTAL: Address = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
-export const ROUTER_ADDRESS_FRACTAL: Address = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
+export const FACTORY_ADDRESS_FRACTAL: Address = deadAddress();
+export const POOL_ADDRESS_FRACTAL: Address = deadAddress();
+export const WBTC_ADDRESS_FRACTAL: Address = deadAddress();
+export const MOTO_ADDRESS_FRACTAL: Address = deadAddress();
+export const ROUTER_ADDRESS_FRACTAL: Address = deadAddress();
 
 export enum OPNetNetwork {
     Mainnet = 'mainnet',

package/src/opnet.ts

@@ -73,6 +73,19 @@ export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';
 
+/** Binary */
+export * from './utils/BufferHelper.js';
+export * from './utils/types.js';
+export * from './keypair/Address.js';
+export * from './event/NetEvent.js';
+export * from './deterministic/DeterministicMap.js';
+export * from './deterministic/DeterministicSet.js';
+export * from './deterministic/AddressMap.js';
+export * from './deterministic/AddressSet.js';
+export * from './abi/ABICoder.js';
+export * from './buffer/BinaryWriter.js';
+export * from './buffer/BinaryReader.js';
+
 /** Custom signers */
 export * from './transaction/browser/BrowserSignerBase.js';
 export * from './transaction/browser/extensions/UnisatSigner.js';

package/src/transaction/TransactionFactory.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Psbt, Transaction } from 'bitcoinjs-lib';
 import { Output } from 'bitcoinjs-lib/src/transaction.js';
 import { currentConsensus, currentConsensusConfig } from '../consensus/ConsensusConfig.js';
@@ -30,17 +29,18 @@ import { PSBTTypes } from './psbt/PSBTTypes.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
 
-    readonly contractAddress: Address;
-    readonly p2trAddress: Address;
+    readonly contractAddress: string;
+    readonly contractPubKey: string;
+    readonly p2trAddress: string;
 
     readonly utxos: UTXO[];
 }
 
 export interface WrapResult {
     readonly transaction: [string, string];
-    readonly vaultAddress: Address;
+    readonly vaultAddress: string;
     readonly amount: bigint;
-    readonly receiverAddress: Address;
+    readonly receiverAddress: string;
     readonly utxos: UTXO[];
 }
 
@@ -277,7 +277,8 @@ export class TransactionFactory {
 
         return {
             transaction: [signedTransaction.toHex(), outTx.toHex()],
-            contractAddress: finalTransaction.contractAddress,
+            contractAddress: finalTransaction.contractAddress.p2tr(deploymentParameters.network),
+            contractPubKey: finalTransaction.contractPubKey,
             p2trAddress: finalTransaction.p2trAddress,
             utxos: [refundUTXO],
         };
@@ -344,7 +345,7 @@ export class TransactionFactory {
             transaction: [signedTransaction.tx.toHex(), outTx.toHex()],
             vaultAddress: finalTransaction.vault,
             amount: finalTransaction.amount,
-            receiverAddress: finalTransaction.receiver,
+            receiverAddress: finalTransaction.receiver.p2tr(wrapParameters.network),
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, wrapParameters.from, 1),
         };
     }
@@ -522,12 +523,12 @@ export class TransactionFactory {
      * Get all new UTXOs of a generated transaction.
      * @param {TransactionBuilder<TransactionType>} original - The original transaction
      * @param {Transaction} tx - The transaction
-     * @param {Address} to - The address to filter
+     * @param {string} to - The address to filter
      */
     public getAllNewUTXOs(
         original: TransactionBuilder<TransactionType>,
         tx: Transaction,
-        to: Address,
+        to: string,
     ): UTXO[] {
         const outputs = original.getOutputs();
 
@@ -613,7 +614,7 @@ export class TransactionFactory {
         return params.priorityFee;
     }
 
-    private getUTXOAsTransaction(tx: Transaction, to: Address, index: number): UTXO[] {
+    private getUTXOAsTransaction(tx: Transaction, to: string, index: number): UTXO[] {
         if (!tx.outs[index]) return [];
 
         const out: Output = tx.outs[index];

package/src/transaction/browser/BrowserSignerBase.ts

@@ -1,5 +1,4 @@
 import { Network, Psbt, Signer } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
 
 /**
  * Create a custom keypair.
@@ -10,10 +9,10 @@ export abstract class CustomKeypair implements Signer {
 
     public abstract publicKey: Buffer;
 
-    public abstract addresses: Address[];
+    public abstract addresses: string[];
 
-    public abstract p2tr: Address;
-    public abstract p2wpkh: Address;
+    public abstract p2tr: string;
+    public abstract p2wpkh: string;
 
     protected constructor() {}
 

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { TapScriptSig } from 'bip174/src/lib/interfaces.js';
 import { Network, networks, Psbt } from 'bitcoinjs-lib';
 import { ECPairInterface } from 'ecpair';
@@ -24,9 +23,9 @@ export class UnisatSigner extends CustomKeypair {
         }
     }
 
-    private _p2tr: Address | undefined;
+    private _p2tr: string | undefined;
 
-    public get p2tr(): Address {
+    public get p2tr(): string {
         if (!this._p2tr) {
             throw new Error('P2TR address not set');
         }
@@ -34,9 +33,9 @@ export class UnisatSigner extends CustomKeypair {
         return this._p2tr;
     }
 
-    private _p2wpkh: Address | undefined;
+    private _p2wpkh: string | undefined;
 
-    public get p2wpkh(): Address {
+    public get p2wpkh(): string {
         if (!this._p2wpkh) {
             throw new Error('P2PKH address not set');
         }
@@ -44,9 +43,9 @@ export class UnisatSigner extends CustomKeypair {
         return this._p2wpkh;
     }
 
-    private _addresses: Address[] | undefined;
+    private _addresses: string[] | undefined;
 
-    public get addresses(): Address[] {
+    public get addresses(): string[] {
         if (!this._addresses) {
             throw new Error('Addresses not set');
         }

package/src/transaction/browser/types/Unisat.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Web3Provider } from '../Web3Provider.js';
 
 export enum UnisatNetwork {
@@ -45,7 +44,7 @@ export interface ToSignInputPublicKey extends ToSignInputBase {
 }
 
 export interface ToSignInputAddress extends ToSignInputBase {
-    readonly address: Address;
+    readonly address: string;
 }
 
 export type ToSignInput = ToSignInputPublicKey | ToSignInputAddress;
@@ -59,7 +58,7 @@ export interface Unisat {
     web3?: Web3Provider;
 
     sendBitcoin(
-        toAddress: Address,
+        toAddress: string,
         satoshis: number,
         options: { feeRate: number; memo?: string; memos?: string[] },
     ): Promise<string>;

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -2,7 +2,6 @@ import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { crypto as bitCrypto, Payment, Psbt, Signer, Stack } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
@@ -17,7 +16,7 @@ export interface ICustomTransactionParameters extends SharedInteractionParameter
     readonly script: (Buffer | Stack)[];
     readonly witnesses: Buffer[];
 
-    readonly to: Address;
+    readonly to: string;
 }
 
 /**
@@ -31,7 +30,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * The contract address
      * @protected
      */
-    protected readonly _scriptAddress: Address;
+    protected readonly _scriptAddress: string;
     /**
      * The tap leaf script
      * @private
@@ -113,14 +112,14 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
     /**
      * @description Get the contract address (PKSH)
      */
-    public get scriptAddress(): Address {
+    public get scriptAddress(): string {
         return this._scriptAddress;
     }
 
     /**
      * @description Get the P2TR address
      */
-    public get p2trAddress(): Address {
+    public get p2trAddress(): string {
         return this.to || this.getScriptAddress();
     }
 

package/src/transaction/builders/DeploymentTransaction.ts

@@ -10,10 +10,9 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { Compressor } from '../../bytecode/Compressor.js';
-import { AddressGenerator } from '../../generators/AddressGenerator.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { ECPairInterface } from 'ecpair';
+import { Address } from '../../keypair/Address.js';
 
 export class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     public static readonly MAXIMUM_CONTRACT_SIZE = 128 * 1024;
@@ -78,6 +77,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      */
     private readonly contractSigner: Signer | ECPairInterface;
 
+    /**
+     * The contract public key
+     * @private
+     */
+    private readonly _contractPubKey: string;
+
     /**
      * The contract salt random bytes
      * @private
@@ -116,7 +121,15 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
 
         this.internalInit();
 
-        this._contractAddress = AddressGenerator.generatePKSH(this.contractSeed, this.network);
+        this._contractPubKey = '0x' + this.contractSigner.publicKey.toString('hex');
+        this._contractAddress = new Address(this.contractSigner.publicKey); //AddressGenerator.generatePKSH(this.contractSeed, this.network);
+    }
+
+    /**
+     * Get the contract public key
+     */
+    public get contractPubKey(): string {
+        return this._contractPubKey;
     }
 
     /**
@@ -129,7 +142,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
     /**
      * @description Get the P2TR address
      */
-    public get p2trAddress(): Address {
+    public get p2trAddress(): string {
         return this.to || this.getScriptAddress();
     }
 

package/src/transaction/builders/MultiSignTransaction.ts

@@ -6,7 +6,6 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
 import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
@@ -19,9 +18,9 @@ export interface MultiSignParameters
     readonly from?: undefined;
     readonly to?: undefined;
     readonly psbt?: Psbt;
-    readonly receiver: Address;
+    readonly receiver: string;
     readonly requestedAmount: bigint;
-    readonly refundVault: Address;
+    readonly refundVault: string;
 }
 
 export interface MultiSignFromBase64Params extends Omit<MultiSignParameters, 'psbt'> {
@@ -62,8 +61,8 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
     protected readonly originalInputCount: number = 0;
     protected readonly requestedAmount: bigint;
 
-    protected readonly receiver: Address;
-    protected readonly refundVault: Address;
+    protected readonly receiver: string;
+    protected readonly refundVault: string;
     /**
      * @description Sign hash types
      * @protected

package/src/transaction/builders/TransactionBuilder.ts

@@ -8,7 +8,6 @@ import {
     ITransactionParameters,
 } from '../interfaces/ITransactionParameters.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { ECPairInterface } from 'ecpair';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -108,13 +107,13 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @description The address where the transaction is sent to
      * @protected
      */
-    protected to: Address | undefined;
+    protected to: string | undefined;
 
     /**
      * @description The address where the transaction is sent from
      * @protected
      */
-    protected from: Address;
+    protected from: string;
 
     /**
      * @description The maximum fee rate of the transaction
@@ -163,7 +162,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         from: string | undefined,
         keypair: ECPairInterface | Signer,
         network: Network,
-    ): Address {
+    ): string {
         return from || EcKeyPair.getTaprootAddress(keypair, network);
     }
 
@@ -223,9 +222,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
     /**
      * Set the destination address of the transaction
-     * @param {Address} address - The address to set
+     * @param {string} address - The address to set
      */
-    public setDestinationAddress(address: Address): void {
+    public setDestinationAddress(address: string): void {
         this.to = address; // this.getScriptAddress()
     }
 
@@ -354,7 +353,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
     /**
      * Receiver address.
      * @public
-     * @returns {Address} - The receiver address
+     * @returns {string} - The receiver address
      */
     public toAddress(): string | undefined {
         return this.to;
@@ -362,9 +361,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
     /**
      * @description Returns the script address
-     * @returns {Address} - The script address
+     * @returns {string} - The script address
      */
-    public address(): Address | undefined {
+    public address(): string | undefined {
         return this.tapData?.address;
     }
 

package/src/transaction/builders/UnwrapSegwitTransaction.ts

@@ -3,7 +3,6 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ABICoder, BinaryWriter, Selector } from '@btc-vision/bsi-binary';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { payments, Psbt, Signer } from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
@@ -11,6 +10,9 @@ import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/Psb
 import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { ECPairInterface } from 'ecpair';
+import { Selector } from '../../utils/types.js';
+import { ABICoder } from '../../abi/ABICoder.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 const abiCoder: ABICoder = new ABICoder();
 

package/src/transaction/builders/UnwrapTransaction.ts

@@ -3,7 +3,6 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ABICoder, BinaryWriter, Selector } from '@btc-vision/bsi-binary';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { Network, Payment, payments, Psbt } from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
@@ -17,6 +16,9 @@ import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Features } from '../../generators/Features.js';
+import { ABICoder } from '../../abi/ABICoder.js';
+import { Selector } from '../../utils/types.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 const abiCoder: ABICoder = new ABICoder();
 const numsPoint: Buffer = Buffer.from(
@@ -140,22 +142,6 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
         return Buffer.from(bufWriter.getBuffer());
     }
 
-    /*public tweakScalarPoints(): Uint8Array {
-        const key: Uint8Array = (this.signer as ECPairInterface).privateKey as Uint8Array;
-        //const r = bitcoin.crypto.sha256(Buffer.from('WTF_IS_OP_NET!', 'utf-8'));
-        const rG = ecc.pointMultiply(
-            Buffer.from(this.internalPubKeyToXOnly()), //EcKeyPair.fromPrivateKey(r).publicKey.subarray(1)
-            key,
-        );
-
-        if (!rG) throw new Error('Failed to tweak rG');
-
-        const tweaked = ecc.pointAdd(this.numsPoint, rG);
-        if (!tweaked) throw new Error('Failed to tweak rG');
-
-        return Buffer.from(tweaked);
-    }*/
-
     /**
      * @description Signs the transaction
      * @public

package/src/transaction/builders/WrapTransaction.ts

@@ -4,14 +4,15 @@ import { PsbtOutputExtendedAddress, TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { ABICoder, Address, BinaryWriter, Selector } from '@btc-vision/bsi-binary';
-import { TransactionBuilder } from './TransactionBuilder.js';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { Network } from 'bitcoinjs-lib';
 import { P2TR_MS } from '../shared/P2TR_MS.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
+import { Selector } from '../../utils/types.js';
+import { ABICoder } from '../../abi/ABICoder.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
+import { Address } from '../../keypair/Address.js';
 
 const abiCoder: ABICoder = new ABICoder();
 
@@ -31,7 +32,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
      * @private
      * @readonly
      */
-    public readonly vault: Address;
+    public readonly vault: string;
 
     /**
      * The amount to wrap
@@ -91,9 +92,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
             );
         }
 
-        const receiver: Address =
-            parameters.receiver ||
-            TransactionBuilder.getFrom(parameters.from, parameters.signer, parameters.network);
+        const receiver: Address = parameters.receiver || new Address(parameters.signer.publicKey);
 
         parameters.calldata = WrapTransaction.generateMintCalldata(
             parameters.amount,
@@ -146,7 +145,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
         if (!amount) throw new Error('Amount is required');
         if (!to) throw new Error('To address is required');
 
-        if (!AddressVerificator.isValidP2TRAddress(to, network)) {
+        if (!to.isValid(network)) {
             throw new Error(
                 `Oops! The address ${to} is not a valid P2TR address! If you wrap at this address, your funds will be lost!`,
             );

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -1,14 +1,15 @@
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from './Tap.js';
+import { Address } from '../../keypair/Address.js';
 
 export interface ITransactionParameters extends ITweakedTransactionData {
-    readonly from?: Address;
-    readonly to?: Address;
+    readonly from?: string;
+    readonly to?: string;
+
     utxos: UTXO[];
 
     nonWitnessUtxo?: Buffer;
@@ -39,13 +40,13 @@ export interface IInteractionParameters
     extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly calldata: Buffer;
 
-    readonly to: Address;
+    readonly to: string;
 }
 
 export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
-    readonly to?: Address;
+    readonly to?: string;
+    readonly from: string;
 
-    readonly from: Address;
     readonly amount: bigint;
     readonly receiver?: Address;
 

package/src/transaction/processor/PsbtTransaction.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
 import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
@@ -10,7 +9,7 @@ export interface PsbtTransactionData extends ITweakedTransactionData {
 }
 
 export interface IWBTCUTXODocument {
-    readonly vault: Address;
+    readonly vault: string;
     readonly blockId: bigint;
 
     readonly hash: string;
@@ -21,8 +20,8 @@ export interface IWBTCUTXODocument {
 }
 
 export interface VaultUTXOs {
-    readonly vault: Address;
-    readonly publicKeys: Address[];
+    readonly vault: string;
+    readonly publicKeys: string[];
     readonly minimum: number;
     readonly utxos: IWBTCUTXODocument[];
 }

package/src/transaction/shared/P2TR_MS.ts

@@ -1,5 +1,4 @@
 import { Network, networks } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { MultiSignParameters, MultiSignTransaction } from '../builders/MultiSignTransaction.js';
 
@@ -9,14 +8,14 @@ export class P2TR_MS {
      * @param {Buffer[]} pubKeys - The public keys to use
      * @param {number} minimumSignatureRequired - The minimum number of signatures required
      * @param {Network} network - The network to use
-     * @returns {Address} - The generated address
+     * @returns {string} - The generated address
      * @throws {Error} - If the address cannot be generated
      */
     public static generateMultiSigAddress(
         pubKeys: Buffer[],
         minimumSignatureRequired: number,
         network: Network = networks.bitcoin,
-    ): Address {
+    ): string {
         const publicKeys: Buffer[] = EcKeyPair.verifyPubKeys(pubKeys, network);
         if (publicKeys.length !== pubKeys.length) throw new Error(`Contains invalid public keys`);