@btc-vision/transaction 1.1.16 → 1.2.0

package/build/signer/SignerUtils.js

@@ -0,0 +1,40 @@
+import { isP2TR, pubkeyPositionInScript } from '@btc-vision/bitcoin';
+export function isTaprootInput(input) {
+    return (input &&
+        !!(input.tapInternalKey ||
+            input.tapMerkleRoot ||
+            (input.tapLeafScript && input.tapLeafScript.length) ||
+            (input.tapBip32Derivation && input.tapBip32Derivation.length) ||
+            (input.witnessUtxo && isP2TR(input.witnessUtxo.script))));
+}
+export function getInputRelevantScript(input) {
+    if (input.redeemScript) {
+        return input.redeemScript;
+    }
+    if (input.witnessScript) {
+        return input.witnessScript;
+    }
+    if (input.witnessUtxo) {
+        return input.witnessUtxo.script;
+    }
+    if (input.nonWitnessUtxo) {
+    }
+    return null;
+}
+export function canSignNonTaprootInput(input, publicKey) {
+    if ((input.nonWitnessUtxo &&
+        !input.redeemScript &&
+        !input.witnessScript &&
+        !input.witnessUtxo) ||
+        input.redeemScript) {
+        return true;
+    }
+    const script = getInputRelevantScript(input);
+    if (script) {
+        return pubkeyInScript(publicKey, script);
+    }
+    return false;
+}
+export function pubkeyInScript(pubkey, script) {
+    return pubkeyPositionInScript(pubkey, script) !== -1;
+}

package/build/signer/TweakedSigner.js

