@btc-vision/bitcoin 6.3.6 → 6.4.1

package/browser/index.js.LICENSE.txt

@@ -7,8 +7,8 @@
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! noble-secp256k1 - MIT License (c) 2019 Paul Miller (paulmillr.com) */
+/*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+/*! noble-secp256k1 - MIT License (c) 2019 Paul Miller (paulmillr.com) */
 
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

package/browser/networks.d.ts

@@ -7,6 +7,7 @@ export interface Network {
     bip32: Bip32;
     messagePrefix: string;
     bech32: string;
+    bech32Opnet?: string;
     pubKeyHash: number;
     scriptHash: number;
 }

package/build/address.d.ts

@@ -8,9 +8,10 @@ export interface Bech32Result {
     prefix: string;
     data: Buffer;
 }
+export declare function toFutureOPNetAddress(output: Buffer, network: Network): string;
 export declare function fromBase58Check(address: string): Base58CheckResult;
 export declare function fromBech32(address: string): Bech32Result;
 export declare function toBase58Check(hash: Buffer, version: number): string;
-export declare function toBech32(data: Buffer, version: number, prefix: string): string;
+export declare function toBech32(data: Buffer, version: number, prefix: string, prefixOpnet?: string): string;
 export declare function fromOutputScript(output: Buffer, network?: Network): string;
 export declare function toOutputScript(address: string, network?: Network): Buffer;

package/build/address.js

@@ -1,29 +1,64 @@
 import { bech32, bech32m } from 'bech32';
 import * as bs58check from 'bs58check';
-import { payments } from './index.js';
+import { opcodes, payments } from './index.js';
 import * as networks from './networks.js';
 import * as bscript from './script.js';
 import { Hash160bit, tuple, typeforce, UInt8 } from './types.js';
 const FUTURE_SEGWIT_MAX_SIZE = 40;
 const FUTURE_SEGWIT_MIN_SIZE = 2;
-const FUTURE_SEGWIT_MAX_VERSION = 16;
+const FUTURE_SEGWIT_MAX_VERSION = 15;
+const FUTURE_MAX_VERSION = 16;
+const FUTURE_OPNET_VERSION = 16;
 const FUTURE_SEGWIT_MIN_VERSION = 2;
 const FUTURE_SEGWIT_VERSION_DIFF = 0x50;
 const FUTURE_SEGWIT_VERSION_WARNING = 'WARNING: Sending to a future segwit version address can lead to loss of funds. ' +
     'End users MUST be warned carefully in the GUI and asked if they wish to proceed ' +
     'with caution. Wallets should verify the segwit version from the output of fromBech32, ' +
     'then decide when it is safe to use which version of segwit.';
+export function toFutureOPNetAddress(output, network) {
+    if (!Buffer.isBuffer(output))
+        throw new TypeError('output must be a Buffer');
+    if (!network.bech32Opnet)
+        throw new Error('Network does not support opnet');
+    const opcode = output[0];
+    let pushPos = 1, progLen;
+    if (output[1] < 0x4c) {
+        progLen = output[1];
+        pushPos = 2;
+    }
+    else if (output[1] === 0x4c) {
+        progLen = output[2];
+        pushPos = 3;
+    }
+    else {
+        throw new TypeError('Unsupported push opcode in script');
+    }
+    const program = output.subarray(pushPos, pushPos + progLen);
+    if (program.length < FUTURE_SEGWIT_MIN_SIZE || program.length > FUTURE_SEGWIT_MAX_SIZE)
+        throw new TypeError('Invalid program length for segwit address');
+    const version = opcode === opcodes.OP_0
+        ? 0
+        : opcode >= opcodes.OP_1 && opcode <= opcodes.OP_16
+            ? opcode - (opcodes.OP_1 - 1)
+            : -1;
+    if (version < FUTURE_SEGWIT_MAX_VERSION || version > FUTURE_MAX_VERSION)
+        throw new TypeError(`Invalid segwit version ${version}`);
+    const words = [version, ...bech32m.toWords(program)];
+    return bech32m.encode(network.bech32Opnet, words);
+}
 function _toFutureSegwitAddress(output, network) {
-    const data = output.slice(2);
-    if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE)
+    const data = output.subarray(2);
+    if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE) {
         throw new TypeError('Invalid program length for segwit address');
+    }
     const version = output[0] - FUTURE_SEGWIT_VERSION_DIFF;
