@btc-vision/transaction 1.0.41 → 1.0.44

package/browser/opnet.d.ts

@@ -41,3 +41,6 @@ export * from './wbtc/UnwrapGeneration.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';
+export * from './transaction/browser/BrowserSignerBase.js';
+export * from './transaction/browser/extensions/UnisatSigner.js';
+export * from './transaction/browser/types/Unisat.js';

package/browser/transaction/TransactionFactory.d.ts

@@ -18,9 +18,9 @@ export interface UnwrapResult {
 }
 export declare class TransactionFactory {
     constructor();
-    signInteraction(interactionParameters: IInteractionParameters): [string, string];
-    signDeployment(deploymentParameters: IDeploymentParameters): DeploymentResult;
-    wrap(warpParameters: IWrapParameters): WrapResult;
+    signInteraction(interactionParameters: IInteractionParameters): Promise<[string, string]>;
+    signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
+    wrap(warpParameters: IWrapParameters): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     private calculateNumSignatures;

package/browser/transaction/browser/BrowserSigner.d.ts

@@ -0,0 +1,9 @@
+import { Psbt, Transaction } from 'bitcoinjs-lib';
+declare global {
+    interface Window {
+        unisat?: {};
+    }
+}
+export declare class BrowserSigner {
+    static signTransaction(transaction: Psbt): Promise<Transaction>;
+}

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

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+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 p2pkh: Address;
+    protected constructor();
+    abstract signTaprootInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    abstract signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    abstract getPublicKey(): Buffer;
+    abstract sign(hash: Buffer, lowR?: boolean): Buffer;
+    abstract signSchnorr(hash: Buffer): Buffer;
+    abstract verify(hash: Buffer, signature: Buffer): boolean;
+    abstract init(): Promise<void>;
+}

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

@@ -0,0 +1,35 @@
+/// <reference types="node" />
+import { CustomKeypair } from '../BrowserSignerBase.js';
+import { Network, Psbt } from 'bitcoinjs-lib';
+import { Unisat } from '../types/Unisat.js';
+import { Address } from '@btc-vision/bsi-binary';
+declare global {
+    interface Window {
+        unisat?: Unisat;
+    }
+}
+export declare class UnisatSigner extends CustomKeypair {
+    private isInitialized;
+    constructor();
+    private _p2tr;
+    get p2tr(): Address;
+    private _p2pkh;
+    get p2pkh(): Address;
+    private _addresses;
+    get addresses(): Address[];
+    private _publicKey;
+    get publicKey(): Buffer;
+    _network: Network | undefined;
+    get network(): Network;
+    get unisat(): Unisat;
+    init(): Promise<void>;
+    getPublicKey(): Buffer;
+    sign(hash: Buffer, lowR?: boolean): Buffer;
+    signSchnorr(hash: Buffer): Buffer;
+    verify(hash: Buffer, signature: Buffer): boolean;
+    signTaprootInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    private combine;
+    private signTweaked;
+    private getNonDuplicateScriptSig;
+}

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

