lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

watch channel, when open keysend the amt

master^2
Evan Feenstra 4 years ago
parent
9ca1095646
commit
a66604178d
6 changed files with 159 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      dist/src/controllers/queries.js
  2. 2
      dist/src/controllers/queries.js.map
  3. 8
      dist/src/utils/lightning.js
  4. 2
      dist/src/utils/lightning.js.map
  5. 76
      src/controllers/queries.ts
  6. 13
      src/utils/lightning.ts

79
dist/src/controllers/queries.js
View File

@ -19,12 +19,23 @@ const wallet_1 = require("../utils/wallet");
const jsonUtils = require("../utils/json");
const sequelize_1 = require("sequelize");
const node_fetch_1 = require("node-fetch");
const helpers = require("../helpers");
let queries = {};
// const hub_pubkey = '023d70f2f76d283c6c4e58109ee3a2816eb9d8feb40b23d62469060a2b2867b77f'
const hub_pubkey = '02290714deafd0cb33d2be3b634fc977a98a9c9fa1dd6c53cf17d99b350c08c67b';
function getReceivedAccountings() {
return __awaiter(this, void 0, void 0, function* () {
const accountings = yield models_1.models.Accounting.findAll({
where: {
status: constants_1.default.statuses.received
}
});
return accountings.map(a => (a.dataValues || a));
});
}
function getPendingAccountings() {
return __awaiter(this, void 0, void 0, function* () {
const utxos = yield wallet_1.listUnspent(); // at least 1 confg
const utxos = yield wallet_1.listUnspent();
const accountings = yield models_1.models.Accounting.findAll({
where: {
onchain_address: {
@ -40,11 +51,11 @@ function getPendingAccountings() {
ret.push({
id: a.id,
pubkey: a.pubkey,
address: utxo.address,
onchainAddress: utxo.address,
amount: utxo.amount_sat,
confirmations: utxo.confirmations,
sourceApp: a.sourceApp,
date: a.sourceApp,
date: a.date,
});
}
});
@ -91,12 +102,13 @@ function genChannelAndConfirmAccounting(acc) {
});
console.log("[WATCH]=> CHANNEL OPENED!", r);
yield models_1.models.Accounting.update({
status: constants_1.default.statuses.confirmed,
fundingTxid: r.funding_txid_str
status: constants_1.default.statuses.received,
fundingTxid: r.funding_txid_str,
amount: acc.amount
}, {
where: { id: acc.id }
});
console.log("[WATCH]=> ACCOUNTINGS UPDATED!");
console.log("[WATCH]=> ACCOUNTINGS UPDATED to received!", acc.id);
}
catch (e) {
console.log('[ACCOUNTING] error creating channel', e);
@ -110,7 +122,7 @@ function pollUTXOs() {
if (!accs)
return;
console.log("[WATCH]=> accs", accs.length);
asyncForEach(accs, (acc) => __awaiter(this, void 0, void 0, function* () {
yield asyncForEach(accs, (acc) => __awaiter(this, void 0, void 0, function* () {
if (acc.confirmations <= 0)
return; // needs confs
if (acc.amount <= 0)
@ -119,6 +131,59 @@ function pollUTXOs() {
return; // this shouldnt happen
yield genChannelAndConfirmAccounting(acc);
}));
yield checkForConfirmedChannels();
});
}
function checkForConfirmedChannels() {
return __awaiter(this, void 0, void 0, function* () {
const received = yield getReceivedAccountings();
console.log('[WATCH] received accountings:', received);
yield asyncForEach(received, (rec) => __awaiter(this, void 0, void 0, function* () {
if (rec.confirmations <= 0)
return; // needs confs
if (rec.amount <= 0)
return; // needs amount
if (!rec.pubkey)
return; // this shouldnt happen
if (!rec.fundingTxid)
return;
checkChannelsAndKeysend(rec);
}));
});
}
function checkChannelsAndKeysend(rec) {
return __awaiter(this, void 0, void 0, function* () {
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const channels = yield lightning.listChannels({
active_only: true,
peer: rec.pubkey
});
console.log('[WATCH] found active channel for pubkey:', rec.pubkey, channels);
channels.forEach(chan => {
if (chan.channel_point.includes(rec.fundingTxid)) {
console.log('[WATCH] found channel to keysend:', chan);
const msg = {
type: constants_1.default.message_types.keysend,
};
helpers.performKeysendMessage({
sender: owner,
destination_key: rec.pubkey,
amount: rec.amount,
msg,
success: function () {
console.log('[WATCH] complete! Updating accounting, id:', rec.id);
models_1.models.Accounting.update({
status: constants_1.default.statuses.confirmed,
}, {
where: { id: rec.id }
});
},
failure: function () {
console.log('[WATCH] failed final keysend');
}
});
}
});
});
}
function startWatchingUTXOs() {

2
dist/src/controllers/queries.js.map
View File

File diff suppressed because one or more lines are too long

8
dist/src/utils/lightning.js
View File

@ -487,11 +487,15 @@ function getInfo() {
});
}
exports.getInfo = getInfo;
function listChannels() {
function listChannels(args) {
return __awaiter(this, void 0, void 0, function* () {
const opts = args || {};
if (args && args.peer) {
opts.peer = ByteBuffer.fromHex(args.peer);
}
return new Promise((resolve, reject) => {
const lightning = loadLightning();
lightning.listChannels({}, function (err, response) {
lightning.listChannels(opts, function (err, response) {
if (err == null) {
resolve(response);
}

2
dist/src/utils/lightning.js.map
View File

File diff suppressed because one or more lines are too long

76
src/controllers/queries.ts
View File

@ -8,6 +8,7 @@ import { listUnspent, UTXO } from '../utils/wallet'
import * as jsonUtils from '../utils/json'
import { Op } from 'sequelize'
import fetch from 'node-fetch'
import * as helpers from '../helpers'
type QueryType = 'onchain_address'
export interface Query {
@ -25,15 +26,25 @@ const hub_pubkey = '02290714deafd0cb33d2be3b634fc977a98a9c9fa1dd6c53cf17d99b350c
interface Accounting {
id: number
pubkey: string
address: string
onchainAddress: string
amount: number
confirmations: number
sourceApp: string
date: string
fundingTxid: string
}
async function getReceivedAccountings(): Promise<Accounting[]> {
const accountings = await models.Accounting.findAll({
where: {
status: constants.statuses.received
}
})
return accountings.map(a => (a.dataValues || a))
}
async function getPendingAccountings(): Promise<Accounting[]> {
const utxos: UTXO[] = await listUnspent() // at least 1 confg
const utxos: UTXO[] = await listUnspent()
const accountings = await models.Accounting.findAll({
where: {
onchain_address: {
@ -50,11 +61,11 @@ async function getPendingAccountings(): Promise<Accounting[]> {
ret.push(<Accounting>{
id: a.id,
pubkey: a.pubkey,
address: utxo.address,
onchainAddress: utxo.address,
amount: utxo.amount_sat,
confirmations: utxo.confirmations,
sourceApp: a.sourceApp,
date: a.sourceApp,
date: a.date,
})
}
})
@ -95,12 +106,13 @@ async function genChannelAndConfirmAccounting(acc: Accounting) {
})
console.log("[WATCH]=> CHANNEL OPENED!", r)
await models.Accounting.update({
status: constants.statuses.confirmed,
fundingTxid: r.funding_txid_str
status: constants.statuses.received,
fundingTxid: r.funding_txid_str,
amount: acc.amount
}, {
where: { id: acc.id }
})
console.log("[WATCH]=> ACCOUNTINGS UPDATED!")
console.log("[WATCH]=> ACCOUNTINGS UPDATED to received!", acc.id)
} catch (e) {
console.log('[ACCOUNTING] error creating channel', e)
}
@ -111,12 +123,60 @@ async function pollUTXOs() {
const accs: Accounting[] = await getPendingAccountings()
if (!accs) return
console.log("[WATCH]=> accs", accs.length)
asyncForEach(accs, async (acc: Accounting) => {
await asyncForEach(accs, async (acc: Accounting) => {
if (acc.confirmations <= 0) return // needs confs
if (acc.amount <= 0) return // needs amount
if (!acc.pubkey) return // this shouldnt happen
await genChannelAndConfirmAccounting(acc)
})
await checkForConfirmedChannels()
}
async function checkForConfirmedChannels(){
const received = await getReceivedAccountings()
console.log('[WATCH] received accountings:', received)
await asyncForEach(received, async (rec: Accounting) => {
if (rec.confirmations <= 0) return // needs confs
if (rec.amount <= 0) return // needs amount
if (!rec.pubkey) return // this shouldnt happen
if (!rec.fundingTxid) return
checkChannelsAndKeysend(rec)
})
}
async function checkChannelsAndKeysend(rec: Accounting){
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const channels = await lightning.listChannels({
active_only:true,
peer: rec.pubkey
})
console.log('[WATCH] found active channel for pubkey:', rec.pubkey, channels)
channels.forEach(chan=>{ // find by txid
if(chan.channel_point.includes(rec.fundingTxid)) {
console.log('[WATCH] found channel to keysend:', chan)
const msg: { [k: string]: any } = {
type: constants.message_types.keysend,
}
helpers.performKeysendMessage({
sender: owner,
destination_key: rec.pubkey,
amount: rec.amount,
msg,
success: function(){
console.log('[WATCH] complete! Updating accounting, id:', rec.id)
models.Accounting.update({
status: constants.statuses.confirmed,
}, {
where: { id: rec.id }
})
},
failure: function(){
console.log('[WATCH] failed final keysend')
}
})
}
})
}
export function startWatchingUTXOs() {

13
src/utils/lightning.ts
View File

@ -436,10 +436,19 @@ async function getInfo(): Promise<{ [k: string]: any }> {
})
}
async function listChannels(): Promise<{ [k: string]: any }> {
interface ListChannelsArgs {
active_only?: boolean
inactive_only?: boolean
peer?: string // HEX!
}
async function listChannels(args?:ListChannelsArgs): Promise<{ [k: string]: any }> {
const opts:{[k:string]:any} = args || {}
if(args && args.peer) {
opts.peer = ByteBuffer.fromHex(args.peer)
}
return new Promise((resolve, reject) => {
const lightning = loadLightning()
lightning.listChannels({}, function (err, response) {
lightning.listChannels(opts, function (err, response) {
if (err == null) {
resolve(response)
} else {

Write Preview
Loading…
Cancel
Save