remove support for older versions of lnd

alexbosworth · Oct 23, 2020 · 5e559cf · 5e559cf
1 parent dd05681
commit 5e559cf
Show file tree

Hide file tree

Showing 26 changed files with 153 additions and 209 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Versions
 
+## Version 7.0.0
+
+- Support for versions of LND lower than v0.11.0 is discontinued
+
 ## Version 6.5.2
 
 - `increase-inbound-liquidity`: Increase default maximum wait time

diff --git a/balances/get_liquidity.js b/balances/get_liquidity.js
@@ -4,7 +4,6 @@ const {getLiquidity} = require('ln-sync');
 const {getNetwork} = require('ln-sync');
 const {getNode} = require('ln-service');
 const {getScoredNodes} = require('ln-sync');
-const {getWalletInfo} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const balanceFromTokens = require('./balance_from_tokens');

diff --git a/bos b/bos
@@ -220,7 +220,7 @@ prog
   .option('--max-fee <max_fee>', 'Max fee in tokens to pay', INT, 4000)
   .option('--no-color', 'Mute all colors')
   .option('--node <node_name>', 'Node to receive funds on')
-  .option('--recovery <refund_recovery>', 'Attempt refund of swap')
+  .option('--recovery <refund_recovery>', 'Attempt refund of swap', hexMatch)
   .option('--refund-address <refund_address>', 'Refund address for swap')
   .option('--service-socket <swap_service_socket>', 'host:port for service')
   .option('--test-refund', 'Reduce refund timeout height to test refund')
@@ -635,6 +635,7 @@ prog
   // Increase inbound liquidity
   .command('increase-inbound-liquidity', 'Increase node inbound liquidity')
   .help('Spend down a channel to get inbound. Fee is an estimate, may be more')
+  .help('If you want to control chain fee increases, use show-raw-recoveries')
   .option('--address <out_address>', 'Out chain address to send funds out to')
   .option('--api-key <api_key>', 'Pre-paid API key to use')
   .option('--avoid <pubkey>', 'Avoid forwarding through node', REPEATABLE)

diff --git a/chain/get_channel_closes.js b/chain/get_channel_closes.js
@@ -98,20 +98,22 @@ module.exports = ({limit, lnd, request}, cbk) => {
 
           const currentHeight = getHeight.current_block_height;
           const isRemoteForceClose = channel.is_remote_force_close;
+          const init = `${channel.transaction_id}:${channel.transaction_vout}`;
 
           return {
-            alias: alias || undefined,
+            peer_public_key: channel.partner_public_key,
+            peer_alias: alias || undefined,
+            is_local_force_close: channel.is_local_force_close || undefined,
+            is_cooperative_close: channel.is_cooperative_close || undefined,
+            is_remote_force_close: isRemoteForceClose || undefined,
             blocks_since_close: currentHeight - channel.close_confirm_height,
             capacity: channel.capacity,
-            close_transaction_id: channel.close_transaction_id,
+            channel_id: channel.id || undefined,
+            channel_open: init,
+            channel_close: channel.close_transaction_id,
+            channel_balance_spend: channel.close_balance_spent_by || undefined,
+            channel_resolutions: resolutions || undefined,
             is_breach_close: channel.is_breach_close || undefined,
-            is_cooperative_close: channel.is_cooperative_close || undefined,
-            is_local_force_close: channel.is_local_force_close || undefined,
-            is_remote_force_close: isRemoteForceClose || undefined,
-            output_resolutions: resolutions || undefined,
-            partner_public_key: channel.partner_public_key,
-            transaction_id: channel.transaction_id,
-            transaction_vout: channel.transaction_vout,
           };
         });
       }],

diff --git a/encryption/decrypt_with_node.js b/encryption/decrypt_with_node.js
@@ -1,8 +1,8 @@
 const asyncAuto = require('async/auto');
 const {decodeFirst} = require('cbor');
 const {diffieHellmanComputeSecret} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
-const {getWalletInfo} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const decryptWithSecret = require('./decrypt_with_secret');
@@ -64,9 +64,7 @@ module.exports = ({encrypted, lnd}, cbk) => {
       }],
 
       // Get node public key