@@ -0,0 +1,54 @@
+import { Address } from '@btc-vision/bsi-binary';
+export declare enum UnisatNetwork {
+    testnet = "testnet",
+    mainnet = "livenet",
+    regtest = "regtest"
+}
+export interface Balance {
+    readonly confirmed: number;
+    readonly unconfirmed: number;
+    readonly total: number;
+}
+export declare enum MessageType {
+    ecdsa = "ecdsa",
+    bip322 = "bip322-simple"
+}
+interface ToSignInputBase {
+    readonly index: number;
+    readonly sighashTypes?: number[];
+    readonly disableTweakSigner?: boolean;
+}
+export interface ToSignInputPublicKey extends ToSignInputBase {
+    readonly publicKey: string;
+}
+export interface ToSignInputAddress extends ToSignInputBase {
+    readonly address: Address;
+}
+export type ToSignInput = ToSignInputPublicKey | ToSignInputAddress;
+export interface PsbtSignatureOptions {
+    readonly autoFinalized?: boolean;
+    readonly toSignInputs?: ToSignInput[];
+}
+export interface Unisat {
+    sendBitcoin(toAddress: Address, satoshis: number, options: {
+        feeRate: number;
+    }): Promise<string>;
+    requestAccounts(): Promise<string[]>;
+    getNetwork(): Promise<UnisatNetwork>;
+    getAccounts(): Promise<string[]>;
+    switchNetwork(network: UnisatNetwork): Promise<void>;
+    getPublicKey(): Promise<string>;
+    getBalance(): Promise<Balance>;
+    signMessage(message: string, type?: MessageType): Promise<string>;
+    pushTx(options: {
+        rawtx: string;
+    }): Promise<string>;
+    signPsbt(psbtHex: string, psbtOptions: PsbtSignatureOptions): Promise<string>;
+    signPsbts(psbtHex: string[], psbtOptions: PsbtSignatureOptions): Promise<string[]>;
+    pushPsbt(psbtHex: string): Promise<string>;
+    on(event: 'accountsChanged', listener: (accounts: string[]) => void): void;
+    on(event: 'networkChanged', listener: (network: UnisatNetwork) => void): void;
+    removeListener(event: 'accountsChanged', listener: (accounts: string[]) => void): void;
+    removeListener(event: 'networkChanged', listener: (network: UnisatNetwork) => void): void;
+}
+export {};

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

@@ -23,8 +23,8 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     get p2trAddress(): Address;
     getRndBytes(): Buffer;
     protected contractSignerXOnlyPubKey(): Buffer;
-    protected buildTransaction(): void;
-    protected signInputs(transaction: Psbt): void;
+    protected buildTransaction(): Promise<void>;
+    protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
     private getContractSeed;

package/browser/transaction/builders/FundingTransaction.d.ts

@@ -6,6 +6,6 @@ export declare class FundingTransaction extends TransactionBuilder<TransactionTy
     readonly type: TransactionType.FUNDING;
     protected childTransactionRequiredFees: bigint;
     constructor(parameters: IFundingTransactionParameters);
-    protected buildTransaction(): void;
+    protected buildTransaction(): Promise<void>;
     protected getSignerKey(): Signer;
 }

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

@@ -48,10 +48,10 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     static dedupeSignatures(original: TapScriptSig[], partial: TapScriptSig[]): TapScriptSig[];
     static attemptFinalizeInputs(psbt: Psbt, startIndex: number, orderedPubKeys: Buffer[][], isFinal: boolean): boolean;
     finalizeTransactionInputs(): boolean;
