@btc-vision/transaction 1.0.113 → 1.0.114

package/build/keypair/Wallet.js

@@ -1,6 +1,7 @@
 import { EcKeyPair } from './EcKeyPair.js';
 import { networks } from 'bitcoinjs-lib';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { Address } from './Address.js';
 export class Wallet {
     constructor(wallet, network = networks.bitcoin) {
         this.network = network;
@@ -8,7 +9,16 @@ export class Wallet {
         this._p2wpkh = EcKeyPair.getP2WPKHAddress(this._keypair, this.network);
         this._p2tr = EcKeyPair.getTaprootAddress(this._keypair, this.network);
         this._legacy = EcKeyPair.getLegacyAddress(this._keypair, this.network);
+        this._segwitLegacy = EcKeyPair.getLegacySegwitAddress(this._keypair, this.network);
+        this._tweakedKey = Buffer.from(EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex')), 'hex');
         this._bufferPubKey = Buffer.from(wallet.publicKey, 'hex');
+        this._address = new Address(this._keypair.publicKey);
+    }
+    get address() {
+        return this._address;
+    }
+    get tweakedPubKeyKey() {
+        return this._tweakedKey;
     }
     get keypair() {
         if (!this._keypair)
@@ -25,7 +35,10 @@ export class Wallet {
         return this._legacy;
     }
     get addresses() {
-        return [this.p2wpkh, this.p2tr, this.legacy];
+        return [this.p2wpkh, this.p2tr, this.legacy, this.segwitLegacy];
+    }
+    get segwitLegacy() {
+        return this._segwitLegacy;
     }
     get publicKey() {
         if (!this._bufferPubKey)

package/build/metadata/ContractBaseMetadata.d.ts

@@ -1,9 +1,8 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Network } from 'bitcoinjs-lib';
 export declare abstract class ContractBaseMetadata {
     protected network: Network;
-    protected abstract readonly address: Address;
+    protected abstract readonly address: string;
     protected constructor(network?: Network);
-    static getAddress(network?: Network): Address;
-    getAddress(): Address;
+    static getAddress(network?: Network): string;
+    getAddress(): string;
 }

package/build/metadata/contracts/wBTC.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Network } from 'bitcoinjs-lib';
 import { ChainId } from '../../network/ChainId.js';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
@@ -7,8 +6,8 @@ export declare class wBTC extends ContractBaseMetadata {
     readonly tokenName: string;
     readonly tokenSymbol: string;
     readonly decimals: number;
-    protected readonly address: Address;
+    protected readonly address: string;
     constructor(network?: Network, chainId?: ChainId);
-    static getAddress(network?: Network, chainId?: ChainId): Address;
+    static getAddress(network?: Network, chainId?: ChainId): string;
     private static getWBTCAddressForChain;
 }

package/build/metadata/contracts/wBTC.js

@@ -14,23 +14,21 @@ export class wBTC extends ContractBaseMetadata {
     static getAddress(network = networks.bitcoin, chainId) {
         switch (network.bech32) {
             case networks.bitcoin.bech32:
-                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin);
+                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin).p2tr(network);
             case networks.regtest.bech32:
-                return WBTC_ADDRESS_REGTEST;
+                return WBTC_ADDRESS_REGTEST.p2tr(network);
             case networks.testnet.bech32:
-                return WBTC_ADDRESS_TESTNET;
+                return WBTC_ADDRESS_TESTNET.p2tr(network);
             default:
                 throw new Error(`Invalid network: ${network.bech32}`);
         }
     }
     static getWBTCAddressForChain(chainId) {
         switch (chainId) {
-            case ChainId.Bitcoin:
-                return 'unknown';
             case ChainId.Fractal:
                 return WBTC_ADDRESS_FRACTAL;
             default:
-                throw new Error(`Invalid chainId: ${chainId}`);
+                throw new Error(`Unsupported chainId: ${chainId}`);
         }
     }
 }

package/build/metadata/tokens.d.ts

@@ -1,5 +1,5 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { ChainId } from '../network/ChainId.js';
+import { Address } from '../keypair/Address.js';
 export declare const FACTORY_ADDRESS_REGTEST: Address;
 export declare const POOL_ADDRESS_REGTEST: Address;
 export declare const WBTC_ADDRESS_REGTEST: Address;

package/build/metadata/tokens.js

@@ -1,19 +1,23 @@
 import { ChainId } from '../network/ChainId.js';
-export const FACTORY_ADDRESS_REGTEST = 'bcrt1q9pf9fnpch9z2qrp5e3dgr2avzu3mypq3km2k40';
-export const POOL_ADDRESS_REGTEST = 'bcrt1qg87nx9v9ln3qyadcn0llekzjn0hx8js46ztwky';
-export const WBTC_ADDRESS_REGTEST = 'bcrt1qamv2ejattjgsc6k3yf3zqrp0wpuyedqgjmwx0v';
-export const MOTO_ADDRESS_REGTEST = 'bcrt1qw8w4ejas2k22y54avv7hgrslg3cd0hme58h28r';
-export const ROUTER_ADDRESS_REGTEST = 'bcrt1q9yd6mk324k0q4krmlxjky0pk65ul6hkf4u35e6';
-export const FACTORY_ADDRESS_TESTNET = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';
-export const POOL_ADDRESS_TESTNET = 'tb1q6a7yw353hjmresphupytw5vczpqxtg4yrupayk';
-export const WBTC_ADDRESS_TESTNET = 'tb1qp28xna6pv47x6wflcplhu0a9hkld5shtvjx6xv';
-export const MOTO_ADDRESS_TESTNET = 'tb1q4tyhf8hpu04qjj3qaag20knun0spctultxzakw';
-export const ROUTER_ADDRESS_TESTNET = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0myhxv7tllgt';
-export const FACTORY_ADDRESS_FRACTAL = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
-export const POOL_ADDRESS_FRACTAL = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
-export const WBTC_ADDRESS_FRACTAL = 'bc1qdtzlucslvrvu4useyh9r69supqrw3w4xn9t4yv';
-export const MOTO_ADDRESS_FRACTAL = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
-export const ROUTER_ADDRESS_FRACTAL = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
+import { Address } from '../keypair/Address.js';
+function deadAddress() {
+    return Address.dead();
+}
+export const FACTORY_ADDRESS_REGTEST = deadAddress();
+export const POOL_ADDRESS_REGTEST = deadAddress();
+export const WBTC_ADDRESS_REGTEST = deadAddress();
+export const MOTO_ADDRESS_REGTEST = deadAddress();
+export const ROUTER_ADDRESS_REGTEST = deadAddress();
+export const FACTORY_ADDRESS_TESTNET = deadAddress();
+export const POOL_ADDRESS_TESTNET = deadAddress();
+export const WBTC_ADDRESS_TESTNET = deadAddress();
+export const MOTO_ADDRESS_TESTNET = deadAddress();
+export const ROUTER_ADDRESS_TESTNET = deadAddress();
+export const FACTORY_ADDRESS_FRACTAL = deadAddress();
+export const POOL_ADDRESS_FRACTAL = deadAddress();
+export const WBTC_ADDRESS_FRACTAL = deadAddress();
+export const MOTO_ADDRESS_FRACTAL = deadAddress();
+export const ROUTER_ADDRESS_FRACTAL = deadAddress();
 export var OPNetNetwork;
 (function (OPNetNetwork) {
     OPNetNetwork["Mainnet"] = "mainnet";

package/build/opnet.d.ts

@@ -43,6 +43,17 @@ export * from './wbtc/UnwrapGeneration.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';
+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';
 export * from './transaction/browser/BrowserSignerBase.js';
 export * from './transaction/browser/extensions/UnisatSigner.js';
 export * from './transaction/browser/types/Unisat.js';

package/build/opnet.js

@@ -43,6 +43,17 @@ export * from './wbtc/UnwrapGeneration.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';
+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';
 export * from './transaction/browser/BrowserSignerBase.js';
 export * from './transaction/browser/extensions/UnisatSigner.js';
 export * from './transaction/browser/types/Unisat.js';

package/build/transaction/TransactionFactory.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Transaction } from 'bitcoinjs-lib';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { ICustomTransactionParameters } from './builders/CustomScriptTransaction.js';
@@ -8,15 +7,16 @@ import { TransactionType } from './enums/TransactionType.js';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.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[];
 }
 export interface FundingTransactionResponse {
@@ -45,7 +45,7 @@ export declare class TransactionFactory {
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
-    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: Address): UTXO[];
+    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: string): UTXO[];
     private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;

package/build/transaction/TransactionFactory.js

@@ -137,7 +137,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],
         };
