From 28b5f8b5b4186eba7d84863a7827bf0b7eb27f7f Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 13 Nov 2020 09:52:19 -0800 Subject: [PATCH 1/2] fix loopbot new api, get chan from bot.meta, gen file with conn string for raspiblitz --- dist/src/builtin/loop.js | 65 ++++++++++++++++++++++------ dist/src/builtin/loop.js.map | 2 +- dist/src/controllers/payment.js | 1 + dist/src/controllers/payment.js.map | 2 +- dist/src/utils/setup.js | 5 +++ dist/src/utils/setup.js.map | 2 +- src/builtin/loop.ts | 67 +++++++++++++++++++++++------ src/controllers/payment.ts | 1 + src/utils/setup.ts | 6 +++ 9 files changed, 121 insertions(+), 30 deletions(-) diff --git a/dist/src/builtin/loop.js b/dist/src/builtin/loop.js index 66857ba..fe3d16e 100644 --- a/dist/src/builtin/loop.js +++ b/dist/src/builtin/loop.js @@ -13,9 +13,10 @@ const Sphinx = require("sphinx-bot"); const api_1 = require("../controllers/api"); const node_fetch_1 = require("node-fetch"); const path = require("path"); +const models_1 = require("../models"); +const constants_1 = require("../constants"); var validate = require('bitcoin-address-validation'); const msg_types = Sphinx.MSG_TYPE; -// /home/ec2-user/.lnd/data/chain/bitcoin/mainnet/admin.macaroon let initted = false; const baseurl = 'https://localhost:8080'; function init() { @@ -58,19 +59,27 @@ function init() { try { const j = yield doRequest(baseurl + '/v1/loop/out/quote/' + amt); console.log("=> LOOP QUOTE RES", j); - if (!(j && j.swap_fee && j.prepay_amt)) { + if (!(j && j.swap_fee_sat && j.prepay_amt_sat)) { return; } + let chan; + const bot = yield getBot(message.channel.id); + if (bot && bot.meta) + chan = bot.meta; + if (!chan) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('LoopBot') + .setDescription('No channel set'); + message.channel.send({ embed }); + } const j2 = yield doRequest(baseurl + '/v1/loop/out', { method: 'POST', body: JSON.stringify({ amt: amt, dest: addy, - outgoing_chan_set: [ - '704899103684034561' - ], - max_swap_fee: j.swap_fee, - max_prepay_amt: j.prepay_amt + outgoing_chan_set: [chan], + max_swap_fee: j.swap_fee_sat, + max_prepay_amt: j.prepay_amt_sat }), }); console.log("=> LOOP RESPONSE", j2); @@ -81,13 +90,13 @@ function init() { message.channel.send({ embed }); return; } - if (!(j2 && j2.server_message)) { - return; - } + // if (!(j2 && j2.server_message)) { + // return + // } const embed = new Sphinx.MessageEmbed() .setAuthor('LoopBot') - .setTitle('Loop Initialized!') - .setDescription('Success!'); + .setTitle('Payment was sent!'); + // .setDescription('Success!') message.channel.send({ embed }); return; } @@ -96,6 +105,20 @@ function init() { } } const cmd = arr[1]; + const isAdmin = message.member.roles.find(role => role.name === 'Admin'); + if (isAdmin && cmd.startsWith('setchan=')) { + const bot = yield getBot(message.channel.id); + const arr = cmd.split('='); + if (bot && arr.length > 1) { + const chan = arr[1]; + yield bot.update({ meta: chan }); + const embed = new Sphinx.MessageEmbed() + .setAuthor('LoopBot') + .setDescription('Channel updated to ' + chan) + .setThumbnail(botSVG); + message.channel.send({ embed }); + } + } switch (cmd) { case 'help': const embed = new Sphinx.MessageEmbed() @@ -103,7 +126,8 @@ function init() { .setTitle('LoopBot Commands:') .addFields([ { name: 'Send to your on-chain address', value: '/loopout {ADDRESS} {AMOUNT}' }, - { name: 'Help', value: '/loopout help' } + { name: 'Set Channel', value: '/loopout setchan=***' }, + { name: 'Help', value: '/loopout help' }, ]) .setThumbnail(botSVG); message.channel.send({ embed }); @@ -118,6 +142,21 @@ function init() { })); } exports.init = init; +function getBot(tribeUUID) { + return __awaiter(this, void 0, void 0, function* () { + const chat = yield models_1.models.Chat.findOne({ where: { + uuid: tribeUUID + } }); + if (!chat) + return; + const chatBot = yield models_1.models.ChatBot.findOne({ where: { + chatId: chat.id, + botPrefix: '/loopout', + botType: constants_1.default.bot_types.builtin + } }); + return chatBot; + }); +} const botSVG = ` `; diff --git a/dist/src/builtin/loop.js.map b/dist/src/builtin/loop.js.map index 207db53..bd79e6b 100644 --- a/dist/src/builtin/loop.js.map +++ b/dist/src/builtin/loop.js.map @@ -1 +1 @@ -{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../../src/builtin/loop.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../../src/builtin/loop.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/payment.js b/dist/src/controllers/payment.js index 9e3a604..3d793a4 100644 --- a/dist/src/controllers/payment.js +++ b/dist/src/controllers/payment.js @@ -190,6 +190,7 @@ exports.listPayments = (req, res) => __awaiter(void 0, void 0, void 0, function* const msgs = yield models_1.models.Message.findAll({ where: { type: { [sequelize_1.Op.or]: [ + constants_1.default.message_types.message, constants_1.default.message_types.payment, constants_1.default.message_types.direct_payment, constants_1.default.message_types.keysend, diff --git a/dist/src/controllers/payment.js.map b/dist/src/controllers/payment.js.map index afa98b1..48095dc 100644 --- a/dist/src/controllers/payment.js.map +++ b/dist/src/controllers/payment.js.map @@ -1 +1 @@ -{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/setup.js b/dist/src/utils/setup.js index 7540221..02b1a67 100644 --- a/dist/src/utils/setup.js +++ b/dist/src/utils/setup.js @@ -17,6 +17,7 @@ const publicIp = require("public-ip"); const password_1 = require("../utils/password"); const path = require("path"); const gitinfo_1 = require("../utils/gitinfo"); +const fs = require("fs"); const env = process.env.NODE_ENV || 'development'; const config = require(path.join(__dirname, '../../config/app.json'))[env]; const USER_VERSION = 7; @@ -225,9 +226,13 @@ function printQR() { const b64 = Buffer.from(`ip::${theIP}::${password_1.default || ''}`).toString('base64'); console.log('Scan this QR in Sphinx app:'); console.log(b64); + connectionStringFile(b64); QRCode.toString(b64, { type: 'terminal' }, function (err, url) { console.log(url); }); }); } +function connectionStringFile(str) { + fs.appendFile('../connection_string.txt', str, function (err) { }); +} //# sourceMappingURL=setup.js.map \ No newline at end of file diff --git a/dist/src/utils/setup.js.map b/dist/src/utils/setup.js.map index d7713bb..3be60de 100644 --- a/dist/src/utils/setup.js.map +++ b/dist/src/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/loop.ts b/src/builtin/loop.ts index 82295b2..62065d5 100644 --- a/src/builtin/loop.ts +++ b/src/builtin/loop.ts @@ -2,11 +2,11 @@ import * as Sphinx from 'sphinx-bot' import { finalAction } from '../controllers/api' import fetch from 'node-fetch' import * as path from 'path' +import { models } from '../models' +import constants from '../constants' var validate = require('bitcoin-address-validation'); const msg_types = Sphinx.MSG_TYPE -// /home/ec2-user/.lnd/data/chain/bitcoin/mainnet/admin.macaroon - let initted = false const baseurl = 'https://localhost:8080' @@ -52,19 +52,28 @@ export function init() { try { const j = await doRequest(baseurl + '/v1/loop/out/quote/' + amt) console.log("=> LOOP QUOTE RES", j) - if (!(j && j.swap_fee && j.prepay_amt)) { + if (!(j && j.swap_fee_sat && j.prepay_amt_sat)) { return } + + let chan + const bot = await getBot(message.channel.id) + if (bot && bot.meta) chan = bot.meta + if (!chan) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('LoopBot') + .setDescription('No channel set') + message.channel.send({ embed }) + } + const j2 = await doRequest(baseurl + '/v1/loop/out', { method: 'POST', body: JSON.stringify({ amt: amt, dest: addy, - outgoing_chan_set: [ - '704899103684034561' - ], - max_swap_fee: j.swap_fee, - max_prepay_amt: j.prepay_amt + outgoing_chan_set: [chan], + max_swap_fee: j.swap_fee_sat, + max_prepay_amt: j.prepay_amt_sat }), }) console.log("=> LOOP RESPONSE", j2) @@ -75,13 +84,13 @@ export function init() { message.channel.send({ embed }) return } - if (!(j2 && j2.server_message)) { - return - } + // if (!(j2 && j2.server_message)) { + // return + // } const embed = new Sphinx.MessageEmbed() .setAuthor('LoopBot') - .setTitle('Loop Initialized!') - .setDescription('Success!') + .setTitle('Payment was sent!') + // .setDescription('Success!') message.channel.send({ embed }) return } catch (e) { @@ -90,6 +99,22 @@ export function init() { } const cmd = arr[1] + + const isAdmin = message.member.roles.find(role => role.name === 'Admin') + + if(isAdmin && cmd.startsWith('setchan=')) { + const bot = await getBot(message.channel.id) + const arr = cmd.split('=') + if(bot && arr.length>1) { + const chan = arr[1] + await bot.update({meta: chan}) + const embed = new Sphinx.MessageEmbed() + .setAuthor('LoopBot') + .setDescription('Channel updated to '+chan) + .setThumbnail(botSVG) + message.channel.send({ embed }) + } + } switch (cmd) { case 'help': const embed = new Sphinx.MessageEmbed() @@ -97,7 +122,8 @@ export function init() { .setTitle('LoopBot Commands:') .addFields([ { name: 'Send to your on-chain address', value: '/loopout {ADDRESS} {AMOUNT}' }, - { name: 'Help', value: '/loopout help' } + { name: 'Set Channel', value: '/loopout setchan=***' }, + { name: 'Help', value: '/loopout help' }, ]) .setThumbnail(botSVG) message.channel.send({ embed }) @@ -112,6 +138,19 @@ export function init() { }) } +async function getBot(tribeUUID:string){ + const chat = await models.Chat.findOne({ where:{ + uuid: tribeUUID + }}) + if (!chat) return + const chatBot = await models.ChatBot.findOne({where: { + chatId: chat.id, + botPrefix: '/loopout', + botType: constants.bot_types.builtin + }}) + return chatBot +} + const botSVG = ` ` diff --git a/src/controllers/payment.ts b/src/controllers/payment.ts index a9b3dc3..16184a5 100644 --- a/src/controllers/payment.ts +++ b/src/controllers/payment.ts @@ -203,6 +203,7 @@ export const listPayments = async (req, res) => { const msgs = await models.Message.findAll({ where:{ type: {[Op.or]: [ + constants.message_types.message, // for example /loopout message constants.message_types.payment, constants.message_types.direct_payment, constants.message_types.keysend, diff --git a/src/utils/setup.ts b/src/utils/setup.ts index d811cfa..802ad18 100644 --- a/src/utils/setup.ts +++ b/src/utils/setup.ts @@ -6,6 +6,7 @@ import * as publicIp from 'public-ip' import password from '../utils/password' import * as path from 'path' import { checkTag, checkCommitHash } from '../utils/gitinfo' +import * as fs from 'fs'; const env = process.env.NODE_ENV || 'development'; const config = require(path.join(__dirname, '../../config/app.json'))[env] @@ -222,7 +223,12 @@ async function printQR() { const b64 = Buffer.from(`ip::${theIP}::${password || ''}`).toString('base64') console.log('Scan this QR in Sphinx app:') console.log(b64) + connectionStringFile(b64) QRCode.toString(b64, { type: 'terminal' }, function (err, url) { console.log(url) }) +} + +function connectionStringFile(str:string){ + fs.appendFile('../connection_string.txt', str, function (err) {}); } \ No newline at end of file From 49a828cdc62d269f7bc4be7834cc1eb8b91956eb Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 13 Nov 2020 10:06:58 -0800 Subject: [PATCH 2/2] connection_string file --- dist/src/utils/setup.js | 2 +- dist/src/utils/setup.js.map | 2 +- src/utils/setup.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/src/utils/setup.js b/dist/src/utils/setup.js index 02b1a67..b19d419 100644 --- a/dist/src/utils/setup.js +++ b/dist/src/utils/setup.js @@ -233,6 +233,6 @@ function printQR() { }); } function connectionStringFile(str) { - fs.appendFile('../connection_string.txt', str, function (err) { }); + fs.appendFile('connection_string.txt', str, function (err) { }); } //# sourceMappingURL=setup.js.map \ No newline at end of file diff --git a/dist/src/utils/setup.js.map b/dist/src/utils/setup.js.map index 3be60de..18a3ec2 100644 --- a/dist/src/utils/setup.js.map +++ b/dist/src/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/setup.ts b/src/utils/setup.ts index 802ad18..a34b158 100644 --- a/src/utils/setup.ts +++ b/src/utils/setup.ts @@ -230,5 +230,5 @@ async function printQR() { } function connectionStringFile(str:string){ - fs.appendFile('../connection_string.txt', str, function (err) {}); + fs.appendFile('connection_string.txt', str, function (err) {}); } \ No newline at end of file