balanceofsatoshis 19.2.1 → 19.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +5 -1
- package/chain/get_chain_fees.js +12 -1
- package/package.json +4 -5
- package/test/chain/test_get_chain_fees.js +2 -0
package/CHANGELOG.md
CHANGED
package/chain/get_chain_fees.js
CHANGED
|
@@ -2,6 +2,7 @@ const asyncAuto = require('async/auto');
|
|
|
2
2
|
const asyncTimesSeries = require('async/timesSeries');
|
|
3
3
|
const {getChainFeeRate} = require('ln-service');
|
|
4
4
|
const {getHeight} = require('ln-service');
|
|
5
|
+
const {getMinimumRelayFee} = require('ln-service');
|
|
5
6
|
const {returnResult} = require('asyncjs-util');
|
|
6
7
|
|
|
7
8
|
const bytesPerKb = 1e3;
|
|
@@ -26,6 +27,7 @@ const start = 2;
|
|
|
26
27
|
fee_by_block_target: {
|
|
27
28
|
$number: <Kvbyte Fee Rate Number>
|
|
28
29
|
}
|
|
30
|
+
min_relay_feerate: <Chain Backend Minimum KVbyte Fee Rate Number>
|
|
29
31
|
}
|
|
30
32
|
*/
|
|
31
33
|
module.exports = ({blocks, lnd}, cbk) => {
|
|
@@ -63,8 +65,16 @@ module.exports = ({blocks, lnd}, cbk) => {
|
|
|
63
65
|
// Get chain info
|
|
64
66
|
getHeight: ['validate', ({}, cbk) => getHeight({lnd}, cbk)],
|
|
65
67
|
|
|
68
|
+
// Get the minimum relay fee rate
|
|
69
|
+
getMinFee: ['validate', ({}, cbk) => getMinimumRelayFee({lnd}, cbk)],
|
|
70
|
+
|
|
66
71
|
// Collapse chain fees into steps
|
|
67
|
-
chainFees: [
|
|
72
|
+
chainFees: [
|
|
73
|
+
'getFees',
|
|
74
|
+
'getHeight',
|
|
75
|
+
'getMinFee',
|
|
76
|
+
({getFees, getHeight, getMinFee}, cbk) =>
|
|
77
|
+
{
|
|
68
78
|
let cursor = {};
|
|
69
79
|
const feeByBlockTarget = {};
|
|
70
80
|
|
|
@@ -83,6 +93,7 @@ module.exports = ({blocks, lnd}, cbk) => {
|
|
|
83
93
|
return cbk(null, {
|
|
84
94
|
current_block_hash: getHeight.current_block_hash,
|
|
85
95
|
fee_by_block_target: feeByBlockTarget,
|
|
96
|
+
min_relay_feerate: ceil(getMinFee.tokens_per_vbyte * bytesPerKb),
|
|
86
97
|
});
|
|
87
98
|
}],
|
|
88
99
|
},
|
package/package.json
CHANGED
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
"ini": "4.1.3",
|
|
38
38
|
"inquirer": "10.1.8",
|
|
39
39
|
"ln-accounting": "8.0.3",
|
|
40
|
-
"ln-service": "57.
|
|
40
|
+
"ln-service": "57.18.0",
|
|
41
41
|
"ln-sync": "6.1.0",
|
|
42
42
|
"ln-telegram": "6.1.6",
|
|
43
43
|
"minimist": "1.2.8",
|
|
44
44
|
"moment": "2.30.1",
|
|
45
|
-
"paid-services": "6.1.
|
|
45
|
+
"paid-services": "6.1.5",
|
|
46
46
|
"probing": "5.0.3",
|
|
47
47
|
"psbt": "3.0.0",
|
|
48
48
|
"qrcode-terminal": "0.12.0",
|
|
@@ -56,8 +56,7 @@
|
|
|
56
56
|
"description": "Lightning balance CLI",
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"invoices": "3.0.0",
|
|
59
|
-
"ln-docker-daemons": "6.0.
|
|
60
|
-
"mock-lnd": "1.4.4"
|
|
59
|
+
"ln-docker-daemons": "6.0.22"
|
|
61
60
|
},
|
|
62
61
|
"engines": {
|
|
63
62
|
"node": ">=18"
|
|
@@ -84,5 +83,5 @@
|
|
|
84
83
|
"postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
|
|
85
84
|
"test": "npx nyc@17.0.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"
|
|
86
85
|
},
|
|
87
|
-
"version": "19.
|
|
86
|
+
"version": "19.3.0"
|
|
88
87
|
}
|
|
@@ -54,6 +54,7 @@ const tests = [
|
|
|
54
54
|
estimateFee: (args, cbk) => {
|
|
55
55
|
return cbk(null, {
|
|
56
56
|
sat_per_kw: 1 + Math.round(1 / args.conf_target),
|
|
57
|
+
min_relay_fee_sat_per_kw: '250',
|
|
57
58
|
});
|
|
58
59
|
},
|
|
59
60
|
},
|
|
@@ -63,6 +64,7 @@ const tests = [
|
|
|
63
64
|
expected: {
|
|
64
65
|
current_block_hash: '00',
|
|
65
66
|
fee_by_block_target: {'2': 8, '3': 4},
|
|
67
|
+
min_relay_feerate: 1000,
|
|
66
68
|
},
|
|
67
69
|
},
|
|
68
70
|
];
|