GlcoinCore/balanceofsatoshis
1
0
Fork 0
mirror of https://github.com/alexbosworth/balanceofsatoshis.git synced 2026-08-13 12:33:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update dependencies

Browse source
This commit is contained in:
Alex Bosworth 2019-05-24 12:08:42 -07:00
parent 90777853ad
commit 3033637663
No known key found for this signature in database
GPG key ID: E80D2F3F311FD87E
24 changed files with 262 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

3
async/index.js
View file

@ -1,3 +0,0 @@
const returnResult = require('./return_result');
module.exports = {returnResult};

22
async/return_result.js
View file

@ -1,22 +0,0 @@
/** Return result of async auto flow
{
[of]: <Attribute String>
}
@returns
<(err, res) Function>
*/
module.exports = (args, cbk) => {
return (err, res) => {
if (!!err) {
return cbk(err);
}
if (!!args.of) {
return cbk(null, res[args.of]);
}
return cbk();
};
};

3
balances/balance_from_tokens.js
View file

@ -1,3 +1,4 @@
const {isArray} = Array;
const noTokens = 0;
/** Get balance from tokens
@ -15,7 +16,7 @@ const noTokens = 0;
<Balance Number>
*/
module.exports = args => {
if (!Array.isArray(args.tokens)) {
if (!isArray(args.tokens)) {
throw new Error('ExpectedTokensToCalculateBalance');
}

8
balances/get_accounting_report.js
View file

@ -1,10 +1,10 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {getAccountingReport} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const categories = require('./accounting_categories');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const defaultCurrency = 'BTC';
const defaultFiat = 'USD';
@ -40,11 +40,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', 'validate', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get accounting info

8
balances/get_balance.js
View file

@ -1,13 +1,13 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {getChainBalance} = require('ln-service');
const {getChannelBalance} = require('ln-service');
const {getChannels} = require('ln-service');
const {getPendingChainBalance} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const balanceFromTokens = require('./balance_from_tokens');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const {max} = Math;
const noTokens = 0;
@ -34,11 +34,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get the chain balance

8
balances/get_liquidity.js
View file

@ -1,11 +1,11 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {getChannels} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {percentile} = require('stats-lite');
const {returnResult} = require('asyncjs-util');
const balanceFromTokens = require('./balance_from_tokens');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const {round} = Math;
const topPercentile = 0.9;
@ -32,11 +32,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get the channels

4
bolt03/resolution_type.js
View file

@ -1,6 +1,8 @@
const {channelResolution} = require('bolt03');
const {Transaction} = require('bitcoinjs-lib');
const {fromHex} = Transaction;
/** Resolution type
{
@ -14,7 +16,7 @@ const {Transaction} = require('bitcoinjs-lib');
}
*/
module.exports = ({transaction, vin}) => {
const tx = Transaction.fromHex(transaction);
const tx = fromHex(transaction);
const witness = tx.ins[vin].witness.map(n => n.toString('hex'));

11
chain/get_chain_fees.js
View file

@ -1,10 +1,10 @@
const asyncAuto = require('async/auto');
const asyncTimesSeries = require('async/timesSeries');
const {authenticatedLndGrpc} = require('ln-service');
const {getChainFeeRate} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const bytesPerKb = 1e3;
const {ceil} = Math;
@ -14,6 +14,8 @@ const start = 2;
/** Get chain fees
Requires that the lnd is built with walletrpc
{
[blocks]: <Block Count Number>
[node]: <Node Name String>
@ -33,12 +35,11 @@ module.exports = ({blocks, node}, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
service: 'WalletKit',
socket: credentials.socket,
}));
}).lnd);
}],
// Get the fees

8
chain/get_channel_closes.js
View file

@ -1,9 +1,10 @@
const asyncAuto = require('async/auto');
const asyncMapSeries = require('async/mapSeries');
const {authenticatedLndGrpc} = require('ln-service');
const {getClosedChannels} = require('ln-service');
const {getWalletInfo} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const request = require('request');
const {returnResult} = require('asyncjs-util');
const {subscribeToChainSpend} = require('ln-service');
const {take} = require('lodash');
const {Transaction} = require('bitcoinjs-lib');
@ -12,7 +13,6 @@ const {channelResolution} = require('./../bolt03');
const getChannelResolution = require('./get_channel_resolution');
const {lndCredentials} = require('./../lnd');
const {resolutionType} = require('./../bolt03');
const {returnResult} = require('./../async');
const defaultLimit = 20;
@ -50,11 +50,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get closed channels

2
chain/get_channel_resolution.js
View file

@ -1,10 +1,10 @@
const asyncAuto = require('async/auto');
const asyncMapSeries = require('async/mapSeries');
const request = require('request');
const {returnResult} = require('asyncjs-util');
const {Transaction} = require('bitcoinjs-lib');
const {resolutionType} = require('./../bolt03');
const {returnResult} = require('./../async');
const closeSpendsDelayMs = 1000;
const getTxDelayMs = 2000;

8
chain/get_utxos.js
View file

@ -1,9 +1,9 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {getUtxos} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const noTokens = 0;
@ -37,11 +37,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get UTXOs

8
chain/split_utxos.js
View file

@ -1,12 +1,12 @@
const asyncAuto = require('async/auto');
const asyncMapSeries = require('async/mapSeries');
const {authenticatedLndGrpc} = require('ln-service');
const {createChainAddress} = require('ln-service');
const {getUtxos} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {sendToChainAddresses} = require('ln-service');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const consumedUtxoCount = 1;
const decBase = 10;
@ -48,11 +48,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get all the current confirmed UTXOs

3
fiat/get_exchange_rates.js
View file

@ -4,8 +4,7 @@ const {readFile} = require('fs');
const asyncAuto = require('async/auto');
const request = require('request');
const {returnResult} = require('./../async');
const {returnResult} = require('asyncjs-util');
const apiKeyFile = 'bitcoinaverage_api_key';
const cents = 100;

2
lnd/lnd_credentials.js
View file

@ -5,9 +5,9 @@ const {readFile} = require('fs');
const asyncAuto = require('async/auto');
const asyncDetectSeries = require('async/detectSeries');
const {flatten} = require('lodash');
const {returnResult} = require('asyncjs-util');
const lndDirectory = require('./lnd_directory');
const {returnResult} = require('./../async');
const base64 = 'base64';
const certPath = ['tls.cert'];

8
network/get_forwards.js
View file

@ -1,16 +1,16 @@
const asyncAuto = require('async/auto');
const asyncMap = require('async/map');
const {authenticatedLndGrpc} = require('ln-service');
const {getChannels} = require('ln-service');
const {getClosedChannels} = require('ln-service');
const {getForwards} = require('ln-service');
const {getPendingChannels} = require('ln-service');
const {getNode} = require('ln-service');
const {getWalletInfo} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {uniq} = require('lodash');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const byLastForwardAt = (a, b) => parse(a.last_forward_at) < parse(b.last_forward_at) ? -1 : 1;
const limit = 99999;
@ -47,11 +47,11 @@ module.exports = ({days, node}, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get channels

8
network/hidden_pay.js
View file

@ -1,16 +1,16 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {calculatePaths} = require('ln-service');
const {getChannels} = require('ln-service');
const {getNetworkGraph} = require('ln-service');
const {getWalletInfo} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {parsePaymentRequest} = require('ln-service');
const {pay} = require('ln-service');
const {probe} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {routeFromHops} = require('ln-service');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
/** Pay an invoice using only non-public IP node channels
@ -33,11 +33,11 @@ module.exports = ({node, request}, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Decode payment request

8
network/probe_destination.js
View file

@ -1,11 +1,11 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {decodePaymentRequest} = require('ln-service');
const {getRoutes} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {probe} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const defaultTokens = 10;
const {now} = Date;
@ -31,11 +31,11 @@ module.exports = ({node, request}, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Decode payment request

6
network/send_gift.js
View file

@ -1,14 +1,14 @@
const asyncAuto = require('async/auto');
const {authenticatedLndGrpc} = require('ln-service');
const {createInvoice} = require('ln-service');
const {getChannel} = require('ln-service');
const {getChannels} = require('ln-service');
const {getWalletInfo} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const {routeFromChannels} = require('ln-service');
const {pay} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const {floor} = Math;
const {isArray} = Array;
@ -52,7 +52,7 @@ module.exports = ({node, to, tokens}, cbk) => {
lnd: ['credentials', 'validate', ({credentials}, cbk) => {
const {cert, macaroon, socket} = credentials;
return cbk(null, lightningDaemon({cert, macaroon, socket}));
return cbk(null, authenticatedLndGrpc({cert, macaroon, socket}).lnd);
}],
// Get channels

26
network/set_autopilot.js
View file

@ -1,12 +1,12 @@
const asyncAuto = require('async/auto');
const asyncMap = require('async/map');
const {authenticatedLndGrpc} = require('ln-service');
const {getNetworkGraph} = require('ln-service');
const {lightningDaemon} = require('ln-service');
const request = require('request');
const {returnResult} = require('asyncjs-util');
const {setAutopilot} = require('ln-service');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const average = arr => arr.reduce((a, b) => a + b, 0) / arr.length;
const flatten = arr => [].concat(...arr);
@ -123,23 +123,13 @@ module.exports = (args, cbk) => {
cbk);
}],
// Autopilot RPC lnd
autopilotLnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
cert: credentials.cert,
macaroon: credentials.macaroon,
service: 'Autopilot',
socket: credentials.socket,
}));
}],
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Get the mirror nodes
@ -228,19 +218,15 @@ module.exports = (args, cbk) => {
}],
// Set autopilot
setAutopilot: [
'autopilotLnd',
'candidateNodes',
({autopilotLnd, candidateNodes}, cbk) =>
{
setAutopilot: ['lnd', 'candidateNodes', ({lnd, candidateNodes}, cbk) => {
if (!!args.is_dryrun) {
return cbk();
}
return setAutopilot({
lnd,
candidateNodes: !candidateNodes.length ? undefined : candidateNodes,
is_enabled: args.is_enabled,
lnd: autopilotLnd,
},
cbk);
}],

193
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "balanceofsatoshis",
"version": "1.11.3",
"version": "1.11.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -118,15 +118,15 @@
}
},
"@babel/parser": {
"version": "7.4.4",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz",
"integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==",
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
"integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
"dev": true
},
"@babel/runtime": {
"version": "7.4.4",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz",
"integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==",
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
"integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
"dev": true,
"requires": {
"regenerator-runtime": "^0.13.2"
@ -152,16 +152,16 @@
}
},
"@babel/traverse": {
"version": "7.4.4",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz",
"integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==",
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
"integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"@babel/generator": "^7.4.4",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.4.4",
"@babel/parser": "^7.4.4",
"@babel/parser": "^7.4.5",
"@babel/types": "^7.4.4",
"debug": "^4.1.0",
"globals": "^11.1.0",
@ -295,9 +295,9 @@
"dev": true
},
"@types/react": {
"version": "16.8.17",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.17.tgz",
"integrity": "sha512-pln3mgc6VfkNg92WXODul/ONo140huK9OMsx62GlBlZ2lvjNK86PQJhYMPLO1i66aF5O9OPyZefogvNltBIszA==",
"version": "16.8.18",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.18.tgz",
"integrity": "sha512-lUXdKzRqWR4FebR5tGHkLCqnvQJS4fdXKCBrNGGbglqZg2gpU+J82pMONevQODUotATs9fc9k66bx3/St8vReg==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@ -438,12 +438,9 @@
"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
},
"async": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
"integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
"requires": {
"lodash": "^4.17.11"
}
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-3.0.0.tgz",
"integrity": "sha512-LNZ6JSpKraIia6VZKKbKxmX6nWIdfsG7WqrOvKpCuDjH7BnGyQRFMTSXEe8to2WF/rqoAKgZvj+L5nnxe0suAg=="
},
"async-each": {
"version": "1.0.3",
@ -465,6 +462,11 @@
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
},
"asyncjs-util": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.0.0.tgz",
"integrity": "sha512-WNHgzCG8Px3RrYTUDaz78IwNl88jjwWGzNULdMLhkDoUZsA7prFTMvys7GvQqd/kD5xSdny40xjYP1USX3CSWQ=="
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@ -784,15 +786,15 @@
}
},
"bip32": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.2.tgz",
"integrity": "sha512-Wws0wBYp+KViCTJLLalmOUhefd1puJslme6ks1HPRuEEXGA28HNRVcx6aIGnH0VNYr/NqoUMYf/QakCjbXcElQ==",
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.3.tgz",
"integrity": "sha512-Tg4dHUXiYBkJyCQq4g++C2PqKcZRveVqy7cKxyl88Uai7MmmknFGaF88odYrXcXk5EMyrlXLuAMC3yEiLxRnNA==",
"requires": {
"@types/node": "10.12.18",
"bs58check": "^2.1.1",
"create-hash": "^1.2.0",
"create-hmac": "^1.1.7",
"tiny-secp256k1": "^1.0.0",
"tiny-secp256k1": "^1.1.0",
"typeforce": "^1.11.5",
"wif": "^2.0.6"
}
@ -811,13 +813,13 @@
"integrity": "sha512-pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow=="
},
"bitcoinjs-lib": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.0.3.tgz",
"integrity": "sha512-uc1htf5acG5vcwyhOnES1MFIe21fNn+0VnJLNAcw1/uAQGDF0SNfzEA8SUwnMZ4J26zHiAmk6hVnlVl8yYOTPA==",
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.0.4.tgz",
"integrity": "sha512-xX+nTIBeTn8p4R4CbQaArvAjSt5gKsYTEWmFcD8hlH6ZDXaACvQVk1m7XpqNGP/84Wpd6FTIZoaYycLYfM95xA==",
"requires": {
"@types/node": "10.12.18",
"bech32": "^1.1.2",
"bip32": "^2.0.0",
"bip32": "^2.0.3",
"bip66": "^1.1.0",
"bitcoin-ops": "^1.4.0",
"bs58check": "^2.0.0",
@ -826,7 +828,7 @@
"merkle-lib": "^2.0.10",
"pushdata-bitcoin": "^1.0.1",
"randombytes": "^2.0.1",
"tiny-secp256k1": "^1.0.0",
"tiny-secp256k1": "^1.1.1",
"typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1"
@ -866,6 +868,30 @@
"requires": {
"bitcoin-ops": "1.4.1",
"bitcoinjs-lib": "5.0.3"
},
"dependencies": {
"bitcoinjs-lib": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.0.3.tgz",
"integrity": "sha512-uc1htf5acG5vcwyhOnES1MFIe21fNn+0VnJLNAcw1/uAQGDF0SNfzEA8SUwnMZ4J26zHiAmk6hVnlVl8yYOTPA==",
"requires": {
"@types/node": "10.12.18",
"bech32": "^1.1.2",
"bip32": "^2.0.0",
"bip66": "^1.1.0",
"bitcoin-ops": "^1.4.0",
"bs58check": "^2.0.0",
"create-hash": "^1.1.0",
"create-hmac": "^1.1.3",
"merkle-lib": "^2.0.10",
"pushdata-bitcoin": "^1.0.1",
"randombytes": "^2.0.1",
"tiny-secp256k1": "^1.0.0",
"typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1"
}
}
}
},
"bolt07": {
@ -1345,9 +1371,9 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"core-js": {
"version": "2.6.5",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.8.tgz",
"integrity": "sha512-RWlREFU74TEkdXzyl1bka66O3kYp8jeTXrvJZDzVVMH8AiHUSOFpL1yfhQJ+wHocAm1m+4971W1PPzfLuCv1vg==",
"dev": true
},
"core-util-is": {
@ -2552,9 +2578,9 @@
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ink": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ink/-/ink-2.1.1.tgz",
"integrity": "sha512-vP1yE/uJoiY6uB9yHalczUA02I9fg7xDUbTEZitPK5y6dvnPo9a/6UWqIB2uCYkHOhEZMN+D/TsVr4v2sz8qYA==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/ink/-/ink-2.2.0.tgz",
"integrity": "sha512-BQl7jpmLxPqFGjdQdgXQS0+mAyn1BHkEW1YXur3dahNNwLB6MWsfAZ1GWVdj+Mbpmj+u33KaFOosw3067t3d9g==",
"dev": true,
"requires": {
"@types/react": "^16.8.6",
@ -2767,6 +2793,11 @@
"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
"dev": true
},
"is-base64": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/is-base64/-/is-base64-0.1.0.tgz",
"integrity": "sha512-WRRyllsGXJM7ZN7gPTCCQ/6wNPTRDwiWdPK66l5sJzcU/oOzcIcRRf0Rux8bkpox/1yjt0F6VJRsQOIG2qz5sg=="
},
"is-binary-path": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@ -2814,6 +2845,11 @@
"is-extglob": "^2.1.1"
}
},
"is-hex": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/is-hex/-/is-hex-1.1.3.tgz",
"integrity": "sha1-RAJZwHloHgNy5SFWqmeiM8OXXe4="
},
"is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@ -2888,9 +2924,9 @@
},
"dependencies": {
"semver": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
"integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz",
"integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==",
"dev": true
}
}
@ -2985,9 +3021,9 @@
}
},
"jackspeak": {
"version": "1.3.8",
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-1.3.8.tgz",
"integrity": "sha512-/Q7j4mWr5/XCnsR6IGA4FFZTylZCDbF5sNaLEVhfOYlau3DXcCSygTvXKnP3apwikzMirljf2QZq9fVuSZw6MA==",
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-1.4.0.tgz",
"integrity": "sha512-VDcSunT+wcccoG46FtzuBAyQKlzhHjli4q31e1fIHGOsRspqNUFjVzGb+7eIFDlTvqLygxapDHPHS0ouT2o/tw==",
"dev": true,
"requires": {
"cliui": "^4.1.0"
@ -3101,16 +3137,16 @@
"dev": true
},
"ln-service": {
"version": "37.0.1",
"resolved": "https://registry.npmjs.org/ln-service/-/ln-service-37.0.1.tgz",
"integrity": "sha512-1ISwBjNVJd343Is0b9ISAoiYdztiNrZulKD6V+1TIy7TWopPhtsDifVZmvY5vcER4VuXCf07Snla60WMQ6zeFg==",
"version": "38.0.0",
"resolved": "https://registry.npmjs.org/ln-service/-/ln-service-38.0.0.tgz",
"integrity": "sha512-OqT+rHwrJSPHPbhCa1cQ8eoQ6KwKLz/tbLu7RNNc3aEuQKyvOkSVzGS+8dZMC5ztoQOy8H6oP2tDVmd0oxZl3A==",
"requires": {
"@datastructures-js/priority-queue": "1.0.2",
"@grpc/proto-loader": "0.5.1",
"async": "2.6.2",
"async": "3.0.0",
"basicauth-middleware": "3.1.0",
"bech32": "1.1.3",
"bitcoinjs-lib": "5.0.3",
"bitcoinjs-lib": "5.0.4",
"bn.js": "4.11.8",
"body-parser": "1.19.0",
"bolt07": "1.4.0",
@ -3119,6 +3155,8 @@
"dotenv": "8.0.0",
"express": "4.17.0",
"grpc": "1.20.3",
"is-base64": "0.1.0",
"is-hex": "1.1.3",
"json2csv": "4.5.1",
"lodash": "4.17.11",
"morgan": "1.9.1",
@ -4669,9 +4707,9 @@
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
},
"table": {
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/table/-/table-5.3.3.tgz",
"integrity": "sha512-3wUNCgdWX6PNpOe3amTTPWPuF6VGvgzjKCaO1snFj0z7Y3mUPWf5+zDtxUVGispJkDECPmR29wbzh6bVMOHbcw==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
"integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
"requires": {
"ajv": "^6.9.1",
"lodash": "^4.17.11",
@ -4720,9 +4758,9 @@
}
},
"tap": {
"version": "14.0.0",
"resolved": "https://registry.npmjs.org/tap/-/tap-14.0.0.tgz",
"integrity": "sha512-4690TGCbBTwyIhJWH918o/1zLoWUqc+8o0/zQtLjFLzQ76vlurNtMfVLkVS9dNztjuv01fgol+YhNJbzg/dfUA==",
"version": "14.1.10",
"resolved": "https://registry.npmjs.org/tap/-/tap-14.1.10.tgz",
"integrity": "sha512-mwYjPJpbnBvwsy1IP12g7UgtvgfnFwIVfeYcI27LDuefFGe1XtW+7+ZgFwu0qHG9f+YCBPMhm82W5o8QggPxkA==",
"dev": true,
"requires": {
"async-hook-domain": "^1.1.0",
@ -4743,10 +4781,10 @@
"import-jsx": "^2.0.0",
"isexe": "^2.0.0",
"istanbul-lib-processinfo": "^1.0.0",
"jackspeak": "^1.3.8",
"jackspeak": "^1.4.0",
"minipass": "^2.3.5",
"mkdirp": "^0.5.1",
"nyc": "^14.1.0",
"nyc": "^14.1.1",
"opener": "^1.5.1",
"own-or": "^1.0.0",
"own-or-env": "^1.0.1",
@ -4758,13 +4796,13 @@
"tap-parser": "^9.3.2",
"tap-yaml": "^1.0.0",
"tcompare": "^2.3.0",
"treport": "^0.3.0",
"treport": "^0.4.0",
"trivial-deferred": "^1.0.1",
"ts-node": "^8.1.0",
"typescript": "^3.4.5",
"which": "^1.3.1",
"write-file-atomic": "^2.4.2",
"yaml": "^1.5.1",
"yaml": "^1.6.0",
"yapool": "^1.0.0"
}
},
@ -4848,14 +4886,23 @@
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"tiny-secp256k1": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.1.tgz",
"integrity": "sha512-jA9WalQuhKun1svJrAVi9Vu8aUWKMfR7nMV903kHjrHTTY/IFa0petSq+Jk/Mv447dGD9LC8fGsmGRubBbcNng==",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.2.tgz",
"integrity": "sha512-InukePecGvfngAEmPR/AIVpAmBTBCdO7tFuMKCpQDE6Zr+lQVT/hDArPkUUolPPpCgwbN/yk2rSAGhJsoIl4hA==",
"requires": {
"bindings": "^1.3.0",
"bn.js": "^4.11.8",
"create-hmac": "^1.1.7",
"elliptic": "^6.4.0",
"tiny-secp256k1-native": "1.1.x"
}
},
"tiny-secp256k1-native": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/tiny-secp256k1-native/-/tiny-secp256k1-native-1.1.0.tgz",
"integrity": "sha512-ZEt41e4pvq52Zs6MqNZpbDH3qg5fQkOCH9bzGsVPtlLeo9tdfNFz2XfjiKzo1Rc+Yvv4cb0lzy7ClQ3FbE4kKg==",
"optional": true,
"requires": {
"bindings": "^1.3.0",
"nan": "^2.13.2"
}
},
@ -4904,9 +4951,9 @@
}
},
"treport": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/treport/-/treport-0.3.0.tgz",
"integrity": "sha512-THr7NS5iLJewcAiaBkxAuCVoakw84hAVY9n2kFNZqlFKHrZeGw8sNR4VhmT23JB1/JnCmPcIOmooTdYYVTI5hA==",
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/treport/-/treport-0.4.0.tgz",
"integrity": "sha512-1/gjl3sCJAm60txV3uyz/bghxkzXidSvijM15dM+xgtBRXnZ/5Lwzb6SY1AvhRzTl+rOsukw9kDh2mjTtm6L9A==",
"dev": true,
"requires": {
"cardinal": "^2.1.1",
@ -5054,9 +5101,9 @@
"dev": true
},
"uglify-js": {
"version": "3.5.13",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.13.tgz",
"integrity": "sha512-Lho+IJlquX6sdJgyKSJx/M9y4XbDd3ekPjD8S6HYmT5yVSwDtlSuca2w5hV4g2dIsp0Y/4orbfWxKexodmFv7w==",
"version": "3.5.15",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.15.tgz",
"integrity": "sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==",
"dev": true,
"optional": true,
"requires": {
@ -5274,9 +5321,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write-file-atomic": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz",
"integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
"integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.11",
@ -5304,12 +5351,12 @@
"dev": true
},
"yaml": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.5.1.tgz",
"integrity": "sha512-btfJvMOgVthGZSgHBMrDkLuQu4YxOycw6kwuC67cUEOKJmmNozjIa02eKvuSq7usqqqpwwCvflGTF6JcDvSudw==",
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.6.0.tgz",
"integrity": "sha512-iZfse3lwrJRoSlfs/9KQ9iIXxs9++RvBFVzAqbbBiFT+giYtyanevreF9r61ZTbGMgWQBxAua3FzJiniiJXWWw==",
"dev": true,
"requires": {
"@babel/runtime": "^7.4.4"
"@babel/runtime": "^7.4.5"
}
},
"yapool": {

15
package.json
View file

@ -7,19 +7,20 @@
"url": "https://github.com/alexbosworth/balanceofsatoshis/issues"
},
"dependencies": {
"async": "2.6.2",
"async": "3.0.0",
"asyncjs-util": "1.0.0",
"bitcoin-ops": "1.4.1",
"bitcoinjs-lib": "5.0.3",
"bitcoinjs-lib": "5.0.4",
"bolt03": "1.1.0",
"caporal": "1.2.0",
"ln-service": "37.0.1",
"ln-service": "38.0.0",
"request": "2.88.0",
"stats-lite": "2.2.0",
"table": "5.3.3"
"table": "5.4.0"
},
"description": "Lightning balance CLI",
"devDependencies": {
"tap": "14.0.0"
"tap": "14.1.10"
},
"keywords": [
"cli",
@ -35,7 +36,7 @@
"url": "https://github.com/alexbosworth/balanceofsatoshis.git"
},
"scripts": {
"test": "tap test/balances/*.js"
"test": "tap test/balances/*.js test/bolt03/*.js"
},
"version": "1.11.3"
"version": "1.11.4"
}

31
test/balances/test_balance_from_tokens.js
View file

@ -3,6 +3,13 @@ const {test} = require('tap');
const balanceFromTokens = require('./../../balances/balance_from_tokens');
const tests = [
// No tokens
{
args: {},
description: 'Nothing is passed',
error: 'ExpectedTokensToCalculateBalance',
},
// Normal balance
{
args: {tokens: [1, 2, 3, 4, 5]},
@ -17,16 +24,36 @@ const tests = [
expected: {balance: 5},
},
// No balance above watermark
{
args: {above: 10, tokens: [1]},
description: 'Tokens are summed to a balance',
expected: {balance: 0},
},
// Balance below watermark
{
args: {below: 25, tokens: [1, 2, 3, 4, 5]},
description: 'Tokens are summed to a balance',
expected: {balance: 10},
},
// No balance below watermark
{
args: {below: 25, tokens: [25]},
description: 'Tokens are summed to a balance',
expected: {balance: 0},
},
];
tests.forEach(({args, description, expected}) => {
return test(description, ({end, equal}) => {
tests.forEach(({args, description, error, expected}) => {
return test(description, ({end, equal, throws}) => {
if (!!error) {
throws(() => balanceFromTokens(args), new Error(error));
return end();
}
const balance = balanceFromTokens(args);
equal(balance, expected.balance, 'Balance is calculated');

40
test/bolt03/test_resolution_type.js Normal file
View file

@ -0,0 +1,40 @@
const {test} = require('tap');
const {resolutionType} = require('./../../bolt03');
const tests = [
{
args: {
transaction: '02000000000101ddcd0a8bac799449d6032f1c09b4ecb2fa1f48c9b801084f1239a7a16e6cc3d20000000000e001000001197f0c00000000001600142837ab3877dabede38c8dc28045b338fd405849e03483045022100d36c08ee9f016c981e83aed10d199d2f8897456b06ce870265adb8fbfc6f36bd0220633acd45d93de8604ea84e030de8d98e8401e32aedf5c3382d7bad603b31fdf301004d6321024196926ad64c09cec89ee66725c5148fd2a52a5eae3a19a5668d70eef8b6a4c36702e001b2752103f87f9850d5529e877caef71d202131c1433c84f6ccb24120e1205ba3124f7cac68acd9ce0800',
vin: 0,
},
description: 'CSV delayed output',
expected: {type: 'csv_delayed'},
},
{
args: {
transaction: '02000000000101ac9b0c7789dc910e2d45d0b285a988a5694dcc9097983676431433915dbdc02300000000000000000001e05c0700000000002200200e7844380de5e31e7c40a8679c0273ea0af0295a4d58dc987f51656c0ac539d50500473044022033848e2f1c319111f48e414894562e02ef29a696ce6193d26696848ac6331b7202202d8e673f026a56fee32b93665babf2d4a6e70843da5a7b853ae8e19637d824ba01473044022019e1113150ea58d69a53930872387e5c722c23b8fb399497cc5ac4e276ba2f5902203256c0811db24cba16a09a6165d2cd77033f9dd67a1c2303028f79c089def8d301008576a91459f163aba7b55413a852fb1eada13d0d89e488918763ac672103566233faa157eae76dcade6a8594ce38729e157ff583a44a442f43fd3312cb6d7c820120876475527c21039d15f95af63bd0316e2c7a82c84d3139ef7900961c0e9a3a90462ebce4c0d37252ae67a9145dc7a3df22079ba503b2e9c73ed068f05895c10e88ac6868a7c80800',
vin: 0,
},
description: 'Offered HTLC timeout',
expected: {type: 'offered_htlc_timeout'},
},
{
args: {
transaction: '020000000001019e901f24fe92b547d457e543397ff6b058414fda423147de7f5b80485fe0f77801000000000000000001e2462e00000000001600141a4051f3f29c406deb56dd0531459f3691b9d7d402473044022048f8e11c4ed55ac956613fdfb5baf3ceaea4a953d4fdaba7fa83158c52e7831c02204605ac2aa34753e1be2ff63a5806b106fb40f015c8ef688cb971dbd3f2e3ca74012102deb79556e61246f30343d68621ec0ee654ef4ba6150a21d59aff25a6a6d9587600d00800',
vin: 0,
},
description: 'Pay to witness public key hash',
expected: {type: 'p2wpkh'},
},
];
tests.forEach(({args, description, expected}) => {
return test(description, ({end, equal}) => {
const {type} = resolutionType(args);
equal(type, expected.type, 'Type is resolved');
return end();
});
});

13
wallets/unlock_wallet.js
View file

@ -1,15 +1,15 @@
const {readFile} = require('fs');
const asyncAuto = require('async/auto');
const {lightningDaemon} = require('ln-service');
const {authenticatedLndGrpc} = require('ln-service');
const {returnResult} = require('asyncjs-util');
const {signMessage} = require('ln-service');
const {unauthenticatedLndGrpc} = require('ln-service');
const {unlockWallet} = require('ln-service');
const {lndCredentials} = require('./../lnd');
const {returnResult} = require('./../async');
const message = 'message';
const walletUnlockerService = 'WalletUnlocker';
/** Unlock wallet if locked
@ -30,11 +30,11 @@ module.exports = (args, cbk) => {
// Lnd
lnd: ['credentials', ({credentials}, cbk) => {
return cbk(null, lightningDaemon({
return cbk(null, authenticatedLndGrpc({
cert: credentials.cert,
macaroon: credentials.macaroon,
socket: credentials.socket,
}));
}).lnd);
}],
// Check if locked
@ -73,9 +73,8 @@ module.exports = (args, cbk) => {
return cbk();
}
const lnd = lightningDaemon({
const {lnd} = unauthenticatedLndGrpc({
cert: credentials.cert,
service: walletUnlockerService,
socket: credentials.socket,
});