-    signPSBT(): Psbt;
-    protected buildTransaction(): void;
-    protected internalBuildTransaction(transaction: Psbt): boolean;
-    protected signInputs(_transaction: Psbt): void;
+    signPSBT(): Promise<Psbt>;
+    protected buildTransaction(): Promise<void>;
+    protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;
+    protected signInputs(_transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
     protected getScriptSolution(input: PsbtInput): Buffer[];

package/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -24,8 +24,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected generateSecret(): Buffer;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
-    protected buildTransaction(): void;
-    protected signInputs(transaction: Psbt): void;
+    protected buildTransaction(): Promise<void>;
+    protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
     protected getScriptSolution(input: PsbtInput): Buffer[];

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

@@ -14,6 +14,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     readonly logColor: string;
     overflowFees: bigint;
     transactionFee: bigint;
+    estimatedFees: bigint;
     protected transaction: Psbt;
     protected readonly updateInputs: UpdateInput[];
     protected readonly outputs: PsbtOutputExtended[];
@@ -30,32 +31,32 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected constructor(parameters: ITransactionParameters);
     static getFrom(from: string | undefined, keypair: ECPairInterface, network: Network): Address;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;
-    getFundingTransactionParameters(): IFundingTransactionParameters;
+    getFundingTransactionParameters(): Promise<IFundingTransactionParameters>;
     setDestinationAddress(address: Address): void;
     setMaximumFeeRate(feeRate: number): void;
-    signTransaction(): Transaction;
-    signPSBT(): Psbt;
+    signTransaction(): Promise<Transaction>;
+    signPSBT(): Promise<Psbt>;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;
     toAddress(): string | undefined;
     address(): Address | undefined;
-    estimateTransactionFees(): bigint;
-    rebuildFromBase64(base64: string): Psbt;
+    estimateTransactionFees(): Promise<bigint>;
+    rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;
-    protected addRefundOutput(amountSpent: bigint): void;
+    protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
     protected calculateTotalUTXOAmount(): bigint;
     protected calculateTotalVOutAmount(): bigint;
     protected addInputsFromUTXO(): void;
     protected internalInit(): void;
-    protected abstract buildTransaction(): void;
+    protected abstract buildTransaction(): Promise<void>;
     protected updateInput(input: UpdateInput): void;
     protected getWitness(): Buffer;
     protected getTapOutput(): Buffer;
     protected getInputs(): PsbtInputExtended[];
     protected getOutputs(): PsbtOutputExtended[];
     protected verifyUTXOValidity(): void;
-    protected setFeeOutput(output: PsbtOutputExtended): void;
-    protected internalBuildTransaction(transaction: Psbt): boolean;
+    protected setFeeOutput(output: PsbtOutputExtended): Promise<void>;
+    protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;
 }

package/browser/transaction/builders/UnwrapSegwitTransaction.d.ts

@@ -18,9 +18,9 @@ export declare class UnwrapSegwitTransaction extends SharedInteractionTransactio
     private readonly calculatedSignHash;
     constructor(parameters: IUnwrapParameters);
     static generateBurnCalldata(amount: bigint): Buffer;
-    signPSBT(): Psbt;
-    mergeVaults(input: VaultUTXOs[]): void;
-    protected internalBuildTransaction(transaction: Psbt): boolean;
+    signPSBT(): Promise<Psbt>;
+    mergeVaults(input: VaultUTXOs[]): Promise<void>;
+    protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;
     protected generateMultiSignRedeemScript(publicKeys: string[], minimum: number): {
         witnessUtxo: Buffer;
         redeemScript: Buffer;

package/browser/transaction/builders/UnwrapTransaction.d.ts

@@ -20,7 +20,7 @@ export declare class UnwrapTransaction extends SharedInteractionTransaction<Tran
     private readonly calculatedSignHash;
     constructor(parameters: IUnwrapParameters);
     static generateBurnCalldata(amount: bigint): Buffer;
-    signPSBT(): Psbt;
+    signPSBT(): Promise<Psbt>;
     getRefund(): bigint;
     getFeeLossOrRefund(): bigint;
     protected mergeVaults(): void;
@@ -35,7 +35,7 @@ export declare class UnwrapTransaction extends SharedInteractionTransaction<Tran
         redeem: Payment;
     };
     protected getScriptSolution(input: PsbtInput): Buffer[];
-    protected internalBuildTransaction(transaction: Psbt): boolean;
+    protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;
     private addVaultUTXO;
     private addVaultInputs;
     private calculateOutputLeftAmountFromVaults;

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

@@ -22,7 +22,7 @@ export declare class WrapTransaction extends SharedInteractionTransaction<Transa
     constructor(parameters: IWrapParameters);
     private static generateMintCalldata;
     verifyPublicKeysConstraints(generation: WrappedGeneration): boolean;
-    protected buildTransaction(): void;
+    protected buildTransaction(): Promise<void>;
     private verifyRequiredValue;
     private addVaultOutput;
     private generateVaultAddress;

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

@@ -9,6 +9,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     readonly to?: Address | undefined;
     utxos: UTXO[];
     nonWitnessUtxo?: Buffer | undefined;
+    estimatedFees?: bigint;
     readonly feeRate: number;
     readonly priorityFee: bigint;
 }

package/browser/transaction/processor/PsbtTransaction.d.ts

