@bitcoinerlab/descriptors 2.3.0 → 2.3.2

package/dist/applyPR2137.js

@@ -111,6 +111,7 @@ const applyPR2137 = (psbt) => {
                 results.push(true);
             }
             catch (err) {
+                void err;
                 results.push(false);
             }
         }

package/dist/descriptors.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Network, Payment, Psbt } from 'bitcoinjs-lib';
 import type { PartialSig } from 'bip174/src/lib/interfaces';
 import { BIP32API } from 'bip32';

package/dist/descriptors.js

@@ -221,6 +221,7 @@ function DescriptorsFactory(ecc) {
                 output = bitcoinjs_lib_1.address.toOutputScript(matchedAddress, network);
             }
             catch (e) {
+                void e;
                 throw new Error(`Error: invalid address ${matchedAddress}`);
             }
             try {
@@ -228,32 +229,42 @@ function DescriptorsFactory(ecc) {
                 isSegwit = false;
                 isTaproot = false;
             }
-            catch (e) { }
+            catch (e) {
+                void e;
+            }
             try {
                 payment = p2sh({ output, network });
                 // It assumes that an addr(SH_ADDRESS) is always a add(SH_WPKH) address
                 isSegwit = true;
                 isTaproot = false;
             }
-            catch (e) { }
+            catch (e) {
+                void e;
+            }
             try {
                 payment = p2wpkh({ output, network });
                 isSegwit = true;
                 isTaproot = false;
             }
-            catch (e) { }
+            catch (e) {
+                void e;
+            }
             try {
                 payment = p2wsh({ output, network });
                 isSegwit = true;
                 isTaproot = false;
             }
-            catch (e) { }
+            catch (e) {
+                void e;
+            }
             try {
                 payment = p2tr({ output, network });
                 isSegwit = true;
                 isTaproot = true;
             }
-            catch (e) { }
+            catch (e) {
+                void e;
+            }
             if (!payment) {
                 throw new Error(`Error: invalid address ${matchedAddress}`);
             }
@@ -489,7 +500,7 @@ function DescriptorsFactory(ecc) {
         return (0, miniscript_1.expandMiniscript)({
             miniscript,
             isSegwit,
-            isTaproot: false,
+            isTaproot: false, //TODO:
             network,
             BIP32,
             ECPair
@@ -758,6 +769,7 @@ function DescriptorsFactory(ecc) {
                     return true;
                 }
                 catch (err) {
+                    void err;
                     return false;
                 }
             }
@@ -767,6 +779,7 @@ function DescriptorsFactory(ecc) {
                     return true;
                 }
                 catch (err) {
+                    void err;
                     return false;
                 }
             }
@@ -776,6 +789,7 @@ function DescriptorsFactory(ecc) {
                     return true;
                 }
                 catch (err) {
+                    void err;
                     return false;
                 }
             }
@@ -785,6 +799,7 @@ function DescriptorsFactory(ecc) {
                     return true;
                 }
                 catch (err) {
+                    void err;
                     return false;
                 }
             }
@@ -794,6 +809,7 @@ function DescriptorsFactory(ecc) {
                     return true;
                 }
                 catch (err) {
+                    void err;
                     return false;
                 }
             }
