@btc-vision/transaction 1.0.112 → 1.0.114

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';
@@ -11,12 +10,13 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { PsbtInput } from 'bip174/src/lib/interfaces.js';
+import { ECPairInterface } from 'ecpair';
 
 export interface ICustomTransactionParameters extends SharedInteractionParameters {
     readonly script: (Buffer | Stack)[];
     readonly witnesses: Buffer[];
 
-    readonly to: Address;
+    readonly to: string;
 }
 
 /**
@@ -30,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
@@ -72,7 +72,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * The contract signer
      * @private
      */
-    private readonly contractSigner: Signer;
+    private readonly contractSigner: Signer | ECPairInterface;
 
     /**
      * The contract salt random bytes
@@ -112,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();
     }
 
@@ -136,7 +136,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * @protected
      */
     protected contractSignerXOnlyPubKey(): Buffer {
-        return toXOnly(this.contractSigner.publicKey);
+        return toXOnly(Buffer.from(this.contractSigner.publicKey));
     }
 
     /**
@@ -261,7 +261,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
         if (!this.tapLeafScript) {
             throw new Error('Tap leaf script is required');
         }
-        
+
         const scriptSolution = this.witnesses;
         const witness = scriptSolution
             .concat(this.tapLeafScript.script)
@@ -277,10 +277,10 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * @private
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [this.signer.publicKey];
+        const pubkeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.contractSigner) {
-            pubkeys.push(this.contractSigner.publicKey);
+            pubkeys.push(Buffer.from(this.contractSigner.publicKey));
         }
 
         return pubkeys;

package/src/transaction/builders/DeploymentTransaction.ts

@@ -10,9 +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;
@@ -75,7 +75,13 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * The contract signer
      * @private
      */