@@ -36,7 +36,7 @@ export declare class PsbtTransaction extends TweakedTransaction {
     toHex(): string;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;
-    attemptSignAllInputs(): boolean;
+    attemptSignAllInputs(): Promise<boolean>;
     attemptFinalizeInputs(n?: number): boolean;
     getPSBT(): Psbt;
     private getTotalOutputAmount;

package/browser/transaction/shared/TweakedTransaction.d.ts

@@ -28,10 +28,12 @@ export declare abstract class TweakedTransaction extends Logger {
     protected sequence: number;
     protected tapLeafScript: TapLeafScript | null;
     protected nonWitnessUtxo?: Buffer;
+    protected readonly isBrowser: boolean;
     protected regenerated: boolean;
     protected ignoreSignatureErrors: boolean;
     protected constructor(data: ITweakedTransactionData);
     static readScriptWitnessToWitnessStack(buffer: Buffer): Buffer[];
+    static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
     protected static signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer, sighashTypes: number[]): void;
     protected static calculateSignHash(sighashTypes: number[]): number;
     ignoreSignatureError(): void;
@@ -41,15 +43,14 @@ export declare abstract class TweakedTransaction extends Logger {
     disableRBF(): void;
     getTweakerHash(): Buffer | undefined;
     preEstimateTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numSignatures: bigint, numPubkeys: bigint): bigint;
-    static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
     protected generateTapData(): Payment;
     protected generateScriptAddress(): Payment;
     protected getSignerKey(): Signer;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer): void;
-    protected signInputs(transaction: Psbt): void;
+    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer): Promise<void>;
+    protected signInputs(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
-    protected getTweakedSigner(useTweakedHash?: boolean, signer?: Signer): Signer;
+    protected getTweakedSigner(useTweakedHash?: boolean, signer?: Signer): Signer | undefined;
     protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
 }

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.41";
+export declare const version = "1.0.44";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.41';
+export const version = '1.0.44';

package/build/metadata/contracts/wBTC.js