-    if (version < FUTURE_SEGWIT_MIN_VERSION || version > FUTURE_SEGWIT_MAX_VERSION)
+    if (version < FUTURE_SEGWIT_MIN_VERSION || version > FUTURE_SEGWIT_MAX_VERSION) {
         throw new TypeError('Invalid version for segwit address');
-    if (output[1] !== data.length)
-        throw new TypeError('Invalid script for segwit address');
-    console.warn(FUTURE_SEGWIT_VERSION_WARNING);
-    return toBech32(data, version, network.bech32);
+    }
+    if (output[1] !== data.length) {
+        throw new TypeError(`Invalid script for segwit address ${output[1]} !== ${data.length}`);
+    }
+    return toBech32(data, version, network.bech32, network.bech32Opnet);
 }
 export function fromBase58Check(address) {
     const payload = Buffer.from(bs58check.default.decode(address));
@@ -32,7 +67,7 @@ export function fromBase58Check(address) {
     if (payload.length > 21)
         throw new TypeError(address + ' is too long');
     const version = payload.readUInt8(0);
-    const hash = payload.slice(1);
+    const hash = payload.subarray(1);
     return { version, hash };
 }
 export function fromBech32(address) {
@@ -67,9 +102,12 @@ export function toBase58Check(hash, version) {
     hash.copy(payload, 1);
     return bs58check.default.encode(payload);
 }
-export function toBech32(data, version, prefix) {
+export function toBech32(data, version, prefix, prefixOpnet) {
     const words = bech32.toWords(data);
     words.unshift(version);
+    if (version === FUTURE_OPNET_VERSION && prefixOpnet) {
+        return bech32m.encode(prefixOpnet, words);
+    }
     return version === 0 ? bech32.encode(prefix, words) : bech32m.encode(prefix, words);
 }
 export function fromOutputScript(output, network) {
@@ -94,6 +132,10 @@ export function fromOutputScript(output, network) {
         return payments.p2tr({ output, network }).address;
     }
     catch (e) { }
+    try {
+        return toFutureOPNetAddress(output, network);
+    }
+    catch (e) { }
     try {
         return _toFutureSegwitAddress(output, network);
     }
@@ -120,7 +162,9 @@ export function toOutputScript(address, network) {
         }
         catch (e) { }
         if (decodeBech32) {
-            if (decodeBech32.prefix !== network.bech32)
+            if (decodeBech32.prefix !== network.bech32 &&
+                network.bech32Opnet &&
+                decodeBech32.prefix !== network.bech32Opnet)
                 throw new Error(address + ' has an invalid prefix');
             if (decodeBech32.version === 0) {
                 if (decodeBech32.data.length === 20)
@@ -132,11 +176,22 @@ export function toOutputScript(address, network) {
                 if (decodeBech32.data.length === 32)
                     return payments.p2tr({ pubkey: decodeBech32.data }).output;
             }
+            else if (decodeBech32.version === FUTURE_OPNET_VERSION) {
+                if (!network.bech32Opnet)
+                    throw new Error(address + ' has an invalid prefix');
+                if (decodeBech32.data.length < FUTURE_SEGWIT_MIN_SIZE ||
+                    decodeBech32.data.length > FUTURE_SEGWIT_MAX_SIZE) {
+                    throw new Error('Invalid program length for opnet address');
+                }
+                return bscript.compile([opcodes.OP_16, decodeBech32.data]);
+            }
             else if (decodeBech32.version >= FUTURE_SEGWIT_MIN_VERSION &&
                 decodeBech32.version <= FUTURE_SEGWIT_MAX_VERSION &&
                 decodeBech32.data.length >= FUTURE_SEGWIT_MIN_SIZE &&
                 decodeBech32.data.length <= FUTURE_SEGWIT_MAX_SIZE) {
-                console.warn(FUTURE_SEGWIT_VERSION_WARNING);
+                if (decodeBech32.version !== FUTURE_OPNET_VERSION) {
+                    console.warn(FUTURE_SEGWIT_VERSION_WARNING);
+                }
                 return bscript.compile([
                     decodeBech32.version + FUTURE_SEGWIT_VERSION_DIFF,
                     decodeBech32.data,

package/build/block.js

@@ -123,8 +123,8 @@ export class Block {
         bufferWriter.writeUInt32(this.nonce);
         if (headersOnly || !this.transactions)
             return buffer;
-        varuint.encode(this.transactions.length, buffer, bufferWriter.offset);
-        bufferWriter.offset += varuint.encode.bytes;
+        const encoded = varuint.encode(this.transactions.length, buffer, bufferWriter.offset);
+        bufferWriter.offset += encoded.bytes;
         this.transactions.forEach((tx) => {
             const txSize = tx.byteLength();
             tx.toBuffer(buffer, bufferWriter.offset);

package/build/bufferutils.js

@@ -65,8 +65,8 @@ export class BufferWriter {
         this.offset = writeUInt64LE(this.buffer, i, this.offset);
     }
     writeVarInt(i) {
-        varuint.encode(i, this.buffer, this.offset);
-        this.offset += varuint.encode.bytes;
+        const encode = varuint.encode(i, this.buffer, this.offset);
+        this.offset += encode.bytes;
     }
     writeSlice(slice) {
         if (this.buffer.length < this.offset + slice.length) {
@@ -117,14 +117,14 @@ export class BufferReader {
     }
     readVarInt() {
         const vi = varuint.decode(this.buffer, this.offset);
-        this.offset += varuint.decode.bytes;
-        return vi;
+        this.offset += vi.bytes;
+        return vi.numberValue || 0;
     }
     readSlice(n) {
         if (this.buffer.length < this.offset + n) {
             throw new Error('Cannot read slice out of bounds');
         }
-        const result = this.buffer.slice(this.offset, this.offset + n);
+        const result = this.buffer.subarray(this.offset, this.offset + n);
         this.offset += n;
         return result;
     }

package/build/networks.d.ts

@@ -7,6 +7,7 @@ export interface Network {
     bip32: Bip32;
     messagePrefix: string;
     bech32: string;
+    bech32Opnet?: string;
     pubKeyHash: number;
     scriptHash: number;
 }

package/build/networks.js

@@ -1,6 +1,7 @@
 export const bitcoin = {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
     bech32: 'bc',
+    bech32Opnet: 'op',
     bip32: {
         public: 0x0488b21e,
         private: 0x0488ade4,
@@ -12,6 +13,7 @@ export const bitcoin = {
 export const regtest = {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
     bech32: 'bcrt',
+    bech32Opnet: 'opr',
     bip32: {
         public: 0x043587cf,
         private: 0x04358394,
@@ -23,6 +25,7 @@ export const regtest = {
 export const testnet = {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
     bech32: 'tb',
+    bech32Opnet: 'opt',
     bip32: {
         public: 0x043587cf,
         private: 0x04358394,
@@ -34,6 +37,7 @@ export const testnet = {
 export const dogecoin = {
     messagePrefix: '\x19Dogecoin Signed Message:\n',
     bech32: '',
+    bech32Opnet: '',
     bip32: {
         public: 0x02facafd,
         private: 0x02fac398,
@@ -45,6 +49,7 @@ export const dogecoin = {
 export const dogecoinTestnet = {
     messagePrefix: '\x19Dogecoin Signed Message:\n',
     bech32: '',
+    bech32Opnet: '',
     bip32: {
         public: 0x0432a9a8,
         private: 0x0432a243,
@@ -56,6 +61,7 @@ export const dogecoinTestnet = {
 export const litecoin = {
     messagePrefix: '\x19Litecoin Signed Message:\n',
     bech32: 'ltc',
+    bech32Opnet: 'opl',
     bip32: {
         public: 0x019da462,
         private: 0x019d9cfe,
@@ -67,6 +73,7 @@ export const litecoin = {
 export const litecoinTestnet = {
     messagePrefix: '\x19Litecoin Signed Message:\n',
     bech32: 'tltc',
+    bech32Opnet: 'oplt',
     bip32: {
         public: 0x0436ef7d,
         private: 0x0436f6e1,
@@ -78,6 +85,7 @@ export const litecoinTestnet = {
 export const bitcoinCash = {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
     bech32: 'bitcoincash',
+    bech32Opnet: 'opbch',
     bip32: {
         public: 0x0488b21e,
         private: 0x0488ade4,
@@ -89,6 +97,7 @@ export const bitcoinCash = {
 export const bitcoinCashTestnet = {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
     bech32: 'bchtest',
+    bech32Opnet: 'opbcht',
     bip32: {
         public: 0x043587cf,
         private: 0x04358394,
@@ -100,6 +109,7 @@ export const bitcoinCashTestnet = {
 export const dash = {
     messagePrefix: '\x19DarkCoin Signed Message:\n',
     bech32: '',
+    bech32Opnet: '',
     bip32: {
         public: 0x02fe52cc,
         private: 0x02fe52f8,
@@ -111,6 +121,7 @@ export const dash = {
 export const dashTestnet = {
     messagePrefix: '\x19DarkCoin Signed Message:\n',
     bech32: '',
+    bech32Opnet: '',
     bip32: {
         public: 0x3a8061a0,
         private: 0x3a805837,

package/build/psbt/psbtutils.js

@@ -56,8 +56,8 @@ export function decompressPublicKey(realPubKey) {
         return;
     }
     if (![33, 65].includes(realPubKey.length)) {
-        console.trace(`Unsupported key length=${realPubKey.length}. Must be 33 (compressed) or 65 (uncompressed).`);
-        throw new Error(`Unsupported key length=${realPubKey.length}. Must be 33 (compressed) or 65 (uncompressed).`);
+        console.warn(`Unsupported key length=${realPubKey.length}. Must be 33 (compressed) or 65 (uncompressed).`);
+        return;
     }
     let point;
     try {

package/build/psbt.js

@@ -3,7 +3,6 @@ import * as varuint from 'bip174/src/lib/converter/varint.js';
 import { checkForInput, checkForOutput } from 'bip174/src/lib/utils.js';
 import { fromOutputScript, toOutputScript } from './address.js';
 import { cloneBuffer, reverseBuffer } from './bufferutils.js';
-import { hookSigner } from './hooks/HookedSigner.js';
 import { payments } from './index.js';
 import { bitcoin as btcNetwork } from './networks.js';
 import { tapleafHash } from './payments/bip341.js';
@@ -92,8 +91,7 @@ export class Psbt {
         return this;
     }
     clone() {
-        const res = Psbt.fromBuffer(this.data.toBuffer(), JSON.parse(JSON.stringify(this.opts)));
-        return res;
+        return Psbt.fromBuffer(this.data.toBuffer(), JSON.parse(JSON.stringify(this.opts)));
     }
     setMaximumFeeRate(satoshiPerByte) {
         check32Bit(satoshiPerByte);
@@ -555,7 +553,6 @@ export class Psbt {
         return validationResultCount > 0;
     }
     _signInput(inputIndex, keyPair, sighashTypes = [Transaction.SIGHASH_ALL]) {
-        hookSigner(keyPair);
         const { hash, sighashType } = getHashAndSighashType(this.data.inputs, inputIndex, keyPair.publicKey, this.__CACHE, sighashTypes);
         const partialSig = [
             {
@@ -567,7 +564,6 @@ export class Psbt {
         return this;
     }
     _signTaprootInput(inputIndex, input, keyPair, tapLeafHashToSign, allowedSighashTypes = [Transaction.SIGHASH_DEFAULT]) {
-        hookSigner(keyPair);
         const hashesForSig = this.checkTaprootHashesForSig(inputIndex, input, keyPair, tapLeafHashToSign, allowedSighashTypes);
         const tapKeySig = hashesForSig
             .filter((h) => !h.leafHash)
@@ -588,7 +584,6 @@ export class Psbt {
         return this;
     }
     _signInputAsync(inputIndex, keyPair, sighashTypes = [Transaction.SIGHASH_ALL]) {
-        hookSigner(keyPair);
         const { hash, sighashType } = getHashAndSighashType(this.data.inputs, inputIndex, keyPair.publicKey, this.__CACHE, sighashTypes);
         return Promise.resolve(keyPair.sign(hash)).then((signature) => {
             const partialSig = [
@@ -601,7 +596,6 @@ export class Psbt {
         });
     }
     async _signTaprootInputAsync(inputIndex, input, keyPair, tapLeafHash, sighashTypes = [Transaction.SIGHASH_DEFAULT]) {
-        hookSigner(keyPair);
         const hashesForSig = this.checkTaprootHashesForSig(inputIndex, input, keyPair, tapLeafHash, sighashTypes);
         const signaturePromises = [];
         const tapKeyHash = hashesForSig.filter((h) => !h.leafHash)[0];
@@ -684,6 +678,8 @@ function canFinalize(input, script, scriptType) {
         case 'multisig':
             const p2ms = payments.p2ms({ output: script });
             return hasSigs(p2ms.m, input.partialSig, p2ms.pubkeys);
+        case 'nonstandard':
+            return true;
         default:
             return false;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/bitcoin",
     "type": "module",
-    "version": "6.3.6",
+    "version": "6.4.1",
     "description": "Client-side Bitcoin JavaScript library",
     "engines": {
         "node": ">=16.0.0"
@@ -55,7 +55,7 @@
         "audit": "better-npm-audit audit -l high",
         "build:tests": "npm run clean:jstests && tsc -p ./test/tsconfig.json",
         "clean": "rimraf build",
-        "clean:jstests": "rimraf 'test/**/!(ts-node-register)*.js'",
+        "clean:jstests": "rimraf --glob \"test/**/!(ts-node-register).js\"",
         "coverage-report": "npm run build && npm run nobuild:coverage-report",
         "coverage-html": "npm run build && npm run nobuild:coverage-html",
         "coverage": "npm run build && npm run nobuild:coverage",
@@ -65,29 +65,29 @@
         "format:ci": "npm run prettier -- --check && npm run prettierjs -- --check",
         "gitdiff:ci": "npm run build && git diff --exit-code",
         "integration": "npm run build && npm run nobuild:integration",
-        "lint": "eslint ts_src/**",
+        "lint": "eslint src/**",
         "lint:tests": "eslint test/**/*.spec.ts",
-        "mocha:ts": "mocha --recursive --require test/ts-node-register",
+        "mocha:ts": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha -n loader=ts-node/esm -n experimental-specifier-resolution=node --extension ts --timeout 10000 --recursive \"test/**/*.spec.ts\"",
         "nobuild:coverage-report": "nyc report --reporter=lcov",
         "nobuild:coverage-html": "nyc report --reporter=html",
         "nobuild:coverage": "npm run build:tests && nyc --check-coverage --branches 85 --functions 90 --lines 90 mocha && npm run clean:jstests",
         "nobuild:integration": "npm run mocha:ts -- --timeout 50000 'test/integration/*.ts'",
         "nobuild:unit": "npm run mocha:ts -- 'test/*.ts'",
-        "prettier": "prettier \"ts_src/**/*.ts\" \"test/**/*.ts\" --ignore-path ./.prettierignore",
+        "prettier": "prettier \"src/**/*.ts\" \"test/**/*.ts\" --ignore-path ./.prettierignore",
         "test": "npm run build && npm run format:ci && npm run lint && npm run nobuild:coverage",
         "unit": "npm run build && npm run nobuild:unit"
     },
     "devDependencies": {
-        "@babel/core": "^7.26.0",
+        "@babel/core": "^7.27.1",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.25.9",
-        "@babel/preset-env": "^7.26.0",
-        "@babel/preset-flow": "^7.25.9",
-        "@babel/preset-react": "^7.26.3",
-        "@babel/preset-typescript": "^7.26.0",
+        "@babel/plugin-transform-runtime": "^7.27.1",
+        "@babel/preset-env": "^7.27.2",
+        "@babel/preset-flow": "^7.27.1",
+        "@babel/preset-react": "^7.27.1",
+        "@babel/preset-typescript": "^7.27.1",
         "@types/bs58check": "^2.1.2",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^20.17.10",
+        "@types/node": "^22.15.21",
         "@types/proxyquire": "^1.3.31",
         "@types/randombytes": "^2.0.3",
         "better-npm-audit": "^3.11.0",
@@ -97,17 +97,17 @@
         "bs58": "^6.0.0",
         "dhttp": "^3.0.3",
         "ecpair": "^2.0.1",
-        "eslint": "^9.17.0",
+        "eslint": "^9.27.0",
         "gulp": "^5.0.0",
         "gulp-cached": "^1.1.1",
         "gulp-typescript": "^6.0.0-alpha.1",
         "hoodwink": "^2.0.0",
         "https-browserify": "^1.0.0",
         "minimaldata": "^1.0.2",
-        "mocha": "^11.0.1",
+        "mocha": "^11.5.0",
         "nyc": "^17.1.0",
         "os-browserify": "^0.3.0",
-        "prettier": "^3.4.2",
+        "prettier": "^3.5.3",
         "proxyquire": "^2.1.3",
         "randombytes": "^2.1.0",
         "regtest-client": "0.2.1",
@@ -115,23 +115,23 @@
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "tiny-secp256k1": "^2.2.3",
-        "ts-loader": "^9.5.1",
+        "ts-loader": "^9.5.2",
         "ts-node": "^10.9.2",
-        "typedoc": "^0.27.6",
-        "typescript": "^5.7.2",
-        "typescript-eslint": "^8.19.0",
-        "webpack": "^5.97.1",
+        "typedoc": "^0.28.5",
+        "typescript": "^5.8.3",
+        "typescript-eslint": "^8.32.1",
+        "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     },
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@btc-vision/logger": "^1.0.6",
-        "@eslint/js": "^9.17.0",
-        "@noble/hashes": "^1.6.1",
-        "@noble/secp256k1": "^2.1.0",
+        "@eslint/js": "^9.27.0",
+        "@noble/hashes": "^1.8.0",
+        "@noble/secp256k1": "^2.2.3",
         "assert": "^2.1.0",
-        "babel-loader": "^9.2.1",
-        "babel-plugin-transform-import-meta": "^2.2.1",
+        "babel-loader": "^10.0.0",
+        "babel-plugin-transform-import-meta": "^2.3.2",
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
         "bip32": "^4.0.0",
@@ -145,6 +145,6 @@
         "gulp-logger-new": "^1.0.1",
         "process": "^0.11.10",
         "typeforce": "^1.18.0",
-        "varuint-bitcoin": "^1.1.2"
+        "varuint-bitcoin": "^2.0.0"
     }
 }