-    private readonly contractSigner: Signer;
+    private readonly contractSigner: Signer | ECPairInterface;
+
+    /**
+     * The contract public key
+     * @private
+     */
+    private readonly _contractPubKey: string;
 
     /**
      * The contract salt random bytes
@@ -100,7 +106,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
 
         this.deploymentGenerator = new DeploymentGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.contractSignerXOnlyPubKey(),
             this.network,
         );
@@ -115,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;
     }
 
     /**
@@ -128,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();
     }
 
@@ -145,7 +159,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * @protected
      */
     protected contractSignerXOnlyPubKey(): Buffer {
-        return toXOnly(this.contractSigner.publicKey);
+        return toXOnly(Buffer.from(this.contractSigner.publicKey));
     }
 
     /**
@@ -323,10 +337,10 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * @private
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [this.signer.publicKey];
+        const pubkeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.contractSigner) {
-            pubkeys.push(this.contractSigner.publicKey);
+            pubkeys.push(Buffer.from(this.contractSigner.publicKey));
         }
 
         return pubkeys;

package/src/transaction/builders/FundingTransaction.ts

@@ -2,6 +2,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
+import { ECPairInterface } from 'ecpair';
 
 export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     public readonly type: TransactionType.FUNDING = TransactionType.FUNDING;
@@ -64,7 +65,7 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
         }
     }
 
-    protected override getSignerKey(): Signer {
+    protected override getSignerKey(): Signer | ECPairInterface {
         return this.signer;
     }
 }

package/src/transaction/builders/MultiSignTransaction.ts

@@ -6,10 +6,10 @@ 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';
+import { ECPairInterface } from 'ecpair';
 
 export interface MultiSignParameters
     extends Omit<ITransactionParameters, 'priorityFee' | 'signer'> {
@@ -18,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'> {
@@ -61,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
@@ -172,7 +172,7 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      */
     public static signPartial(
         psbt: Psbt,
-        signer: Signer,
+        signer: Signer | ECPairInterface,
         originalInputCount: number,
         minimums: number[],
     ): {
@@ -498,7 +498,10 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      * @returns {Promise<boolean>}
      * @throws {Error} - If something went wrong while building the transaction
      */
-    protected override async internalBuildTransaction(transaction: Psbt, checkPartialSigs: boolean = false): Promise<boolean> {
+    protected override async internalBuildTransaction(
+        transaction: Psbt,
+        checkPartialSigs: boolean = false,
+    ): Promise<boolean> {
         const inputs: PsbtInputExtended[] = this.getInputs();
         const outputs: PsbtOutputExtended[] = this.getOutputs();
 

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -50,7 +50,7 @@ export abstract class SharedInteractionTransaction<
      * Script signer for the interaction
      * @protected
      */
-    protected readonly scriptSigner: Signer;
+    protected readonly scriptSigner: Signer | ECPairInterface;
 
     /**
      * Disable auto refund
@@ -73,7 +73,7 @@ export abstract class SharedInteractionTransaction<
         this.scriptSigner = this.generateKeyPairFromSeed();
 
         this.calldataGenerator = new CalldataGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );
@@ -113,7 +113,7 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer} The internal pubkey as an x-only key
      */
     protected scriptSignerXOnlyPubKey(): Buffer {
-        return toXOnly(this.scriptSigner.publicKey);
+        return toXOnly(Buffer.from(this.scriptSigner.publicKey));
     }
 
     /**
@@ -362,10 +362,10 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer[]} The public keys
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [this.signer.publicKey];
+        const pubkeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.scriptSigner) {
-            pubkeys.push(this.scriptSigner.publicKey);
+            pubkeys.push(Buffer.from(this.scriptSigner.publicKey));
         }
 
         return pubkeys;

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';
@@ -43,65 +42,79 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @description Cost in satoshis of the transaction fee
      */
     public transactionFee: bigint = 0n;
+
     /**
      * @description The estimated fees of the transaction
      */
     public estimatedFees: bigint = 0n;
+
     /**
      * @param {ITransactionParameters} parameters - The transaction parameters
      */
-
     public optionalOutputs: PsbtOutputExtended[] | undefined;
+
     /**
      * @description The transaction itself.
      */
     protected transaction: Psbt;
+
     /**
      * @description Inputs to update later on.
      */
     protected readonly updateInputs: UpdateInput[] = [];
+
     /**
      * @description The outputs of the transaction
      */
     protected readonly outputs: PsbtOutputExtended[] = [];
+
     /**
      * @description Output that will be used to pay the fees
      */
     protected feeOutput: PsbtOutputExtended | null = null;
+
     /**
      * @description The total amount of satoshis in the inputs
      */
     protected totalInputAmount: bigint;
+
     /**
      * @description The signer of the transaction
      */
-    protected readonly signer: Signer;
+    protected readonly signer: Signer | ECPairInterface;
+
     /**
      * @description The network where the transaction will be broadcasted
      */
     protected readonly network: Network;
+
     /**
      * @description The fee rate of the transaction
      */
     protected readonly feeRate: number;
+
     /**
      * @description The opnet priority fee of the transaction
      */
     protected priorityFee: bigint;
+
     /**
      * @description The utxos used in the transaction
      */
     protected utxos: UTXO[];
+
     /**
      * @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
      */
@@ -131,11 +144,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
         this.optionalOutputs = parameters.optionalOutputs;
 
-        this.from = TransactionBuilder.getFrom(
-            parameters.from,
-            this.signer as ECPairInterface,
-            this.network,
-        );
+        this.from = TransactionBuilder.getFrom(parameters.from, this.signer, this.network);
 
         this.totalInputAmount = this.calculateTotalUTXOAmount();
 
@@ -151,9 +160,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
     public static getFrom(
         from: string | undefined,
-        keypair: ECPairInterface,
+        keypair: ECPairInterface | Signer,
         network: Network,
-    ): Address {
+    ): string {
         return from || EcKeyPair.getTaprootAddress(keypair, network);
     }
 
@@ -213,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()
     }
 
@@ -344,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;
@@ -352,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,13 +3,16 @@ 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';
 import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/PsbtTransaction.js';
 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();
 
@@ -196,7 +199,10 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction<Transa
      * @returns {Promise<boolean>}
      * @throws {Error} - If something went wrong while building the transaction
      */
-    protected async internalBuildTransaction(transaction: Psbt, checkPartialSigs: boolean = false): Promise<boolean> {
+    protected async internalBuildTransaction(
+        transaction: Psbt,
+        checkPartialSigs: boolean = false,
+    ): Promise<boolean> {
         if (transaction.data.inputs.length === 0) {
             const inputs: PsbtInputExtended[] = this.getInputs();
             const outputs: PsbtOutputExtended[] = this.getOutputs();
@@ -300,12 +306,12 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction<Transa
     /**
      * @description Add vault inputs to the transaction
      * @param {VaultUTXOs} vault The vault UTXOs
-     * @param {Signer} [firstSigner] The first signer
+     * @param {Signer | ECPairInterface} [firstSigner] The first signer
      * @private
      */
     private async addVaultInputs(
         vault: VaultUTXOs,
-        firstSigner: Signer = this.signer,
+        firstSigner: Signer | ECPairInterface = this.signer,
     ): Promise<void> {
         const p2wshOutput = this.generateMultiSignRedeemScript(vault.publicKeys, vault.minimum);
         for (const utxo of vault.utxos) {