@@ -16,7 +16,7 @@ export class wBTC extends ContractBaseMetadata {
             case networks.bitcoin.bech32:
                 return 'unknown';
             case networks.regtest.bech32:
-                return 'bcrt1qxeyh0pacdtkqmlna9n254fztp3ptadkkfu6efl';
+                return 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
             case networks.testnet.bech32:
                 return 'tb1qj58a6yf4pez426nqvf8wyu6ssggcajw8kr44vy';
             default:

package/build/opnet.d.ts

@@ -41,3 +41,6 @@ export * from './wbtc/UnwrapGeneration.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.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

@@ -41,3 +41,6 @@ export * from './wbtc/UnwrapGeneration.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';
+export * from './transaction/browser/BrowserSignerBase.js';
+export * from './transaction/browser/extensions/UnisatSigner.js';
+export * from './transaction/browser/types/Unisat.js';

package/build/tests/adaptPSBT.js

@@ -37,7 +37,7 @@ const psbtTransactionData2 = {
 };
 const psbtTransaction2 = PsbtTransaction.fromBase64('AHBzYnT/AQCJAgAAAAGqpr9zTL0OUcMPJqSjy18vGXoaAwonXBXnpciJFtGgggEAAAAA/f///wLgP+4FAAAAACIAIPxalL3e9VOleQh1cyXELH155fo5VCUAMolPgEQO/yfFSgEAAAAAAAAiUSDL4fsq34Gxa6Svuzh0P0c4zLKBcNLvw1o8qTZs5k6kUQAAAAAAAQErAOH1BQAAAAAiACD8WpS93vVTpXkIdXMlxCx9eeX6OVQlADKJT4BEDv8nxSICAgPmjuI2/MNJM9STswWm8MdWEllHHRPs0Q3+DjdjOny+RzBEAiAZRgcFaRr39GY9sko5lKWov4g4i+77dNzCMKHR2WUbHQIgaPfYFjQZt0sCItEkosLeCZD94VPH4T2q/pZXP//x/luBAQMEgQAAAAEFi1IhAgPmjuI2/MNJM9STswWm8MdWEllHHRPs0Q3+DjdjOny+IQLTjqWw7J4i27NkBrqjxbuwJwjivZTUkpfqbz69JtGMdyEDgkTBMHBPHlBosIU5FOjDbtRC+QtBZmC6HPo353wVzMghA7ZKMoDQJlcQNbzIikCE5MPiFC81RvHHTeTMRx2/bFiOVK4AAAA=', psbtTransactionData2);
 psbtTransaction2.ignoreSignatureError();
-const s = psbtTransaction2.attemptSignAllInputs();
+const s = await psbtTransaction2.attemptSignAllInputs();
 const f = psbtTransaction2.attemptFinalizeInputs(1);
 console.log(psbtTransaction2, s, f);
 const newPsbt = psbtTransaction2.getTransaction().toHex();

package/build/tests/deploy.js

@@ -13,7 +13,6 @@ const utxoSetting = {
     minAmount: 10000n,
     requestedAmount: 100000n,
 };
-console.log(utxoSetting);
 const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
 if (!utxos) {
     throw new Error('No UTXOs found');
@@ -28,7 +27,7 @@ const deploymentParameters = {
     priorityFee: 50000n,
     bytecode: bytecode,
 };
-const finalTx = factory.signDeployment(deploymentParameters);
+const finalTx = await factory.signDeployment(deploymentParameters);
 console.log(`Final transaction:`, finalTx);
 const firstTxBroadcast = await utxoManager.broadcastTransaction(finalTx.transaction[0], false);
 console.log(`First transaction broadcasted:`, firstTxBroadcast);

package/build/tests/deployMotoRegStep1.d.ts

@@ -0,0 +1 @@
+export {};

package/build/tests/deployMotoRegStep1.js

@@ -0,0 +1,85 @@
+import { Wallet } from '../keypair/Wallet.js';
+import { Regtest } from './Regtest.js';
+import { OPNetLimitedProvider } from '../utxo/OPNetLimitedProvider.js';
+import { networks } from 'bitcoinjs-lib';
+import { TransactionFactory } from '../transaction/TransactionFactory.js';
+import { BitcoinRPC } from '@btc-vision/bsi-bitcoin-rpc';
+import * as fs from 'fs';
+const network = networks.regtest;
+const rpc = new BitcoinRPC();
+const wallet = new Wallet(Regtest.wallet, network);
+const utxoManager = new OPNetLimitedProvider('http://localhost:9001');
+const factory = new TransactionFactory();
+const shouldMineBlock = false;
+async function mineBlock() {
+    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
+    if (!ok) {
+        throw new Error('Could not mine block');
+    }
+    console.log(`Mined block`, ok);
+    return !!ok.length;
+}
+await rpc.init(Regtest.config);
+const requestedAmount = 100000000000n;
+const utxoSetting = {
+    addresses: [wallet.p2wpkh, wallet.p2tr],
+    minAmount: 10000n,
+    requestedAmount: requestedAmount,
+};
+function shuffleArray(array) {
+    for (let i = array.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [array[i], array[j]] = [array[j], array[i]];
+    }
+}
+const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
+if (!utxos) {
+    throw new Error('No UTXOs found');
+}
+shuffleArray(utxos);
+const bytecode = fs.readFileSync('./bytecode/wbtc.wasm');
+for (let utxo of utxos) {
+    const deploymentParameters = {
+        from: wallet.p2wpkh,
+        utxos: [utxo],
+        signer: wallet.keypair,
+        network: network,
+        feeRate: 500,
+        priorityFee: 50000n,
+        bytecode: bytecode,
+    };
+    try {
+        const finalTx = factory.signDeployment(deploymentParameters);
+        console.log(`Final transaction:`, finalTx);
+        let txid;
+        try {
+            txid = await utxoManager.broadcastTransaction(finalTx.transaction[0], false);
+            console.log(`Transaction ID:`, txid);
+        }
+        catch (e) {
+            continue;
+        }
+        if (!txid) {
+            continue;
+        }
+        try {
+            txid = await utxoManager.broadcastTransaction(finalTx.transaction[1], false);
+            console.log(`Transaction ID:`, txid);
+        }
+        catch (e) {
+            continue;
+        }
+        if (!txid) {
+            continue;
+        }
+        console.log(`Contract deployed at ${finalTx.contractAddress}`);
+    }
+    catch (e) {
+        continue;
+    }
+    break;
+}
+if (shouldMineBlock) {
+    await mineBlock();
+}
+rpc.destroy();

package/build/tests/deployReg.js

@@ -37,7 +37,7 @@ if (!utxos) {
     throw new Error('No UTXOs found');
 }
 shuffleArray(utxos);
-const bytecode = fs.readFileSync('./bytecode/pool.wasm');
+const bytecode = fs.readFileSync('./bytecode/wbtc.wasm');
 for (let utxo of utxos) {
     const deploymentParameters = {
         from: wallet.p2wpkh,
@@ -49,7 +49,7 @@ for (let utxo of utxos) {
         bytecode: bytecode,
     };
     try {
-        const finalTx = factory.signDeployment(deploymentParameters);
+        const finalTx = await factory.signDeployment(deploymentParameters);
         console.log(`Final transaction:`, finalTx);
         let txid;
         try {

package/build/tests/factory/createPairReg.js

@@ -1,84 +1,13 @@
-import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { Wallet } from '../../keypair/Wallet.js';
-import { Regtest } from '../Regtest.js';
-import { OPNetLimitedProvider } from '../../utxo/OPNetLimitedProvider.js';
-import { networks } from 'bitcoinjs-lib';
-import { TransactionFactory } from '../../transaction/TransactionFactory.js';
-import { BitcoinRPC } from '@btc-vision/bsi-bitcoin-rpc';
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
-const network = networks.regtest;
-const rpc = new BitcoinRPC();
-const wBtc = new wBTC(network);
-const wallet = new Wallet(Regtest.wallet, network);
-const utxoManager = new OPNetLimitedProvider('http://localhost:9001');
-const factory = new TransactionFactory();
+import { MOTO_ADDRESS, WBTC_ADDRESS } from '../shared/tokens.js';
 const abiCoder = new ABICoder();
-const stakeSelector = Number(`0x` + abiCoder.encodeSelector('createPool'));
-const MOTO_CONTRACT = 'bcrt1q6zk8yjz2l2mzhy0xa645jzsuh44gg3re8qr5zj';
-const FACTORY_CONTRACT = 'bcrt1q65enkl69g8ysh5tg9v7g35dmxzuy34egjftz6w';
+const createPoolSelector = Number(`0x` + abiCoder.encodeSelector('createPool'));
 function generateCalldata() {
     const addCalldata = new BinaryWriter();
-    addCalldata.writeSelector(stakeSelector);
-    addCalldata.writeAddress(wBtc.getAddress());
-    addCalldata.writeAddress(MOTO_CONTRACT);
+    addCalldata.writeSelector(createPoolSelector);
+    addCalldata.writeAddress(WBTC_ADDRESS);
+    addCalldata.writeAddress(MOTO_ADDRESS);
     return Buffer.from(addCalldata.getBuffer());
 }
-const shouldMineBlock = true;
-async function mineBlock() {
-    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
-    if (!ok) {
-        throw new Error('Could not mine block');
-    }
-    return !!ok.length;
-}
-await rpc.init(Regtest.config);
-const requestedAmount = 1n * 10000000000000n;
-const utxoSetting = {
-    addresses: [wallet.p2wpkh, wallet.p2tr],
-    minAmount: 10000n,
-    requestedAmount: requestedAmount,
-};
-const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
-if (!utxos) {
-    throw new Error('No UTXOs found');
-}
 const calldata = generateCalldata();
-for (let utxo of utxos) {
-    const interactionParameters = {
-        from: wallet.p2wpkh,
-        to: FACTORY_CONTRACT,
-        utxos: [utxo],
-        signer: wallet.keypair,
-        network: network,
-        feeRate: 140,
-        priorityFee: 45000n,
-        calldata: calldata,
-    };
-    const finalTx = factory.signInteraction(interactionParameters);
-    let txid;
-    try {
-        txid = await utxoManager.broadcastTransaction(finalTx[0], false);
-        console.log(`Transaction ID:`, txid);
-    }
-    catch (e) {
-        continue;
-    }
-    if (!txid) {
-        continue;
-    }
-    try {
-        txid = await utxoManager.broadcastTransaction(finalTx[1], false);
-        console.log(`Transaction ID:`, txid);
-    }
-    catch (e) {
-        continue;
-    }
-    if (!txid) {
-        continue;
-    }
-    break;
-}
-if (shouldMineBlock) {
-    await mineBlock();
-}
-rpc.destroy();
+console.log('createPool', calldata.toString('hex'));

package/build/tests/gen.js

@@ -1,30 +1,19 @@
-import { TapscriptVerificator } from '../verification/TapscriptVerificator.js';
 import { networks } from 'bitcoinjs-lib';
 import { Regtest } from './Regtest.js';
 import { Wallet } from '../keypair/Wallet.js';
-import { EcKeyPair } from '../keypair/EcKeyPair.js';
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 const walletTest = new Wallet(Regtest.wallet, networks.testnet);
 console.log(walletTest);
 const wallet = new Wallet(Regtest.wallet, networks.regtest);
 console.log(wallet);
 const selector = new ABICoder().encodeSelector('approve');
-console.log('selector', Number(`0x${selector}`), selector);
+console.log('approve', Number(`0x${selector}`), selector);
 const balanceOf = Number('0x' + new ABICoder().encodeSelector('balanceOf'));
+const totalSupplyS = Number('0x' + new ABICoder().encodeSelector('totalSupply'));
 const balanceCall = new BinaryWriter();
 balanceCall.writeSelector(balanceOf);
-balanceCall.writeAddress('bcrt1pe0slk2klsxckhf90hvu8g0688rxt9qts6thuxk3u4ymxeejw53gs0xjlhn');
+balanceCall.writeAddress('bcrt1pmc2dz8fy4rwghzmfz4hdsennusld8cwgtr0mjxl45wt8cnqcm3psssc327');
+const totalSupply = new BinaryWriter();
+totalSupply.writeSelector(totalSupplyS);
 console.log('balanceOf', balanceOf, Buffer.from(balanceCall.getBuffer()).toString('hex'));
-const rndGeneratedRegWallet = EcKeyPair.generateWallet(networks.regtest);
-const rndWallet = new Wallet(rndGeneratedRegWallet, networks.regtest);
-console.log('rnd', rndWallet);
-const params = {
-    bytecode: Buffer.from('deadbeef', 'hex'),
-    contractSaltPubKey: Buffer.from('deadbeef', 'hex'),
-    deployerPubKeyXOnly: wallet.xOnly,
-    originalSalt: Buffer.from('deadbeef', 'hex'),
-    network: networks.regtest,
-};
-const contractAddress = TapscriptVerificator.getContractAddress(params);
-const virtualAddress = TapscriptVerificator.generateContractVirtualAddress(params.deployerPubKeyXOnly, params.bytecode, params.originalSalt, networks.regtest);
-console.log('contract sewgit address', virtualAddress, '\ncontract p2tr address', contractAddress);
+console.log('totalSupply', totalSupplyS, Buffer.from(totalSupply.getBuffer()).toString('hex'));

package/build/tests/interaction.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { Wallet } from '../keypair/Wallet.js';
+import { Address } from '@btc-vision/bsi-binary';
+export declare const wallet: Wallet;
+export declare function interact(contract: Address, calldata: Buffer, mine?: boolean): Promise<void>;