balanceofsatoshis 22.1.5 → 22.1.7

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 22.1.5
+## 22.1.7
 
 - Add support for LND 0.21.1
 

package/lnurl/auth.js

@@ -2,7 +2,6 @@ const asyncAuto = require('async/auto');
 const {bech32} = require('bech32');
 const {returnResult} = require('asyncjs-util');
 const {signMessage} = require('ln-service');
-const tinysecp = require('tiny-secp256k1');
 
 const signAuthChallenge = require('./sign_auth_challenge');
 
@@ -35,9 +34,6 @@ const wordsAsUtf8 = n => Buffer.from(bech32.fromWords(n)).toString('utf8');
 module.exports = (args, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
-      // Import the ECPair library
-      ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
-
       // Check arguments
       validate: cbk => {
         if (!args.ask) {
@@ -112,18 +108,21 @@ module.exports = (args, cbk) => {
       }],
 
       // Derive keys and get signatures
-      sign: ['ecp', 'parse', 'seed', ({ecp, parse, seed}, cbk) => {
-        const sign = signAuthChallenge({
-          ecp,
-          hostname: parse.hostname,
-          k1: parse.k1,
-          seed: seed.signature,
-        });
-
-        return cbk(null, {
-          public_key: sign.public_key,
-          signature: sign.signature,
-        });
+      sign: ['parse', 'seed', ({parse, seed}, cbk) => {
+        try {
+          const sign = signAuthChallenge({
+            hostname: parse.hostname,
+            k1: parse.k1,
+            seed: seed.signature,
+          });
+
+          return cbk(null, {
+            public_key: sign.public_key,
+            signature: sign.signature,
+          });
+        } catch (err) {
+          return cbk([500, 'UnexpectedErrorSigningAuthChallenge', {err}]);
+        }
       }],
 
       // Display confirmation dialog with domain name and action

package/lnurl/sign_auth_challenge.js

@@ -1,46 +1,59 @@
 const {createHash} = require('crypto');
 const {createHmac} = require('crypto');
 
+const tinysecp256k1 = require('tiny-secp256k1');
+
 const derEncodeSignature = require('./der_encode_signature');
 
-const asDer = n => (n[0]&128)?Buffer.concat([Buffer.alloc(1),n],1+n.length):n;
-const bufferAsHex = buffer => buffer.toString('hex');
-const {from} = Buffer;
+const bufferAsHex = buffer => Buffer.from(buffer).toString('hex');
+const derivePublicKey = key => tinysecp256k1.pointFromScalar(key, true);
 const hexAsBuffer = hex => Buffer.from(hex, 'hex');
 const hmacSha256 = (pk, url) => createHmac('sha256', pk).update(url).digest();
+const {isPrivate} = tinysecp256k1;
 const sha256 = n => createHash('sha256').update(n).digest();
+const {sign} = tinysecp256k1;
 const utf8AsBuffer = utf8 => Buffer.from(utf8, 'utf8');
 
 /** Sign an authentication challenge for LNURL Auth
 
   {
-    ecp: <ECPair Object>
     hostname: <Domain for Authentication Challenge String>
     k1: <Challenge Nonce String>
     seed: <Seed Signature String>
   }
 
+  @throws
+  <Error>
+
   @returns
   {
     public_key: <Signing Identity Public Key Hex String>
     signature: <Signature For Authentication Challenge Hex String>
   }
 */
-module.exports = ({ecp, hostname, k1, seed}) => {
+module.exports = ({hostname, k1, seed}) => {
   // LUD-13: LN wallet defines hashingKey as sha256(signature)
   const hashingKey = sha256(utf8AsBuffer(seed));
 
   // LUD-13: linkingPrivKey is defined as hmacSha256(hashingKey, domain)
   const linkingPrivKey = hmacSha256(hashingKey, utf8AsBuffer(hostname));
 
-  // Instantiate the key pair from this derived private key
-  const linkingKey = ecp.fromPrivateKey(linkingPrivKey);
+  // Validate the private key
+  if (!isPrivate(linkingPrivKey)) {
+    throw new Error('ExpectedValidLinkingPrivateKey');
+  }
+
+  const publicKey = derivePublicKey(linkingPrivKey);
+
+  if (!publicKey) {
+    throw new Error('ExpectedPublicKeyFromLinkingPrivateKey');
+  }
 
   // Using the host-specific linking key, sign the challenge k1 value
-  const signature = bufferAsHex(from(linkingKey.sign(hexAsBuffer(k1))));
+  const signature = bufferAsHex(sign(hexAsBuffer(k1), linkingPrivKey));
 
   return {
-    public_key: bufferAsHex(linkingKey.publicKey),
+    public_key: bufferAsHex(publicKey),
     signature: derEncodeSignature({signature}).encoded,
   };
 };

package/offchain/sign_payment_request.js

@@ -1,6 +1,7 @@
 const {randomBytes} = require('crypto');
 
 const asyncAuto = require('async/auto');
+const asyncRetry = require('async/retry');
 const {createSignedRequest} = require('ln-service');
 const {createUnsignedRequest} = require('ln-service');
 const {decode} = require('bip66');
@@ -8,13 +9,15 @@ const {returnResult} = require('asyncjs-util');
 const {signBytes} = require('ln-service');
 const tinysecp256k1 = require('tiny-secp256k1');
 
-const bufferAsHex = buffer => buffer.toString('hex');
+const bufferAsHex = buffer => Buffer.from(buffer).toString('hex');
 const {concat} = Buffer;
 const defaultBaseFee = '1000';
 const defaultCltvDelta = 144;
 const defaultFeeRate = '1';
+const derivePublicKey = key => tinysecp256k1.pointFromScalar(key, true);
 const hexAsBuffer = hex => Buffer.from(hex, 'hex');
 const {isArray} = Array;
+const {isPrivate} = tinysecp256k1;
 const keyFamilyIdentity = 6;
 const keyIndexIdentity = 0;
 const makePrivateKey = () => randomBytes(32);
@@ -103,20 +106,33 @@ module.exports = (args, cbk) => {
         return cbk();
       },
 
-      // Create a key pair for a virtual channel invoice
-      getKeyPair: ['validate', async ({}) => {
+      // Generate key pair
+      getKeyPair: ['validate', ({}, cbk) => {
         // Exit early when not using a virtual channel
         if (!args.is_virtual) {
-          return;
+          return cbk();
         }
 
-        const ecp = (await import('ecpair')).ECPairFactory(tinysecp256k1);
+        return asyncRetry({}, cbk => {
+          const privateKey = makePrivateKey();
 
-        const key = ecp.fromPrivateKey(makePrivateKey());
+          // Very rarely random bytes are not a valid private key
+          if (!isPrivate(privateKey)) {
+            return cbk([503, 'ExpectedValidPrivateKeyFromRandomBytes']);
+          }
+
+          const publicKey = derivePublicKey(privateKey);
 
-        const publicKey = unit8AsHex(key.publicKey);
+          if (!publicKey) {
+            return cbk([503, 'ExpectedDerivedPublicKeyFromPrivateKey']);
+          }
 
-        return {private_key: key.privateKey, public_key: publicKey};
+          return cbk(null, {
+            private_key: privateKey,
+            public_key: bufferAsHex(publicKey),
+          });
+        },
+        cbk);
       }],
 
       // Assemble the hop hints from the chosen hint channels

package/package.json

@@ -28,8 +28,7 @@
     "cbor": "10.0.12",
     "colorette": "2.0.20",
     "crypto-js": "4.2.0",
-    "csv-parse": "6.2.1",
-    "ecpair": "2.1.0",
+    "csv-parse": "7.0.1",
     "goldengate": "16.0.3",
     "grammy": "1.44.0",
     "hot-formula-parser": "4.0.0",
@@ -37,7 +36,7 @@
     "ini": "7.0.0",
     "inquirer": "14.0.2",
     "ln-accounting": "10.0.3",
-    "ln-service": "59.1.2",
+    "ln-service": "59.2.0",
     "ln-sync": "8.0.3",
     "ln-telegram": "8.0.3",
     "minimist": "1.2.8",
@@ -81,5 +80,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "npx nyc@17.1.0 node --experimental-test-coverage --test test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/peers/*.js test/responses/*.js test/routing/*.js test/services/*.js test/swaps/*.js test/tags/*.js test/telegram/*.js test/wallets/*.js"
   },
-  "version": "22.1.5"
+  "version": "22.1.7"
 }

package/test/integration/test_fund_transaction.js

@@ -1,37 +1,25 @@
 const {equal} = require('node:assert').strict;
 const test = require('node:test');
 
-const {address} = require('bitcoinjs-lib');
 const {createChainAddress} = require('ln-service');
-const {crypto} = require('bitcoinjs-lib');
-const {networks} = require('bitcoinjs-lib');
-const {script} = require('bitcoinjs-lib');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const tinysecp = require('tiny-secp256k1');
 
 const {fundTransaction} = require('./../../chain');
 
-const {compile} = script;
 const count = 100;
-const {fromOutputScript} = address;
-const makeTaprootKey = (k, h) => tinysecp.xOnlyPointAddTweak(k, h).xOnlyPubkey;
-const OP_1 = 81;
-const shortKey = keyPair =>  keyPair.publicKey.slice(1, 33);
-const tapHash = k => crypto.taggedHash('TapTweak', k.publicKey.slice(1, 33));
 const tokens = 1e6;
 
 // Funding a transaction should result in a funded tx
 test(`Fund transaction`, async () => {
-  const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
   const {kill, nodes} = await spawnLightningCluster({});
 
   const [{generate, lnd}] = nodes;
 
-  const {address} = await createChainAddress({lnd, format: 'p2tr'});
+  try {
+    const {address} = await createChainAddress({lnd, format: 'p2tr'});
 
-  await generate({count});
+    await generate({count});
 
-  try {
     await fundTransaction({
       lnd,
       addresses: [address],
@@ -44,7 +32,7 @@ test(`Fund transaction`, async () => {
     });
   } catch (err) {
     equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
   }
-
-  await kill({});
 });

package/test/wallets/test_report_overview.js

@@ -19,7 +19,7 @@ const report = [
   },
   {},
   {
-    subtitle: '56 years ago',
+    subtitle: '57 years ago',
     title: 'Last Block:',
   },
   {