@btc-vision/transaction 1.0.112 → 1.0.114

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(
@@ -109,7 +111,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
         this.contractSecret = this.generateSecret();
 
         this.calldataGenerator = new CalldataGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );
@@ -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
@@ -372,7 +358,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
 
         return [
             this.contractSecret,
-            toXOnly(this.signer.publicKey),
+            toXOnly(Buffer.from(this.signer.publicKey)),
             input.tapScriptSig[0].signature,
             input.tapScriptSig[1].signature,
         ];

package/src/transaction/builders/WrapTransaction.ts

@@ -4,15 +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 { ECPairInterface } from 'ecpair';
 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();
 
@@ -32,7 +32,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
      * @private
      * @readonly
      */
-    public readonly vault: Address;
+    public readonly vault: string;
 
     /**
      * The amount to wrap
@@ -92,13 +92,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
             );
         }
 
-        const receiver: Address =
-            parameters.receiver ||
-            TransactionBuilder.getFrom(
-                parameters.from,
-                parameters.signer as ECPairInterface,
-                parameters.network,
-            );
+        const receiver: Address = parameters.receiver || new Address(parameters.signer.publicKey);
 
         parameters.calldata = WrapTransaction.generateMintCalldata(
             parameters.amount,
@@ -151,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`);
 

package/src/transaction/shared/TweakedTransaction.ts

@@ -11,7 +11,7 @@ import { ChainId } from '../../network/ChainId.js';
 import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
 
 export interface ITweakedTransactionData {
-    readonly signer: Signer;
+    readonly signer: Signer | ECPairInterface;
     readonly network: Network;
     readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
@@ -34,11 +34,11 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * @description Was the transaction signed?
      */
-    protected signer: Signer;
+    protected signer: Signer | ECPairInterface;
     /**
      * @description Tweaked signer
      */
-    protected tweakedSigner?: Signer;
+    protected tweakedSigner?: ECPairInterface;
     /**
      * @description The network of the transaction
      */