-      getPublicKey: ['decode', ({decode}, cbk) => {
-        return getWalletInfo({lnd}, cbk);
-      }],
+      getPublicKey: ['decode', ({decode}, cbk) => getIdentity({lnd}, cbk)],
 
       // Determine the foreign key if any
       foreignKey: ['decode', 'getPublicKey', ({decode, getPublicKey}, cbk) => {

diff --git a/encryption/encrypt_to_node.js b/encryption/encrypt_to_node.js
@@ -1,6 +1,6 @@
 const asyncAuto = require('async/auto');
 const {diffieHellmanComputeSecret} = require('ln-service');
-const {getWalletInfo} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const encryptToSecret = require('./encrypt_to_secret');
@@ -36,9 +36,7 @@ module.exports = ({lnd, message, to}, cbk) => {
       },
 
       // Get own public key
-      getPublicKey: ['validate', ({}, cbk) => {
-        return getWalletInfo({lnd}, cbk);
-      }],
+      getPublicKey: ['validate', ({}, cbk) => getIdentity({lnd}, cbk)],
 
       // Encode to public key
       toPublicKey: ['getPublicKey', ({getPublicKey}, cbk) => {

diff --git a/network/execute_probe.js b/network/execute_probe.js
@@ -120,11 +120,9 @@ module.exports = (args, cbk) => {
         const {features} = args;
         const start = now();
 
-        const method = !features ? subscribeToProbe : subscribeToProbeForRoute;
-
         const timeoutMinutes = minutesAsMs((args.timeout_minutes || Number()));
 
-        const sub = method({
+        const sub = subscribeToProbeForRoute({
           cltv_delta: args.cltv_delta,
           destination: args.destination,
           features: args.features,

diff --git a/network/get_identity.js b/network/get_identity.js
diff --git a/network/index.js b/network/index.js
@@ -1,7 +1,6 @@
 const currencyForNetwork = require('./currency_for_network');
 const executeProbe = require('./execute_probe');
 const getForwards = require('./get_forwards');
-const getIdentity = require('./get_identity');
 const getPeers = require('./get_peers');
 const multiPathPayment = require('./multi_path_payment');
 const multiPathProbe = require('./multi_path_probe');
@@ -21,7 +20,6 @@ module.exports = {
   currencyForNetwork,
   executeProbe,
   getForwards,
-  getIdentity,
   getPeers,
   multiPathPayment,
   multiPathProbe,

diff --git a/network/multi_path_probe.js b/network/multi_path_probe.js
@@ -1,6 +1,6 @@
 const asyncAuto = require('async/auto');
 const {getChannels} = require('ln-service');
-const {getWalletInfo} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const multiProbe = require('./multi_probe');
@@ -77,7 +77,7 @@ module.exports = (args, cbk) => {
       }],
 
       // Get the node public key
-      getKey: ['validate', ({}, cbk) => getWalletInfo({lnd: args.lnd}, cbk)],
+      getKey: ['validate', ({}, cbk) => getIdentity({lnd: args.lnd}, cbk)],
 
       // Run probe with ignore list
       probe: ['getChannels', 'getKey', ({getChannels, getKey}, cbk) => {

diff --git a/network/open_channel.js b/network/open_channel.js
@@ -5,12 +5,12 @@ const asyncTimeout = require('async/timeout');
 const {getChainFeeRate} = require('ln-service');
 const {getChannels} = require('ln-service');
 const {getClosedChannels} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {getNetwork} = require('ln-sync');
 const {getNode} = require('ln-service');
 const {getPeers} = require('ln-service');
 const {getPendingChannels} = require('ln-service');
 const {getScoredNodes} = require('ln-sync');
-const {getWalletInfo} = require('ln-service');
 const {openChannel} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
@@ -120,10 +120,8 @@ module.exports = (args, cbk) => {
         cbk);
       }],
 
-      // Get wallet info
-      getWallet: ['validate', ({}, cbk) => {
-        return getWalletInfo({lnd: args.lnd}, cbk);
-      }],
+      // Get wallet identity
+      getWallet: ['validate', ({}, cbk) => getIdentity({lnd: args.lnd}, cbk)],
 
       // Get mempool size
       getMempool: ['getNetwork', ({getNetwork}, cbk) => {

diff --git a/network/pay.js b/network/pay.js
@@ -4,7 +4,6 @@ const {findKey} = require('ln-sync');
 const {formatTokens} = require('ln-sync');
 const {getChannels} = require('ln-service');
 const {getSyntheticOutIgnores} = require('probing');
-const {getWalletInfo} = require('ln-service');
 const {parsePaymentRequest} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 const {subscribeToMultiPathPay} = require('probing');

diff --git a/network/probe_destination.js b/network/probe_destination.js
@@ -4,9 +4,9 @@ const {randomBytes} = require('crypto');
 const asyncAuto = require('async/auto');
 const {decodePaymentRequest} = require('ln-service');
 const {getChannels} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getRouteToDestination} = require('ln-service');
-const {getRoutes} = require('ln-service');
 const {getWalletInfo} = require('ln-service');
 const {parsePaymentRequest} = require('invoices');
 const {payViaRoutes} = require('ln-service');
@@ -15,7 +15,6 @@ const {signBytes} = require('ln-service');
 const {subscribeToFindMaxPayable} = require('probing');
 
 const executeProbe = require('./execute_probe');
-const getIdentity = require('./get_identity');
 const {getInboundPath} = require('./../routing');
 const {sortBy} = require('./../arrays');
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "inquirer": "7.3.3",
     "invoices": "1.1.4",
     "ln-accounting": "4.1.11",
-    "ln-service": "49.14.2",
+    "ln-service": "50.0.1",
     "ln-sync": "0.3.0",
     "ln-telegram": "3.0.2",
     "moment": "2.29.1",
@@ -73,5 +73,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis --push .",
     "test": "tap test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/fiat/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/responses/*.js test/routing/*.js test/swaps/*.js test/wallets/*.js"
   },
-  "version": "6.5.2"
+  "version": "7.0.0"
 }
diff --git a/routing/adjust_fees.js b/routing/adjust_fees.js
@@ -6,11 +6,11 @@ const {findKey} = require('ln-sync');
 const {getChannel} = require('ln-service');
 const {getChannels} = require('ln-service');
 const {getFeeRates} = require('ln-service');
+const {getIdentity} = require('ln-service');
 const {getNodeAlias} = require('ln-sync');
 const {getPendingChannels} = require('ln-service');
 const {gray} = require('colorette');
 const {green} = require('colorette');
-const {getWalletInfo} = require('ln-service');
 const moment = require('moment');
 const {Parser} = require('hot-formula-parser');
 const {returnResult} = require('asyncjs-util');
@@ -76,7 +76,7 @@ module.exports = (args, cbk) => {
 
       // Get the wallet public key
       getPublicKey: ['validate', ({}, cbk) => {
-        return getWalletInfo({lnd: args.lnd}, cbk);
+        return getIdentity({lnd: args.lnd}, cbk);
       }],
 
       // Get the current fee rates