@btc-vision/transaction 1.8.6 → 1.8.7

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",
     "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/TransactionFactory.ts

@@ -556,7 +556,7 @@ export class TransactionFactory {
             estimatedFees: resp.estimatedFees,
             tx: resp.tx.toHex(),
             nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
-            inputUtxos: parameters.utxos,
+            inputUtxos: [...parameters.utxos, ...(parameters.feeUtxos ?? [])],
         };
     }
 

package/src/transaction/builders/FundingTransaction.ts

@@ -31,9 +31,12 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
 
         this.addInputsFromUTXO();
 
-        // When autoAdjustAmount is enabled and the amount would leave no room for fees,
-        // estimate the fee first and reduce the output amount accordingly.
-        if (this.autoAdjustAmount && this.amount >= this.totalInputAmount) {
+        // When autoAdjustAmount is enabled, estimate the fee against the final
+        // transaction shape and reduce the output amount whenever amount + fee
+        // would exceed the total input. This covers both the send-max case
+        // (amount == totalInput) and the near-total case where amount alone fits
+        // but leaves no room for the requested feeRate.
+        if (this.autoAdjustAmount) {
             // Add temporary outputs matching the ACTUAL final transaction shape
             // so the fee estimate accounts for the real vsize.
             const numOutputs = this.splitInputsInto > 1 ? this.splitInputsInto : 1;
@@ -59,27 +62,32 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
                 }
             }
 
-            // If a note is present, add a temporary OP_RETURN since it affects vsize.
             if (this.note) {
                 this.addOPReturn(this.note);
             }
 
+            if (this.anchor) {
+                this.addAnchor();
+            }
+
             const estimatedFee = await this.estimateTransactionFees();
 
             // Remove all temporary outputs.
-            const tempCount = numOutputs + (this.note ? 1 : 0);
+            const tempCount = numOutputs + (this.note ? 1 : 0) + (this.anchor ? 1 : 0);
             for (let i = 0; i < tempCount; i++) {
                 this.outputs.pop();
             }
 
-            const adjustedAmount = this.totalInputAmount - estimatedFee;
-            if (adjustedAmount < TransactionBuilder.MINIMUM_DUST) {
-                throw new Error(
-                    `Insufficient funds: after deducting fee of ${estimatedFee} sats, remaining amount ${adjustedAmount} sats is below minimum dust`,
-                );
-            }
+            if (this.amount + estimatedFee > this.totalInputAmount) {
+                const adjustedAmount = this.totalInputAmount - estimatedFee;
+                if (adjustedAmount < TransactionBuilder.MINIMUM_DUST) {
+                    throw new Error(
+                        `Insufficient funds: after deducting fee of ${estimatedFee} sats, remaining amount ${adjustedAmount} sats is below minimum dust`,
+                    );
+                }
 
-            this.amount = adjustedAmount;
+                this.amount = adjustedAmount;
+            }
         }
 
         // Add the primary output(s) first
@@ -87,10 +95,7 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
             this.splitInputs(this.amount);
         } else if (this.isPubKeyDestination) {
             const toHexClean = this.to.startsWith('0x') ? this.to.slice(2) : this.to;
-            const pubKeyScript: Script = script.compile([
-                fromHex(toHexClean),
-                opcodes.OP_CHECKSIG,
-            ]);
+            const pubKeyScript: Script = script.compile([fromHex(toHexClean), opcodes.OP_CHECKSIG]);
 
             this.addOutput({
                 value: toSatoshi(this.amount),

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,
@@ -45,6 +46,11 @@ export const MINIMUM_AMOUNT_REWARD: bigint = 330n; //540n;
 export const MINIMUM_AMOUNT_CA: bigint = 297n;
 export const ANCHOR_SCRIPT = fromHex('51024e73');
 
+// Tolerance for fees
+// Less than 1 is percentage: 0.10 equals +- 10%
+// 1 or more is satoshis, 5 equals +- 5 sat
+export const TOLERANCE = 1;
+
 /**
  * Allows to build a transaction like you would on Ethereum.
  * @description The transaction builder class
@@ -386,11 +392,28 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @throws {Error} - If something went wrong
      */
     public async signPSBT(): Promise<Psbt> {
-        if (await this.signTransaction()) {
-            return this.transaction;
+        if (!this.utxos.length) throw new Error('No UTXOs specified');
+
+        if (
+            this.to &&
+            !this.isPubKeyDestination &&
+            !EcKeyPair.verifyContractAddress(this.to, this.network)
+        ) {
+            throw new Error(
+                'Invalid contract address. The contract address must be a taproot address.',
+            );
         }
 
-        throw new Error('Could not sign transaction');
+        if (this.signed) throw new Error('Transaction is already signed');
+        this.signed = true;
+
+        await this.buildTransaction();
+
+        const built = await this.internalBuildTransaction(this.transaction);
+        if (!built) throw new Error('Could not sign transaction');
+        if (this.regenerated) throw new Error('Transaction was regenerated');
+
+        return this.transaction;
     }
 
     /**
@@ -498,6 +521,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[] = [];
@@ -794,19 +826,33 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 );
             }
 
-            if (this.totalInputAmount <= amountSpent) {
-                throw new Error(
-                    `Insufficient funds: need ${amountSpent + feeWithoutChange} sats but only have ${this.totalInputAmount} sats`,
-                );
-            }
-
             if (expectRefund && sendBackAmount < 0n) {
                 throw new Error(
-                    `Insufficient funds: need at least ${-sendBackAmount} more sats to cover fees.`,
+                    `Insufficient funds for fee: need at least ${-sendBackAmount} more sats to cover fees.`,
                 );
             }
         }
 
+        const amountNeeded = amountSpent + this.transactionFee;
+
+        const tolerance: bigint =
+            TOLERANCE < 1
+                ? BigInt(Math.ceil(Number(this.transactionFee) * TOLERANCE))
+                : BigInt(Math.ceil(TOLERANCE));
+
+        if (this.totalInputAmount < amountSpent) {
+            throw new Error(
+                `Insufficient funds: need ${amountNeeded} sats but only have ${this.totalInputAmount} sats`,
+            );
+        }
+
+        if (this.totalInputAmount < amountNeeded - tolerance) {
+            const missingAmount = amountNeeded - this.totalInputAmount - tolerance;
+            throw new Error(
+                `Insufficient funds for fee: need at least ${missingAmount} more sats to cover fees.`,
+            );
+        }
+
         if (this.debugFees) {
             this.log(
                 `Final fee: ${this.transactionFee} sats, Change output: ${this.feeOutput ? `${this.feeOutput.value} sats` : 'none'}`,