@@ -1,7 +1,5 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { initEccLib } from '@btc-vision/bitcoin';
-import { tapTweakHash } from '@btc-vision/bitcoin/src/payments/bip341.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { initEccLib, tapTweakHash, toXOnly } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../keypair/EcKeyPair.js';
 initEccLib(ecc);
 export class TweakedSigner {

package/build/transaction/ContractAddress.d.ts

@@ -0,0 +1,6 @@
+declare class ContractAddressBase {
+    private readonly deriver;
+    generateHybridKeyFromHash(input: Buffer): Buffer;
+}
+export declare const ContractAddress: ContractAddressBase;
+export {};

package/build/transaction/ContractAddress.js

@@ -0,0 +1,12 @@
+import { Secp256k1PointDeriver } from '../keypair/Secp256k1PointDeriver.js';
+class ContractAddressBase {
+    constructor() {
+        this.deriver = new Secp256k1PointDeriver();
+    }
+    generateHybridKeyFromHash(input) {
+        const p = this.deriver.findOrDeriveValidPoint(input, false);
+        const y = this.deriver.getCanonicalY(p.y1, p.y2);
+        return Buffer.from(this.deriver.getHybridPublicKey(p.x, y));
+    }
+}
+export const ContractAddress = new ContractAddressBase();

package/build/transaction/browser/extensions/UnisatSigner.js

@@ -1,8 +1,8 @@
-import { crypto as bitCrypto, networks, opcodes, Psbt, script as bitScript, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, networks, Psbt, script as bitScript, toXOnly, } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { UnisatNetwork } from '../types/Unisat.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUtils.js';
 export class UnisatSigner extends CustomKeypair {
     constructor() {
         super();
@@ -147,12 +147,9 @@ export class UnisatSigner extends CustomKeypair {
                         }
                     }
                 }
-                else {
-                    const script = getInputRelevantScript(input);
-                    if (script && pubkeyInScript(this.publicKey, script)) {
-                        needsToSign = true;
-                        viaTaproot = false;
-                    }
+                else if (canSignNonTaprootInput(input, this.publicKey)) {
+                    needsToSign = true;
+                    viaTaproot = false;
                 }
                 if (needsToSign) {
                     return {
@@ -248,31 +245,6 @@ export class UnisatSigner extends CustomKeypair {
         return nonDuplicate;
     }
 }
-function isTaprootInput(input) {
-    if (input.tapInternalKey || input.tapKeySig || input.tapScriptSig || input.tapLeafScript) {
-        return true;
-    }
-    if (input.witnessUtxo) {
-        const script = input.witnessUtxo.script;
-        return script.length === 34 && script[0] === opcodes.OP_1 && script[1] === 0x20;
-    }
-    return false;
-}
-function getInputRelevantScript(input) {
-    if (input.redeemScript) {
-        return input.redeemScript;
-    }
-    if (input.witnessScript) {
-        return input.witnessScript;
-    }
-    if (input.witnessUtxo) {
-        return input.witnessUtxo.script;
-    }
-    if (input.nonWitnessUtxo) {
-        return null;
-    }
-    return null;
-}
 function pubkeyInScript(pubkey, script) {
     return pubkeyPositionInScript(pubkey, script) !== -1;
 }

package/build/transaction/browser/extensions/XverseSigner.js

@@ -1,7 +1,7 @@
-import { crypto as bitCrypto, script as bitScript, networks, opcodes, Psbt, } from '@btc-vision/bitcoin';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { networks, Psbt, toXOnly } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
+import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../../signer/SignerUtils.js';
 export class XverseSigner extends CustomKeypair {
     constructor() {
         super();
@@ -145,12 +145,9 @@ export class XverseSigner extends CustomKeypair {
                         }
                     }
                 }
-                else {
-                    const script = getInputRelevantScript(input);
-                    if (script && pubkeyInScript(this.publicKey, script)) {
-                        needsToSign = true;
-                        viaTaproot = false;
-                    }
+                else if (canSignNonTaprootInput(input, this.publicKey)) {
+                    needsToSign = true;
+                    viaTaproot = false;
                 }
                 if (needsToSign) {
                     return {
@@ -256,44 +253,3 @@ export class XverseSigner extends CustomKeypair {
         return nonDuplicate;
     }
 }
-function isTaprootInput(input) {
-    if (input.tapInternalKey || input.tapKeySig || input.tapScriptSig || input.tapLeafScript) {
-        return true;
-    }
-    if (input.witnessUtxo) {
-        const script = input.witnessUtxo.script;
-        return script.length === 34 && script[0] === opcodes.OP_1 && script[1] === 0x20;
-    }
-    return false;
-}
-function getInputRelevantScript(input) {
-    if (input.redeemScript) {
-        return input.redeemScript;
-    }
-    if (input.witnessScript) {
-        return input.witnessScript;
-    }
-    if (input.witnessUtxo) {
-        return input.witnessUtxo.script;
-    }
-    if (input.nonWitnessUtxo) {
-        return null;
-    }
-    return null;
-}
-function pubkeyInScript(pubkey, script) {
-    return pubkeyPositionInScript(pubkey, script) !== -1;
-}
-function pubkeyPositionInScript(pubkey, script) {
-    const pubkeyHash = bitCrypto.hash160(pubkey);
-    const pubkeyXOnly = toXOnly(pubkey);
-    const decompiled = bitScript.decompile(script);
-    if (decompiled === null)
-        throw new Error('Unknown script error');
-    return decompiled.findIndex((element) => {
-        if (typeof element === 'number')
-            return false;
-        return (Buffer.isBuffer(element) &&
-            (element.equals(pubkey) || element.equals(pubkeyHash) || element.equals(pubkeyXOnly)));
-    });
-}

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

@@ -1,7 +1,7 @@
+import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export interface ICustomTransactionParameters extends SharedInteractionParameters {
     readonly script: (Buffer | Stack)[];

package/build/transaction/builders/CustomScriptTransaction.js

@@ -1,11 +1,10 @@
+import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class CustomScriptTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/transaction/builders/DeploymentTransaction.js

@@ -1,13 +1,13 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { Address } from '../../keypair/Address.js';
+const p = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2fn;
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/transaction/builders/FundingTransaction.js

@@ -1,4 +1,5 @@
 import { TransactionType } from '../enums/TransactionType.js';
+import { opcodes, script } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export class FundingTransaction extends TransactionBuilder {
     constructor(parameters) {
@@ -17,9 +18,13 @@ export class FundingTransaction extends TransactionBuilder {
             this.splitInputs(this.amount);
         }
         else if (this.isPubKeyDestination) {
+            const pubKeyScript = script.compile([
+                Buffer.from(this.to.replace('0x', ''), 'hex'),
+                opcodes.OP_CHECKSIG,
+            ]);
             this.addOutput({
                 value: Number(this.amount),
-                script: Buffer.from(this.to.slice(2), 'hex'),
+                script: pubKeyScript,
             });
         }
         else {

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

@@ -1,4 +1,4 @@
-import { Taptree } from '@btc-vision/bitcoin/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';

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

@@ -1,5 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from '@btc-vision/bitcoin';
-import { Taptree } from '@btc-vision/bitcoin/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
@@ -20,7 +19,7 @@ export interface MultiSignFromBase64Params extends Omit<MultiSignParameters, 'ps
 export declare class MultiSignTransaction extends TransactionBuilder<TransactionType.MULTI_SIG> {
     static readonly LOCK_LEAF_SCRIPT: Buffer;
     static readonly signHashTypesArray: number[];
-    static readonly numsPoint: Buffer;
+    static readonly numsPoint: Buffer<ArrayBuffer>;
     type: TransactionType.MULTI_SIG;
     protected targetScriptRedeem: Payment | null;
     protected leftOverFundsScriptRedeem: Payment | null;
@@ -41,7 +40,7 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
         signed: boolean;
     };
     static partialFinalizer: (inputIndex: number, input: PsbtInput, partialSignatures: Buffer[], orderedPubKeys: Buffer[], isFinal: boolean) => {
-        finalScriptWitness: Buffer;
+        finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     static dedupeSignatures(original: TapScriptSig[], partial: TapScriptSig[]): TapScriptSig[];
     static attemptFinalizeInputs(psbt: Psbt, startIndex: number, orderedPubKeys: Buffer[][], isFinal: boolean): boolean;

package/build/transaction/builders/MultiSignTransaction.js

@@ -1,8 +1,7 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script, } from '@btc-vision/bitcoin';
+import { crypto as bitcoinCrypto, opcodes, Psbt, script, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 export class MultiSignTransaction extends TransactionBuilder {
     constructor(parameters) {

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

@@ -1,5 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
-import { Taptree } from '@btc-vision/bitcoin/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -30,7 +29,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
-        finalScriptWitness: Buffer;
+        finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     private signInputsNonWalletBased;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,10 +1,9 @@
-import { address } from '@btc-vision/bitcoin';
+import { address, toXOnly } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class SharedInteractionTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/transaction/builders/TransactionBuilder.js

@@ -1,5 +1,4 @@
-import { initEccLib, opcodes, Psbt, script, Transaction, } from '@btc-vision/bitcoin';
-import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
+import { initEccLib, opcodes, Psbt, script, Transaction, varuint, } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -25,7 +24,9 @@ export class TransactionBuilder extends TweakedTransaction {
         this.priorityFee = parameters.priorityFee ?? 0n;
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
-        this.isPubKeyDestination = this.to ? this.to.startsWith('0x') : false;
+        this.isPubKeyDestination = this.to
+            ? AddressVerificator.isValidPublicKey(this.to, this.network)
+            : false;
         this.optionalOutputs = parameters.optionalOutputs;
         this.from = TransactionBuilder.getFrom(parameters.from, this.signer, this.network);
         this.totalInputAmount = this.calculateTotalUTXOAmount();
@@ -205,6 +206,16 @@ export class TransactionBuilder extends TweakedTransaction {
                     tapInternalKey: this.internalPubKeyToXOnly(),
                 });
             }
+            else if (AddressVerificator.isValidPublicKey(this.from, this.network)) {
+                const pubKeyScript = script.compile([
+                    Buffer.from(this.from.replace('0x', ''), 'hex'),
+                    opcodes.OP_CHECKSIG,
+                ]);
+                await this.setFeeOutput({
+                    value: Number(sendBackAmount),
+                    script: pubKeyScript,
+                });
+            }
             else {
                 await this.setFeeOutput({
                     value: Number(sendBackAmount),

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

@@ -48,7 +48,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected generateTapData(): Payment;
     protected generateScriptAddress(): Payment;
     protected getSignerKey(): Signer | ECPairInterface;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean): Promise<void>;
+    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
@@ -60,6 +60,10 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
+    protected generateP2SHP2PKHRedeemScript(inputAddr: string): {
+        redeemScript: Buffer;
+        outputScript: Buffer;
+    } | undefined;
     protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
     protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
         finalScriptSig: Buffer | undefined;
@@ -68,11 +72,6 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     private attemptSignTaproot;
     private isTaprootScriptSpend;
-    private isTaprootInput;
-    private canSignNonTaprootInput;
-    private getInputRelevantScript;
-    private pubkeyInScript;
-    private pubkeyPositionInScript;
     private signTaprootInput;
     private signNonTaprootInput;
 }