@btc-vision/transaction 1.8.6 → 1.8.7-beta.0

package/build/transaction/shared/TweakedTransaction.js

@@ -1,11 +1,12 @@
 import { Logger } from '@btc-vision/logger';
-import { address as bitAddress, applySignaturesToPsbt, crypto as bitCrypto, fromHex, getFinalScripts, isP2A, isP2MR, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, isUnknownSegwitVersion, opcodes, payments, PaymentType, prepareSigningTasks, Psbt, script, toXOnly, Transaction, varuint, WorkerSigningPool, } from '@btc-vision/bitcoin';
+import { address as bitAddress, applySignaturesToPsbt, crypto as bitCrypto, equals, fromHex, getFinalScripts, isP2A, isP2MR, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, isUnknownSegwitVersion, opcodes, payments, PaymentType, prepareSigningTasks, Psbt, script, toXOnly, Transaction, varuint, WorkerSigningPool, } from '@btc-vision/bitcoin';
 import { isUniversalSigner, TweakedSigner, } from '../../signer/TweakedSigner.js';
 import {} from '@btc-vision/ecpair';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
 import { witnessStackToScriptWitness } from '../utils/WitnessUtils.js';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
+import { CSVMultisigProvider, } from '../mineable/CSVMultisigProvider.js';
 import { MessageSigner } from '../../keypair/MessageSigner.js';
 import {} from '../../signer/AddressRotation.js';
 import { toTweakedParallelKeyPair } from '../../signer/ParallelSignerAdapter.js';
