ln-service 53.9.1 → 53.9.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 53.9.1
+## 53.9.2
 
 - `getPendingPayments`: Add method to get payments in flight
 

package/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "bolt07": "1.8.0",
     "cors": "2.8.5",
-    "express": "4.17.2",
+    "express": "4.17.3",
     "invoices": "2.0.4",
     "lightning": "5.8.1",
     "macaroon": "3.0.4",
@@ -29,11 +29,12 @@
     "bs58check": "2.1.2",
     "ecpair": "2.0.1",
     "ln-docker-daemons": "2.2.4",
+    "p2tr": "1.2.0",
     "portfinder": "1.0.28",
     "psbt": "2.0.0",
     "rimraf": "3.0.2",
     "secp256k1": "4.0.3",
-    "tiny-secp256k1": "2.2.0",
+    "tiny-secp256k1": "2.2.1",
     "uuid": "8.3.2",
     "varuint-bitcoin": "1.1.2"
   },
@@ -68,5 +69,5 @@
     "integration-test-0.12.0": "DOCKER_LND_VERSION=v0.12.0-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 200 test/autopilotrpc-integration/*.js test/chainrpc-integration/*.js test/integration/*.js test/invoicesrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "53.9.1"
+  "version": "53.9.2"
 }

package/test/walletrpc-integration/test_fund_psbt.js

@@ -1,14 +1,14 @@
 const asyncRetry = require('async/retry');
 const {address} = require('bitcoinjs-lib');
 const {createPsbt} = require('psbt');
-const {crypto} = require('bitcoinjs-lib');
 const {decodePsbt} = require('psbt');
 const {networks} = require('bitcoinjs-lib');
-const {script} = require('bitcoinjs-lib');
+const {signHash} = require('p2tr');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
 const {Transaction} = require('bitcoinjs-lib');
+const {v1OutputScript} = require('p2tr');
 
 const {broadcastChainTransaction} = require('./../../');
 const {createChainAddress} = require('./../../');
@@ -20,28 +20,16 @@ const {sendToChainAddress} = require('./../../');
 const {signPsbt} = require('./../../');
 
 const chainAddressRowType = 'chain_address';
-const {compile} = script;
 const confirmationCount = 6;
 const count = 100;
 const description = 'description';
-const extra = Buffer.alloc(32);
 const {fromBech32} = address;
 const {fromHex} = Transaction;
 const {fromOutputScript} = address;
 const hexAsBuffer = hex => Buffer.from(hex, 'hex');
 const interval = retryCount => 10 * Math.pow(2, retryCount);
-const isLowPublicKey = keyPair => keyPair.publicKey[0] === 2;
-const makeTaprootKey = (k, h) => tinysecp.xOnlyPointAddTweak(k, h).xOnlyPubkey;
-const nLess1 = 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140';
-const one256BitBigEndian = '0000000000000000000000000000000000000000000000000000000000000001';
-const OP_1 = 81;
-const {privateAdd} = tinysecp;
-const {privateSub} = tinysecp;
 const regtestBech32AddressHrp = 'bcrt';
-const shortKey = keyPair =>  keyPair.publicKey.slice(1, 33);
-const {signSchnorr} = tinysecp;
 const smallTokens = 2e5;
-const tapHash = k => crypto.taggedHash('TapTweak', k.publicKey.slice(1, 33));
 const times = 20;
 const {toOutputScript} = address;
 const tokens = 1e6;
@@ -126,10 +114,11 @@ test(`Fund PSBT`, async ({end, equal}) => {
 
     const keyPair = ecp.makeRandom({network: networks.regtest});
 
-    const outputKey = makeTaprootKey(shortKey(keyPair), tapHash(keyPair));
-    const tweakHash = tapHash(keyPair);
+    const output = v1OutputScript({
+      internal_key: keyPair.publicKey.toString('hex'),
+    });
 
-    const outputScript = compile([OP_1, Buffer.from(outputKey)]);
+    const outputScript = hexAsBuffer(output.script);
 
     const [utxo] = (await getUtxos({lnd})).utxos.reverse();
 
@@ -175,16 +164,13 @@ test(`Fund PSBT`, async ({end, equal}) => {
       );
     });
 
-    const isLow = isLowPublicKey(keyPair);
-    const ONE = hexAsBuffer(one256BitBigEndian);
-    const subtract = privateSub(hexAsBuffer(nLess1), keyPair.privateKey);
-
-    const privateKey = isLow ? keyPair.privateKey : privateAdd(subtract, ONE);
-
-    // Only low keys are allowed to save a leading byte on the public key
-    const lowPrivateKey = privateAdd(privateKey, tweakHash);
+    const signedInput = signHash({
+      private_key: keyPair.privateKey.toString('hex'),
+      public_key: keyPair.publicKey.toString('hex'),
+      sign_hash: hashToSign.toString('hex'),
+    });
 
-    const signature = signSchnorr(hashToSign, lowPrivateKey, extra);
+    const signature = hexAsBuffer(signedInput.signature);
 
     // Add the signature to the input
     tx.ins.forEach((input, i) => tx.setWitness(i, [Buffer.from(signature)]));