@@ -848,13 +864,14 @@ function DescriptorsFactory(ecc) {
         signatures) {
             if (this.isSegwit() && !isSegwitTx)
                 throw new Error(`a tx is segwit if at least one input is segwit`);
-            const errorMsg = 'Input type not implemented. Currently supported: pkh(KEY), wpkh(KEY), tr(KEY), \
-sh(wpkh(KEY)), sh(wsh(MINISCRIPT)), sh(MINISCRIPT), wsh(MINISCRIPT), \
-addr(PKH_ADDRESS), addr(WPKH_ADDRESS), addr(SH_WPKH_ADDRESS), addr(SINGLE_KEY_ADDRESS).';
             //expand any miniscript-based descriptor. If not miniscript-based, then it's
             //an addr() descriptor. For those, we can only guess their type.
             const expansion = this.expand().expandedExpression;
             const { isPKH, isWPKH, isSH, isTR } = this.guessOutput();
+            const errorMsg = `Input type not implemented. Currently supported: pkh(KEY), wpkh(KEY), tr(KEY), \
+sh(wpkh(KEY)), sh(wsh(MINISCRIPT)), sh(MINISCRIPT), wsh(MINISCRIPT), \
+addr(PKH_ADDRESS), addr(WPKH_ADDRESS), addr(SH_WPKH_ADDRESS), addr(SINGLE_KEY_ADDRESS). \
+expansion=${expansion}, isPKH=${isPKH}, isWPKH=${isWPKH}, isSH=${isSH}, isTR=${isTR}.`;
             if (!expansion && !isPKH && !isWPKH && !isSH && !isTR)
                 throw new Error(errorMsg);
             const firstSignature = signatures && typeof signatures[0] === 'object'
@@ -967,32 +984,27 @@ addr(PKH_ADDRESS), addr(WPKH_ADDRESS), addr(SH_WPKH_ADDRESS), addr(SINGLE_KEY_AD
          * output in a tx.
          */
         outputWeight() {
-            const errorMsg = 'Output type not implemented. Currently supported: pkh(KEY), wpkh(KEY), tr(ANYTHING), \
-sh(ANYTHING), wsh(ANYTHING), addr(PKH_ADDRESS), addr(WPKH_ADDRESS), \
-addr(SH_WPKH_ADDRESS), addr(TR_ADDRESS)';
             //expand any miniscript-based descriptor. If not miniscript-based, then it's
             //an addr() descriptor. For those, we can only guess their type.
-            const expansion = this.expand().expandedExpression;
             const { isPKH, isWPKH, isSH, isWSH, isTR } = this.guessOutput();
-            if (!expansion && !isPKH && !isWPKH && !isSH && !isTR)
-                throw new Error(errorMsg);
-            if (expansion ? expansion.startsWith('pkh(') : isPKH) {
+            const errorMsg = `Output type not implemented. Currently supported: pkh=${isPKH}, wpkh=${isWPKH}, tr=${isTR}, sh=${isSH} and wsh=${isWSH}.`;
+            if (isPKH) {
                 // (p2pkh:26) + (amount:8)
                 return 34 * 4;
             }
-            else if (expansion ? expansion.startsWith('wpkh(') : isWPKH) {
+            else if (isWPKH) {
                 // (p2wpkh:23) + (amount:8)
                 return 31 * 4;
             }
-            else if (expansion ? expansion.startsWith('sh(') : isSH) {
+            else if (isSH) {
                 // (p2sh:24) + (amount:8)
                 return 32 * 4;
             }
-            else if (expansion ? expansion.startsWith('wsh(') : isWSH) {
+            else if (isWSH) {
                 // (p2wsh:35) + (amount:8)
                 return 43 * 4;
             }
-            else if (expansion ? expansion.startsWith('tr(') : isTR) {
+            else if (isTR) {
                 // (script_pubKey_length:1) + (p2t2(OP_1 OP_PUSH32 <schnorr_public_key>):34) + (amount:8)
                 return 43 * 4;
             }

package/dist/ledger.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { DescriptorInstance, OutputInstance } from './descriptors';
 import { Network, Psbt } from 'bitcoinjs-lib';
 import type { TinySecp256k1Interface } from './types';

package/dist/ledger.js

@@ -60,9 +60,11 @@ async function importAndValidateLedgerBitcoin(ledgerClient) {
         // to require 'ledger-bitcoin' unconditionally, leading to potential errors if
         // 'ledger-bitcoin' is not installed (given it's an optional peerDependency).
         // To bypass this, we directly use require:
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         ledgerBitcoinModule = require('ledger-bitcoin');
     }
     catch (error) {
+        void error;
         throw new Error('Could not import "ledger-bitcoin". This is a peer dependency and needs to be installed explicitly. Please run "npm install ledger-bitcoin" to use Ledger Hardware Wallet functionality.');
     }
     const { AppClient } = ledgerBitcoinModule;
@@ -173,6 +175,7 @@ async function getLedgerXpub({ originPath, ledgerClient, ledgerState, ledgerMana
             xpub = await ledgerClient.getExtendedPubkey(`m${originPath}`, false);
         }
         catch (err) {
+            void err;
             xpub = await ledgerClient.getExtendedPubkey(`m${originPath}`, true);
         }
         if (typeof xpub !== 'string')
@@ -438,7 +441,7 @@ async function registerLedgerWallet({ descriptor, ledgerClient, ledgerState, led
         const { Output } = (0, descriptors_1.DescriptorsFactory)(ledgerManager.ecc);
         output = new Output({
             descriptor,
-            ...(descriptor.includes('*') ? { index: 0 } : {}),
+            ...(descriptor.includes('*') ? { index: 0 } : {}), //if ranged set any index
             network: ledgerManager.network
         });
     }

package/dist/miniscript.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Network } from 'bitcoinjs-lib';
 import type { ECPairAPI } from 'ecpair';
 import type { BIP32API } from 'bip32';

package/dist/psbt.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { PsbtInput } from 'bip174/src/lib/interfaces';
 import type { KeyInfo } from './types';
 import { Network, Psbt } from 'bitcoinjs-lib';

package/dist/signers.js

@@ -74,6 +74,7 @@ function signECPair({ psbt, ecpair }) {
             results.push(true);
         }
         catch (err) {
+            void err;
             results.push(false);
         }
     }

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { ECPairInterface } from 'ecpair';
 import type { BIP32Interface } from 'bip32';
 import type { Payment, Network } from 'bitcoinjs-lib';

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bitcoinerlab/descriptors",
   "description": "This library parses and creates Bitcoin Miniscript Descriptors and generates Partially Signed Bitcoin Transactions (PSBTs). It provides PSBT finalizers and signers for single-signature, BIP32 and Hardware Wallets.",
   "homepage": "https://github.com/bitcoinerlab/descriptors",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "author": "Jose-Luis Landabaso",
   "license": "MIT",
   "repository": {
@@ -34,7 +34,7 @@
     "build:fixtures": "node test/tools/generateBitcoinCoreFixtures.js -i test/fixtures/descriptor_tests.cpp | npx prettier --parser typescript > test/fixtures/bitcoinCore.ts",
     "build:test": "npm run build:fixtures && tsc --project ./node_modules/@bitcoinerlab/configs/tsconfig.test.json --resolveJsonModule",
     "build": "npm run build:src && npm run build:test",
-    "lint": "eslint --ignore-path .gitignore --ext .ts src/ test/",
+    "lint": "if [ \"$ESLINT_USE_FLAT_CONFIG\" != false ]; then echo '\n⚠️  WARNING: ESLINT_USE_FLAT_CONFIG is not set to \"false\".\n   Editors may show different results than the CLI linter.\n   To fix permanently, add this to your ~/.bashrc or ~/.zshrc:\n\n   export ESLINT_USE_FLAT_CONFIG=false\n'; fi; ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ext .ts src/ test/",
     "ensureTester": "./node_modules/@bitcoinerlab/configs/scripts/ensureTester.sh",
     "test:integration:soft": "npm run ensureTester && node test/integration/standardOutputs.js && echo \"\\n\\n\" && node test/integration/miniscript.js",
     "test:integration:ledger": "npm run ensureTester && node test/integration/ledger.js",
@@ -56,7 +56,6 @@
     }
   },
   "devDependencies": {
-    "@bitcoinerlab/configs": "github:bitcoinerlab/configs",
     "@ledgerhq/hw-transport-node-hid": "^6.27.12",
     "@types/lodash.memoize": "^4.1.9",
     "bip39": "^3.0.4",
@@ -67,6 +66,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
+    "@bitcoinerlab/configs": "^1.3.0",
     "@bitcoinerlab/miniscript": "^1.4.0",
     "@bitcoinerlab/secp256k1": "^1.2.0",
     "bip32": "^4.0.0",