diff --git a/dist/src/controllers/queries.js b/dist/src/controllers/queries.js index a003bfc..8d2bb52 100644 --- a/dist/src/controllers/queries.js +++ b/dist/src/controllers/queries.js @@ -167,11 +167,11 @@ function checkChannelsAndKeysend(rec) { const msg = { type: constants_1.default.message_types.keysend, }; + const amount = rec.amount - (chan.local_chan_reserve_sat || 0) - (chan.commit_fee || 0); helpers.performKeysendMessage({ sender: owner, destination_key: rec.pubkey, - amount: rec.amount, - msg, + amount, msg, success: function () { console.log('[WATCH] complete! Updating accounting, id:', rec.id); models_1.models.Accounting.update({ diff --git a/dist/src/controllers/queries.js.map b/dist/src/controllers/queries.js.map index 39eaa94..a2841cf 100644 --- a/dist/src/controllers/queries.js.map +++ b/dist/src/controllers/queries.js.map @@ -1 +1 @@ -{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/queries.ts b/src/controllers/queries.ts index 83e721a..4e5a32a 100644 --- a/src/controllers/queries.ts +++ b/src/controllers/queries.ts @@ -160,11 +160,11 @@ async function checkChannelsAndKeysend(rec: Accounting){ const msg: { [k: string]: any } = { type: constants.message_types.keysend, } + const amount = rec.amount - (chan.local_chan_reserve_sat||0) - (chan.commit_fee||0) helpers.performKeysendMessage({ sender: owner, destination_key: rec.pubkey, - amount: rec.amount, - msg, + amount, msg, success: function(){ console.log('[WATCH] complete! Updating accounting, id:', rec.id) models.Accounting.update({