@@ -87,6 +88,12 @@ export class TweakedTransaction extends Logger {
      */
     csvInputIndices = new Set();
     anchorInputIndices = new Set();
+    /**
+     * Track P2TR CSV multisig inputs together with the address descriptor needed
+     * to finalize them (tapscript + derived control block + parsed config).
+     * @protected
+     */
+    csvMultisigInputs = new Map();
     regenerated = false;
     ignoreSignatureErrors = false;
     noSignatures = false;
@@ -269,6 +276,7 @@ export class TweakedTransaction extends Logger {
         delete this.tweakedSigner;
         this.csvInputIndices.clear();
         this.anchorInputIndices.clear();
+        this.csvMultisigInputs.clear();
         this.inputSignerMap.clear();
         this.tweakedSignerCache.clear();
         delete this.parallelSigningConfig;
@@ -319,7 +327,8 @@ export class TweakedTransaction extends Logger {
         this.sequence = TransactionSequence.FINAL;
         for (const input of this.inputs) {
             // This would disable CSV! You need to check if the input has CSV
-            if (this.csvInputIndices.has(this.inputs.indexOf(input))) {
+            const idx = this.inputs.indexOf(input);
+            if (this.csvInputIndices.has(idx) || this.csvMultisigInputs.has(idx)) {
                 continue;
             }
             input.sequence = TransactionSequence.FINAL;
@@ -934,8 +943,13 @@ export class TweakedTransaction extends Logger {
                 if (inputSign)
                     input.sighashType = inputSign;
             }
-            // Taproot internal key - use per-input signer in address rotation mode
-            if (this.addressRotationEnabled) {
+            // CSV multisig P2TR: script-path spend with NUMS internal key.
+            // Must come before the default key-path setup below.
+            if (this.processCSVMultisigP2TRInput(utxo, input, i, scriptPub)) {
+                // input fully configured for script-path spend
+            }
+            else if (this.addressRotationEnabled) {
+                // Taproot internal key - use per-input signer in address rotation mode
                 input.tapInternalKey = this.internalPubKeyToXOnlyForInput(i);
             }
             else {
@@ -982,8 +996,10 @@ export class TweakedTransaction extends Logger {
             this.error(`Unknown or unsupported script type for output: ${utxo.scriptPubKey.hex}`);
         }
         if (i === 0) {
-            // TapLeafScript if available
-            if (this.tapLeafScript) {
+            // TapLeafScript if available — but never clobber a CSV multisig input's
+            // own tapscript; its spend is a script-path that belongs to the UTXO,
+            // not to this transaction's contract leaf.
+            if (this.tapLeafScript && !this.csvMultisigInputs.has(i)) {
                 input.tapLeafScript = [this.tapLeafScript];
             }
             if (this.nonWitnessUtxo) {
@@ -992,6 +1008,44 @@ export class TweakedTransaction extends Logger {
         }
         return input;
     }
+    /**
+     * Detect + configure a P2TR CSV multisig input for script-path spending.
+     *
+     * UTXOs of this shape carry the tapscript in `witnessScript`. The control
+     * block and internal pubkey are fully determined by the tapscript (single
+     * leaf tree, NUMS internal key) so the caller only needs to provide the
+     * tapscript.
+     *
+     * Returns true when the UTXO was recognized and the input was configured,
+     * false otherwise (caller falls back to the default P2TR key-path setup).
+     */
+    processCSVMultisigP2TRInput(utxo, input, i, scriptPub) {
+        if (!utxo.witnessScript)
+            return false;
+        const tapscript = utxo.witnessScript instanceof Uint8Array
+            ? utxo.witnessScript
+            : fromHex(utxo.witnessScript);
+        const addr = CSVMultisigProvider.deriveAddressFromTapscript(tapscript, this.network);
+        if (!addr)
+            return false;
+        // Guard against spoofed witnessScripts on P2TR UTXOs from an unrelated
+        // address: the tapscript must hash back to this exact scriptPubKey.
+        if (!equals(addr.scriptPubKey, scriptPub)) {
+            return false;
+        }
+        input.tapLeafScript = [
+            {
+                leafVersion: addr.leafVersion,
+                script: addr.tapscript,
+                controlBlock: addr.controlBlock,
+            },
+        ];
+        input.tapInternalKey = addr.internalPubkey;
+        // Force a CSV-compatible nSequence so OP_CHECKSEQUENCEVERIFY passes.
+        input.sequence = this.setCSVSequence(addr.config.csvBlocks, this.sequence);
+        this.csvMultisigInputs.set(i, addr);
+        return true;
+    }
     processP2WSHInput(utxo, input, i) {
         // P2WSH requires a witnessScript
         if (!utxo.witnessScript) {
@@ -1047,6 +1101,15 @@ export class TweakedTransaction extends Logger {
                 finalScriptWitness: Uint8Array.from([0]),
             };
         }
+        const csvMultisigAddr = this.csvMultisigInputs.get(inputIndex);
+        if (csvMultisigAddr) {
+            const tapSigs = input.tapScriptSig ?? [];
+            const witnessStack = CSVMultisigProvider.buildFinalWitnessFromTapScriptSigs(tapSigs, csvMultisigAddr);
+            return {
+                finalScriptSig: undefined,
+                finalScriptWitness: witnessStackToScriptWitness(witnessStack),
+            };
+        }
         if (isP2WSH && isSegwit && input.witnessScript) {
             if (!input.partialSig || input.partialSig.length === 0) {
                 throw new Error(`No signatures for P2WSH input #${inputIndex}`);
@@ -1233,4 +1296,3 @@ export class TweakedTransaction extends Logger {
         }
     }
 }
-//# sourceMappingURL=TweakedTransaction.js.map

package/build/transaction/utils/WitnessUtils.d.ts

@@ -4,4 +4,3 @@
  * @returns {Uint8Array}
  */
 export declare function witnessStackToScriptWitness(witness: Uint8Array[]): Uint8Array;
-//# sourceMappingURL=WitnessUtils.d.ts.map

package/build/transaction/utils/WitnessUtils.js

@@ -34,4 +34,3 @@ export function witnessStackToScriptWitness(witness) {
     writeVector(witness);
     return buffer;
 }
-//# sourceMappingURL=WitnessUtils.js.map

package/build/utils/BitcoinUtils.d.ts

@@ -23,4 +23,3 @@ export declare class BitcoinUtils {
      */
     static opnetHash(data: Uint8Array): string;
 }
-//# sourceMappingURL=BitcoinUtils.d.ts.map

package/build/utils/BitcoinUtils.js

@@ -54,4 +54,3 @@ export class BitcoinUtils {
         return `0x${toHex(new Uint8Array(hash))}`;
     }
 }
-//# sourceMappingURL=BitcoinUtils.js.map

package/build/utils/BufferHelper.d.ts

@@ -9,4 +9,3 @@ export declare class BufferHelper {
     static valueToUint8Array(value: bigint, length?: number): Uint8Array;
     static uint8ArrayToValue(input: Uint8Array): bigint;
 }
-//# sourceMappingURL=BufferHelper.d.ts.map

package/build/utils/BufferHelper.js

@@ -54,4 +54,3 @@ export class BufferHelper {
         return BigInt('0x' + toHex(input));
     }
 }
-//# sourceMappingURL=BufferHelper.js.map

package/build/utils/StringToBuffer.d.ts

@@ -1,2 +1 @@
 export declare function stringToBuffer(str: string): Uint8Array;
-//# sourceMappingURL=StringToBuffer.d.ts.map

package/build/utils/StringToBuffer.js

@@ -2,4 +2,3 @@ import { fromHex } from '@btc-vision/bitcoin';
 export function stringToBuffer(str) {
     return fromHex(str.startsWith('0x') ? str.slice(2) : str);
 }
-//# sourceMappingURL=StringToBuffer.js.map

package/build/utils/lengths.d.ts

@@ -15,4 +15,3 @@ export declare const I32_BYTE_LENGTH: number;
 export declare const I16_BYTE_LENGTH: number;
 export declare const I8_BYTE_LENGTH: number;
 export declare const BOOLEAN_BYTE_LENGTH: number;
-//# sourceMappingURL=lengths.d.ts.map

package/build/utils/lengths.js

@@ -15,4 +15,3 @@ export const I32_BYTE_LENGTH = 4;
 export const I16_BYTE_LENGTH = 2;
 export const I8_BYTE_LENGTH = 1;
 export const BOOLEAN_BYTE_LENGTH = 1;
-//# sourceMappingURL=lengths.js.map

package/build/utils/types.d.ts

@@ -13,4 +13,3 @@ export type u16 = number;
 export type u32 = number;
 export type u64 = bigint;
 export type Selector = number;
-//# sourceMappingURL=types.d.ts.map

package/build/utils/types.js

@@ -1,2 +1 @@
 import { DeterministicMap } from '../deterministic/DeterministicMap.js';
-//# sourceMappingURL=types.js.map

package/build/utxo/OPNetLimitedProvider.d.ts

@@ -56,4 +56,3 @@ export declare class OPNetLimitedProvider {
      */
     rpcMethod(method: string, paramsMethod: unknown[]): Promise<unknown>;
 }
-//# sourceMappingURL=OPNetLimitedProvider.d.ts.map

package/build/utxo/OPNetLimitedProvider.js

@@ -219,4 +219,3 @@ export class OPNetLimitedProvider {
         return result;
     }
 }
-//# sourceMappingURL=OPNetLimitedProvider.js.map

package/build/utxo/interfaces/BroadcastResponse.d.ts

@@ -7,4 +7,3 @@ export interface BroadcastResponse {
     modifiedTransaction?: string;
     created?: boolean;
 }
-//# sourceMappingURL=BroadcastResponse.d.ts.map

package/build/utxo/interfaces/BroadcastResponse.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=BroadcastResponse.js.map

package/build/utxo/interfaces/IUTXO.d.ts

@@ -36,4 +36,3 @@ export interface RawUTXOResponse {
     readonly scriptPubKey: ScriptPubKey;
     readonly raw: string;
 }
-//# sourceMappingURL=IUTXO.d.ts.map

package/build/utxo/interfaces/IUTXO.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=IUTXO.js.map

package/build/verification/TapscriptVerificator.d.ts

@@ -20,4 +20,3 @@ export declare class TapscriptVerificator {
     static generateAddressFromScript(params: ContractAddressVerificationParams, scriptTree: Taptree): string | undefined;
     private static buildScriptTree;
 }
-//# sourceMappingURL=TapscriptVerificator.d.ts.map

package/build/verification/TapscriptVerificator.js

@@ -61,4 +61,3 @@ export class TapscriptVerificator {
         return { scriptTree, compiledTargetScript, network };
     }
 }
-//# sourceMappingURL=TapscriptVerificator.js.map

package/eslint.config.js

@@ -34,6 +34,11 @@ export default tseslint.config(
                 'error',
                 { blankLine: 'always', prev: 'block-like', next: '*' },
             ],
+
+            // This is stupid. null and undefined is not the same thing. who ever made this eslint rule is stupid.
+            'no-useless-assignment': 'off',
+            '@typescript-eslint/no-unnecessary-type-arguments': 'off',
+            '@typescript-eslint/no-unnecessary-type-assertion': 'off',
         },
     },
     {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.8.6",
+    "version": "1.8.7-beta.0",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -145,26 +145,26 @@
         "prebuild": "npm run check:circular"
     },
     "devDependencies": {
-        "@types/node": "^25.5.0",
+        "@types/node": "^25.6.0",
         "@types/sha.js": "^2.4.4",
-        "@vitest/browser": "^4.1.0",
-        "@vitest/browser-playwright": "^4.1.0",
-        "@vitest/ui": "^4.1.0",
+        "@vitest/browser": "^4.1.5",
+        "@vitest/browser-playwright": "^4.1.5",
+        "@vitest/ui": "^4.1.5",
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
-        "esbuild": "^0.27.4",
-        "eslint": "^10.0.3",
+        "esbuild": "^0.28.0",
+        "eslint": "^10.2.1",
         "madge": "^8.0.0",
-        "playwright": "^1.58.2",
-        "prettier": "^3.8.1",
+        "playwright": "^1.59.1",
+        "prettier": "^3.8.3",
         "process": "^0.11.10",
         "stream-browserify": "^3.0.0",
-        "typedoc": "^0.28.17",
-        "typescript-eslint": "^8.57.0",
-        "vite": "^8.0.0",
+        "typedoc": "^0.28.19",
+        "typescript-eslint": "^8.59.0",
+        "vite": "^8.0.10",
         "vite-plugin-dts": "^4.5.4",
-        "vite-plugin-node-polyfills": "^0.25.0",
-        "vitest": "^4.1.0"
+        "vite-plugin-node-polyfills": "^0.26.0",
+        "vitest": "^4.1.5"
     },
     "dependencies": {
         "@btc-vision/bip32": "^7.1.2",
@@ -173,16 +173,19 @@
         "@btc-vision/ecpair": "^4.0.5",
         "@btc-vision/logger": "^1.0.8",
         "@eslint/js": "^10.0.1",
-        "@noble/curves": "^2.0.1",
-        "@noble/hashes": "^2.0.1",
+        "@noble/curves": "^2.2.0",
+        "@noble/hashes": "^2.2.0",
         "bech32": "^2.0.0",
         "bip174": "^3.0.0",
         "bip39": "^3.1.0",
         "pako": "^2.1.0",
         "sha.js": "^2.4.12",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
     },
     "overrides": {
+        "madge": {
+            "typescript": "$typescript"
+        },
         "vite-plugin-node-polyfills": {
             "vite": "$vite"
         }

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.8.6';
+export const version = '1.8.7';

package/src/keypair/Address.ts

@@ -366,7 +366,7 @@ export class Address extends Uint8Array implements Disposable {
      * Converts the address to a hex string
      * @returns {string} The hex string
      */
-    public toHex(): string {
+    public override toHex(): string {
         return '0x' + toHex(this);
     }
 

package/src/opnet.ts

@@ -21,6 +21,7 @@ export * from './generators/Features.js';
 export * from './generators/Generator.js';
 
 export * from './transaction/mineable/TimelockGenerator.js';
+export * from './transaction/mineable/CSVMultisigProvider.js';
 export * from './transaction/mineable/IP2WSHAddress.js';
 export * from './p2wda/P2WDADetector.js';
 

package/src/transaction/builders/TransactionBuilder.ts

@@ -28,6 +28,7 @@ import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import type { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
+import { CSVMultisigProvider } from '../mineable/CSVMultisigProvider.js';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
 import {
     type Feature,
@@ -498,6 +499,15 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 };
             }
 
+            const csvMultisigAddr = this.csvMultisigInputs.get(inputIndex);
+            if (csvMultisigAddr) {
+                return {
+                    finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(
+                        CSVMultisigProvider.buildDummyWitness(csvMultisigAddr),
+                    ),
+                };
+            }
+
             if (input.witnessScript && P2WDADetector.isP2WDAWitnessScript(input.witnessScript)) {
                 // Create dummy witness stack for P2WDA
                 const dummyDataSlots: Uint8Array[] = [];