@@ -190,7 +190,7 @@ export abstract class TweakedTransaction extends Logger {
         transaction: Psbt,
         input: PsbtInput,
         i: number,
-        signer: Signer,
+        signer: Signer | ECPairInterface,
         sighashTypes: number[],
     ): void {
         if (sighashTypes && sighashTypes[0]) input.sighashType = sighashTypes[0];
@@ -336,9 +336,9 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * Returns the signer key.
      * @protected
-     * @returns {Signer}
+     * @returns {Signer | ECPairInterface}
      */
-    protected getSignerKey(): Signer {
+    protected getSignerKey(): Signer | ECPairInterface {
         return this.signer;
     }
 
@@ -354,7 +354,7 @@ export abstract class TweakedTransaction extends Logger {
         transaction: Psbt,
         input: PsbtInput,
         i: number,
-        signer?: Signer,
+        signer?: Signer | ECPairInterface,
     ): Promise<void> {
         const signHash =
             this.sighashTypes && this.sighashTypes.length
@@ -367,7 +367,7 @@ export abstract class TweakedTransaction extends Logger {
         if (input.tapInternalKey) {
             if (!this.tweakedSigner) this.tweakSigner();
 
-            let tweakedSigner: Signer | undefined;
+            let tweakedSigner: ECPairInterface | undefined;
             if (signer !== this.signer) {
                 tweakedSigner = this.getTweakedSigner(true, signer);
             } else {
@@ -481,7 +481,7 @@ export abstract class TweakedTransaction extends Logger {
      * @returns {Buffer}
      */
     protected internalPubKeyToXOnly(): Buffer {
-        return toXOnly(this.signer.publicKey);
+        return toXOnly(Buffer.from(this.signer.publicKey));
     }
 
     /**
@@ -507,12 +507,12 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * Get the tweaked signer
      * @private
-     * @returns {Signer} The tweaked signer
+     * @returns {ECPairInterface} The tweaked signer
      */
     protected getTweakedSigner(
         useTweakedHash: boolean = false,
-        signer: Signer = this.signer,
-    ): Signer | undefined {
+        signer: Signer | ECPairInterface = this.signer,
+    ): ECPairInterface | undefined {
         const settings: TweakSettings = {
             network: this.network,
         };

package/src/utils/BufferHelper.ts

@@ -0,0 +1,71 @@
+import { MemorySlotPointer } from './types.js';
+
+export class BufferHelper {
+    public static readonly EXPECTED_BUFFER_LENGTH: number = 32;
+
+    public static bufferToUint8Array(buffer: Buffer | Uint8Array): Uint8Array {
+        if (Buffer.isBuffer(buffer)) {
+            const length: number = buffer.byteLength;
+            const arrayBuffer: ArrayBuffer = new ArrayBuffer(length);
+
+            const view: Uint8Array = new Uint8Array(arrayBuffer);
+            for (let i = 0; i < length; ++i) {
+                view[i] = buffer[i];
+            }
+
+            return view;
+        }
+
+        return buffer;
+    }
+
+    public static uint8ArrayToHex(input: Uint8Array): string {
+        return Buffer.from(input, 0, input.byteLength).toString('hex');
+    }
+
+    public static hexToUint8Array(input: string): Uint8Array {
+        if (input.startsWith('0x')) {
+            input = input.substring(2); // Remove the '0x' prefix
+        }
+
+        if (input.length % 2 !== 0) {
+            input = '0' + input; // Pad with a leading zero if the length is odd
+        }
+
+        const length = input.length / 2;
+        const buffer = new Uint8Array(length);
+
+        for (let i = 0; i < length; i++) {
+            // Use substring(i * 2, i * 2 + 2) to replace substr(i * 2, 2)
+            buffer[i] = parseInt(input.substring(i * 2, i * 2 + 2), 16);
+        }
+
+        return buffer;
+    }
+
+    public static pointerToUint8Array(pointer: MemorySlotPointer): Uint8Array {
+        const pointerHex = pointer.toString(16).padStart(64, '0');
+
+        return BufferHelper.hexToUint8Array(pointerHex);
+    }
+
+    public static uint8ArrayToPointer(input: Uint8Array): MemorySlotPointer {
+        const hex = BufferHelper.uint8ArrayToHex(input);
+
+        return BigInt('0x' + hex);
+    }
+
+    public static valueToUint8Array(value: bigint): Uint8Array {
+        const valueHex = value.toString(16).padStart(64, '0');
+
+        return BufferHelper.hexToUint8Array(valueHex);
+    }
+
+    public static uint8ArrayToValue(input: Uint8Array): bigint {
+        const hex = BufferHelper.uint8ArrayToHex(input);
+
+        if (!hex) return BigInt(0);
+
+        return BigInt('0x' + hex);
+    }
+}

package/src/utils/types.ts

@@ -0,0 +1,19 @@
+import { DeterministicMap } from '../deterministic/DeterministicMap.js';
+
+export const ADDRESS_BYTE_LENGTH: number = 32;
+
+export type MemorySlotPointer = bigint;
+
+export type BufferLike = Uint8Array | Buffer;
+
+export type MemorySlotData<T> = T;
+export type PointerStorage = DeterministicMap<MemorySlotPointer, MemorySlotData<bigint>>;
+
+export type i32 = number;
+export type u8 = number;
+export type u16 = number;
+export type u32 = number;
+
+export type u64 = bigint;
+
+export type Selector = number;

package/src/utxo/OPNetLimitedProvider.ts

@@ -1,7 +1,6 @@
-import { Address } from '@btc-vision/bsi-binary';
 import { Network } from 'bitcoinjs-lib';
 import { currentConsensusConfig } from '../consensus/ConsensusConfig.js';
-import { IFundingTransactionParameters, TransactionFactory, Wallet } from '../opnet.js';
+import { Address, IFundingTransactionParameters, TransactionFactory, Wallet } from '../opnet.js';
 import { UnwrappedGenerationParameters, WrappedGenerationParameters } from '../wbtc/Generate.js';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
@@ -249,7 +248,6 @@ export class OPNetLimitedProvider {
 
         const url: string = `${this.opnetAPIUrl}/api/v1/${this.rpc}`;
 
-        //try {
         const resp: Response = await fetch(url, params);
         if (!resp.ok) {
             throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
@@ -274,9 +272,6 @@ export class OPNetLimitedProvider {
         }
 
         return result;
-        //} catch (e) {
-        //    throw e;
-        //}
     }
 
     /**
@@ -305,7 +300,7 @@ export class OPNetLimitedProvider {
     /**
      * Fetches the wrap parameters from the OPNET node
      * @param {bigint} amount - The amount to wrap
-     * @param {Address} receiver - The receiver address
+     * @param {string} receiver - The receiver address
      * @returns {Promise<UnwrapGeneration | undefined>} - The wrap parameters fetched
      * @throws {Error} - If wrap parameters could not be fetched
      */
@@ -323,7 +318,7 @@ export class OPNetLimitedProvider {
             throw new Error('Invalid receiver address');
         }
 
-        const params = [1, amount.toString(), receiver];
+        const params = [1, amount.toString(), receiver.toHex()];
         const result = await this.rpcMethod('btc_generate', params);
 
         if (!result) {

package/src/verification/TapscriptVerificator.ts

@@ -3,7 +3,7 @@ import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
 import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.js';
-import { AddressGenerator } from '../generators/AddressGenerator.js';
+import { Address } from '../keypair/Address.js';
 
 export interface ContractAddressVerificationParams {
     readonly deployerPubKey: Buffer;
@@ -70,7 +70,9 @@ export class TapscriptVerificator {
             saltHash,
         );
 
-        return AddressGenerator.generatePKSH(virtualAddress, network);
+        const address = new Address(virtualAddress);
+
+        return address.p2tr(network);
     }
 
     public static generateAddressFromScript(