@@ -179,7 +180,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),
         };
     }

package/build/transaction/browser/BrowserSignerBase.d.ts

@@ -1,11 +1,10 @@
 import { Network, Psbt, Signer } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
 export declare abstract class CustomKeypair implements Signer {
     abstract network: Network;
     abstract publicKey: Buffer;
-    abstract addresses: Address[];
-    abstract p2tr: Address;
-    abstract p2wpkh: Address;
+    abstract addresses: string[];
+    abstract p2tr: string;
+    abstract p2wpkh: string;
     protected constructor();
     abstract signTaprootInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
     abstract signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;

package/build/transaction/browser/extensions/UnisatSigner.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Network, Psbt } from 'bitcoinjs-lib';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { Unisat } from '../types/Unisat.js';
@@ -12,11 +11,11 @@ export declare class UnisatSigner extends CustomKeypair {
     private isInitialized;
     constructor();
     private _p2tr;
-    get p2tr(): Address;
+    get p2tr(): string;
     private _p2wpkh;
-    get p2wpkh(): Address;
+    get p2wpkh(): string;
     private _addresses;
-    get addresses(): Address[];
+    get addresses(): string[];
     private _publicKey;
     get publicKey(): Buffer;
     _network: Network | undefined;

package/build/transaction/browser/types/Unisat.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Web3Provider } from '../Web3Provider.js';
 export declare enum UnisatNetwork {
     testnet = "testnet",
@@ -37,7 +36,7 @@ export interface ToSignInputPublicKey extends ToSignInputBase {
     readonly publicKey: string;
 }
 export interface ToSignInputAddress extends ToSignInputBase {
-    readonly address: Address;
+    readonly address: string;
 }
 export type ToSignInput = ToSignInputPublicKey | ToSignInputAddress;
 export interface PsbtSignatureOptions {
@@ -46,7 +45,7 @@ export interface PsbtSignatureOptions {
 }
 export interface Unisat {
     web3?: Web3Provider;
-    sendBitcoin(toAddress: Address, satoshis: number, options: {
+    sendBitcoin(toAddress: string, satoshis: number, options: {
         feeRate: number;
         memo?: string;
         memos?: string[];

package/build/transaction/builders/CustomScriptTransaction.d.ts

@@ -1,17 +1,16 @@
 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 { Payment, Psbt, Stack } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export interface ICustomTransactionParameters extends SharedInteractionParameters {
     readonly script: (Buffer | Stack)[];
     readonly witnesses: Buffer[];
-    readonly to: Address;
+    readonly to: string;
 }
 export declare class CustomScriptTransaction extends TransactionBuilder<TransactionType.CUSTOM_CODE> {
     type: TransactionType.CUSTOM_CODE;
-    protected readonly _scriptAddress: Address;
+    protected readonly _scriptAddress: string;
     protected tapLeafScript: TapLeafScript | null;
     private targetScriptRedeem;
     private leftOverFundsScriptRedeem;
@@ -23,8 +22,8 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     private readonly randomBytes;
     private readonly witnesses;
     constructor(parameters: ICustomTransactionParameters);
-    get scriptAddress(): Address;
-    get p2trAddress(): Address;
+    get scriptAddress(): string;
+    get p2trAddress(): string;
     getRndBytes(): Buffer;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/DeploymentTransaction.d.ts

@@ -3,7 +3,7 @@ import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
 import { Payment, Psbt } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { Address } from '@btc-vision/bsi-binary';
+import { Address } from '../../keypair/Address.js';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     static readonly MAXIMUM_CONTRACT_SIZE: number;
     type: TransactionType.DEPLOYMENT;
@@ -18,10 +18,12 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private readonly bytecode;
     private readonly calldata?;
     private readonly contractSigner;
+    private readonly _contractPubKey;
     private readonly randomBytes;
     constructor(parameters: IDeploymentParameters);
+    get contractPubKey(): string;
     get contractAddress(): Address;
-    get p2trAddress(): Address;
+    get p2trAddress(): string;
     getRndBytes(): Buffer;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/DeploymentTransaction.js

@@ -6,8 +6,8 @@ import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
-import { AddressGenerator } from '../../generators/AddressGenerator.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
+import { Address } from '../../keypair/Address.js';
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
@@ -48,7 +48,11 @@ export class DeploymentTransaction extends TransactionBuilder {
         this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes, this.calldata);
         this.scriptTree = this.getScriptTree();
         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);
+    }
+    get contractPubKey() {
+        return this._contractPubKey;
     }
     get contractAddress() {
         return this._contractAddress;

package/build/transaction/builders/MultiSignTransaction.d.ts

@@ -4,7 +4,6 @@ import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { ECPairInterface } from 'ecpair';
 export interface MultiSignParameters extends Omit<ITransactionParameters, 'priorityFee' | 'signer'> {
     readonly pubkeys: Buffer[];
@@ -12,9 +11,9 @@ export interface MultiSignParameters extends Omit<ITransactionParameters, 'prior
     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'> {
     readonly psbt: string;
@@ -32,8 +31,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     protected readonly minimumSignatures: number;
     protected readonly originalInputCount: number;
     protected readonly requestedAmount: bigint;
-    protected readonly receiver: Address;
-    protected readonly refundVault: Address;
+    protected readonly receiver: string;
+    protected readonly refundVault: string;
     protected readonly sighashTypes: number[];
     constructor(parameters: MultiSignParameters);
     static fromBase64(params: MultiSignFromBase64Params): MultiSignTransaction;

package/build/transaction/builders/TransactionBuilder.d.ts

@@ -2,7 +2,6 @@ import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
 import { PsbtInputExtended, PsbtOutputExtended, UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { ECPairInterface } from 'ecpair';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
@@ -25,15 +24,15 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected readonly feeRate: number;
     protected priorityFee: bigint;
     protected utxos: UTXO[];
-    protected to: Address | undefined;
-    protected from: Address;
+    protected to: string | undefined;
+    protected from: string;
     protected _maximumFeeRate: number;
     protected isPubKeyDestination: boolean;
     protected constructor(parameters: ITransactionParameters);
-    static getFrom(from: string | undefined, keypair: ECPairInterface | Signer, network: Network): Address;
+    static getFrom(from: string | undefined, keypair: ECPairInterface | Signer, network: Network): string;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;
     getFundingTransactionParameters(): Promise<IFundingTransactionParameters>;
-    setDestinationAddress(address: Address): void;
+    setDestinationAddress(address: string): void;
     setMaximumFeeRate(feeRate: number): void;
     signTransaction(): Promise<Transaction>;
     generateTransactionMinimalSignatures(checkPartialSigs?: boolean): Promise<void>;
@@ -41,7 +40,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;
     toAddress(): string | undefined;
-    address(): Address | undefined;
+    address(): string | undefined;
     estimateTransactionFees(): Promise<bigint>;
     rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;

package/build/transaction/builders/UnwrapSegwitTransaction.js

@@ -1,12 +1,13 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { payments } from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { PsbtTransaction } from '../processor/PsbtTransaction.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
+import { ABICoder } from '../../abi/ABICoder.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 const abiCoder = new ABICoder();
 export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
     constructor(parameters) {

package/build/transaction/builders/UnwrapTransaction.js

@@ -1,7 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { payments } from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
@@ -13,6 +12,8 @@ import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.j
 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 { BinaryWriter } from '../../buffer/BinaryWriter.js';
 const abiCoder = new ABICoder();
 const numsPoint = Buffer.from('50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0', 'hex');
 export class UnwrapTransaction extends SharedInteractionTransaction {

package/build/transaction/builders/WrapTransaction.d.ts

@@ -3,12 +3,12 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
+import { Address } from '../../keypair/Address.js';
 export declare class WrapTransaction extends SharedInteractionTransaction<TransactionType.WBTC_WRAP> {
     private static readonly WRAP_SELECTOR;
     type: TransactionType.WBTC_WRAP;
-    readonly vault: Address;
+    readonly vault: string;
     readonly amount: bigint;
     readonly receiver: Address;
     protected readonly compiledTargetScript: Buffer;

package/build/transaction/builders/WrapTransaction.js

@@ -1,20 +1,19 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
-import { TransactionBuilder } from './TransactionBuilder.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { P2TR_MS } from '../shared/P2TR_MS.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
+import { ABICoder } from '../../abi/ABICoder.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
+import { Address } from '../../keypair/Address.js';
 const abiCoder = new ABICoder();
 export class WrapTransaction extends SharedInteractionTransaction {
     constructor(parameters) {
         if (parameters.amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
             throw new Error(`Amount is below the minimum required of ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat.`);
         }
-        const receiver = parameters.receiver ||
-            TransactionBuilder.getFrom(parameters.from, parameters.signer, parameters.network);
+        const receiver = parameters.receiver || new Address(parameters.signer.publicKey);
         parameters.calldata = WrapTransaction.generateMintCalldata(parameters.amount, receiver, parameters.network);
         super(parameters);
         this.type = TransactionType.WBTC_WRAP;
@@ -42,7 +41,7 @@ export class WrapTransaction extends SharedInteractionTransaction {
             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!`);
         }
         const bufWriter = new BinaryWriter();

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -1,13 +1,13 @@
 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;
     estimatedFees?: bigint;
@@ -27,11 +27,11 @@ export interface SharedInteractionParameters extends ITransactionParameters {
 }
 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 from: Address;
+    readonly to?: string;
+    readonly from: string;
     readonly amount: bigint;
     readonly receiver?: Address;
     readonly generationParameters: WrappedGeneration;

package/build/transaction/processor/PsbtTransaction.d.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';
@@ -8,7 +7,7 @@ export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly network: Network;
 }
 export interface IWBTCUTXODocument {
-    readonly vault: Address;
+    readonly vault: string;
     readonly blockId: bigint;
     readonly hash: string;
     readonly value: bigint;
@@ -16,8 +15,8 @@ export interface IWBTCUTXODocument {
     readonly output: string;
 }
 export interface VaultUTXOs {
-    readonly vault: Address;
-    readonly publicKeys: Address[];
+    readonly vault: string;
+    readonly publicKeys: string[];
     readonly minimum: number;
     readonly utxos: IWBTCUTXODocument[];
 }

package/build/transaction/shared/P2TR_MS.d.ts

@@ -1,5 +1,4 @@
 import { Network } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
 export declare class P2TR_MS {
-    static generateMultiSigAddress(pubKeys: Buffer[], minimumSignatureRequired: number, network?: Network): Address;
+    static generateMultiSigAddress(pubKeys: Buffer[], minimumSignatureRequired: number, network?: Network): string;
 }

package/build/utils/BufferHelper.d.ts

@@ -0,0 +1,11 @@
+import { MemorySlotPointer } from './types.js';
+export declare class BufferHelper {
+    static readonly EXPECTED_BUFFER_LENGTH: number;
+    static bufferToUint8Array(buffer: Buffer | Uint8Array): Uint8Array;
+    static uint8ArrayToHex(input: Uint8Array): string;
+    static hexToUint8Array(input: string): Uint8Array;
+    static pointerToUint8Array(pointer: MemorySlotPointer): Uint8Array;
+    static uint8ArrayToPointer(input: Uint8Array): MemorySlotPointer;
+    static valueToUint8Array(value: bigint): Uint8Array;
+    static uint8ArrayToValue(input: Uint8Array): bigint;
+}