From 1f171dde5d1bffab7a27dc674447a2b730b9d04c Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 3 Aug 2023 14:53:35 -0700 Subject: [PATCH 01/93] ml bot start --- src/builtin/ml.ts | 92 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/builtin/ml.ts diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts new file mode 100644 index 000000000..7538c7b3a --- /dev/null +++ b/src/builtin/ml.ts @@ -0,0 +1,92 @@ +import * as Sphinx from 'sphinx-bot' +import { finalAction } from '../controllers/botapi' +import { ChatRecord, models, ChatBotRecord } from '../models' +import { findBot } from './utill' + +const msg_types = Sphinx.MSG_TYPE + +let initted = false + +export function init() { + if (initted) return + initted = true + + const client = new Sphinx.Client() + client.login('_', finalAction) + + client.on(msg_types.MESSAGE, async (message: Sphinx.Message) => { + // if (message.author?.bot !== botPrefix) return + + const isAdmin = message.member.roles.find((role) => role.name === 'Admin') + + try { + const tribe = (await models.Chat.findOne({ + where: { uuid: message.channel.id }, + })) as ChatRecord + + const bot: ChatBotRecord = await findBot({ botPrefix: '/ML', tribe }) + + let meta: MlMeta = JSON.parse(bot.meta || `{}`) + const url = meta.url + if (!url) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('not configured') + .setOnlyOwner(isAdmin ? true : false) + message.channel.send({ embed }) + return + } + + const r = await fetch(`${url}/conversation`, { + method: 'POST', + body: JSON.stringify({ + message: message.content, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + const j = await r.json() + if (!j.process_id) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('failed to process message') + .setOnlyOwner(isAdmin ? true : false) + message.channel.send({ embed }) + return + } + + // poll process id + let i = 0 + while (true) { + const r2 = await fetch(`${url}/result`) + const j2 = await r2.json() + if (j2) { + // respond + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription(j2.result) + .setOnlyOwner(isAdmin ? true : false) + message.channel.send({ embed }) + break + } + if (i > 100) { + break + } + i++ + } + } catch (e) { + console.error(e) + } + }) +} + +export interface MlMeta { + url: string + apiKey: string +} + +export async function sleep(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)) +} From 56809d50259c38347e9869e8b029ce5deda34ac5 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 10:26:31 -0700 Subject: [PATCH 02/93] personal tribe, ml callbacks, only user --- dist/src/controllers/botapi/broadcast.js | 5 ++- dist/src/controllers/botapi/broadcast.js.map | 2 +- dist/src/controllers/botapi/index.js.map | 2 +- dist/src/network/send.js | 7 ++-- dist/src/network/send.js.map | 2 +- src/builtin/ml.ts | 36 ++++++++++---------- src/controllers/botapi/broadcast.ts | 5 +++ src/controllers/botapi/index.ts | 19 +++++++++++ src/network/send.ts | 8 +++-- 9 files changed, 60 insertions(+), 26 deletions(-) diff --git a/dist/src/controllers/botapi/broadcast.js b/dist/src/controllers/botapi/broadcast.js index 886478107..af476e86a 100644 --- a/dist/src/controllers/botapi/broadcast.js +++ b/dist/src/controllers/botapi/broadcast.js @@ -20,13 +20,16 @@ const logger_1 = require("../../utils/logger"); const index_1 = require("./index"); function broadcast(a) { return __awaiter(this, void 0, void 0, function* () { - const { amount, content, bot_name, msg_uuid, reply_uuid, parent_id, bot_pic, only_owner, } = a; + const { amount, content, bot_name, msg_uuid, reply_uuid, parent_id, bot_pic, only_owner, only_user, } = a; logger_1.sphinxLogger.info(`=> BOT BROADCAST`); const ret = yield (0, index_1.validateAction)(a); if (!ret) return; const { chat, owner } = ret; const tenant = owner.id; + if (only_user) { + chat.contactIds = `[${only_user}]`; + } const encryptedForMeText = rsa.encrypt(owner.contactKey, content || ''); const encryptedText = rsa.encrypt(chat.groupKey, content || ''); const textMap = { chat: encryptedText }; diff --git a/dist/src/controllers/botapi/broadcast.js.map b/dist/src/controllers/botapi/broadcast.js.map index 63b717af1..4bdc5faef 100644 --- a/dist/src/controllers/botapi/broadcast.js.map +++ b/dist/src/controllers/botapi/broadcast.js.map @@ -1 +1 @@ -{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/broadcast.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/broadcast.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index bd8dcc51b..26a57b993 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/network/send.js b/dist/src/network/send.js index 7809771e9..6e51a9cfc 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -23,6 +23,7 @@ const errMsgString_1 = require("../utils/errMsgString"); const proxy_1 = require("../utils/proxy"); const intercept = require("./intercept"); const receive_1 = require("./receive"); +const ml_1 = require("../builtin/ml"); const config = (0, config_1.loadConfig)(); /** * Sends a message to a chat. @@ -435,9 +436,11 @@ function interceptTribeMsgForHiddenCmds(msg, tenant) { const splitedContent = content.split(' '); for (let i = 0; i < bots.length; i++) { const bot = bots[i]; - if (bot.botPrefix === splitedContent[0] && + const isHidden = bot.botPrefix === splitedContent[0] && bot.hiddenCommands && - JSON.parse(bot.hiddenCommands).includes(splitedContent[1])) { + JSON.parse(bot.hiddenCommands).includes(splitedContent[1]); + const isPersonal = bot.botPrefix === ml_1.ML_PREFIX; + if (isHidden || isPersonal) { yield models_1.models.Message.update({ onlyOwner: true, }, { where: { uuid: msg.message.uuid, tenant } }); diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index b33aeae8a..52ff72be6 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 7538c7b3a..81b1ee9eb 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -7,6 +7,10 @@ const msg_types = Sphinx.MSG_TYPE let initted = false +export const ML_PREFIX = '/ml' + +export const CALLBACKS: { [k: string]: (msg: string) => void } = {} + export function init() { if (initted) return initted = true @@ -41,6 +45,7 @@ export function init() { method: 'POST', body: JSON.stringify({ message: message.content, + webhook: '', }), headers: { Accept: 'application/json', @@ -57,25 +62,20 @@ export function init() { return } - // poll process id - let i = 0 - while (true) { - const r2 = await fetch(`${url}/result`) - const j2 = await r2.json() - if (j2) { - // respond - const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') - .setDescription(j2.result) - .setOnlyOwner(isAdmin ? true : false) - message.channel.send({ embed }) - break - } - if (i > 100) { - break - } - i++ + function cb(msg: string) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription(msg) + .setOnlyOwner(isAdmin ? true : false) + // .setOnlyUser(message.member.id) + message.channel.send({ embed }) } + + CALLBACKS[j.process_id] = cb + + setTimeout(() => { + delete CALLBACKS[j.process_id] + }, 5 * 60 * 1000) } catch (e) { console.error(e) } diff --git a/src/controllers/botapi/broadcast.ts b/src/controllers/botapi/broadcast.ts index 7e54f5614..95c186eea 100644 --- a/src/controllers/botapi/broadcast.ts +++ b/src/controllers/botapi/broadcast.ts @@ -19,6 +19,7 @@ export default async function broadcast(a: Action): Promise { parent_id, bot_pic, only_owner, + only_user, } = a sphinxLogger.info(`=> BOT BROADCAST`) @@ -27,6 +28,10 @@ export default async function broadcast(a: Action): Promise { const { chat, owner } = ret const tenant: number = owner.id + if (only_user) { + chat.contactIds = `[${only_user}]` + } + const encryptedForMeText = rsa.encrypt(owner.contactKey, content || '') const encryptedText = rsa.encrypt(chat.groupKey, content || '') const textMap = { chat: encryptedText } diff --git a/src/controllers/botapi/index.ts b/src/controllers/botapi/index.ts index cdc4d5e0d..a379daa94 100644 --- a/src/controllers/botapi/index.ts +++ b/src/controllers/botapi/index.ts @@ -23,6 +23,7 @@ import { processGithook, WebhookEventName } from '../../utils/githook' import direct_message from './dm' import pay from './pay' import broadcast from './broadcast' +import { CALLBACKS } from '../../builtin/ml' /* hexdump -n 8 -e '4/4 "%08X" 1 "\n"' /dev/random @@ -46,6 +47,7 @@ export interface Action { parent_id?: number bot_pic?: string only_owner?: boolean + only_user?: number } export async function processWebhook(req: Req, res: Res): Promise { @@ -325,3 +327,20 @@ export async function validateAction(a: Action): Promise { })) as ContactRecord return { chat: theChat, owner } } + +export async function processMlCallback(req: Req, res: Res): Promise { + const process_id = req.body.process_id + if (!process_id) { + return failure(res, 'no process_id') + } + const response = req.body.response + if (!response) { + return failure(res, 'no response') + } + + if (CALLBACKS[process_id]) { + CALLBACKS[process_id](response) + } + + success(res, { ok: true }) +} diff --git a/src/network/send.ts b/src/network/send.ts index b9512c010..aed7a851f 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -25,6 +25,7 @@ import { getProxyRootPubkey, isProxy } from '../utils/proxy' import { Msg, MessageContent, ChatMember } from './interfaces' import * as intercept from './intercept' import { typesToForward, receiveCoTenantMessage } from './receive' +import { ML_PREFIX } from '../builtin/ml' const config = loadConfig() @@ -554,15 +555,18 @@ async function interceptTribeMsgForHiddenCmds( const bots = (await models.ChatBot.findAll({ where: { tenant, chatId: newChat.id }, })) as ChatBotRecord[] + const content = msg.message.content as string const splitedContent = content.split(' ') for (let i = 0; i < bots.length; i++) { const bot = bots[i] - if ( + + const isHidden = bot.botPrefix === splitedContent[0] && bot.hiddenCommands && JSON.parse(bot.hiddenCommands).includes(splitedContent[1]) - ) { + const isPersonal = bot.botPrefix === ML_PREFIX + if (isHidden || isPersonal) { await models.Message.update( { onlyOwner: true, From 9fa4fd0e3ed3dffd113545543f25872f46f1494b Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 10:27:17 -0700 Subject: [PATCH 03/93] post /ml --- src/controllers/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/index.ts b/src/controllers/index.ts index 4e87dc1de..f60bb5879 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -157,6 +157,7 @@ export async function set(app) { app.get('/query/onchain_address/:app', queries.queryOnchainAddress) app.get('/utxos', queries.listUTXOs) + app.post('/ml', actions.processMlCallback) app.post('/webhook', actions.processWebhook) app.post('/action', actions.processAction) app.get('/bots', bots.getBots) From fd4d8d2387d887934679c3aa7ac4a7376de3dac5 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 10:31:14 -0700 Subject: [PATCH 04/93] hostname callback url --- src/builtin/ml.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 81b1ee9eb..a126df01e 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -2,6 +2,9 @@ import * as Sphinx from 'sphinx-bot' import { finalAction } from '../controllers/botapi' import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot } from './utill' +import { loadConfig } from '../utils/config' + +const config = loadConfig() const msg_types = Sphinx.MSG_TYPE @@ -41,11 +44,15 @@ export function init() { return } + let host_name = config.host_name + if (!host_name.startsWith('http')) { + host_name = `https://${host_name}` + } const r = await fetch(`${url}/conversation`, { method: 'POST', body: JSON.stringify({ message: message.content, - webhook: '', + webhook: `${host_name}/ml`, }), headers: { Accept: 'application/json', @@ -62,7 +69,7 @@ export function init() { return } - function cb(msg: string) { + CALLBACKS[j.process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription(msg) @@ -71,8 +78,6 @@ export function init() { message.channel.send({ embed }) } - CALLBACKS[j.process_id] = cb - setTimeout(() => { delete CALLBACKS[j.process_id] }, 5 * 60 * 1000) From 6f57514070067765b1aa64ed67afea2111f48073 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 19:02:34 +0100 Subject: [PATCH 05/93] update: updated sphinx_bot package --- dist/src/controllers/botapi/index.js | 20 +++++++++++++++++++- dist/src/controllers/botapi/index.js.map | 2 +- dist/src/controllers/index.js | 1 + dist/src/controllers/index.js.map | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index edfc36f27..9a612d3d4 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.validateAction = exports.finalAction = exports.processAction = exports.processWebhook = void 0; +exports.processMlCallback = exports.validateAction = exports.finalAction = exports.processAction = exports.processWebhook = void 0; const network = require("../../network"); const models_1 = require("../../models"); const res_1 = require("../../utils/res"); @@ -23,6 +23,7 @@ const githook_1 = require("../../utils/githook"); const dm_1 = require("./dm"); const pay_1 = require("./pay"); const broadcast_1 = require("./broadcast"); +const ml_1 = require("../../builtin/ml"); function processWebhook(req, res) { var _a; return __awaiter(this, void 0, void 0, function* () { @@ -284,4 +285,21 @@ function validateAction(a) { }); } exports.validateAction = validateAction; +function processMlCallback(req, res) { + return __awaiter(this, void 0, void 0, function* () { + const process_id = req.body.process_id; + if (!process_id) { + return (0, res_1.failure)(res, 'no process_id'); + } + const response = req.body.response; + if (!response) { + return (0, res_1.failure)(res, 'no response'); + } + if (ml_1.CALLBACKS[process_id]) { + ml_1.CALLBACKS[process_id](response); + } + (0, res_1.success)(res, { ok: true }); + }); +} +exports.processMlCallback = processMlCallback; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 26a57b993..68667b97b 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAAwC;AACxC,yCASqB;AACrB,yCAAgE;AAChE,+CAAuC;AACvC,+CAA6D;AAC7D,+CAA0D;AAC1D,0CAAyC;AACzC,2CAA6E;AAC7E,2CAA4C;AAE5C,iDAAsE;AACtE,6BAAiC;AACjC,+BAAuB;AACvB,2CAAmC;AA2BnC,SAAsB,cAAc,CAAC,GAAQ,EAAE,GAAQ;;;QACrD,qBAAY,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QAClD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC9C,IAAI,CAAC,GAAG,EAAE;YACR,qBAAY,CAAC,KAAK,CAAC,mBAAmB,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACrD,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SACzB;QAED,MAAM,UAAU,GACd,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAChE,IAAI,CAAC,UAAU,EAAE;YACf,qBAAY,CAAC,KAAK,CAAC,sBAAsB,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACxD,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SACzB;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,IAAoB,CAAA;QACtC,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,IAAI,YAAY,IAAI,KAAK,EAAE;YACzB,IAAI,GAAG,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,SAAS,CAAC,WAAW,EAAE,KAAI,EAAE,CAAA;SACvD;QACD,IAAI,CAAC,IAAI,EAAE;YACT,qBAAY,CAAC,KAAK,CAAC,qBAAqB,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACvD,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SACzB;QAED,IAAI,EAAE,GAAG,KAAK,CAAA;QAEd,IAAI;YACF,mBAAmB;YACnB,MAAM,WAAW,GAAoB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACjE,KAAK,EAAE,EAAE,OAAO,EAAE,iBAAW,EAAE;aAChC,CAAC,CAAoB,CAAA;YACtB,MAAM,UAAU,GAAgB,CAAC,MAAM,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,IAAI,EAAE,iBAAW,EAAE;aAC7B,CAAC,CAAgB,CAAA;YAClB,MAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,CAAO,EAAiB,EAAE,EAAE;gBAC1D,MAAM,IAAI,GAAe,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;gBACtE,MAAM,IAAA,sBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,CAAO,CAAO,EAAE,EAAE;oBAC/C,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE;wBAC/C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,MAAM,CAAC,CAAA;wBAC/D,IAAI,MAAM,EAAE;4BACV,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAC3B,GAAa,EACb,GAAG,CAAC,OAAO,EACX,MAAM,CAAC,MAAM,CACd,CAAA;4BACD,IAAI,KAAK,EAAE;gCACT,EAAE,GAAG,IAAI,CAAA;gCACT,WAAW;gCACX,MAAM,IAAI,GAAe,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oCAClD,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE;iCACzB,CAAC,CAAe,CAAA;gCACjB,IAAI,IAAI,EAAE;oCACR,MAAM,OAAO,GAAG,IAAA,wBAAc,EAC5B,GAAG,CAAC,IAAI,EACR,UAA8B,CAC/B,CAAA;oCACD,IAAI,OAAO,EAAE;wCACX,MAAM,CAAC,GAAW;4CAChB,MAAM,EAAE,WAAW;4CACnB,MAAM,EAAE,MAAM,CAAC,EAAE;4CACjB,SAAS,EAAE,IAAI,CAAC,IAAI;4CACpB,MAAM,EAAE,CAAC;4CACT,QAAQ,EAAE,MAAM,CAAC,IAAI;4CACrB,OAAO;4CACP,OAAO,EAAE,gBAAU;yCACpB,CAAA;wCACD,MAAM,IAAA,mBAAS,EAAC,CAAC,CAAC,CAAA;qCACnB;yCAAM;wCACL,qBAAY,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;qCAChD;iCACF;qCAAM;oCACL,qBAAY,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;iCAC1C;6BACF;iCAAM;gCACL,qBAAY,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;6BACjD;yBACF;6BAAM;4BACL,qBAAY,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;yBACrD;qBACF;yBAAM;wBACL,qBAAY,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;qBAChD;gBACH,CAAC,CAAA,CAAC,CAAA;YACJ,CAAC,CAAA,CAAC,CAAA;SACH;QAAC,OAAO,CAAC,EAAE;YACV,qBAAY,CAAC,KAAK,CAAC,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YAClE,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SAClB;QACD,IAAI,EAAE;YAAE,IAAA,aAAO,EAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;aAC7B;YACH,qBAAY,CAAC,KAAK,CAAC,cAAc,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YAChD,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SAClB;;CACF;AA9FD,wCA8FC;AAED,SAAsB,aAAa,CAAC,GAAQ,EAAE,GAAQ;;QACpD,qBAAY,CAAC,IAAI,CAAC,oBAAoB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QACjD,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACnB,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtE,IAAI;gBACF,uDAAuD;gBACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;gBACzD,IAAI,QAAQ;oBAAE,IAAI,GAAG,QAAQ,CAAA;aAC9B;YAAC,OAAO,CAAC,EAAE;gBACV,qBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACrB,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,mCAAmC,CAAC,CAAA;aACzD;SACF;QACD,MAAM,EACJ,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,MAAM,EACN,OAAO,EACP,SAAS,EACT,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,SAAS,GACV,GAAG,IAAI,CAAA;QAER,IAAI,CAAC,MAAM;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAC7C,MAAM,GAAG,GAAQ,CAAC,MAAM,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAQ,CAAA;QAC7E,IAAI,CAAC,GAAG;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAEvC,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC,EAAE;gBAC9C,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,cAAc,CAAC,CAAA;aACpC;SACF;aAAM;YACL,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAa,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;YACrE,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,cAAc,CAAC,CAAA;aACpC;SACF;QACD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;SACjC;QAED,MAAM,CAAC,GAAW;YAChB,MAAM;YACN,MAAM;YACN,MAAM,EAAE,MAAM,IAAI,EAAE;YACpB,OAAO,EAAE,OAAO,IAAI,EAAE;YACtB,MAAM,EAAE,MAAM,IAAI,CAAC;YACnB,QAAQ,EAAE,GAAG,CAAC,IAAI;YAClB,SAAS,EAAE,SAAS,IAAI,EAAE;YAC1B,QAAQ,EAAE,QAAQ,IAAI,EAAE;YACxB,UAAU,EAAE,UAAU,IAAI,EAAE;YAC5B,SAAS,EAAE,SAAS,IAAI,CAAC;YACzB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACxD,CAAA;QAED,IAAI;YACF,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,CAAA;YAC9B,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAlED,sCAkEC;AAED,SAAsB,WAAW,CAAC,CAAS;;QACzC,MAAM,EACJ,MAAM,EACN,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,UAAU,EACV,SAAS,EACT,YAAY,GACb,GAAG,CAAC,CAAA;QAEL,IAAI,KAAK,GAAe,IAAI,CAAA;QAC5B,qCAAqC;QACrC,IAAI,MAAM,EAAE;YACV,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC;gBAChC,KAAK,EAAE;oBACL,EAAE,EAAE,MAAM;iBACX;aACF,CAAC,CAAQ,CAAA;YACV,IAAI,SAAS,EAAE;gBACb,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAwB,EAAC,SAAS,CAAC,CAAA;gBACxD,0DAA0D;gBAC1D,IAAI,MAAM;oBAAE,KAAK,GAAG,IAAI,CAAA;aACzB;SACF;QAED,mCAAmC;QACnC,IAAI,KAAK,EAAE;YACT,kFAAkF;YAClF,MAAM,KAAK,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACnD,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE;aAC5B,CAAC,CAAY,CAAA;YACd,gDAAgD;YAChD,MAAM,SAAS,GAAc,CAAC,MAAM,eAAM,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC3D,KAAK,EAAE;oBACL,SAAS,EAAE,SAAS;oBACpB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,KAAK,CAAC,EAAE;iBACjB;aACF,CAAC,CAAc,CAAA;YAChB,IAAI,CAAC,SAAS;gBAAE,OAAO,qBAAY,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;YAEzD,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAA;YACnC,IAAI,CAAC,IAAI;gBAAE,OAAO,qBAAY,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;YAC1D,MAAM,KAAK,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAA;YACrC,MAAM,IAAI,GAAmB;gBAC3B,MAAM;gBACN,MAAM;gBACN,QAAQ;gBACR,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,OAAO;gBACrC,OAAO,EAAE;oBACP,OAAO,EAAE,OAAO,IAAI,EAAE;oBACtB,MAAM,EAAE,MAAM,IAAI,CAAC;oBACnB,IAAI,EAAE,QAAQ,IAAI,EAAE;iBACrB;gBACD,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE,EAAE;gBAC/B,MAAM,EAAE;oBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;oBAChC,KAAK,EAAE,QAAQ,IAAI,EAAE;oBACrB,IAAI,EAAE,CAAC;oBACP,UAAU;iBACX,EAAE,iBAAiB;aACrB,CAAA;YACD,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;aACjC;YACD,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,UAAU,CAAA;aACpC;YACD,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAA;aAClC;YACD,IAAI;gBACF,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;aACpE;YAAC,OAAO,CAAC,EAAE;gBACV,qBAAY,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;aAC9C;YACD,OAAM,CAAC,OAAO;SACf;QAED,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,qBAAY,CAAC,IAAI,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAA;SACjD;aAAM,IAAI,MAAM,KAAK,KAAK,EAAE;YAC3B,IAAA,aAAG,EAAC,CAAC,CAAC,CAAA;SACP;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE;YACjC,IAAA,mBAAS,EAAC,CAAC,CAAC,CAAA;SACb;aAAM,IAAI,MAAM,KAAK,IAAI,EAAE;YAC1B,IAAA,YAAc,EAAC,CAAC,CAAC,CAAA;SAClB;aAAM;YACL,qBAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;SACrC;IACH,CAAC;CAAA;AAhGD,kCAgGC;AAMD,SAAsB,cAAc,CAAC,CAAS;;QAC5C,IAAI,CAAC,CAAC,CAAC,SAAS;YAAE,OAAO,qBAAY,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAwB,EAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC3D,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;YAAE,OAAO,qBAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAClE,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK;YAC7C,OAAO,qBAAY,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC1C,MAAM,KAAK,GAAkB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE;SAC9B,CAAC,CAAkB,CAAA;QACpB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IACjC,CAAC;CAAA;AAVD,wCAUC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js index 2c14b8931..f6ad1ee44 100644 --- a/dist/src/controllers/index.js +++ b/dist/src/controllers/index.js @@ -141,6 +141,7 @@ function set(app) { app.get('/test_clear', details.clearForTesting); app.get('/query/onchain_address/:app', queries.queryOnchainAddress); app.get('/utxos', queries.listUTXOs); + app.post('/ml', actions.processMlCallback); app.post('/webhook', actions.processWebhook); app.post('/action', actions.processAction); app.get('/bots', bots.getBots); diff --git a/dist/src/controllers/index.js.map b/dist/src/controllers/index.js.map index d22d01a07..9810dcef8 100644 --- a/dist/src/controllers/index.js.map +++ b/dist/src/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAA0C;AAC1C,sCAA2C;AAC3C,kCAA8C;AAC9C,4CAA2C;AAC3C,0CAAyC;AACzC,0CAAyC;AACzC,4CAAoC;AACpC,sCAAsC;AAEtC,kEAAoF;AACpF,iCAAgC;AAChC,2CAA0C;AAC1C,+BAA8B;AAC9B,qCAAoC;AACpC,uCAAsC;AACtC,qCAAoC;AACpC,uCAAsC;AACtC,iCAAgC;AAChC,uCAAsC;AACtC,sCAAqC;AACrC,gDAA+C;AAC/C,qCAAoC;AACpC,iDAAgD;AAChD,oCAAmC;AACnC,qCAAoC;AACpC,iCAAgC;AAChC,+BAA8B;AAC9B,+BAA8B;AAC9B,2CAA0C;AAC1C,iCAAgC;AAChC,0CAAyC;AACzC,oCAAmC;AACnC,yDAAwD;AAExD,MAAM,OAAO,GAAG,IAAA,4BAAS,EAAC;IACxB,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,CAAC;IACN,eAAe,EAAE,IAAI;IACrB,aAAa,EAAE,KAAK,EAAE,sCAAsC;CAC7D,CAAC,CAAA;AAEF,SAAsB,GAAG,CAAC,GAAG;;QAC3B,WAAW,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,eAAM,IAAI,eAAM,CAAC,YAAY,EAAE;YACjC,YAAY,CAAC,kBAAkB,EAAE,CAAA;SAClC;QAED,IAAI,eAAM,IAAI,eAAM,CAAC,aAAa,EAAE;YAClC,IAAA,mDAAmC,GAAE,CAAA;SACtC;QAED,IAAI,eAAM,IAAI,eAAM,CAAC,OAAO,EAAE;YAC5B,QAAQ,CAAC,+BAA+B,EAAE,CAAA;SAC3C;QAED,0BAA0B;QAE1B,MAAM,CAAC,YAAY,EAAE,CAAA;QAErB,gCAAgC;QAEhC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QACjC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,eAAe,CAAC,CAAA;QACzC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpD,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAA;QACxD,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;QACzC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,eAAe,CAAC,CAAA;QAC3C,GAAG,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,cAAc,CAAC,CAAA;QAC3D,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,aAAa,CAAC,CAAA;QACtD,GAAG,CAAC,GAAG,CACL,uCAAuC,EACvC,UAAU,CAAC,qBAAqB,CACjC,CAAA;QACD,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;QAC3C,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;QAC/C,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,eAAe,CAAC,CAAA;QAEpD,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QAE5E,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QAC1C,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QAEjD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QACpD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC1C,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;QAC1D,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QACpD,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAA;QACxD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QACnD,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;QACvD,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,+BAA+B,CAAC,CAAA;QACxE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;QAC/C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;QAEzC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAA;QAClD,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAA;QACpD,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAA;QACxD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;QACjD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC5C,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QACpD,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC/C,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QACnD,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QACxC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC9C,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC9C,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAA;QACpD,GAAG,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;QAC/D,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;QACxD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QAEhD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;QAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC1C,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QAClD,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QACnD,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;QACtD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;QAEpD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAA;QAC3D,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,eAAe,CAAC,CAAA;QAC1D,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAA;QAChE,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAA;QAC3D,GAAG,CAAC,GAAG,CACL,mCAAmC,EACnC,YAAY,CAAC,0BAA0B,CACxC,CAAA;QACD,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;QAClE,GAAG,CAAC,GAAG,CAAC,2BAA2B,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAA;QAEtE,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC3C,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACpD,GAAG,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAE3D,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;QAElD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QAC3C,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;QAExC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QAE3C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;QACzC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACvC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;QACtD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAC7C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QACtC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;QACrC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACrC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAA;QACrD,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;QAE/C,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACnE,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QAEpC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5C,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,CAAA;QAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9B,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACtC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QACzC,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QAEnD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;QAElD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAgB,GAAQ,EAAE,GAAG;;gBAC/C,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;YACpC,CAAC;SAAA,CAAC,CAAA;QAEF,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;QAC9C,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;QACvD,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAEnD,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,UAAgB,GAAQ,EAAE,GAAG;;gBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK;oBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;gBAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;gBACnC,MAAM,KAAK,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;oBACrD,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;oBAC9B,KAAK,EAAE,EAAE,MAAM,EAAE;iBAClB,CAAC,CAAc,CAAA;gBAChB,MAAM,IAAI,GAAG,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC9B,IAAI,CAAC,IAAI,EAAE;oBACT,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;iBAClC;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;iBACrC;YACH,CAAC;SAAA,CAAC,CAAA;QAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;QAClC,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5C,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QAClC,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;QAC/C,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;QAClD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;QAE5C,YAAY;QACZ,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEjC,sBAAsB;QACtB,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QACxE,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,uBAAuB,CAAC,CAAA;QAC1E,GAAG,CAAC,GAAG,CACL,+BAA+B,EAC/B,iBAAiB,CAAC,uBAAuB,CAC1C,CAAA;QACD,GAAG,CAAC,GAAG,CACL,+BAA+B,EAC/B,iBAAiB,CAAC,oBAAoB,CACvC,CAAA;QAED,OAAO;QACP,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QACrC,GAAG,CAAC,GAAG,CAAC,uBAAuB,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAE1D,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;QAEnE,2BAA2B;QAC3B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAEhB,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAE3C,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAA;QACrD,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QAE7C,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;QACxC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,aAAa,CAAC,CAAA;QACpD,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAA;QAE/C,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACpD,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QAErC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QAEpC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QAC7C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;QACzC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;QAEpD,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAE1C,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAA;QAC3D,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAE/D,gEAAgE;QAChE,GAAG,CAAC,GAAG,CAAC,2BAAoB,CAAC,CAAA;QAC7B,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;QACxC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;QACvC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;QACzD,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAChE,CAAC;CAAA;AApND,kBAoNC;AAED,MAAM,QAAQ,GAAG,mBAAS,CAAC,aAAa,CAAA;AAC3B,QAAA,OAAO,GAAG;IACrB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,iBAAiB;IAClD,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,QAAQ,CAAC,wBAAwB;IACtE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,cAAc;IAC3C,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,cAAc;IAC3C,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,cAAc;IAClD,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,mBAAmB;IAC1D,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,iBAAiB;IAC9C,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,eAAe;IAC1C,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,qBAAqB;IACvD,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,mBAAmB;IACnD,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,0BAA0B;IACzD,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,0BAA0B;IACzD,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,gBAAgB;IAC7C,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,iBAAiB;IAC/C,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,gBAAgB;IAC7C,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAChD,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,gBAAgB;IAC/C,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,oBAAoB;IAC1D,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,oBAAoB;IAC1D,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC,mBAAmB;IACxD,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,kBAAkB;IACtD,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB;IAC9C,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa;IACtC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa;IACtC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,gBAAgB;IACpD,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,aAAa,CAAC,4BAA4B;IAC7E,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY;IACvC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY;IACtC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,oBAAoB;IACvD,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,WAAW;CACtC,CAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 955b50383..32b426a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,7 +72,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.39", + "sphinx-bot": "^0.2.40", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", @@ -15421,9 +15421,9 @@ "license": "CC0-1.0" }, "node_modules/sphinx-bot": { - "version": "0.2.39", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.39.tgz", - "integrity": "sha512-u0sNCHmB6EPtcFxNWHyCHhCM9+f8wtJuPJT5Yfhwg0HMSRIvZ0txIVE/fB31N8Mr6c/vzQM20O3Zcjx4gShFqg==", + "version": "0.2.40", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.40.tgz", + "integrity": "sha512-OkmTlUZnm+T4BdPUxxLKZjGkiId13vzvCUJ0Gmj9zevZbhB8ficrwDaEJnQYzd19zo9i4369LgUKKC2l07eQgQ==", "dependencies": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", @@ -28764,9 +28764,9 @@ "dev": true }, "sphinx-bot": { - "version": "0.2.39", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.39.tgz", - "integrity": "sha512-u0sNCHmB6EPtcFxNWHyCHhCM9+f8wtJuPJT5Yfhwg0HMSRIvZ0txIVE/fB31N8Mr6c/vzQM20O3Zcjx4gShFqg==", + "version": "0.2.40", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.40.tgz", + "integrity": "sha512-OkmTlUZnm+T4BdPUxxLKZjGkiId13vzvCUJ0Gmj9zevZbhB8ficrwDaEJnQYzd19zo9i4369LgUKKC2l07eQgQ==", "requires": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", diff --git a/package.json b/package.json index 95d8150d6..3c7ebfe7d 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.39", + "sphinx-bot": "^0.2.40", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", From 50859a4aed73e269ac5f5b405fe4be6b9c3e4ec0 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 11:41:17 -0700 Subject: [PATCH 06/93] ml endpoint --- src/builtin/ml.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index a126df01e..eb1ea3b38 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -48,7 +48,7 @@ export function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } - const r = await fetch(`${url}/conversation`, { + const r = await fetch(`${url}/send-message-llm`, { method: 'POST', body: JSON.stringify({ message: message.content, From 44a971793ea0f7b7ba81443a2b27bba5f4bb8afe Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 19:43:26 +0100 Subject: [PATCH 07/93] update: added ml bot to mother bot --- dist/src/builtin/mother.js | 4 ++++ dist/src/builtin/mother.js.map | 2 +- src/builtin/ml.ts | 2 +- src/builtin/mother.ts | 7 +++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 95e78cb6e..0c6111ef4 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -22,6 +22,7 @@ const config_1 = require("../utils/config"); const tribes_1 = require("../utils/tribes"); const logger_1 = require("../utils/logger"); const git_1 = require("./git"); +const ml_1 = require("./ml"); const msg_types = Sphinx.MSG_TYPE; const config = (0, config_1.loadConfig)(); const builtinBots = [ @@ -34,6 +35,7 @@ const builtinBots = [ 'sentiment', 'jarvis', 'spam_gone', + ml_1.ML_PREFIX.substring(1), ]; // else just message type const builtInBotMsgTypes = { @@ -59,6 +61,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], + [`${ml_1.ML_PREFIX.substring(1)}`]: ['url', 'api_key'], }; const builtInBotNames = { welcome: 'WelcomeBot', @@ -70,6 +73,7 @@ const builtInBotNames = { sentiment: 'SentimentBot', jarvis: 'JarvisBot', spam_gone: 'SpamGoneBot', + [`${ml_1.ML_PREFIX.substring(1)}`]: `${ml_1.ML_PREFIX.substring(1, 2).toUpperCase()}${ml_1.ML_PREFIX.substring(2)}Bot`, }; function init() { const client = new Sphinx.Client(); diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 434837f85..e93ec51e4 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;AAEd,mDAAmD;AACnD,qCAAoC;AACpC,kDAAmD;AACnD,8CAA4D;AAC5D,sCAA8C;AAC9C,2CAA8B;AAC9B,4CAAoC;AACpC,4CAA4C;AAC5C,4CAA0D;AAC1D,4CAA8C;AAC9C,+BAAsD;AAEtD,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,WAAW,GAAG;IAClB,SAAS;IACT,SAAS;IACT,KAAK;IACL,OAAO;IACP,eAAe;IACf,MAAM;IACN,WAAW;IACX,QAAQ;IACR,WAAW;CACZ,CAAA;AAED,yBAAyB;AACzB,MAAM,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACP,mBAAS,CAAC,aAAa,CAAC,OAAO;QAC/B,mBAAS,CAAC,aAAa,CAAC,UAAU;KACnC;IACD,KAAK,EAAE;QACL,mBAAS,CAAC,aAAa,CAAC,OAAO;QAC/B,mBAAS,CAAC,aAAa,CAAC,KAAK;QAC7B,mBAAS,CAAC,aAAa,CAAC,cAAc;KACvC;IACD,IAAI,EAAE,CAAC,mBAAS,CAAC,aAAa,CAAC,UAAU,EAAE,mBAAS,CAAC,aAAa,CAAC,OAAO,CAAC;IAC3E,MAAM,EAAE;QACN,mBAAS,CAAC,aAAa,CAAC,OAAO;QAC/B,mBAAS,CAAC,aAAa,CAAC,KAAK;QAC7B,mBAAS,CAAC,aAAa,CAAC,UAAU;KACnC;CACF,CAAA;AAED,MAAM,gBAAgB,GAAG;IACvB,aAAa,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IACjC,IAAI,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC;IAC/B,SAAS,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC;IACxC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC;CACrC,CAAA;AAED,MAAM,eAAe,GAAG;IACtB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,SAAS;IAClB,GAAG,EAAE,QAAQ;IACb,KAAK,EAAE,UAAU;IACjB,aAAa,EAAE,kBAAkB;IACjC,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,cAAc;IACzB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,aAAa;CACzB,CAAA;AAED,SAAgB,IAAI;IAClB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;QAC7D,mDAAmD;QACnD,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;QACjE,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;YAAE,OAAM;QAC1B,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM;YAAE,OAAM;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QAElB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,QAAQ,GAAG,EAAE;YACX,KAAK,SAAS;gBACZ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;oBAAE,OAAM;gBAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAEtB,IAAI,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBACjC,WAAW;oBACX,qBAAY,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAA;oBACjD,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;oBAC/D,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;wBACpB,OAAO,qBAAY,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;oBACnD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBACnD,IAAI,QAAQ,EAAE;wBACZ,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,WAAW,CAAC;6BACtB,cAAc,CAAC,OAAO,GAAG,oBAAoB,CAAC,CAAA;wBACjD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;qBACvC;oBACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI;wBAC9C,mBAAS,CAAC,aAAa,CAAC,OAAO;qBAChC,CAAA;oBACD,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACnE,MAAM,OAAO,GAAyB;wBACpC,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,SAAS,EAAE,GAAG,GAAG,OAAO;wBACxB,OAAO,EAAE,mBAAS,CAAC,SAAS,CAAC,OAAO;wBACpC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;wBAClC,WAAW,EAAE,CAAC;wBACd,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC;qBACtD,CAAA;oBACD,IAAI,OAAO,KAAK,KAAK,EAAE;wBACrB,MAAM,IAAA,uBAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;wBACpC,OAAO,CAAC,OAAO,GAAG,iBAAW,CAAA;qBAC9B;oBACD,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;oBACpC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,KAAK,CAAA;oBACjD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;yBACpC,SAAS,CAAC,WAAW,CAAC;yBACtB,cAAc,CAAC,OAAO,GAAG,sBAAsB,CAAC,CAAA;oBACnD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;iBAChC;qBAAM;oBACL,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;oBAC/D,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;wBACpB,OAAO,qBAAY,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;oBAEnD,sCAAsC;oBACtC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBACnD,IAAI,QAAQ,EAAE;wBACZ,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,WAAW,CAAC;6BACtB,cAAc,CAAC,OAAO,GAAG,oBAAoB,CAAC,CAAA;wBACjD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;qBACvC;oBACD,2BAA2B;oBAC3B,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAA;oBACvC,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE;wBACnB,qBAAY,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;wBACpD,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;wBAC/D,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;4BACpB,OAAO,qBAAY,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;wBACnD,IAAA,6BAAsB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAA;qBAClC;yBAAM;wBACL,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,WAAW,CAAC;6BACtB,cAAc,CAAC,uBAAuB,CAAC,CAAA;wBAC1C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;qBAChC;iBACF;gBACD,OAAO,IAAI,CAAA;YAEb,KAAK,WAAW;gBACd,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;oBAAE,OAAM;gBAC1B,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBACvB,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;gBAChE,IAAI,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,qBAAY,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBACnD,MAAM,SAAS,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;oBAC7C,KAAK,EAAE;wBACL,MAAM,EAAE,KAAK,CAAC,EAAE;wBAChB,SAAS,EAAE,GAAG,GAAG,QAAQ;wBACzB,MAAM,EAAE,KAAK,CAAC,MAAM;qBACrB;iBACF,CAAC,CAAA;gBACF,IAAI,SAAS,EAAE;oBACb,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;oBACzB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;yBACpC,SAAS,CAAC,WAAW,CAAC;yBACtB,cAAc,CAAC,QAAQ,GAAG,mBAAmB,CAAC,CAAA;oBACjD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;iBACvC;qBAAM;oBACL,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;yBACpC,SAAS,CAAC,WAAW,CAAC;yBACtB,cAAc,CAAC,8BAA8B,CAAC,CAAA;oBACjD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;iBACvC;YAEH,KAAK,QAAQ;gBACX,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;oBAAE,OAAM;gBAC1B,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBACpB,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAA;gBACpC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;oBACrB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;yBACpC,SAAS,CAAC,WAAW,CAAC;yBACtB,cAAc,CAAC,eAAe,CAAC,CAAA;oBAClC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;iBACvC;gBACD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACrC,SAAS,CAAC,WAAW,CAAC;qBACtB,QAAQ,CAAC,OAAO,CAAC;qBACjB,SAAS,CACR,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACb,MAAM,SAAS,GAAG,EAAE,CAAA;oBACpB,MAAM,KAAK,GACT,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,SAAS;wBAC9B,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,KAAK;wBAC5C,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;oBACnB,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,CAAA;gBACvC,CAAC,CAAC,CACH;qBACA,YAAY,CAAC,MAAM,CAAC,CAAA;gBACvB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBACvC,OAAO,IAAI,CAAA;YAEb;gBACE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,WAAW,CAAC;qBACtB,QAAQ,CAAC,eAAe,CAAC;qBACzB,SAAS,CAAC;oBACT,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,2BAA2B,EAAE;oBAC/D,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,wBAAwB,EAAE;oBAC9D,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,0BAA0B,EAAE;oBAC9D;wBACE,IAAI,EAAE,qCAAqC;wBAC3C,KAAK,EAAE,mCAAmC;qBAC3C;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE;iBACrC,CAAC;qBACD,YAAY,CAAC,MAAM,CAAC,CAAA;gBACvB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;SAClC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AA5JD,oBA4JC;AAED,MAAM,MAAM,GAAG;;OAER,CAAA;AAEP,SAAe,UAAU,CAAC,CAAS;;QACjC,IAAI;YACF,IAAI,QAAQ,GAAG,OAAO,CAAA;YACtB,IAAI,MAAM,CAAC,eAAe;gBAAE,QAAQ,GAAG,MAAM,CAAA;YAC7C,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EACnB,GAAG,QAAQ,MAAM,MAAM,CAAC,WAAW,gBAAgB,CAAC,EAAE,CACvD,CAAA;YACD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YACxB,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,CAAA;SACV;IACH,CAAC;CAAA;AACD,SAAe,YAAY,CAAC,IAAY;;QACtC,IAAI;YACF,IAAI,QAAQ,GAAG,OAAO,CAAA;YACtB,IAAI,MAAM,CAAC,eAAe;gBAAE,QAAQ,GAAG,MAAM,CAAA;YAC7C,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,QAAQ,MAAM,MAAM,CAAC,WAAW,QAAQ,IAAI,EAAE,CAAC,CAAA;YACxE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YACxB,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,EAAE;gBACjC,OAAO,CAAC,CAAA;aACT;YACD,OAAO,IAAI,CAAA;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;CAAA;AAED,SAAe,aAAa,CAAC,IAAgB,EAAE,OAAe;;QAC5D,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,SAAS,EAAE,GAAG,GAAG,OAAO;oBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB;aACF,CAAC,CAAA;YACF,OAAO,GAAG,CAAA;SACX;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAA;YAC3D,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index a126df01e..f2fba84c1 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -22,7 +22,7 @@ export function init() { client.login('_', finalAction) client.on(msg_types.MESSAGE, async (message: Sphinx.Message) => { - // if (message.author?.bot !== botPrefix) return + if (message.author?.bot !== ML_PREFIX) return const isAdmin = message.member.roles.find((role) => role.name === 'Admin') diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index 5a96dd4eb..6d846a0b0 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -11,6 +11,7 @@ import { loadConfig } from '../utils/config' import { getTribeOwnersChatByUUID } from '../utils/tribes' import { sphinxLogger } from '../utils/logger' import { GITBOT_UUID, getOrCreateGitBot } from './git' +import { ML_PREFIX } from './ml' const msg_types = Sphinx.MSG_TYPE @@ -26,6 +27,7 @@ const builtinBots = [ 'sentiment', 'jarvis', 'spam_gone', + ML_PREFIX.substring(1), ] // else just message type @@ -53,6 +55,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], + [`${ML_PREFIX.substring(1)}`]: ['url', 'api_key'], } const builtInBotNames = { @@ -65,6 +68,10 @@ const builtInBotNames = { sentiment: 'SentimentBot', jarvis: 'JarvisBot', spam_gone: 'SpamGoneBot', + [`${ML_PREFIX.substring(1)}`]: `${ML_PREFIX.substring( + 1, + 2 + ).toUpperCase()}${ML_PREFIX.substring(2)}Bot`, } export function init() { From 1a559a5ca2d34078d10dc5ee004486e1df18d14e Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 20:02:06 +0100 Subject: [PATCH 08/93] update: added the url command --- dist/src/builtin/mother.js | 2 +- dist/src/builtin/mother.js.map | 2 +- src/builtin/ml.ts | 43 +++++++++++++++++++++++++++++++--- src/builtin/mother.ts | 7 ++---- 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 0c6111ef4..3c4a21c69 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -73,7 +73,7 @@ const builtInBotNames = { sentiment: 'SentimentBot', jarvis: 'JarvisBot', spam_gone: 'SpamGoneBot', - [`${ml_1.ML_PREFIX.substring(1)}`]: `${ml_1.ML_PREFIX.substring(1, 2).toUpperCase()}${ml_1.ML_PREFIX.substring(2)}Bot`, + [`${ml_1.ML_PREFIX.substring(1)}`]: ml_1.ML_BOTNAME, }; function init() { const client = new Sphinx.Client(); diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index e93ec51e4..5e4bd698d 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index f2fba84c1..54391a557 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -1,7 +1,7 @@ import * as Sphinx from 'sphinx-bot' import { finalAction } from '../controllers/botapi' import { ChatRecord, models, ChatBotRecord } from '../models' -import { findBot } from './utill' +import { findBot, botResponse } from './utill' import { loadConfig } from '../utils/config' const config = loadConfig() @@ -12,6 +12,11 @@ let initted = false export const ML_PREFIX = '/ml' +export const ML_BOTNAME = `${ML_PREFIX.substring( + 1, + 2 +).toUpperCase()}${ML_PREFIX.substring(2)}Bot` + export const CALLBACKS: { [k: string]: (msg: string) => void } = {} export function init() { @@ -35,9 +40,41 @@ export function init() { let meta: MlMeta = JSON.parse(bot.meta || `{}`) const url = meta.url - if (!url) { + const api_key = meta.apiKey + if (isAdmin) { + const arr = (message.content && message.content.split(' ')) || [] + const cmd = arr[1] + + switch (cmd) { + case 'url': + const newUrl = arr[2] + if (!newUrl) { + await botResponse( + ML_BOTNAME, + 'Please provide a valid URL', + ML_PREFIX, + tribe.id, + message, + cmd + ) + return + } + meta.url = newUrl + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + ML_BOTNAME, + 'URL updated successfully', + ML_PREFIX, + tribe.id, + message, + cmd + ) + return + } + } + if (!url || !api_key) { const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') + .setAuthor(ML_BOTNAME) .setDescription('not configured') .setOnlyOwner(isAdmin ? true : false) message.channel.send({ embed }) diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index 6d846a0b0..776454a8c 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -11,7 +11,7 @@ import { loadConfig } from '../utils/config' import { getTribeOwnersChatByUUID } from '../utils/tribes' import { sphinxLogger } from '../utils/logger' import { GITBOT_UUID, getOrCreateGitBot } from './git' -import { ML_PREFIX } from './ml' +import { ML_PREFIX, ML_BOTNAME } from './ml' const msg_types = Sphinx.MSG_TYPE @@ -68,10 +68,7 @@ const builtInBotNames = { sentiment: 'SentimentBot', jarvis: 'JarvisBot', spam_gone: 'SpamGoneBot', - [`${ML_PREFIX.substring(1)}`]: `${ML_PREFIX.substring( - 1, - 2 - ).toUpperCase()}${ML_PREFIX.substring(2)}Bot`, + [`${ML_PREFIX.substring(1)}`]: ML_BOTNAME, } export function init() { From 14104ba78ba2d3d9b8dbdbd305493cb924868b42 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 20:09:59 +0100 Subject: [PATCH 09/93] update: added the help command --- src/builtin/ml.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 54391a557..600633416 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -70,6 +70,25 @@ export function init() { cmd ) return + case 'api_key': + return + default: + const embed = new Sphinx.MessageEmbed() + .setAuthor(ML_BOTNAME) + .setTitle('Bot Commands:') + .addFields([ + { + name: `Add URL to ${ML_BOTNAME}`, + value: `${ML_PREFIX} url {URL}`, + }, + { + name: `Add API_KEY to ${ML_BOTNAME}`, + value: `${ML_PREFIX} url {API_KEY}`, + }, + ]) + .setOnlyOwner(true) + message.channel.send({ embed }) + return } } if (!url || !api_key) { From e2624bc2e2a497596e2843eadca94ffb8e8ad107 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 20:13:02 +0100 Subject: [PATCH 10/93] update: added the api_key command --- src/builtin/ml.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 600633416..d2ad37d3f 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -71,6 +71,28 @@ export function init() { ) return case 'api_key': + const newApiKey = arr[2] + if (!newApiKey) { + await botResponse( + ML_BOTNAME, + 'Please provide a valid API KEY', + ML_PREFIX, + tribe.id, + message, + cmd + ) + return + } + meta.apiKey = newApiKey + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + ML_BOTNAME, + 'API KEY updated successfully', + ML_PREFIX, + tribe.id, + message, + cmd + ) return default: const embed = new Sphinx.MessageEmbed() From 2facb49bcd891f0076c1f7f52a5cfafb7b98c462 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 20:15:18 +0100 Subject: [PATCH 11/93] update: initiated the ML Bot --- dist/src/builtin/index.js | 2 ++ dist/src/builtin/index.js.map | 2 +- src/builtin/index.ts | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dist/src/builtin/index.js b/dist/src/builtin/index.js index 404778224..19870696e 100644 --- a/dist/src/builtin/index.js +++ b/dist/src/builtin/index.js @@ -21,6 +21,7 @@ const KickBot = require("./kick"); const SentimentBot = require("./sentiment"); const JarvisBot = require("./jarvis"); const SpamGoneBot = require("./spamGone"); +const MLBot = require("./ml"); const GitBot = require("./git"); const bots_1 = require("../controllers/bots"); Object.defineProperty(exports, "buildBotPayload", { enumerable: true, get: function () { return bots_1.buildBotPayload; } }); @@ -36,6 +37,7 @@ function init() { SentimentBot.init(); JarvisBot.init(); SpamGoneBot.init(); + MLBot.init(); }); } exports.init = init; diff --git a/dist/src/builtin/index.js.map b/dist/src/builtin/index.js.map index 48e80937d..85cbc5f3b 100644 --- a/dist/src/builtin/index.js.map +++ b/dist/src/builtin/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AAEzC,gCAA+B;AAC/B,8CAAqD;AAqBtB,gGArBtB,sBAAe,OAqBsB;AAnB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;IACpB,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file diff --git a/src/builtin/index.ts b/src/builtin/index.ts index 1894d68ce..f3fa2f089 100644 --- a/src/builtin/index.ts +++ b/src/builtin/index.ts @@ -9,6 +9,7 @@ import * as KickBot from './kick' import * as SentimentBot from './sentiment' import * as JarvisBot from './jarvis' import * as SpamGoneBot from './spamGone' +import * as MLBot from './ml' import { BotMsg } from '../network/interfaces' import * as GitBot from './git' import { buildBotPayload } from '../controllers/bots' @@ -24,6 +25,7 @@ async function init() { SentimentBot.init() JarvisBot.init() SpamGoneBot.init() + MLBot.init() } function builtinBotEmit(msg: BotMsg, botPrefix?: string) { From 934fdfbfe08f661f3ae7bd71898b715e36d358ad Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 12:41:13 -0700 Subject: [PATCH 12/93] add /ml to no-auth list --- src/auth.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/auth.ts b/src/auth.ts index 2e3f6ab2c..59abfb426 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -133,7 +133,8 @@ function no_auth(path) { path == '/webhook' || path == '/has_admin' || path == '/initial_admin_pubkey' || - path == '/my_ip' + path == '/my_ip' || + path == '/ml' ) } From e37003c66aae40681371017b0167341a2dd38fb4 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 12:49:08 -0700 Subject: [PATCH 13/93] tsc --- dist/src/auth.js | 3 ++- dist/src/auth.js.map | 2 +- dist/src/controllers/botapi/index.js | 20 +++++++++++++++++++- dist/src/controllers/botapi/index.js.map | 2 +- dist/src/controllers/index.js | 1 + dist/src/controllers/index.js.map | 2 +- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dist/src/auth.js b/dist/src/auth.js index 8fe190c9a..687f2623d 100644 --- a/dist/src/auth.js +++ b/dist/src/auth.js @@ -141,7 +141,8 @@ function no_auth(path) { path == '/webhook' || path == '/has_admin' || path == '/initial_admin_pubkey' || - path == '/my_ip'); + path == '/my_ip' || + path == '/ml'); } function ownerMiddleware(req, res, next) { return __awaiter(this, void 0, void 0, function* () { diff --git a/dist/src/auth.js.map b/dist/src/auth.js.map index 51a5eb4b2..25d1cf848 100644 --- a/dist/src/auth.js.map +++ b/dist/src/auth.js.map @@ -1 +1 @@ -{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAgC;AAChC,qCAAgD;AAChD,sCAAqC;AACrC,qCAA4D;AAC5D,+CAAsD;AACtD,2CAA2C;AAC3C,yCAAuC;AACvC,wCAAuC;AACvC,qCAA2C;AAC3C,sCAAqC;AAErC,yBAAwB;AACxB,uCAA0D;AAC1D,uCAAiC;AACjC,iCAAiC;AAEjC,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,SAAsB,QAAQ,CAAC,GAAQ,EAAE,GAAG;;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,IAAA,aAAO,EAAC,GAAG,EAAE,aAAa,CAAC,CAAA;YAC3B,OAAO,KAAK,CAAA;SACb;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,uBAAuB,CAAA;QACjD,IAAI,CAAC,UAAU,EAAE;YACf,IAAA,aAAO,EAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;YAChC,OAAO,KAAK,CAAA;SACb;QAED,IAAI,MAAc,CAAA;QAElB,IAAI;YACF,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAA;YACtE,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,aAAO,EAAC,GAAG,EAAE,aAAa,CAAC,CAAA;gBAC3B,OAAO,KAAK,CAAA;aACb;YAED,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAChD,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,aAAO,EAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;gBAC1C,OAAO,KAAK,CAAA;aACb;YAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACtC,IAAI,CAAC,QAAQ,EAAE;gBACb,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;gBACzC,OAAO,KAAK,CAAA;aACb;YAED,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YACf,OAAO,KAAK,CAAA;SACb;QAED,IAAI,MAAM,EAAE;YACV,IAAA,8BAAmB,EAAC,MAAM,CAAC,CAAA;YAC3B,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YACxB,MAAM,IAAA,eAAK,EAAC,GAAG,CAAC,CAAA;YAChB,OAAO,IAAI,CAAA;SACZ;aAAM;YACL,IAAA,aAAO,EAAC,GAAG,EAAE,kCAAkC,CAAC,CAAA;YAChD,OAAO,KAAK,CAAA;SACb;IACH,CAAC;CAAA;AAjDD,4BAiDC;AAED,SAAsB,cAAc,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAI;;QAC3D,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QACD,sEAAsE;QACtE,oCAAoC;QACpC,IAAI,GAAG,CAAC,IAAI,IAAI,WAAW,EAAE;YAC3B,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QACD,iBAAiB;QACjB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE;YACtB,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QACD,qCAAqC;QACrC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC1D,IAAI,CAAC,GAAG,EAAE;YACR,6BAA6B;YAC7B,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QACD,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,CAAA;QACvE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC9D,mCAAmC;QACnC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;SACzB;QACD,IAAI,EAAE,CAAA;IACR,CAAC;CAAA;AA9BD,wCA8BC;AAED,SAAsB,oBAAoB,CACxC,GAAQ,EACR,GAAQ,EACR,IAAI;;QAEJ,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QACD,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;QACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;QAChD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAA;QACxC,IAAI,EAAE,CAAA;IACR,CAAC;CAAA;AAbD,oDAaC;AAED,SAAS,OAAO,CAAC,IAAI;IACnB,OAAO,CACL,IAAI,IAAI,MAAM;QACd,IAAI,IAAI,WAAW;QACnB,IAAI,IAAI,GAAG;QACX,IAAI,IAAI,SAAS;QACjB,IAAI,IAAI,OAAO;QACf,IAAI,IAAI,SAAS;QACjB,IAAI,IAAI,kBAAkB;QAC1B,IAAI,IAAI,SAAS;QACjB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAC1B,IAAI,IAAI,mBAAmB;QAC3B,IAAI,IAAI,UAAU;QAClB,IAAI,IAAI,eAAe;QACvB,IAAI,IAAI,SAAS;QACjB,IAAI,IAAI,wBAAwB;QAChC,IAAI,IAAI,UAAU;QAClB,IAAI,IAAI,YAAY;QACpB,IAAI,IAAI,uBAAuB;QAC/B,IAAI,IAAI,QAAQ,CACjB,CAAA;AACH,CAAC;AAED,SAAsB,eAAe,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAI;;QAC5D,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,EAAE,CAAA;YACN,OAAM;SACP;QAED,kEAAkE;QAClE,MAAM,YAAY,GAChB,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5D,MAAM,iBAAiB,GACrB,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACtE,MAAM,aAAa,GACjB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAE9D,uCAAuC;QACvC,IAAI,KAAK,GAAG,YAAY,IAAI,aAAa,CAAA;QACzC,IAAI,SAAS,GAAG,CAAC,CAAA;QAEjB,IAAI,iBAAiB,EAAE;YACrB,MAAM,SAAS,GAAG,MAAM,IAAA,kCAA2B,EAAC,iBAAiB,CAAC,CAAA;YACtE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YACvB,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;SAChC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,EAAE;YAC3C,IAAI,KAAK,EAAE;gBACT,sBAAsB;gBACtB,MAAM,WAAW,GAAG,MAAM;qBACvB,UAAU,CAAC,QAAQ,CAAC;qBACpB,MAAM,CAAC,KAAK,CAAC;qBACb,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACnB,MAAM,KAAK,GAAkB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;oBACzD,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE;iBACjD,CAAC,CAAkB,CAAA;gBACpB,IAAI,KAAK,EAAE;oBACT,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,CAAA;iBAC7B;aACF;iBAAM,IAAI,CAAC,IAAA,eAAO,GAAE,EAAE;gBACrB,MAAM,MAAM,GAAkB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;oBAC1D,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;iBACzB,CAAC,CAAkB,CAAA;gBACpB,IAAI,MAAM;oBAAE,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAA;aAC1C;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;gBAC5B,IAAI,EAAE,CAAA;gBACN,OAAM;aACP;SACF;QAED,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAExD,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACf,GAAG,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;YAChD,OAAM;SACP;QAED,IAAI,KAAgC,CAAA;QAEpC,qBAAqB;QACrB,IAAI,KAAK,EAAE;YACT,MAAM,WAAW,GAAG,MAAM;iBACvB,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,KAAK,CAAC;iBACb,MAAM,CAAC,QAAQ,CAAC,CAAA;YACnB,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACpC,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE;aACjD,CAAC,CAAkB,CAAA;YACpB,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;oBAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;oBACf,GAAG,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;oBAC1C,OAAM;iBACP;aACF;SACF;QAED,cAAc;QACd,IAAI,GAAG,EAAE;YACP,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YACtC,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAI,MAAM,CAAC,IAAY,CAAC,MAAM,CAAA;gBAC7C,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;gBACvD,IAAI,OAAO,IAAI,SAAS,EAAE;oBACxB,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;wBACpC,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;qBACpC,CAAC,CAAkB,CAAA;iBACrB;aACF;SACF;QAED,IAAI,CAAC,KAAK,EAAE;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACf,GAAG,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;YACzC,OAAM;SACP;QAED,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBACf,GAAG,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;gBACtC,OAAM;aACP;YACD,IAAI,KAAK,CAAC,aAAa,EAAE;gBACvB,kDAAkD;gBAClD,IAAI,aAAa,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;gBAClD,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;gBAC9D,IAAI,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;oBACzC,0BAA0B;oBAC1B,+CAA+C;oBAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;oBACf,GAAG,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;oBACnD,OAAM;iBACP;aACF;YACD,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;SACjD;QACD,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,CAAA;QAC5B,IAAI,EAAE,CAAA;IACR,CAAC;CAAA;AAvHD,0CAuHC;AAED,kEAAkE;AAClE,SAAS,mBAAmB,CAAC,EAAU;IACrC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,EAAE,EAAE;QAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KACvB;SAAM;QACL,OAAO,MAAM,CAAC,EAAE,CAAC,CAAA;KAClB;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,QAAgB;IACzD,IAAI;QACF,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACvE,QAAQ,CAAC,GAAG,CAAC,MAAM,CACpB,CAAA;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;QACrC,OAAO,aAAa,CAAA;KACrB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAC5D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAChB,OAAO,EAAE,CAAA;KACV;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,GAAG;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IACrB,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC1C,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;KAC7C;IACD,OAAO,MAAM,CAAC,WAAW,EAAE,CAAA;AAC7B,CAAC;AARD,kCAQC;AAED,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAE/D,MAAM,QAAQ,GAAG,8DAA8D,CAAA"} \ No newline at end of file +{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index edfc36f27..9a612d3d4 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.validateAction = exports.finalAction = exports.processAction = exports.processWebhook = void 0; +exports.processMlCallback = exports.validateAction = exports.finalAction = exports.processAction = exports.processWebhook = void 0; const network = require("../../network"); const models_1 = require("../../models"); const res_1 = require("../../utils/res"); @@ -23,6 +23,7 @@ const githook_1 = require("../../utils/githook"); const dm_1 = require("./dm"); const pay_1 = require("./pay"); const broadcast_1 = require("./broadcast"); +const ml_1 = require("../../builtin/ml"); function processWebhook(req, res) { var _a; return __awaiter(this, void 0, void 0, function* () { @@ -284,4 +285,21 @@ function validateAction(a) { }); } exports.validateAction = validateAction; +function processMlCallback(req, res) { + return __awaiter(this, void 0, void 0, function* () { + const process_id = req.body.process_id; + if (!process_id) { + return (0, res_1.failure)(res, 'no process_id'); + } + const response = req.body.response; + if (!response) { + return (0, res_1.failure)(res, 'no response'); + } + if (ml_1.CALLBACKS[process_id]) { + ml_1.CALLBACKS[process_id](response); + } + (0, res_1.success)(res, { ok: true }); + }); +} +exports.processMlCallback = processMlCallback; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 26a57b993..68667b97b 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js index 2c14b8931..f6ad1ee44 100644 --- a/dist/src/controllers/index.js +++ b/dist/src/controllers/index.js @@ -141,6 +141,7 @@ function set(app) { app.get('/test_clear', details.clearForTesting); app.get('/query/onchain_address/:app', queries.queryOnchainAddress); app.get('/utxos', queries.listUTXOs); + app.post('/ml', actions.processMlCallback); app.post('/webhook', actions.processWebhook); app.post('/action', actions.processAction); app.get('/bots', bots.getBots); diff --git a/dist/src/controllers/index.js.map b/dist/src/controllers/index.js.map index d22d01a07..9810dcef8 100644 --- a/dist/src/controllers/index.js.map +++ b/dist/src/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 39b75e5a5f596d70bd0e3eb8aab7c54b78f3d216 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 12:54:57 -0700 Subject: [PATCH 14/93] MlBot.init() --- dist/src/builtin/index.js | 2 ++ dist/src/builtin/index.js.map | 2 +- src/builtin/index.ts | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dist/src/builtin/index.js b/dist/src/builtin/index.js index 404778224..997db88dc 100644 --- a/dist/src/builtin/index.js +++ b/dist/src/builtin/index.js @@ -21,6 +21,7 @@ const KickBot = require("./kick"); const SentimentBot = require("./sentiment"); const JarvisBot = require("./jarvis"); const SpamGoneBot = require("./spamGone"); +const MlBot = require("./ml"); const GitBot = require("./git"); const bots_1 = require("../controllers/bots"); Object.defineProperty(exports, "buildBotPayload", { enumerable: true, get: function () { return bots_1.buildBotPayload; } }); @@ -36,6 +37,7 @@ function init() { SentimentBot.init(); JarvisBot.init(); SpamGoneBot.init(); + MlBot.init(); }); } exports.init = init; diff --git a/dist/src/builtin/index.js.map b/dist/src/builtin/index.js.map index 48e80937d..85cbc5f3b 100644 --- a/dist/src/builtin/index.js.map +++ b/dist/src/builtin/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AAEzC,gCAA+B;AAC/B,8CAAqD;AAqBtB,gGArBtB,sBAAe,OAqBsB;AAnB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;IACpB,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file diff --git a/src/builtin/index.ts b/src/builtin/index.ts index 1894d68ce..18b61d155 100644 --- a/src/builtin/index.ts +++ b/src/builtin/index.ts @@ -9,6 +9,7 @@ import * as KickBot from './kick' import * as SentimentBot from './sentiment' import * as JarvisBot from './jarvis' import * as SpamGoneBot from './spamGone' +import * as MlBot from './ml' import { BotMsg } from '../network/interfaces' import * as GitBot from './git' import { buildBotPayload } from '../controllers/bots' @@ -24,6 +25,7 @@ async function init() { SentimentBot.init() JarvisBot.init() SpamGoneBot.init() + MlBot.init() } function builtinBotEmit(msg: BotMsg, botPrefix?: string) { From dea6bdcfec6e6819dc519fa21873fa4b9d40d20b Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:03:57 -0700 Subject: [PATCH 15/93] ml.js --- .gitignore | 1 - dist/src/builtin/ml.js | 95 ++++++++++++++++++++++++++++++++++++++ dist/src/builtin/ml.js.map | 1 + 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 dist/src/builtin/ml.js create mode 100644 dist/src/builtin/ml.js.map diff --git a/.gitignore b/.gitignore index 386f37226..3a2fb959d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ sphinx.db binaries/nodeapp-macos binaries/nodeapp-alpine -dist dist/public/uploads dist/config/app.json diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js new file mode 100644 index 000000000..0dcd63fe8 --- /dev/null +++ b/dist/src/builtin/ml.js @@ -0,0 +1,95 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.sleep = exports.init = exports.CALLBACKS = exports.ML_PREFIX = void 0; +const Sphinx = require("sphinx-bot"); +const botapi_1 = require("../controllers/botapi"); +const models_1 = require("../models"); +const utill_1 = require("./utill"); +const config_1 = require("../utils/config"); +const config = (0, config_1.loadConfig)(); +const msg_types = Sphinx.MSG_TYPE; +let initted = false; +exports.ML_PREFIX = '/ml'; +exports.CALLBACKS = {}; +function init() { + if (initted) + return; + initted = true; + const client = new Sphinx.Client(); + client.login('_', botapi_1.finalAction); + client.on(msg_types.MESSAGE, (message) => __awaiter(this, void 0, void 0, function* () { + // if (message.author?.bot !== botPrefix) return + const isAdmin = message.member.roles.find((role) => role.name === 'Admin'); + try { + const tribe = (yield models_1.models.Chat.findOne({ + where: { uuid: message.channel.id }, + })); + const bot = yield (0, utill_1.findBot)({ botPrefix: '/ML', tribe }); + let meta = JSON.parse(bot.meta || `{}`); + const url = meta.url; + if (!url) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('not configured') + .setOnlyOwner(isAdmin ? true : false); + message.channel.send({ embed }); + return; + } + let host_name = config.host_name; + if (!host_name.startsWith('http')) { + host_name = `https://${host_name}`; + } + const r = yield fetch(`${url}/send-message-llm`, { + method: 'POST', + body: JSON.stringify({ + message: message.content, + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }); + const j = yield r.json(); + if (!j.process_id) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('failed to process message') + .setOnlyOwner(isAdmin ? true : false); + message.channel.send({ embed }); + return; + } + exports.CALLBACKS[j.process_id] = function (msg) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription(msg) + .setOnlyOwner(isAdmin ? true : false); + // .setOnlyUser(message.member.id) + message.channel.send({ embed }); + }; + setTimeout(() => { + delete exports.CALLBACKS[j.process_id]; + }, 5 * 60 * 1000); + } + catch (e) { + console.error(e); + } + })); +} +exports.init = init; +function sleep(ms) { + return __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve) => setTimeout(resolve, ms)); + }); +} +exports.sleep = sleep; +//# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map new file mode 100644 index 000000000..4159163c4 --- /dev/null +++ b/dist/src/builtin/ml.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file From c840318f62ed0dc821517807267d20e93197ff7b Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 4 Aug 2023 21:09:48 +0100 Subject: [PATCH 16/93] update: added onlyOwner command --- src/builtin/ml.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index d2ad37d3f..eb5a1ab8c 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -28,21 +28,19 @@ export function init() { client.on(msg_types.MESSAGE, async (message: Sphinx.Message) => { if (message.author?.bot !== ML_PREFIX) return - const isAdmin = message.member.roles.find((role) => role.name === 'Admin') - try { const tribe = (await models.Chat.findOne({ where: { uuid: message.channel.id }, })) as ChatRecord - const bot: ChatBotRecord = await findBot({ botPrefix: '/ML', tribe }) + const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) let meta: MlMeta = JSON.parse(bot.meta || `{}`) const url = meta.url const api_key = meta.apiKey - if (isAdmin) { - const arr = (message.content && message.content.split(' ')) || [] + const arr = (message.content && message.content.split(' ')) || [] + if (isAdmin && arr[0] === ML_PREFIX) { const cmd = arr[1] switch (cmd) { @@ -116,8 +114,8 @@ export function init() { if (!url || !api_key) { const embed = new Sphinx.MessageEmbed() .setAuthor(ML_BOTNAME) - .setDescription('not configured') - .setOnlyOwner(isAdmin ? true : false) + .setDescription('not configured!') + .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) return } @@ -142,7 +140,7 @@ export function init() { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription('failed to process message') - .setOnlyOwner(isAdmin ? true : false) + .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) return } @@ -151,8 +149,7 @@ export function init() { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription(msg) - .setOnlyOwner(isAdmin ? true : false) - // .setOnlyUser(message.member.id) + .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) } From 12b0ee9e1ad72ba7b1ce17350086a4e1ddfb24fb Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:14:45 -0700 Subject: [PATCH 17/93] sphinx-bots 0.2.40 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d8150d6..3c7ebfe7d 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.39", + "sphinx-bot": "^0.2.40", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", From d1661a8088bcc622218149ec79ad499db3688a00 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:30:32 -0700 Subject: [PATCH 18/93] fix fetch --- dist/src/builtin/ml.js | 5 +- dist/src/builtin/ml.js.map | 2 +- .../tests/controllers/feeDeduction.test.js | 59 ------------------- .../controllers/feeDeduction.test.js.map | 1 - .../src/tests/controllers/swarmInvite.test.js | 41 ------------- .../tests/controllers/swarmInvite.test.js.map | 1 - dist/src/tests/utils/invites/createInvite.js | 34 ----------- .../tests/utils/invites/createInvite.js.map | 1 - dist/src/tests/utils/invites/getInvite.js | 29 --------- dist/src/tests/utils/invites/getInvite.js.map | 1 - dist/src/tests/utils/invites/index.js | 10 ---- dist/src/tests/utils/invites/index.js.map | 1 - dist/src/tests/utils/invites/payInvite.js | 29 --------- dist/src/tests/utils/invites/payInvite.js.map | 1 - src/builtin/ml.ts | 3 +- 15 files changed, 6 insertions(+), 212 deletions(-) delete mode 100644 dist/src/tests/controllers/feeDeduction.test.js delete mode 100644 dist/src/tests/controllers/feeDeduction.test.js.map delete mode 100644 dist/src/tests/controllers/swarmInvite.test.js delete mode 100644 dist/src/tests/controllers/swarmInvite.test.js.map delete mode 100644 dist/src/tests/utils/invites/createInvite.js delete mode 100644 dist/src/tests/utils/invites/createInvite.js.map delete mode 100644 dist/src/tests/utils/invites/getInvite.js delete mode 100644 dist/src/tests/utils/invites/getInvite.js.map delete mode 100644 dist/src/tests/utils/invites/index.js delete mode 100644 dist/src/tests/utils/invites/index.js.map delete mode 100644 dist/src/tests/utils/invites/payInvite.js delete mode 100644 dist/src/tests/utils/invites/payInvite.js.map diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 59c14949d..92fbe25f9 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -15,6 +15,7 @@ const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); const utill_1 = require("./utill"); const config_1 = require("../utils/config"); +const node_fetch_1 = require("node-fetch"); const config = (0, config_1.loadConfig)(); const msg_types = Sphinx.MSG_TYPE; let initted = false; @@ -95,7 +96,7 @@ function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } - const r = yield fetch(`${url}/send-message-llm`, { + const r = yield (0, node_fetch_1.default)(`${url}/send-message-llm`, { method: 'POST', body: JSON.stringify({ message: message.content, @@ -127,7 +128,7 @@ function init() { }, 5 * 60 * 1000); } catch (e) { - console.error(e); + console.error('ML CALL FAILED', e); } })); } diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 1ee1dfe15..1ee9fc05e 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/controllers/feeDeduction.test.js b/dist/src/tests/controllers/feeDeduction.test.js deleted file mode 100644 index c206a5dc3..000000000 --- a/dist/src/tests/controllers/feeDeduction.test.js +++ /dev/null @@ -1,59 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.testFeesDeduction = void 0; -const ava_1 = require("ava"); -const helpers = require("../utils/helpers"); -// import { -// sendMessageAndCheckDecryption, -// sendInvoice, -// payInvoice, -// } from '../utils/msg' -const nodes_1 = require("../nodes"); -const keysend_1 = require("../utils/keysend"); -const get_1 = require("../utils/get"); -/* - npx ava src/tests/controllers/feeDeduction.test.ts --verbose --serial --timeout=2m -*/ -(0, ava_1.default)('Fees: update channel policy, make keysend payment, check balance', (t) => __awaiter(void 0, void 0, void 0, function* () { - yield testFeesDeduction(t, 0, 1, 2, 4); -})); -function testFeesDeduction(t, index1, index2, index3, index5) { - return __awaiter(this, void 0, void 0, function* () { - let alice = nodes_1.default[index1]; - let bob = nodes_1.default[index2]; - let carol = nodes_1.default[index3]; - let virtualNode0 = nodes_1.default[index5]; - const newFee = 10; - const channelUpdate2 = yield helpers.updateChannelPolicy(t, alice, 10); - t.true(channelUpdate2.success, 'Channel policy is updated successfully'); - yield helpers.sleep(4000); - const getBalanceBefore = yield (0, get_1.getBalance)(t, virtualNode0); - const keysend_amount = 80; - //VirtualNode0 sent some sats to Carol - const keysend3 = yield (0, keysend_1.keysend)(t, virtualNode0, carol, keysend_amount); - t.true(keysend3.success, 'Keysend payment should be successful'); - const getBalanceAfter = yield (0, get_1.getBalance)(t, virtualNode0); - const total_cost = newFee + keysend_amount; - t.true(getBalanceBefore - getBalanceAfter === total_cost, 'Balance difference should be fee plus amount sent'); - const getBalanceBefore2 = yield (0, get_1.getBalance)(t, virtualNode0); - const keysend_amount2 = 80; - yield helpers.sleep(1000); - //VirtualNode0 sent some sats to Bob - const keysend4 = yield (0, keysend_1.keysend)(t, virtualNode0, bob, keysend_amount2); - t.true(keysend4.success, 'Keysend payment should be successful'); - const getBalanceAfter2 = yield (0, get_1.getBalance)(t, virtualNode0); - const total_cost2 = newFee + keysend_amount; - t.true(getBalanceBefore2 - getBalanceAfter2 === total_cost2, 'Balance difference should be fee plus amount sent'); - }); -} -exports.testFeesDeduction = testFeesDeduction; -//# sourceMappingURL=feeDeduction.test.js.map \ No newline at end of file diff --git a/dist/src/tests/controllers/feeDeduction.test.js.map b/dist/src/tests/controllers/feeDeduction.test.js.map deleted file mode 100644 index 3eb88f7e9..000000000 --- a/dist/src/tests/controllers/feeDeduction.test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"feeDeduction.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/feeDeduction.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAsB;AACtB,4CAA2C;AAC3C,WAAW;AACX,mCAAmC;AACnC,iBAAiB;AACjB,gBAAgB;AAChB,wBAAwB;AAExB,oCAA4B;AAC5B,8CAA0C;AAC1C,sCAAyC;AAEzC;;EAEE;AAEF,IAAA,aAAI,EAAC,kEAAkE,EAAE,CAAO,CAAC,EAAE,EAAE;IACnF,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACxC,CAAC,CAAA,CAAC,CAAA;AAEF,SAAsB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;QACvE,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,GAAG,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,YAAY,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QAEhC,MAAM,MAAM,GAAG,EAAE,CAAA;QAEjB,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,wCAAwC,CAAC,CAAA;QACxE,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzB,MAAM,gBAAgB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAE1D,MAAM,cAAc,GAAG,EAAE,CAAA;QACzB,sCAAsC;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;QACtE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAA;QAEhE,MAAM,eAAe,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,MAAM,GAAG,cAAc,CAAA;QAE1C,CAAC,CAAC,IAAI,CACJ,gBAAgB,GAAG,eAAe,KAAK,UAAU,EACjD,mDAAmD,CACpD,CAAA;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAE3D,MAAM,eAAe,GAAG,EAAE,CAAA;QAC1B,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzB,oCAAoC;QACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;QACrE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAA;QAEhE,MAAM,gBAAgB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAC1D,MAAM,WAAW,GAAG,MAAM,GAAG,cAAc,CAAA;QAE3C,CAAC,CAAC,IAAI,CACJ,iBAAiB,GAAG,gBAAgB,KAAK,WAAW,EACpD,mDAAmD,CACpD,CAAA;IACH,CAAC;CAAA;AAzCD,8CAyCC"} \ No newline at end of file diff --git a/dist/src/tests/controllers/swarmInvite.test.js b/dist/src/tests/controllers/swarmInvite.test.js deleted file mode 100644 index ce7429538..000000000 --- a/dist/src/tests/controllers/swarmInvite.test.js +++ /dev/null @@ -1,41 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.swarmInvite = void 0; -const ava_1 = require("ava"); -const invites_1 = require("../utils/invites"); -const nodes_1 = require("../nodes"); -const helpers_1 = require("../utils/helpers"); -/* -npx ava src/tests/controllers/swarmInvite.test.ts --verbose --serial --timeout=2m -*/ -(0, ava_1.default)('test boostPayment: create tribe, join tribe, send messages, boost messages, leave tribe, delete tribe', (t) => __awaiter(void 0, void 0, void 0, function* () { - yield swarmInvite(t, 3, 4, 5); -})); -function swarmInvite(t, index1, index2, index3) { - return __awaiter(this, void 0, void 0, function* () { - //TWO NODES SEND IMAGES WITHIN A TRIBE ===> - let node1 = nodes_1.default[index1]; - let node2 = nodes_1.default[index2]; - let node3 = nodes_1.default[index3]; - console.log(`Checking swarm invite for ${node1.alias} and ${node2.alias} and ${node3.alias}`); - // Create Invite - const invite = yield (0, invites_1.createInvite)(t, node2); - t.true(invite.success, 'Invite should be created'); - const paidInvite = yield (0, invites_1.payInvite)(t, node2, invite.contact.invite.invite_string); - t.true(paidInvite.success, 'Invite should have been paid for'); - yield (0, helpers_1.sleep)(70000); - const finishedInvite = yield (0, invites_1.getInvite)(t, node2, paidInvite.response.invite.invite_string); - t.truthy(finishedInvite.response.invite.connection_string, 'Connection string should exist'); - }); -} -exports.swarmInvite = swarmInvite; -//# sourceMappingURL=swarmInvite.test.js.map \ No newline at end of file diff --git a/dist/src/tests/controllers/swarmInvite.test.js.map b/dist/src/tests/controllers/swarmInvite.test.js.map deleted file mode 100644 index c5f029dfb..000000000 --- a/dist/src/tests/controllers/swarmInvite.test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"swarmInvite.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/swarmInvite.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAsB;AACtB,8CAAqE;AACrE,oCAA4B;AAC5B,8CAAwC;AAExC;;EAEE;AAEF,IAAA,aAAI,EAAC,uGAAuG,EAAE,CAAO,CAAC,EAAE,EAAE;IACxH,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAC/B,CAAC,CAAA,CAAC,CAAA;AAEF,SAAsB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;QACzD,2CAA2C;QAC3C,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QAEzB,OAAO,CAAC,GAAG,CACT,6BAA6B,KAAK,CAAC,KAAK,QAAQ,KAAK,CAAC,KAAK,QAAQ,KAAK,CAAC,KAAK,EAAE,CACjF,CAAA;QAED,gBAAgB;QAChB,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAY,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QAElD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAS,EAChC,CAAC,EACD,KAAK,EACL,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CACpC,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;QAE9D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAA;QAClB,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAS,EACpC,CAAC,EACD,KAAK,EACL,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CACzC,CAAA;QACD,CAAC,CAAC,MAAM,CACN,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAChD,gCAAgC,CACjC,CAAA;IACH,CAAC;CAAA;AA/BD,kCA+BC"} \ No newline at end of file diff --git a/dist/src/tests/utils/invites/createInvite.js b/dist/src/tests/utils/invites/createInvite.js deleted file mode 100644 index b040c95d2..000000000 --- a/dist/src/tests/utils/invites/createInvite.js +++ /dev/null @@ -1,34 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.createInvite = void 0; -const http = require("ava-http"); -const helpers_1 = require("../../utils/helpers"); -function createInvite(t, node1) { - return __awaiter(this, void 0, void 0, function* () { - //create invite object - try { - const v = { - nickname: 'new user', - welcome_message: 'welcome to sphinx', - }; - //post invite - const r = yield http.post(node1.external_ip + '/invites', (0, helpers_1.makeArgs)(node1, v)); - t.true(r.success, 'invites should have been created'); - return r; - } - catch (error) { - return error.error; - } - }); -} -exports.createInvite = createInvite; -//# sourceMappingURL=createInvite.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/invites/createInvite.js.map b/dist/src/tests/utils/invites/createInvite.js.map deleted file mode 100644 index f3c79efb4..000000000 --- a/dist/src/tests/utils/invites/createInvite.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"createInvite.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invites/createInvite.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,iDAA8C;AAE9C,SAAsB,YAAY,CAAC,CAAC,EAAE,KAAK;;QACzC,sBAAsB;QACtB,IAAI;YACF,MAAM,CAAC,GAAG;gBACR,QAAQ,EAAE,UAAU;gBACpB,eAAe,EAAE,mBAAmB;aACrC,CAAA;YAED,aAAa;YACb,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CACvB,KAAK,CAAC,WAAW,GAAG,UAAU,EAC9B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;YACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;YAErD,OAAO,CAAC,CAAA;SACT;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAA;SACnB;IACH,CAAC;CAAA;AAnBD,oCAmBC"} \ No newline at end of file diff --git a/dist/src/tests/utils/invites/getInvite.js b/dist/src/tests/utils/invites/getInvite.js deleted file mode 100644 index 0fa2de361..000000000 --- a/dist/src/tests/utils/invites/getInvite.js +++ /dev/null @@ -1,29 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.getInvite = void 0; -const http = require("ava-http"); -const helpers_1 = require("../../utils/helpers"); -function getInvite(t, node1, invite_string) { - return __awaiter(this, void 0, void 0, function* () { - try { - //get invite details - const r = yield http.get(`${node1.external_ip}/invites/${invite_string}`, (0, helpers_1.makeArgs)(node1)); - t.true(r.success, 'invoice should exist'); - return r; - } - catch (error) { - return error.error; - } - }); -} -exports.getInvite = getInvite; -//# sourceMappingURL=getInvite.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/invites/getInvite.js.map b/dist/src/tests/utils/invites/getInvite.js.map deleted file mode 100644 index 12d8b1a8a..000000000 --- a/dist/src/tests/utils/invites/getInvite.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"getInvite.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invites/getInvite.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,iDAA8C;AAE9C,SAAsB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa;;QACrD,IAAI;YACF,oBAAoB;YACpB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CACtB,GAAG,KAAK,CAAC,WAAW,YAAY,aAAa,EAAE,EAC/C,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAChB,CAAA;YACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAA;YAEzC,OAAO,CAAC,CAAA;SACT;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAA;SACnB;IACH,CAAC;CAAA;AAbD,8BAaC"} \ No newline at end of file diff --git a/dist/src/tests/utils/invites/index.js b/dist/src/tests/utils/invites/index.js deleted file mode 100644 index 5b075d673..000000000 --- a/dist/src/tests/utils/invites/index.js +++ /dev/null @@ -1,10 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.getInvite = exports.payInvite = exports.createInvite = void 0; -var createInvite_1 = require("./createInvite"); -Object.defineProperty(exports, "createInvite", { enumerable: true, get: function () { return createInvite_1.createInvite; } }); -var payInvite_1 = require("./payInvite"); -Object.defineProperty(exports, "payInvite", { enumerable: true, get: function () { return payInvite_1.payInvite; } }); -var getInvite_1 = require("./getInvite"); -Object.defineProperty(exports, "getInvite", { enumerable: true, get: function () { return getInvite_1.getInvite; } }); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/invites/index.js.map b/dist/src/tests/utils/invites/index.js.map deleted file mode 100644 index b0b7c0945..000000000 --- a/dist/src/tests/utils/invites/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invites/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA"} \ No newline at end of file diff --git a/dist/src/tests/utils/invites/payInvite.js b/dist/src/tests/utils/invites/payInvite.js deleted file mode 100644 index 5906fa609..000000000 --- a/dist/src/tests/utils/invites/payInvite.js +++ /dev/null @@ -1,29 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.payInvite = void 0; -const http = require("ava-http"); -const helpers_1 = require("../../utils/helpers"); -function payInvite(t, node1, invite_string) { - return __awaiter(this, void 0, void 0, function* () { - try { - //pay for invite created - const r = yield http.post(`${node1.external_ip}/invites/${invite_string}/pay`, (0, helpers_1.makeArgs)(node1)); - t.true(r.success, 'invites invoice should have been payed'); - return r; - } - catch (error) { - return error.error; - } - }); -} -exports.payInvite = payInvite; -//# sourceMappingURL=payInvite.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/invites/payInvite.js.map b/dist/src/tests/utils/invites/payInvite.js.map deleted file mode 100644 index 1bd9c99ad..000000000 --- a/dist/src/tests/utils/invites/payInvite.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"payInvite.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invites/payInvite.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,iDAA8C;AAE9C,SAAsB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa;;QACrD,IAAI;YACF,wBAAwB;YACxB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CACvB,GAAG,KAAK,CAAC,WAAW,YAAY,aAAa,MAAM,EACnD,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAChB,CAAA;YACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,wCAAwC,CAAC,CAAA;YAE3D,OAAO,CAAC,CAAA;SACT;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAA;SACnB;IACH,CAAC;CAAA;AAbD,8BAaC"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index a5882e591..c1e1c3c73 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -3,6 +3,7 @@ import { finalAction } from '../controllers/botapi' import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot, botResponse } from './utill' import { loadConfig } from '../utils/config' +import fetch from 'node-fetch' const config = loadConfig() @@ -157,7 +158,7 @@ export function init() { delete CALLBACKS[j.process_id] }, 5 * 60 * 1000) } catch (e) { - console.error(e) + console.error('ML CALL FAILED', e) } }) } From 7d01e032f5e070df94aab081943fad643169d1a4 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:34:56 -0700 Subject: [PATCH 19/93] logs --- dist/src/builtin/ml.js | 1 + dist/src/builtin/ml.js.map | 2 +- dist/src/controllers/botapi/index.js | 1 + dist/src/controllers/botapi/index.js.map | 2 +- src/builtin/ml.ts | 1 + src/controllers/botapi/index.ts | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 92fbe25f9..9e1b4a8d2 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -108,6 +108,7 @@ function init() { }, }); const j = yield r.json(); + console.log('ML body j', j); if (!j.process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 1ee9fc05e..2d9944999 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index 9a612d3d4..c314635f7 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -287,6 +287,7 @@ function validateAction(a) { exports.validateAction = validateAction; function processMlCallback(req, res) { return __awaiter(this, void 0, void 0, function* () { + console.log('ML BODY', req.body); const process_id = req.body.process_id; if (!process_id) { return (0, res_1.failure)(res, 'no process_id'); diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 68667b97b..78058e316 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index c1e1c3c73..7c55bc7a7 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -137,6 +137,7 @@ export function init() { }, }) const j = await r.json() + console.log('ML body j', j) if (!j.process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/src/controllers/botapi/index.ts b/src/controllers/botapi/index.ts index a379daa94..444537b27 100644 --- a/src/controllers/botapi/index.ts +++ b/src/controllers/botapi/index.ts @@ -329,6 +329,7 @@ export async function validateAction(a: Action): Promise { } export async function processMlCallback(req: Req, res: Res): Promise { + console.log('ML BODY', req.body) const process_id = req.body.process_id if (!process_id) { return failure(res, 'no process_id') From 548409a4528e34f9997c394fbf2ab38a58054aed Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:35:39 -0700 Subject: [PATCH 20/93] log hostname --- dist/src/builtin/ml.js | 1 + dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 9e1b4a8d2..1d5716138 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -96,6 +96,7 @@ function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } + console.log('ml bot hostname', host_name); const r = yield (0, node_fetch_1.default)(`${url}/send-message-llm`, { method: 'POST', body: JSON.stringify({ diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 2d9944999..8c552ff03 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 7c55bc7a7..3ad4ed739 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -125,6 +125,7 @@ export function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } + console.log('ml bot hostname', host_name) const r = await fetch(`${url}/send-message-llm`, { method: 'POST', body: JSON.stringify({ From 9bdfe8089ce6a6057a57d97cfae90dba82dadb28 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:38:47 -0700 Subject: [PATCH 21/93] ml callback body --- dist/src/controllers/botapi/index.js | 8 ++++++-- dist/src/controllers/botapi/index.js.map | 2 +- src/controllers/botapi/index.ts | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index c314635f7..856380e05 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -288,11 +288,15 @@ exports.validateAction = validateAction; function processMlCallback(req, res) { return __awaiter(this, void 0, void 0, function* () { console.log('ML BODY', req.body); - const process_id = req.body.process_id; + const body = req.body.body; + if (!body) { + return (0, res_1.failure)(res, 'no body'); + } + const process_id = body.process_id; if (!process_id) { return (0, res_1.failure)(res, 'no process_id'); } - const response = req.body.response; + const response = body.response; if (!response) { return (0, res_1.failure)(res, 'no response'); } diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 78058e316..5fe2b7bae 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/botapi/index.ts b/src/controllers/botapi/index.ts index 444537b27..7a5f0be62 100644 --- a/src/controllers/botapi/index.ts +++ b/src/controllers/botapi/index.ts @@ -330,11 +330,15 @@ export async function validateAction(a: Action): Promise { export async function processMlCallback(req: Req, res: Res): Promise { console.log('ML BODY', req.body) - const process_id = req.body.process_id + const body = req.body.body + if (!body) { + return failure(res, 'no body') + } + const process_id = body.process_id if (!process_id) { return failure(res, 'no process_id') } - const response = req.body.response + const response = body.response if (!response) { return failure(res, 'no response') } From ad8016bfd0342f65e68dbc8dc47739a82d25056b Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:41:37 -0700 Subject: [PATCH 22/93] j body --- dist/src/builtin/ml.js | 8 +++++--- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 1d5716138..cc710faeb 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -110,7 +110,8 @@ function init() { }); const j = yield r.json(); console.log('ML body j', j); - if (!j.process_id) { + const process_id = j.body && j.body.process_id; + if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription('failed to process message') @@ -118,7 +119,8 @@ function init() { message.channel.send({ embed }); return; } - exports.CALLBACKS[j.process_id] = function (msg) { + console.log('PROCESS ID!!!', process_id); + exports.CALLBACKS[process_id] = function (msg) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription(msg) @@ -126,7 +128,7 @@ function init() { message.channel.send({ embed }); }; setTimeout(() => { - delete exports.CALLBACKS[j.process_id]; + delete exports.CALLBACKS[process_id]; }, 5 * 60 * 1000); } catch (e) { diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 8c552ff03..9468ef678 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 3ad4ed739..c658e2237 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -139,7 +139,8 @@ export function init() { }) const j = await r.json() console.log('ML body j', j) - if (!j.process_id) { + const process_id = j.body && j.body.process_id + if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription('failed to process message') @@ -148,7 +149,8 @@ export function init() { return } - CALLBACKS[j.process_id] = function (msg: string) { + console.log('PROCESS ID!!!', process_id) + CALLBACKS[process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') .setDescription(msg) @@ -157,7 +159,7 @@ export function init() { } setTimeout(() => { - delete CALLBACKS[j.process_id] + delete CALLBACKS[process_id] }, 5 * 60 * 1000) } catch (e) { console.error('ML CALL FAILED', e) From 1a20afc06a53763eb23f5be9592fd473483f6f14 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:44:32 -0700 Subject: [PATCH 23/93] parsebody --- dist/src/builtin/ml.js | 11 ++++++++++- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 11 ++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index cc710faeb..6e0b32e8d 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -110,7 +110,16 @@ function init() { }); const j = yield r.json(); console.log('ML body j', j); - const process_id = j.body && j.body.process_id; + if (!j.body) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('failed to process message (no body)') + .setOnlyUser(parseInt(message.member.id || '0')); + message.channel.send({ embed }); + return; + } + const body = JSON.parse(j.body); + let process_id = body.process_id; if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 9468ef678..ace67cb86 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAA8C;AAC9C,4CAA4C;AAC5C,2CAA8B;AAE9B,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YACjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACrB,IAAI,CAAC,MAAM,EAAE;4BACX,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,4BAA4B,EAC5B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;wBACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,0BAA0B,EAC1B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACxB,IAAI,CAAC,SAAS,EAAE;4BACd,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,gCAAgC,EAChC,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;wBACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,8BAA8B,EAC9B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR;wBACE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,kBAAU,CAAC;6BACrB,QAAQ,CAAC,eAAe,CAAC;6BACzB,SAAS,CAAC;4BACT;gCACE,IAAI,EAAE,cAAc,kBAAU,EAAE;gCAChC,KAAK,EAAE,GAAG,iBAAS,YAAY;6BAChC;4BACD;gCACE,IAAI,EAAE,kBAAkB,kBAAU,EAAE;gCACpC,KAAK,EAAE,GAAG,iBAAS,gBAAgB;6BACpC;yBACF,CAAC;6BACD,YAAY,CAAC,IAAI,CAAC,CAAA;wBACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;wBAC/B,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,kBAAU,CAAC;qBACrB,cAAc,CAAC,iBAAiB,CAAC;qBACjC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;YACzC,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,GAAG,mBAAmB,EAAE;gBAC/C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;YAC3B,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC9C,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,2BAA2B,CAAC;qBAC3C,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YACxC,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,GAAG,CAAC;qBACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YACjC,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAjJD,oBAiJC;AAOD,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index c658e2237..79527df16 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -139,7 +139,16 @@ export function init() { }) const j = await r.json() console.log('ML body j', j) - const process_id = j.body && j.body.process_id + if (!j.body) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription('failed to process message (no body)') + .setOnlyUser(parseInt(message.member.id || '0')) + message.channel.send({ embed }) + return + } + const body = JSON.parse(j.body) + let process_id = body.process_id if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') From 2563da828540f5ee60bda7f84d2b345688e1aa65 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:48:46 -0700 Subject: [PATCH 24/93] del cb --- dist/src/builtin/ml.js | 1 + dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 6e0b32e8d..cf31fbf39 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -135,6 +135,7 @@ function init() { .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')); message.channel.send({ embed }); + delete exports.CALLBACKS[process_id]; }; setTimeout(() => { delete exports.CALLBACKS[process_id]; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index ace67cb86..a1ebd9f42 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 79527df16..a1520b64a 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -165,6 +165,7 @@ export function init() { .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) + delete CALLBACKS[process_id] } setTimeout(() => { From 17cbf47aa06b803a08f518a1ec0f0571498f269c Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 13:50:56 -0700 Subject: [PATCH 25/93] fix replay --- dist/src/controllers/botapi/broadcast.js | 2 +- dist/src/controllers/botapi/broadcast.js.map | 2 +- src/controllers/botapi/broadcast.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/src/controllers/botapi/broadcast.js b/dist/src/controllers/botapi/broadcast.js index af476e86a..78e5972cb 100644 --- a/dist/src/controllers/botapi/broadcast.js +++ b/dist/src/controllers/botapi/broadcast.js @@ -52,7 +52,7 @@ function broadcast(a) { updatedAt: date, senderAlias: alias, tenant, - onlyOwner: only_owner ? only_owner : false, + onlyOwner: only_owner || only_user ? true : false, }; if (parent_id) msg.parentId = parent_id; diff --git a/dist/src/controllers/botapi/broadcast.js.map b/dist/src/controllers/botapi/broadcast.js.map index 4bdc5faef..0a66d2cd8 100644 --- a/dist/src/controllers/botapi/broadcast.js.map +++ b/dist/src/controllers/botapi/broadcast.js.map @@ -1 +1 @@ -{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/broadcast.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/broadcast.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/botapi/broadcast.ts b/src/controllers/botapi/broadcast.ts index 95c186eea..8e8dbec82 100644 --- a/src/controllers/botapi/broadcast.ts +++ b/src/controllers/botapi/broadcast.ts @@ -55,7 +55,7 @@ export default async function broadcast(a: Action): Promise { updatedAt: date, senderAlias: alias, tenant, - onlyOwner: only_owner ? only_owner : false, + onlyOwner: only_owner || only_user ? true : false, } if (parent_id) msg.parentId = parent_id if (bot_pic) msg.senderPic = bot_pic From 0a7ce163d46b5d155a3a5d8114c302fc16e5c9ac Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 4 Aug 2023 14:55:03 -0700 Subject: [PATCH 26/93] j.body --- dist/src/builtin/ml.js | 3 +-- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index cf31fbf39..035ec0582 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -118,8 +118,7 @@ function init() { message.channel.send({ embed }); return; } - const body = JSON.parse(j.body); - let process_id = body.process_id; + let process_id = j.body && j.body.process_id; if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index a1ebd9f42..c342f9feb 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index a1520b64a..7228b6aec 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -147,8 +147,7 @@ export function init() { message.channel.send({ embed }) return } - const body = JSON.parse(j.body) - let process_id = body.process_id + let process_id = j.body && j.body.process_id if (!process_id) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') From 9575248e76ffc659c2444fd710f67d7e4d2c5e95 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Sat, 5 Aug 2023 00:07:06 +0100 Subject: [PATCH 27/93] update: ensured messages are only visible by sender --- dist/src/network/send.js | 2 +- dist/src/network/send.js.map | 2 +- src/network/send.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/src/network/send.js b/dist/src/network/send.js index 6e51a9cfc..fef6482bc 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -93,7 +93,7 @@ function sendMessage({ type, chat, message, sender, amount, success, failure, sk logger_1.sphinxLogger.info(`[Network] => isBotMsg`, logger_1.logging.Network); // return // DO NOT FORWARD TO TRIBE, forwarded to bot instead? } - if (msg.sender.role === constants_1.default.chat_roles.owner && msg.type === 0) { + if (msg.type === 0) { const hiddenCmd = yield interceptTribeMsgForHiddenCmds(msg, tenant); justMe = hiddenCmd ? hiddenCmd : justMe; } diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 52ff72be6..083a30e8a 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/network/send.ts b/src/network/send.ts index aed7a851f..2053d909c 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -149,7 +149,7 @@ export async function sendMessage({ sphinxLogger.info(`[Network] => isBotMsg`, logging.Network) // return // DO NOT FORWARD TO TRIBE, forwarded to bot instead? } - if (msg.sender.role === constants.chat_roles.owner && msg.type === 0) { + if (msg.type === 0) { const hiddenCmd = await interceptTribeMsgForHiddenCmds(msg, tenant) justMe = hiddenCmd ? hiddenCmd : justMe } From e9c41762b26885e9b800cbe89f56457908bedad8 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Mon, 7 Aug 2023 13:04:27 -0700 Subject: [PATCH 28/93] content kinds, url config --- dist/src/builtin/ml.js | 24 +++++++++++-- dist/src/builtin/ml.js.map | 2 +- dist/src/controllers/botapi/index.js | 2 +- dist/src/controllers/botapi/index.js.map | 2 +- src/builtin/ml.ts | 43 ++++++++++++++++++++++-- src/controllers/botapi/index.ts | 2 +- 6 files changed, 67 insertions(+), 8 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 035ec0582..d25b681fc 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -39,6 +39,7 @@ function init() { })); const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); let meta = JSON.parse(bot.meta || `{}`); + meta.kind = meta.kind || 'text'; const url = meta.url; const api_key = meta.apiKey; const arr = (message.content && message.content.split(' ')) || []; @@ -65,6 +66,16 @@ function init() { yield bot.update({ meta: JSON.stringify(meta) }); yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'API KEY updated successfully', exports.ML_PREFIX, tribe.id, message, cmd); return; + case 'kind': + const newKind = arr[2]; + if (newKind !== 'text' && newKind !== 'image') { + yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'Please provide a valid kind (text/image)', exports.ML_PREFIX, tribe.id, message, cmd); + return; + } + meta.kind = newKind; + yield bot.update({ meta: JSON.stringify(meta) }); + yield (0, utill_1.botResponse)(exports.ML_BOTNAME, `bot kind updated to ${newKind}`, exports.ML_PREFIX, tribe.id, message, cmd); + return; default: const embed = new Sphinx.MessageEmbed() .setAuthor(exports.ML_BOTNAME) @@ -78,6 +89,10 @@ function init() { name: `Add API_KEY to ${exports.ML_BOTNAME}`, value: `${exports.ML_PREFIX} url {API_KEY}`, }, + { + name: `Set content type`, + value: `${exports.ML_PREFIX} kind {text/image}`, + }, ]) .setOnlyOwner(true); message.channel.send({ embed }); @@ -97,7 +112,7 @@ function init() { host_name = `https://${host_name}`; } console.log('ml bot hostname', host_name); - const r = yield (0, node_fetch_1.default)(`${url}/send-message-llm`, { + const r = yield (0, node_fetch_1.default)(url, { method: 'POST', body: JSON.stringify({ message: message.content, @@ -131,8 +146,13 @@ function init() { exports.CALLBACKS[process_id] = function (msg) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') - .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')); + if (meta.kind === 'text') { + embed.setDescription(msg); + } + if (meta.kind === 'image') { + embed.setImage(msg); + } message.channel.send({ embed }); delete exports.CALLBACKS[process_id]; }; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index c342f9feb..78ded6ece 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index 856380e05..c355712ad 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -20,10 +20,10 @@ const hmac = require("../../crypto/hmac"); const git_1 = require("../../builtin/git"); const helpers_1 = require("../../helpers"); const githook_1 = require("../../utils/githook"); +const ml_1 = require("../../builtin/ml"); const dm_1 = require("./dm"); const pay_1 = require("./pay"); const broadcast_1 = require("./broadcast"); -const ml_1 = require("../../builtin/ml"); function processWebhook(req, res) { var _a; return __awaiter(this, void 0, void 0, function* () { diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 5fe2b7bae..52db0d05c 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 7228b6aec..4a69bce85 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -18,6 +18,8 @@ export const ML_BOTNAME = `${ML_PREFIX.substring( 2 ).toUpperCase()}${ML_PREFIX.substring(2)}Bot` +type ContentKind = 'text' | 'image' + export const CALLBACKS: { [k: string]: (msg: string) => void } = {} export function init() { @@ -38,9 +40,11 @@ export function init() { const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) let meta: MlMeta = JSON.parse(bot.meta || `{}`) + meta.kind = meta.kind || 'text' const url = meta.url const api_key = meta.apiKey const arr = (message.content && message.content.split(' ')) || [] + if (isAdmin && arr[0] === ML_PREFIX) { const cmd = arr[1] @@ -93,6 +97,30 @@ export function init() { cmd ) return + case 'kind': + const newKind = arr[2] + if (newKind !== 'text' && newKind !== 'image') { + await botResponse( + ML_BOTNAME, + 'Please provide a valid kind (text/image)', + ML_PREFIX, + tribe.id, + message, + cmd + ) + return + } + meta.kind = newKind + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + ML_BOTNAME, + `bot kind updated to ${newKind}`, + ML_PREFIX, + tribe.id, + message, + cmd + ) + return default: const embed = new Sphinx.MessageEmbed() .setAuthor(ML_BOTNAME) @@ -106,6 +134,10 @@ export function init() { name: `Add API_KEY to ${ML_BOTNAME}`, value: `${ML_PREFIX} url {API_KEY}`, }, + { + name: `Set content type`, + value: `${ML_PREFIX} kind {text/image}`, + }, ]) .setOnlyOwner(true) message.channel.send({ embed }) @@ -126,7 +158,7 @@ export function init() { host_name = `https://${host_name}` } console.log('ml bot hostname', host_name) - const r = await fetch(`${url}/send-message-llm`, { + const r = await fetch(url, { method: 'POST', body: JSON.stringify({ message: message.content, @@ -158,11 +190,17 @@ export function init() { } console.log('PROCESS ID!!!', process_id) + CALLBACKS[process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') - .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')) + if (meta.kind === 'text') { + embed.setDescription(msg) + } + if (meta.kind === 'image') { + embed.setImage(msg) + } message.channel.send({ embed }) delete CALLBACKS[process_id] } @@ -179,6 +217,7 @@ export function init() { export interface MlMeta { url: string apiKey: string + kind: ContentKind } export async function sleep(ms: number): Promise { diff --git a/src/controllers/botapi/index.ts b/src/controllers/botapi/index.ts index 7a5f0be62..8c278fc04 100644 --- a/src/controllers/botapi/index.ts +++ b/src/controllers/botapi/index.ts @@ -20,10 +20,10 @@ import { GITBOT_UUID, GitBotMeta, Repo, GITBOT_PIC } from '../../builtin/git' import { asyncForEach } from '../../helpers' import { Req, Res } from '../../types' import { processGithook, WebhookEventName } from '../../utils/githook' +import { CALLBACKS } from '../../builtin/ml' import direct_message from './dm' import pay from './pay' import broadcast from './broadcast' -import { CALLBACKS } from '../../builtin/ml' /* hexdump -n 8 -e '4/4 "%08X" 1 "\n"' /dev/random From 5e12e2b9f0f7d670fb54e16eaaddaececafdcefd Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Mon, 7 Aug 2023 13:46:11 -0700 Subject: [PATCH 29/93] phinx-bot: 0.2.411 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c7ebfe7d..79d6a6984 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.40", + "sphinx-bot": "^0.2.41", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", From 679fb23305eab712b9caecf74ca9648cde9f90c7 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Tue, 8 Aug 2023 10:38:55 -0700 Subject: [PATCH 30/93] lock grpc to 1.8.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d8150d6..2f4cdbb9f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@boltz/bolt11": "^1.2.7", - "@grpc/grpc-js": "^1.8.7", + "@grpc/grpc-js": "1.8.7", "@grpc/proto-loader": "0.7.4", "@octokit/webhooks-types": "^5.2.0", "@scout_apm/scout-apm": "^0.1.10", From 887fbacaefa2536694ea756b2511bfe285b4f4f7 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 12:32:23 +0100 Subject: [PATCH 31/93] update: refactored the add url command for ml-bot --- dist/src/builtin/ml.js | 9 ++----- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 27 ++++++++++++++++++++ dist/src/builtin/utill/ml.js.map | 1 + package-lock.json | 14 +++++----- src/builtin/ml.ts | 32 +++++------------------ src/builtin/utill/ml.ts | 44 ++++++++++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 40 deletions(-) create mode 100644 dist/src/builtin/utill/ml.js create mode 100644 dist/src/builtin/utill/ml.js.map create mode 100644 src/builtin/utill/ml.ts diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index d25b681fc..256b8308a 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -16,6 +16,7 @@ const models_1 = require("../models"); const utill_1 = require("./utill"); const config_1 = require("../utils/config"); const node_fetch_1 = require("node-fetch"); +const ml_1 = require("./utill/ml"); const config = (0, config_1.loadConfig)(); const msg_types = Sphinx.MSG_TYPE; let initted = false; @@ -48,13 +49,7 @@ function init() { switch (cmd) { case 'url': const newUrl = arr[2]; - if (!newUrl) { - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'Please provide a valid URL', exports.ML_PREFIX, tribe.id, message, cmd); - return; - } - meta.url = newUrl; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'URL updated successfully', exports.ML_PREFIX, tribe.id, message, cmd); + yield (0, ml_1.addUrl)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newUrl); return; case 'api_key': const newApiKey = arr[2]; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 78ded6ece..c0e2eaa93 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAA8C;AAC9C,4CAA4C;AAC5C,2CAA8B;AAE9B,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAIhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACrB,IAAI,CAAC,MAAM,EAAE;4BACX,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,4BAA4B,EAC5B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;wBACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,0BAA0B,EAC1B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACxB,IAAI,CAAC,SAAS,EAAE;4BACd,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,gCAAgC,EAChC,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;wBACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,8BAA8B,EAC9B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACtB,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;4BAC7C,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,0CAA0C,EAC1C,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;wBACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,uBAAuB,OAAO,EAAE,EAChC,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR;wBACE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,kBAAU,CAAC;6BACrB,QAAQ,CAAC,eAAe,CAAC;6BACzB,SAAS,CAAC;4BACT;gCACE,IAAI,EAAE,cAAc,kBAAU,EAAE;gCAChC,KAAK,EAAE,GAAG,iBAAS,YAAY;6BAChC;4BACD;gCACE,IAAI,EAAE,kBAAkB,kBAAU,EAAE;gCACpC,KAAK,EAAE,GAAG,iBAAS,gBAAgB;6BACpC;4BACD;gCACE,IAAI,EAAE,kBAAkB;gCACxB,KAAK,EAAE,GAAG,iBAAS,oBAAoB;6BACxC;yBACF,CAAC;6BACD,YAAY,CAAC,IAAI,CAAC,CAAA;wBACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;wBAC/B,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,kBAAU,CAAC;qBACrB,cAAc,CAAC,iBAAiB,CAAC;qBACjC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;YACzC,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;YAC3B,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,qCAAqC,CAAC;qBACrD,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,2BAA2B,CAAC;qBAC3C,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAExC,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AA9LD,oBA8LC;AAQD,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAA8C;AAC9C,4CAA4C;AAC5C,2CAA8B;AAC9B,mCAA2C;AAE3C,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACrB,MAAM,IAAA,WAAM,EACV,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,CAAA;wBACD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACxB,IAAI,CAAC,SAAS,EAAE;4BACd,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,gCAAgC,EAChC,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;wBACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,8BAA8B,EAC9B,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACtB,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;4BAC7C,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,0CAA0C,EAC1C,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;4BACD,OAAM;yBACP;wBACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;wBACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;wBAChD,MAAM,IAAA,mBAAW,EACf,kBAAU,EACV,uBAAuB,OAAO,EAAE,EAChC,iBAAS,EACT,KAAK,CAAC,EAAE,EACR,OAAO,EACP,GAAG,CACJ,CAAA;wBACD,OAAM;oBACR;wBACE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;6BACpC,SAAS,CAAC,kBAAU,CAAC;6BACrB,QAAQ,CAAC,eAAe,CAAC;6BACzB,SAAS,CAAC;4BACT;gCACE,IAAI,EAAE,cAAc,kBAAU,EAAE;gCAChC,KAAK,EAAE,GAAG,iBAAS,YAAY;6BAChC;4BACD;gCACE,IAAI,EAAE,kBAAkB,kBAAU,EAAE;gCACpC,KAAK,EAAE,GAAG,iBAAS,gBAAgB;6BACpC;4BACD;gCACE,IAAI,EAAE,kBAAkB;gCACxB,KAAK,EAAE,GAAG,iBAAS,oBAAoB;6BACxC;yBACF,CAAC;6BACD,YAAY,CAAC,IAAI,CAAC,CAAA;wBACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;wBAC/B,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,kBAAU,CAAC;qBACrB,cAAc,CAAC,iBAAiB,CAAC;qBACjC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;YACzC,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;YAC3B,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,qCAAqC,CAAC;qBACrD,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,cAAc,CAAC,2BAA2B,CAAC;qBAC3C,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAM;aACP;YAED,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAExC,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAnLD,oBAmLC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js new file mode 100644 index 000000000..6399bb9c1 --- /dev/null +++ b/dist/src/builtin/utill/ml.js @@ -0,0 +1,27 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.addUrl = void 0; +const index_1 = require("./index"); +function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { + return __awaiter(this, void 0, void 0, function* () { + if (!newUrl) { + yield (0, index_1.botResponse)(botName, 'Please provide a valid URL', botPrefix, tribe.id, messageObj, cmd); + return; + } + meta.url = newUrl; + yield bot.update({ meta: JSON.stringify(meta) }); + yield (0, index_1.botResponse)(botName, 'URL updated successfully', botPrefix, tribe.id, messageObj, cmd); + return; + }); +} +exports.addUrl = addUrl; +//# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map new file mode 100644 index 000000000..f5ddfaf0d --- /dev/null +++ b/dist/src/builtin/utill/ml.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 32b426a10..75b55b7af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,7 +72,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.40", + "sphinx-bot": "^0.2.41", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", @@ -15421,9 +15421,9 @@ "license": "CC0-1.0" }, "node_modules/sphinx-bot": { - "version": "0.2.40", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.40.tgz", - "integrity": "sha512-OkmTlUZnm+T4BdPUxxLKZjGkiId13vzvCUJ0Gmj9zevZbhB8ficrwDaEJnQYzd19zo9i4369LgUKKC2l07eQgQ==", + "version": "0.2.41", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.41.tgz", + "integrity": "sha512-OYDitqmSE4D3gzHjHsctn/eswJ8OnyL68J4hw+qG6Y9Okae+AnBuBYn1frzEtKghjIjxyqyZJLoNqlN0GU0H5w==", "dependencies": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", @@ -28764,9 +28764,9 @@ "dev": true }, "sphinx-bot": { - "version": "0.2.40", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.40.tgz", - "integrity": "sha512-OkmTlUZnm+T4BdPUxxLKZjGkiId13vzvCUJ0Gmj9zevZbhB8ficrwDaEJnQYzd19zo9i4369LgUKKC2l07eQgQ==", + "version": "0.2.41", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.41.tgz", + "integrity": "sha512-OYDitqmSE4D3gzHjHsctn/eswJ8OnyL68J4hw+qG6Y9Okae+AnBuBYn1frzEtKghjIjxyqyZJLoNqlN0GU0H5w==", "requires": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 4a69bce85..145aa2940 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -4,6 +4,7 @@ import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot, botResponse } from './utill' import { loadConfig } from '../utils/config' import fetch from 'node-fetch' +import { MlMeta, addUrl } from './utill/ml' const config = loadConfig() @@ -18,8 +19,6 @@ export const ML_BOTNAME = `${ML_PREFIX.substring( 2 ).toUpperCase()}${ML_PREFIX.substring(2)}Bot` -type ContentKind = 'text' | 'image' - export const CALLBACKS: { [k: string]: (msg: string) => void } = {} export function init() { @@ -51,26 +50,15 @@ export function init() { switch (cmd) { case 'url': const newUrl = arr[2] - if (!newUrl) { - await botResponse( - ML_BOTNAME, - 'Please provide a valid URL', - ML_PREFIX, - tribe.id, - message, - cmd - ) - return - } - meta.url = newUrl - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( + await addUrl( + bot, + meta, ML_BOTNAME, - 'URL updated successfully', ML_PREFIX, - tribe.id, + tribe, + cmd, message, - cmd + newUrl ) return case 'api_key': @@ -214,12 +202,6 @@ export function init() { }) } -export interface MlMeta { - url: string - apiKey: string - kind: ContentKind -} - export async function sleep(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)) } diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts new file mode 100644 index 000000000..283437a63 --- /dev/null +++ b/src/builtin/utill/ml.ts @@ -0,0 +1,44 @@ +import { ChatBotRecord, ChatRecord } from '../../models' +import { botResponse } from './index' +import * as Sphinx from 'sphinx-bot' + +type ContentKind = 'text' | 'image' +export interface MlMeta { + url: string + apiKey: string + kind: ContentKind +} + +export async function addUrl( + bot: ChatBotRecord, + meta: MlMeta, + botName: string, + botPrefix: string, + tribe: ChatRecord, + cmd: string, + messageObj: Sphinx.Message, + newUrl: string +) { + if (!newUrl) { + await botResponse( + botName, + 'Please provide a valid URL', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + meta.url = newUrl + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + botName, + 'URL updated successfully', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return +} From 2bb0f3ff2e9d7d973c2ffab7e022fd7df25e1349 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 12:52:45 +0100 Subject: [PATCH 32/93] updated: the api_key command --- dist/src/builtin/ml.js | 8 +------- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 15 +++++++++++++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 25 +++++++---------------- src/builtin/utill/ml.ts | 34 ++++++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 28 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 256b8308a..2d838e371 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -53,13 +53,7 @@ function init() { return; case 'api_key': const newApiKey = arr[2]; - if (!newApiKey) { - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'Please provide a valid API KEY', exports.ML_PREFIX, tribe.id, message, cmd); - return; - } - meta.apiKey = newApiKey; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'API KEY updated successfully', exports.ML_PREFIX, tribe.id, message, cmd); + yield (0, ml_1.addApiKey)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newApiKey); return; case 'kind': const newKind = arr[2]; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index c0e2eaa93..7ff0d0ae2 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 6399bb9c1..f28b73b6e 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.addUrl = void 0; +exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { return __awaiter(this, void 0, void 0, function* () { @@ -24,4 +24,17 @@ function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { }); } exports.addUrl = addUrl; +function addApiKey(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newApiKey) { + return __awaiter(this, void 0, void 0, function* () { + if (!newApiKey) { + yield (0, index_1.botResponse)(botName, 'Please provide a valid API KEY', botPrefix, tribe.id, messageObj, cmd); + return; + } + meta.apiKey = newApiKey; + yield bot.update({ meta: JSON.stringify(meta) }); + yield (0, index_1.botResponse)(botName, 'API KEY updated successfully', botPrefix, tribe.id, messageObj, cmd); + return; + }); +} +exports.addApiKey = addApiKey; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index f5ddfaf0d..44cefb0ac 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 145aa2940..20dfbfec0 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -4,7 +4,7 @@ import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot, botResponse } from './utill' import { loadConfig } from '../utils/config' import fetch from 'node-fetch' -import { MlMeta, addUrl } from './utill/ml' +import { MlMeta, addUrl, addApiKey } from './utill/ml' const config = loadConfig() @@ -63,26 +63,15 @@ export function init() { return case 'api_key': const newApiKey = arr[2] - if (!newApiKey) { - await botResponse( - ML_BOTNAME, - 'Please provide a valid API KEY', - ML_PREFIX, - tribe.id, - message, - cmd - ) - return - } - meta.apiKey = newApiKey - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( + await addApiKey( + bot, + meta, ML_BOTNAME, - 'API KEY updated successfully', ML_PREFIX, - tribe.id, + tribe, + cmd, message, - cmd + newApiKey ) return case 'kind': diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 283437a63..e73304766 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -42,3 +42,37 @@ export async function addUrl( ) return } + +export async function addApiKey( + bot: ChatBotRecord, + meta: MlMeta, + botName: string, + botPrefix: string, + tribe: ChatRecord, + cmd: string, + messageObj: Sphinx.Message, + newApiKey: string +) { + if (!newApiKey) { + await botResponse( + botName, + 'Please provide a valid API KEY', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + meta.apiKey = newApiKey + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + botName, + 'API KEY updated successfully', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return +} From 5b7c7d872423827b64903a37b22acd4b18e2ab88 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 14:52:42 +0100 Subject: [PATCH 33/93] update: refactored the kind command for ml bot --- dist/src/builtin/ml.js | 8 +------- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 15 +++++++++++++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 27 ++++++++----------------- src/builtin/utill/ml.ts | 34 ++++++++++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 29 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 2d838e371..5818eacc3 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -57,13 +57,7 @@ function init() { return; case 'kind': const newKind = arr[2]; - if (newKind !== 'text' && newKind !== 'image') { - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, 'Please provide a valid kind (text/image)', exports.ML_PREFIX, tribe.id, message, cmd); - return; - } - meta.kind = newKind; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, utill_1.botResponse)(exports.ML_BOTNAME, `bot kind updated to ${newKind}`, exports.ML_PREFIX, tribe.id, message, cmd); + yield (0, ml_1.addKind)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newKind); return; default: const embed = new Sphinx.MessageEmbed() diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 7ff0d0ae2..ae0d870a2 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index f28b73b6e..75cc3568b 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.addApiKey = exports.addUrl = void 0; +exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { return __awaiter(this, void 0, void 0, function* () { @@ -37,4 +37,17 @@ function addApiKey(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newApi }); } exports.addApiKey = addApiKey; +function addKind(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newKind) { + return __awaiter(this, void 0, void 0, function* () { + if (newKind !== 'text' && newKind !== 'image') { + yield (0, index_1.botResponse)(botName, 'Please provide a valid kind (text/image)', botPrefix, tribe.id, messageObj, cmd); + return; + } + meta.kind = newKind; + yield bot.update({ meta: JSON.stringify(meta) }); + yield (0, index_1.botResponse)(botName, `bot kind updated to ${newKind}`, botPrefix, tribe.id, messageObj, cmd); + return; + }); +} +exports.addKind = addKind; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 44cefb0ac..4742c5776 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC;AAED,SAAsB,OAAO,CAC3B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,OAAe;;QAEf,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;QACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,uBAAuB,OAAO,EAAE,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,0BAgCC"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 20dfbfec0..c8bf61c3d 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -1,10 +1,10 @@ import * as Sphinx from 'sphinx-bot' import { finalAction } from '../controllers/botapi' import { ChatRecord, models, ChatBotRecord } from '../models' -import { findBot, botResponse } from './utill' +import { findBot } from './utill' import { loadConfig } from '../utils/config' import fetch from 'node-fetch' -import { MlMeta, addUrl, addApiKey } from './utill/ml' +import { MlMeta, addUrl, addApiKey, addKind } from './utill/ml' const config = loadConfig() @@ -76,26 +76,15 @@ export function init() { return case 'kind': const newKind = arr[2] - if (newKind !== 'text' && newKind !== 'image') { - await botResponse( - ML_BOTNAME, - 'Please provide a valid kind (text/image)', - ML_PREFIX, - tribe.id, - message, - cmd - ) - return - } - meta.kind = newKind - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( + await addKind( + bot, + meta, ML_BOTNAME, - `bot kind updated to ${newKind}`, ML_PREFIX, - tribe.id, + tribe, + cmd, message, - cmd + newKind ) return default: diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index e73304766..97093c9eb 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -76,3 +76,37 @@ export async function addApiKey( ) return } + +export async function addKind( + bot: ChatBotRecord, + meta: MlMeta, + botName: string, + botPrefix: string, + tribe: ChatRecord, + cmd: string, + messageObj: Sphinx.Message, + newKind: string +) { + if (newKind !== 'text' && newKind !== 'image') { + await botResponse( + botName, + 'Please provide a valid kind (text/image)', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + meta.kind = newKind + await bot.update({ meta: JSON.stringify(meta) }) + await botResponse( + botName, + `bot kind updated to ${newKind}`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return +} From 430b9cd0e7f272e0b097b5b06039773fe5e627fc Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 15:03:39 +0100 Subject: [PATCH 34/93] refactored the default function --- dist/src/builtin/ml.js | 20 +------------------- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 25 ++++++++++++++++++++++++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 22 ++-------------------- src/builtin/utill/ml.ts | 26 ++++++++++++++++++++++++++ 6 files changed, 55 insertions(+), 42 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 5818eacc3..4d22a7e40 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -60,25 +60,7 @@ function init() { yield (0, ml_1.addKind)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newKind); return; default: - const embed = new Sphinx.MessageEmbed() - .setAuthor(exports.ML_BOTNAME) - .setTitle('Bot Commands:') - .addFields([ - { - name: `Add URL to ${exports.ML_BOTNAME}`, - value: `${exports.ML_PREFIX} url {URL}`, - }, - { - name: `Add API_KEY to ${exports.ML_BOTNAME}`, - value: `${exports.ML_PREFIX} url {API_KEY}`, - }, - { - name: `Set content type`, - value: `${exports.ML_PREFIX} kind {text/image}`, - }, - ]) - .setOnlyOwner(true); - message.channel.send({ embed }); + (0, ml_1.defaultCommand)(exports.ML_BOTNAME, exports.ML_PREFIX, message); return; } } diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index ae0d870a2..1a689acda 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 75cc3568b..2c1287494 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.addKind = exports.addApiKey = exports.addUrl = void 0; +exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); +const Sphinx = require("sphinx-bot"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { return __awaiter(this, void 0, void 0, function* () { if (!newUrl) { @@ -50,4 +51,26 @@ function addKind(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newKind) }); } exports.addKind = addKind; +function defaultCommand(botName, botPrefix, message) { + const embed = new Sphinx.MessageEmbed() + .setAuthor(botName) + .setTitle('Bot Commands:') + .addFields([ + { + name: `Add URL to ${botName}`, + value: `${botPrefix} url {URL}`, + }, + { + name: `Add API_KEY to ${botName}`, + value: `${botPrefix} url {API_KEY}`, + }, + { + name: `Set content type`, + value: `${botPrefix} kind {text/image}`, + }, + ]) + .setOnlyOwner(true); + message.channel.send({ embed }); +} +exports.defaultCommand = defaultCommand; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 4742c5776..fdbc8b9e7 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AAUrC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC;AAED,SAAsB,OAAO,CAC3B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,OAAe;;QAEf,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;QACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,uBAAuB,OAAO,EAAE,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,0BAgCC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index c8bf61c3d..8cd477c49 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -4,7 +4,7 @@ import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot } from './utill' import { loadConfig } from '../utils/config' import fetch from 'node-fetch' -import { MlMeta, addUrl, addApiKey, addKind } from './utill/ml' +import { MlMeta, addUrl, addApiKey, addKind, defaultCommand } from './utill/ml' const config = loadConfig() @@ -88,25 +88,7 @@ export function init() { ) return default: - const embed = new Sphinx.MessageEmbed() - .setAuthor(ML_BOTNAME) - .setTitle('Bot Commands:') - .addFields([ - { - name: `Add URL to ${ML_BOTNAME}`, - value: `${ML_PREFIX} url {URL}`, - }, - { - name: `Add API_KEY to ${ML_BOTNAME}`, - value: `${ML_PREFIX} url {API_KEY}`, - }, - { - name: `Set content type`, - value: `${ML_PREFIX} kind {text/image}`, - }, - ]) - .setOnlyOwner(true) - message.channel.send({ embed }) + defaultCommand(ML_BOTNAME, ML_PREFIX, message) return } } diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 97093c9eb..1ccaf2d03 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -110,3 +110,29 @@ export async function addKind( ) return } + +export function defaultCommand( + botName: string, + botPrefix: string, + message: Sphinx.Message +) { + const embed = new Sphinx.MessageEmbed() + .setAuthor(botName) + .setTitle('Bot Commands:') + .addFields([ + { + name: `Add URL to ${botName}`, + value: `${botPrefix} url {URL}`, + }, + { + name: `Add API_KEY to ${botName}`, + value: `${botPrefix} url {API_KEY}`, + }, + { + name: `Set content type`, + value: `${botPrefix} kind {text/image}`, + }, + ]) + .setOnlyOwner(true) + message.channel.send({ embed }) +} From c3f7b4ac47c3b8c4e4f6dc3cf92057ac8cdd2155 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 15:20:04 +0100 Subject: [PATCH 35/93] update: removed console logs and refactored the mlBotResponse --- dist/src/builtin/ml.js | 21 +++----------------- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 10 +++++++++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 33 +++++++++++++------------------- src/builtin/utill/ml.ts | 8 ++++++++ 6 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 4d22a7e40..df4fbec26 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -65,18 +65,13 @@ function init() { } } if (!url || !api_key) { - const embed = new Sphinx.MessageEmbed() - .setAuthor(exports.ML_BOTNAME) - .setDescription('not configured!') - .setOnlyUser(parseInt(message.member.id || '0')); - message.channel.send({ embed }); + (0, ml_1.mlBotResponse)('not configured!', message); return; } let host_name = config.host_name; if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } - console.log('ml bot hostname', host_name); const r = yield (0, node_fetch_1.default)(url, { method: 'POST', body: JSON.stringify({ @@ -89,25 +84,15 @@ function init() { }, }); const j = yield r.json(); - console.log('ML body j', j); if (!j.body) { - const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') - .setDescription('failed to process message (no body)') - .setOnlyUser(parseInt(message.member.id || '0')); - message.channel.send({ embed }); + (0, ml_1.mlBotResponse)('failed to process message (no body)', message); return; } let process_id = j.body && j.body.process_id; if (!process_id) { - const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') - .setDescription('failed to process message') - .setOnlyUser(parseInt(message.member.id || '0')); - message.channel.send({ embed }); + (0, ml_1.mlBotResponse)('failed to process message', message); return; } - console.log('PROCESS ID!!!', process_id); exports.CALLBACKS[process_id] = function (msg) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 1a689acda..9c7cdb0b8 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAAiC;AACjC,4CAA4C;AAC5C,2CAA8B;AAC9B,mCAOmB;AAEnB,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACrB,MAAM,IAAA,WAAM,EACV,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,CAAA;wBACD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACxB,MAAM,IAAA,cAAS,EACb,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,SAAS,CACV,CAAA;wBACD,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACtB,MAAM,IAAA,YAAO,EACX,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,OAAO,CACR,CAAA;wBACD,OAAM;oBACR;wBACE,IAAA,mBAAc,EAAC,kBAAU,EAAE,iBAAS,EAAE,OAAO,CAAC,CAAA;wBAC9C,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,IAAA,kBAAa,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;gBACzC,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YAED,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,IAAA,kBAAa,EAAC,qCAAqC,EAAE,OAAO,CAAC,CAAA;gBAC7D,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,IAAA,kBAAa,EAAC,2BAA2B,EAAE,OAAO,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AA7HD,oBA6HC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 2c1287494..3e7ac1400 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; +exports.mlBotResponse = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); const Sphinx = require("sphinx-bot"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { @@ -73,4 +73,12 @@ function defaultCommand(botName, botPrefix, message) { message.channel.send({ embed }); } exports.defaultCommand = defaultCommand; +function mlBotResponse(msg, message) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription(msg) + .setOnlyUser(parseInt(message.member.id || '0')); + message.channel.send({ embed }); +} +exports.mlBotResponse = mlBotResponse; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index fdbc8b9e7..1249068f3 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAqC;AACrC,qCAAoC;AASpC,SAAsB,MAAM,CAC1B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,MAAc;;QAEd,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA;QACjB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0BAA0B,EAC1B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,wBAgCC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC;AAED,SAAsB,OAAO,CAC3B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,OAAe;;QAEf,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;QACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,uBAAuB,OAAO,EAAE,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,0BAgCC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,SAAiB,EACjB,OAAuB;IAEvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,OAAO,CAAC;SAClB,QAAQ,CAAC,eAAe,CAAC;SACzB,SAAS,CAAC;QACT;YACE,IAAI,EAAE,cAAc,OAAO,EAAE;YAC7B,KAAK,EAAE,GAAG,SAAS,YAAY;SAChC;QACD;YACE,IAAI,EAAE,kBAAkB,OAAO,EAAE;YACjC,KAAK,EAAE,GAAG,SAAS,gBAAgB;SACpC;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,GAAG,SAAS,oBAAoB;SACxC;KACF,CAAC;SACD,YAAY,CAAC,IAAI,CAAC,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAxBD,wCAwBC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 8cd477c49..8dc0aeb23 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -4,7 +4,14 @@ import { ChatRecord, models, ChatBotRecord } from '../models' import { findBot } from './utill' import { loadConfig } from '../utils/config' import fetch from 'node-fetch' -import { MlMeta, addUrl, addApiKey, addKind, defaultCommand } from './utill/ml' +import { + MlMeta, + addUrl, + addApiKey, + addKind, + defaultCommand, + mlBotResponse, +} from './utill/ml' const config = loadConfig() @@ -93,11 +100,7 @@ export function init() { } } if (!url || !api_key) { - const embed = new Sphinx.MessageEmbed() - .setAuthor(ML_BOTNAME) - .setDescription('not configured!') - .setOnlyUser(parseInt(message.member.id || '0')) - message.channel.send({ embed }) + mlBotResponse('not configured!', message) return } @@ -105,7 +108,7 @@ export function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } - console.log('ml bot hostname', host_name) + const r = await fetch(url, { method: 'POST', body: JSON.stringify({ @@ -118,27 +121,17 @@ export function init() { }, }) const j = await r.json() - console.log('ML body j', j) + if (!j.body) { - const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') - .setDescription('failed to process message (no body)') - .setOnlyUser(parseInt(message.member.id || '0')) - message.channel.send({ embed }) + mlBotResponse('failed to process message (no body)', message) return } let process_id = j.body && j.body.process_id if (!process_id) { - const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') - .setDescription('failed to process message') - .setOnlyUser(parseInt(message.member.id || '0')) - message.channel.send({ embed }) + mlBotResponse('failed to process message', message) return } - console.log('PROCESS ID!!!', process_id) - CALLBACKS[process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() .setAuthor('ML Bot') diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 1ccaf2d03..659f13bd9 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -136,3 +136,11 @@ export function defaultCommand( .setOnlyOwner(true) message.channel.send({ embed }) } + +export function mlBotResponse(msg: string, message: Sphinx.Message) { + const embed = new Sphinx.MessageEmbed() + .setAuthor('ML Bot') + .setDescription(msg) + .setOnlyUser(parseInt(message.member.id || '0')) + message.channel.send({ embed }) +} From 035bdcb58f6af34101c53d7bdf34d2ed568445d0 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 15:26:58 +0100 Subject: [PATCH 36/93] update: added sphinx-logger --- dist/src/builtin/ml.js | 3 ++- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index df4fbec26..dc798000f 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -17,6 +17,7 @@ const utill_1 = require("./utill"); const config_1 = require("../utils/config"); const node_fetch_1 = require("node-fetch"); const ml_1 = require("./utill/ml"); +const logger_1 = require("../utils/logger"); const config = (0, config_1.loadConfig)(); const msg_types = Sphinx.MSG_TYPE; let initted = false; @@ -111,7 +112,7 @@ function init() { }, 5 * 60 * 1000); } catch (e) { - console.error('ML CALL FAILED', e); + logger_1.sphinxLogger.error(`ML CALL FAILED: ${e}`, logger_1.logging.Bots); } })); } diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 9c7cdb0b8..69e86a3d6 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAAiC;AACjC,4CAA4C;AAC5C,2CAA8B;AAC9B,mCAOmB;AAEnB,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACrB,MAAM,IAAA,WAAM,EACV,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,CAAA;wBACD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACxB,MAAM,IAAA,cAAS,EACb,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,SAAS,CACV,CAAA;wBACD,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBACtB,MAAM,IAAA,YAAO,EACX,GAAG,EACH,IAAI,EACJ,kBAAU,EACV,iBAAS,EACT,KAAK,EACL,GAAG,EACH,OAAO,EACP,OAAO,CACR,CAAA;wBACD,OAAM;oBACR;wBACE,IAAA,mBAAc,EAAC,kBAAU,EAAE,iBAAS,EAAE,OAAO,CAAC,CAAA;wBAC9C,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,IAAA,kBAAa,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;gBACzC,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YAED,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,IAAA,kBAAa,EAAC,qCAAqC,EAAE,OAAO,CAAC,CAAA;gBAC7D,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,IAAA,kBAAa,EAAC,2BAA2B,EAAE,OAAO,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,QAAQ,CAAC;qBACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AA7HD,oBA6HC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 8dc0aeb23..33493b58f 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -12,6 +12,7 @@ import { defaultCommand, mlBotResponse, } from './utill/ml' +import { sphinxLogger, logging } from '../utils/logger' const config = loadConfig() @@ -150,7 +151,7 @@ export function init() { delete CALLBACKS[process_id] }, 5 * 60 * 1000) } catch (e) { - console.error('ML CALL FAILED', e) + sphinxLogger.error(`ML CALL FAILED: ${e}`, logging.Bots) } }) } From 83ce53faf708ff1927dcf9f2753ef4b79e7fc83e Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 10 Aug 2023 15:32:11 +0100 Subject: [PATCH 37/93] update: added kind command array of hidden commands --- dist/src/builtin/mother.js | 2 +- dist/src/builtin/mother.js.map | 2 +- dist/src/controllers/botapi/index.js | 1 - dist/src/controllers/botapi/index.js.map | 2 +- src/builtin/mother.ts | 2 +- src/controllers/botapi/index.ts | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 3c4a21c69..7d24e3b14 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -61,7 +61,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], - [`${ml_1.ML_PREFIX.substring(1)}`]: ['url', 'api_key'], + [`${ml_1.ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind'], }; const builtInBotNames = { welcome: 'WelcomeBot', diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 5e4bd698d..3edca1c9d 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/botapi/index.js b/dist/src/controllers/botapi/index.js index c355712ad..e296fec1e 100644 --- a/dist/src/controllers/botapi/index.js +++ b/dist/src/controllers/botapi/index.js @@ -287,7 +287,6 @@ function validateAction(a) { exports.validateAction = validateAction; function processMlCallback(req, res) { return __awaiter(this, void 0, void 0, function* () { - console.log('ML BODY', req.body); const body = req.body.body; if (!body) { return (0, res_1.failure)(res, 'no body'); diff --git a/dist/src/controllers/botapi/index.js.map b/dist/src/controllers/botapi/index.js.map index 52db0d05c..5c28cb553 100644 --- a/dist/src/controllers/botapi/index.js.map +++ b/dist/src/controllers/botapi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controllers/botapi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index 776454a8c..b1c0d1a1d 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -55,7 +55,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], - [`${ML_PREFIX.substring(1)}`]: ['url', 'api_key'], + [`${ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind'], } const builtInBotNames = { diff --git a/src/controllers/botapi/index.ts b/src/controllers/botapi/index.ts index 8c278fc04..6a7d5e6b8 100644 --- a/src/controllers/botapi/index.ts +++ b/src/controllers/botapi/index.ts @@ -329,7 +329,6 @@ export async function validateAction(a: Action): Promise { } export async function processMlCallback(req: Req, res: Res): Promise { - console.log('ML BODY', req.body) const body = req.body.body if (!body) { return failure(res, 'no body') From 9195b1ccc6ac23f57a7c8afd8d2297da032fe68c Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 14 Aug 2023 22:18:58 +0100 Subject: [PATCH 38/93] update: added host name --- testing/stack/alice.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/stack/alice.json b/testing/stack/alice.json index d2de0af13..9f1af4483 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -12,6 +12,7 @@ "tribes_mqtt_port": "1883", "tribes_insecure": true, "public_url": "127.0.0.1:3001", - "connect_ui": true + "connect_ui": true, + "host_name": "http://localhost:3001" } } From e08352e9ca5286cfa305a0722ea0e585124c5d45 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:19:26 +0100 Subject: [PATCH 39/93] feat: ml-bot test --- dist/src/tests/controllers/mlBot.test.js | 136 +++++++++++++ dist/src/tests/controllers/mlBot.test.js.map | 1 + dist/src/tests/utils/msg/decryptMsg.js | 10 + dist/src/tests/utils/msg/decryptMsg.js.map | 1 + dist/src/tests/utils/msg/index.js | 4 +- dist/src/tests/utils/msg/index.js.map | 2 +- src/tests/configs/nodes.json | 65 +++--- src/tests/controllers/mlBot.test.ts | 197 +++++++++++++++++++ src/tests/utils/msg/decryptMsg.ts | 7 + src/tests/utils/msg/index.ts | 1 + 10 files changed, 383 insertions(+), 41 deletions(-) create mode 100644 dist/src/tests/controllers/mlBot.test.js create mode 100644 dist/src/tests/controllers/mlBot.test.js.map create mode 100644 dist/src/tests/utils/msg/decryptMsg.js create mode 100644 dist/src/tests/utils/msg/decryptMsg.js.map create mode 100644 src/tests/controllers/mlBot.test.ts create mode 100644 src/tests/utils/msg/decryptMsg.ts diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js new file mode 100644 index 000000000..9a3ddf397 --- /dev/null +++ b/dist/src/tests/controllers/mlBot.test.js @@ -0,0 +1,136 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.mlBot = void 0; +const ava_1 = require("ava"); +const helpers_1 = require("../utils/helpers"); +const del_1 = require("../utils/del"); +const save_1 = require("../utils/save"); +const msg_1 = require("../utils/msg"); +const nodes_1 = require("../nodes"); +const get_1 = require("../utils/get"); +/* +npx ava src/tests/controllers/mlBot.test.ts --verbose --serial --timeout=2m +*/ +(0, ava_1.default)('test ml-bot: create tribe, join tribe, install bot, send messages, receive bot response, leave tribe, delete tribe', (t) => __awaiter(void 0, void 0, void 0, function* () { + yield mlBot(t, 0, 1, 4); +})); +function mlBot(t, index1, index2, index3) { + return __awaiter(this, void 0, void 0, function* () { + let alice = nodes_1.default[index1]; + let bob = nodes_1.default[index2]; + let virtualNode1 = nodes_1.default[index3]; + t.truthy(virtualNode1, 'this test requires three nodes'); + console.log(`Checking ml-bot response in tribe for ${alice.alias} and ${bob.alias} and ${virtualNode1.alias}`); + //ALICE CREATES A TRIBE + let tribe = yield (0, save_1.createTribe)(t, alice); + t.truthy(tribe, 'tribe should have been created by alice'); + //BOB JOINS TRIBE CREATED BY NODE1 + if (alice.routeHint) + tribe.owner_route_hint = alice.routeHint; + let join = yield (0, save_1.joinTribe)(t, bob, tribe); + t.true(join, 'bob should join tribe'); + //VIRTUALNODE1 JOINS TRIBE CREATED BY NODE1 + let join2 = yield (0, save_1.joinTribe)(t, virtualNode1, tribe); + t.true(join2, 'node3 should join tribe'); + //Alice installs ML Bot + const install = '/bot install ml'; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, install); + let botAlias = 'MotherBot'; + const botReply = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 1); + t.truthy(botReply, 'MotherBot should reply'); + botAlias = 'MlBot'; + //http://ml-bot-sphinx-server:3500/text + const url = 'http://localhost:3500/text'; + //Alice Set Text URL + const urlCommand = `/ml url ${url}`; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, urlCommand); + yield (0, helpers_1.sleep)(20); + const botReply2 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 1); + t.truthy(botReply2, 'MlBot should reply'); + //Alice set API_KEY + const api_key = '/ml api_key qwerty'; + const apiKeyMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, api_key); + const botReply3 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 2); + t.truthy(botReply3, 'MlBot should reply'); + const checkNode1 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, apiKeyMsg.uuid); + t.true(checkNode1, 'BOB SHOULD NOT SEE THE API_KEY TRIBE COMMAND'); + const checkNode2 = yield (0, get_1.shouldNotGetNewMsgs)(t, virtualNode1, apiKeyMsg.uuid); + t.true(checkNode2, 'VIRTUALNODE1 SHOULD NOT SEE THE API_KEY TRIBE COMMAND'); + //Bot sends Message in tribe + const text4 = (0, helpers_1.randomText)(); + const bobMessage = yield (0, msg_1.sendTribeMessage)(t, bob, tribe, text4); + const botTextResponse = '
This is a response from test ml-bot server built in sphinx-stack
'; + const botImageResponse = '
'; + yield (0, helpers_1.sleep)(8000); + const botReply4 = (yield (0, get_1.getCheckBotMsg)(t, bob, botAlias, tribe, 1)); + const botResponse = (0, msg_1.decryptMessage)(bob, botReply4); + t.true(botResponse === botTextResponse); + //VirtualNodeShould Node See Message + const checkNode3 = yield (0, get_1.shouldNotGetNewMsgs)(t, virtualNode1, bobMessage.uuid); + t.true(checkNode3, 'VIRTUALNODE1 SHOULD NOT SEE Bob Message'); + //Bot sends Message in tribe + const text5 = (0, helpers_1.randomText)(); + const virtualNode1Message = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, text5); + yield (0, helpers_1.sleep)(8000); + const botReply5 = (yield (0, get_1.getCheckBotMsg)(t, bob, botAlias, tribe, 1)); + const botResponse2 = (0, msg_1.decryptMessage)(bob, botReply5); + t.true(botResponse2 === botTextResponse); + //Bob Node Should not See VirtualNode1 Message + const checkNode4 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, virtualNode1Message.uuid); + t.true(checkNode4, 'BOB SHOULD NOT SEE VIRTUALNODE1 Message'); + //Alice change Tribe kind to image + const imageKind = '/ml kind image'; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageKind); + const botReply6 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 5); + t.truthy(botReply6, 'MlBot should reply'); + const imageUrl = 'http://localhost:3500/image'; + //Alice change Tribe kind to image + const imageUrlMsg = `/ml url ${imageUrl}`; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageUrlMsg); + const botReply7 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 6); + t.truthy(botReply7, 'MlBot should reply'); + //Alice sends Message in the tribe + const text6 = (0, helpers_1.randomText)(); + const aliceMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, text6); + yield (0, helpers_1.sleep)(8000); + const botReply8 = (yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 7)); + const botResponse3 = (0, msg_1.decryptMessage)(alice, botReply8); + t.true(botResponse3 === botImageResponse); + //Bob Node Should not See Alice Message + const checkNode5 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, aliceMsg.uuid); + t.true(checkNode5, 'BOB SHOULD NOT SEE ALICE Message'); + //VirtualNode1 Should not See Alice Message + const checkNode6 = yield (0, get_1.shouldNotGetNewMsgs)(t, virtualNode1, aliceMsg.uuid); + t.true(checkNode6, 'VIRTUALNODE1 SHOULD NOT SEE ALICE Message'); + //VirtualNode1 send message in tribe + const text9 = (0, helpers_1.randomText)(); + const virtualNodeImageMsg = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, text9); + yield (0, helpers_1.sleep)(8000); + const botReply9 = (yield (0, get_1.getCheckBotMsg)(t, virtualNode1, botAlias, tribe, 2)); + const botResponse4 = (0, msg_1.decryptMessage)(virtualNode1, botReply9); + t.true(botResponse4 === botImageResponse); + //Bob Node Should not See VirtualNode Message + const checkNode7 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, virtualNodeImageMsg.uuid); + t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message'); + //BOB LEAVES TRIBE + let left2 = yield (0, del_1.leaveTribe)(t, bob, tribe); + t.true(left2, 'bob should leave tribe'); + //VIRTUALNODE1 LEAVES TRIBE + let left3 = yield (0, del_1.leaveTribe)(t, virtualNode1, tribe); + t.true(left3, 'virtualNode1 should leave tribe'); + //NODE1 DELETES TRIBE + let delTribe2 = yield (0, del_1.deleteTribe)(t, alice, tribe); + t.true(delTribe2, 'alice should delete tribe'); + }); +} +exports.mlBot = mlBot; +//# sourceMappingURL=mlBot.test.js.map \ No newline at end of file diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map new file mode 100644 index 000000000..26da1eae6 --- /dev/null +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/decryptMsg.js b/dist/src/tests/utils/msg/decryptMsg.js new file mode 100644 index 000000000..7ce0b81da --- /dev/null +++ b/dist/src/tests/utils/msg/decryptMsg.js @@ -0,0 +1,10 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.decryptMessage = void 0; +const rsa = require("../../../crypto/rsa"); +function decryptMessage(node, message) { + const decrypt = rsa.decrypt(node.privkey, message.message_content); + return decrypt; +} +exports.decryptMessage = decryptMessage; +//# sourceMappingURL=decryptMsg.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/msg/decryptMsg.js.map b/dist/src/tests/utils/msg/decryptMsg.js.map new file mode 100644 index 000000000..0ca7b2e4b --- /dev/null +++ b/dist/src/tests/utils/msg/decryptMsg.js.map @@ -0,0 +1 @@ +{"version":3,"file":"decryptMsg.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/decryptMsg.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAG1C,SAAgB,cAAc,CAAC,IAAgB,EAAE,OAAgB;IAC/D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,OAAO,OAAO,CAAA;AAChB,CAAC;AAHD,wCAGC"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/index.js b/dist/src/tests/utils/msg/index.js index 8efc021e9..8ceedf8af 100644 --- a/dist/src/tests/utils/msg/index.js +++ b/dist/src/tests/utils/msg/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getTribeMessages = exports.sendDirectPayment = exports.sendTribeDirectPayment = exports.getSpecificMsg = exports.getAllMessages = exports.sendMessage = exports.payStream = exports.appRejMember = exports.payInvoice = exports.sendInvoice = exports.sendTribeMessage = exports.sendEscrowMsg = exports.sendPayment = exports.sendImage = exports.boostAsMessage = exports.sendBoost = exports.checkMessageDecryption = exports.sendTribeMessageAndCheckDecryption = exports.sendMessageAndCheckDecryption = void 0; +exports.decryptMessage = exports.getTribeMessages = exports.sendDirectPayment = exports.sendTribeDirectPayment = exports.getSpecificMsg = exports.getAllMessages = exports.sendMessage = exports.payStream = exports.appRejMember = exports.payInvoice = exports.sendInvoice = exports.sendTribeMessage = exports.sendEscrowMsg = exports.sendPayment = exports.sendImage = exports.boostAsMessage = exports.sendBoost = exports.checkMessageDecryption = exports.sendTribeMessageAndCheckDecryption = exports.sendMessageAndCheckDecryption = void 0; var sendMessageAndCheckDecryption_1 = require("./sendMessageAndCheckDecryption"); Object.defineProperty(exports, "sendMessageAndCheckDecryption", { enumerable: true, get: function () { return sendMessageAndCheckDecryption_1.sendMessageAndCheckDecryption; } }); var sendTribeMessageAndCheckDecryption_1 = require("./sendTribeMessageAndCheckDecryption"); @@ -37,4 +37,6 @@ Object.defineProperty(exports, "sendTribeDirectPayment", { enumerable: true, get Object.defineProperty(exports, "sendDirectPayment", { enumerable: true, get: function () { return sendTribeDirectpayment_1.sendDirectPayment; } }); var getTribeMessages_1 = require("./getTribeMessages"); Object.defineProperty(exports, "getTribeMessages", { enumerable: true, get: function () { return getTribeMessages_1.getTribeMessages; } }); +var decryptMsg_1 = require("./decryptMsg"); +Object.defineProperty(exports, "decryptMessage", { enumerable: true, get: function () { return decryptMsg_1.decryptMessage; } }); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/src/tests/utils/msg/index.js.map b/dist/src/tests/utils/msg/index.js.map index 226253a8e..831c42fd3 100644 --- a/dist/src/tests/utils/msg/index.js.map +++ b/dist/src/tests/utils/msg/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/index.ts"],"names":[],"mappings":";;;AAAA,iFAA+E;AAAtE,8IAAA,6BAA6B,OAAA;AACtC,2FAAyF;AAAhF,wJAAA,kCAAkC,OAAA;AAC3C,mEAAiE;AAAxD,gIAAA,sBAAsB,OAAA;AAC/B,yCAAuD;AAA9C,sGAAA,SAAS,OAAA;AAAE,2GAAA,cAAc,OAAA;AAClC,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,iDAA+C;AAAtC,8GAAA,aAAa,OAAA;AACtB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,2CAAyC;AAAhC,wGAAA,UAAU,OAAA;AACnB,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,mDAAiD;AAAxC,gHAAA,cAAc,OAAA;AACvB,yDAAoD;AAA3C,mHAAA,cAAc,OAAA;AACvB,mEAGiC;AAF/B,gIAAA,sBAAsB,OAAA;AACtB,2HAAA,iBAAiB,OAAA;AAEnB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/index.ts"],"names":[],"mappings":";;;AAAA,iFAA+E;AAAtE,8IAAA,6BAA6B,OAAA;AACtC,2FAAyF;AAAhF,wJAAA,kCAAkC,OAAA;AAC3C,mEAAiE;AAAxD,gIAAA,sBAAsB,OAAA;AAC/B,yCAAuD;AAA9C,sGAAA,SAAS,OAAA;AAAE,2GAAA,cAAc,OAAA;AAClC,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,iDAA+C;AAAtC,8GAAA,aAAa,OAAA;AACtB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,2CAAyC;AAAhC,wGAAA,UAAU,OAAA;AACnB,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,mDAAiD;AAAxC,gHAAA,cAAc,OAAA;AACvB,yDAAoD;AAA3C,mHAAA,cAAc,OAAA;AACvB,mEAGiC;AAF/B,gIAAA,sBAAsB,OAAA;AACtB,2HAAA,iBAAiB,OAAA;AAEnB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,2CAA6C;AAApC,4GAAA,cAAc,OAAA"} \ No newline at end of file diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index 113c70d93..6fa370bd5 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -4,11 +4,11 @@ "pubkey": "03a394d0ebf0d003124ab130c6b12b8b990a50a30a464354800a51981ba745bb07", "ip": "http://alice.sphinx:3001", "external_ip": "http://localhost:3001", - "authToken": "OvZ8qFgYCeHeeNu115Uq", - "transportToken": "MIIBCgKCAQEAwGIb8jBtx5jOfGO1l15kxQNUYjn/mbrx1P7HS6jBj2fpDtRGFDDZ\ns57B1+KlG9CIUqPv/4e3fobdHLigJMKVIdWVZXLy8HNsRTYepRzt3LmF9n33dBK8\nDNrggAdP087IODmMIz9hK3oLN0ounu6uPtLgjwrlGrGPRyz8QzZbfCOxpuvJrwtG\nTLHu21oW0kBlgl9V+fwPg5FRhZuwdcBkEpgDfV7KdoRvtDs07Gn5IHHeOVXUSQgt\nkzv8okKvXTZJG9OHTblzqJtIH2TYu4MvX7GpwUffGirdRomVHZc4NFPeu8Pd9YBY\nYrRQzCB8D+B54c3AYso9cViAVsqBnYw39QIDAQAB", - "contact_key": "MIIBCgKCAQEA52wbOYwr6hau8OjHRYecnkHS83qHr4JbBaPpugD5wAVwISEVEfWl3iZA/Q/6f50ZlSCnSU9G/z22y6J0B/jqlEsecVL80nUM/us0wCPdK0hFj/ydXRhKADWJvx0N8qgk3okQ89umBoDpInwOeDYr26VFK9EkSxmlkwrt0/ZScbgs03hHcuq4cgucFT+HhG2nm6DAkmm8h/U72eD6DQ/36EbzWlH9LYFRkL0ZlfDidSyk+BC5DIuIzrmLouLvWEkhg66mvYx8O4nLyn0cNa0q5W3JZKUv6/VTVH2a2Vsxt9EZuWW4AdSq2hkbx28MvtO/ppEBMfaLZAeIepqMM21dgwIDAQAB", - "privkey": "MIIEogIBAAKCAQEA52wbOYwr6hau8OjHRYecnkHS83qHr4JbBaPpugD5wAVwISEVEfWl3iZA/Q/6f50ZlSCnSU9G/z22y6J0B/jqlEsecVL80nUM/us0wCPdK0hFj/ydXRhKADWJvx0N8qgk3okQ89umBoDpInwOeDYr26VFK9EkSxmlkwrt0/ZScbgs03hHcuq4cgucFT+HhG2nm6DAkmm8h/U72eD6DQ/36EbzWlH9LYFRkL0ZlfDidSyk+BC5DIuIzrmLouLvWEkhg66mvYx8O4nLyn0cNa0q5W3JZKUv6/VTVH2a2Vsxt9EZuWW4AdSq2hkbx28MvtO/ppEBMfaLZAeIepqMM21dgwIDAQABAoIBABlFyA9XzG/q/D3Y3fIs5iCuRZBLYEf9b11FUj/63UtoDJ/BkiB8+BkzikNYnF2VVXbgswQhgTpcjfrdCdjZCR0auv9bNbryB3JLU15sTDnu0ZHw32qMPYCaWCmjzaMjU6ttwokvAomRSGR4scfU+qMpAE3RsCn3agqN1f0g2E4MvsQI2qCQ+gfyVJP55SHDNfhlmgbgIJE+AhFHYeavlq0dtXjwhJ7bzjO2bQj6UfegbtWmhv9yCfxRaQSaWxz7fNvKywkBwDLflYszHGI76S0v/6AjKOB/MJ4MZH+Rg9tL6YZcsOvYvPrt771fk4tG30ZVEyhT6Ro9kaER78Ra43ECgYEA+HVlCiRbCbP3Mz+S0/HWGMn97miwYpM840xXVVfs6nQbcxWAxiGmUcjiYjgEv2FyjVxwYT3h89n1cAmy3xf/EuIcH0r7zdxhDCOmSMhRig0vWd6H7VNlA8gBaPiNHESmlcxqiRPvnbLvSFQjUoXJPuSZMW9wGaOiQxXQ2sRYwzkCgYEA7nJViCgfodUjTnY5vEbbPiM9posVDDdfjkSWldxk2tnZEVx2BPS7vBY86WS92ooAU43XnnPOseFvwIeTcL6IcbzOIHB/ilRvqfu7VZQxVZ5c9BRgQVs3mV4p5/r80aNkJVeZ89rp2cO6YYzcBfOP+UrhQmvjyVhIhG6RgWvWepsCgYBOuPuLrBtARspTbZg7GUwJzK5thLQmd5p6Nm0ReGtzmdg8rZqArJbDIRBBqJgwf1LJYXmmBfJ6zhuLJTeMolDKjeP1Mk/4WRRSwVTliLr1L9pJ8k1FMAA4o3124hHr3ACgRAWZazynzdMtKqOKeSNbjxjO5g0xwnweH2JufnnVWQKBgD27Xgd1E9NrAcwDcakb0xEAQKrIYTebcmK7wRylRXsfYUJMZMWdsqjcPQLTsQ9OIQ2AsGz2YHHPAoae0v4iZeLEVb0yQuLGP26LnJFoX2liKYCLcewZuIg9R64mXaPMoFXGmzX13Asj0DIHLMNhrkmFKFJw6jUrZQLcOVF/YLS3AoGAdq+jZZq3Ej2/16/bwm6W1WXug8Ayw7HCZROfECeoEIp1pAUYIwA0PatnY0vwpWKLfNntNHNN77jR50JCO2WhYqVuEXjZNxy9lyjMffqIyPt/6JA7zcFMsSdpMP0RbrN30bFVW99sm4Q0/wafVoBuZd9JSDEqmMEocRsdxs8FeOw=", - "exported_keys": "a2V5czo6QXdFS3lBR3pQUENxcE50RTFjSlpNK0xsR2srVnRZZ2NvVUNNdzlDeHpMRFRmdGsydW12VUNwWjN0WmNoaVoxcWEvVW5yb1g3T3VrUy8xOFpDOTZ2TTNhcHBSdUxWcWxpYW4yczJGdkRjdE50eWJzYzdDNE1ZL0dpSFQ0Y2h1UWJGRlFUNXJRYXhvZDRhN1kzWlppQXB0M0JvQjFPWjY1SCtLVEVBOW4yVnl3dlZjUFI2dVNXUGErS0xrQ0ZWd3lpcE5XWE9JQjlCRkFxYjZ2K3lhRTduTmZFTFZUNUVvK2phMWZEZ1YzcWZGZ0svWjNaeit4SlNnR1dUR082dVUrUlc4YnJWM09sTytjWnZZclV1U1hORzd5ZmVJREhPSm1XaUo3N0NCeGJNM2xqS0JRSmZHRXVteHBvUzVsUFlBbGNRazdrZXh1clR5c1Z5a0Y3NVBxeDdSSmZDTkFwSnZQMTBId2dvWkI2ckJUVEFLZzgwbDNpdHd5SGZFeHdoNUszSVNEZTRJWTZuY0FucjNSVzR4RVlob2VWNGhCemkvWjgyNTZobkxNMGx0N3NZT2Nobzl6dEs0MHhyUDB0NXFTQVNMRGc2ZFNWNGh6TVdaKzlFbDVOOWkvajI1alRwclJsQXpWczIvajVmdzk4NUozZWlHdjdRL0Q2dWVnczM2SEdsckdoNisyUG9nblR6SnRHNy9XdkZZTG5qdzduck92R0xZMkxpemZtZHF3MEU2bWxjTSthTzA5OTc4Rk15NUwyaytQSzZXanRHMjRQWGdoNTNlZVRoZGRRTGV6VEs3UHY0S09mNDJsK3VXMmJuYTlja1RaUnhiRUFIaS9XUW5JSHQ2WjNXc0lVQVFkVDQxNUNOQ21sTGxkL2RHVFBPS1J3QUhPOUEzZGxFUVBMd1pNUGRTQSt0b2JTY0JHdk1kNS9IUlhyQ3FwU0t4VWREcGV4QXZDazI3bDZUQ3ZneHBDYzFPOEtrTjdkRTVsdnZ6K3RvMFBCRk5GODZuaGYxWDY3R0ZobVM5bDZnTXFUWUZlUkdhWm13b3lrQmVjWE56R0FHTTlIb2JpYUJjOG44LzBnaTE2RHJkQllwZ3lkTGc0M2ZySldGa3R5bUIzMkpJVWx5UFdpMklmK0NXTE96aXdQSTlMaUpyTDhNU0s0TGVCd0FaWnJDT1d6T0NHbmF1TEZDMzh6VUxyVmZZZ21VSmx5Tm43RDQwNmlyNWFwa3cxbVp5MEZvQW1NWlh6Tmt1WGM2OVE2NENZVlBtOGxzekZLNUlhKzQ3bTliVW5tMHRXOVdNaEZVcE1xOEsvR01hZ2VqLzBVcHBnampQM2MxMTRlYnRhMWUyaVEzMjB5ZE1PYkl6anJWRlA0Q0lCVkVDalJpYUhwVTk5NFhQUUJ5U2IrTjVxV2Ftejg3czFFNDZsZ0pZSGtXY1pTSkdBZm93RnhtMm8yTDEzb0NTMFdzZmYxR3dqbnFvTXF2QjdGRTE3Q0NHRjJ1NFdDMXZSTGQ5QjJ2bFF0RGlqUUROc2Z3WDNOUVVrMnFNZDc2bTFvRzFpWjBUZzJZV3QwU1B2RXZHcmdyM09VRHFBamlsMDRqbHFGRTU1UWdOSDF4b2JBb0pEZWt6dHNEUXE5ekQzZW1nK3YrYXVpeGUzbDdVUjBwWnNTWHhQWllSajZLQW1aMVgxY1ZVaWVGSjF3VUd3RmlieTVRUjl5bmZZbytaVW9JUk4zUjlka3lLVXcxVE9IY3hKUHpDVm9YWmpkTWMvWkVSRjg5dkRpL0RlUGxyaFBhZmJ2MHMwK1BLSWRpTCtiS2VzNlRpVTlZb2NGR1pPdWUvUU91NjNuc3BkckVNWGk3OUxUYVp5bk0wL0VsRjFaSlVFaktlaUlZNTRrTlA2S3BkU1h5cmk3RlhpQVJ6MHRuelcxRFNNeDVkaGxVTUJTZ01wMHlMMHduTXNYRllXL3NxWHZNdUo1YW5BY0VyKzE5ZGdZT21Jby9ZSXJocHZmMzVkRVVYZjVDZ1F6V0c0NW9zeU9ObVdueXhvZElxZUhWL3FobHJOdDlmcFd5M1ArQWovdkRWekpKZ0szdHJzb2x1K1JBTmhJcHFBdnJtWmxNVUN3amt3cUpQVEc4b1VUSlBJaWdSMzY3YVZjWlJ6VytFclJEeHdNeC8zQ3R1VngxTUpteWl4aHNjNEF2dmNpa095UGlSL0t1NnA2UGRwY1Nqa1o2N3QraDFRQ255RVhUcTlrV29ldVdpMjM4OXlYSiswYmNLR1Q5RUIzcGlaRDJDcUJlOG11bnc1SGc5SFJpeW5qdjRLNWx4aFhoOTM3SkxSWUZNUnlRT2JxUHRpNkRFenJrMCt2bCtoMGJOeS84Y1QzWGlxYXZhd1FTWkV6NVFMay9JTVppbC82cEFEN1NQN3BsTENqWE9wTzAyVTlSSnM4dWMxV2hkSDFIUk5ZNDByZURkbDJlRG1xbm5IY1pCTjVYTlpnWm5yYnpMOTJ5MW5EelFWbGVFQkkvRVdaK2xTdlpZZkZTcmVNN1h4V1oyZ0hISmlNS1dkUTBpalZhQjhQaXZ2V08rTzVpYSs5NUJacFMvaVR0R2I2Z2dLdVYxcHNxLzA0OEJ5emZ4NUpqaGVDUmNLdDhlRXN3bHNCN3o3dy9kTWw0UVdTczM5VG9FL0s2QUx4WDl1bGgwazU1MmtQVUlrRDUvZWJYRzM5T29oU2RXN1JmeUJ6ZjFIMENndE1zT1F4MU5oZlZFSUVEV3A3eDdUcWVNVDBITG05Sms1TEpBd04zek4zRGhIaWVObFB3cVJyVHU2OU4rTlp1dUxpZE52OGFWbUhUK3NqSVAzTk5oMkU2MWVpNlFUeHlCUU1uSTFBN1lVbmw0MERVOCtYS2swZXFvT2lzQmsvaFl5Z0dXS0tjSFNpd0c4Sjl3eTJSTEc2UFNCbmZsLzd3dDhOdkQyc1JEbkRubzhGZ0FNVjVvamQ4cnJtZ2JTU1BpQllOQXMraWZXWnJSUG5mcDVrQmtkRHpqa0JHaHBKRVZXRFMvb2ozUkxLOFMvY2Y5WmJmdHhzaEVucURadVJ5emVFZTJVTWl6MndvL0QvV1B4b2MyWHZtTlA5alJEWCtOWUtvWXBIL1Ezb2hkMlBzNzhOam14aWlER1RZK1o5THJndDU5akZvZkp5alBpOThteU9ZR05MYzBpVDZPNTFYS1VFckpISlljTDA5eFh4RzNNc2F5NEhGcEJzV0pSUWdIL3ZFaW1vTFVIU1B6c0ZjSEtvbndSWXpwVXRwR1VISmxuTk1XVVEwckF6aUhuNUc0MklYejhxU055eE43ZEg1TW1ZZEt0OTJRbnR4djdvYVlsK1JGVlFuQzFRSFVDWE5iemFBWTBWamppNGliSW9Wd1ZKd25zWUZvenU1K3R0S1MvcVVwTks5cXVBa0VpSzhXTHFXZGdhVlRzZHljckNqSmE1K2J3T2pZTDV6ZjdGZi96TmMxeURjR08vSVV6ekNoZEZCK2MzUjdEWnU5QStTMVpBcHhpeE9CNEo1cmp5YUc0QVp3aVN3TVorSm04ZTllN2lSeXlpTnJyN2VKeXNlUXFqdlVINGZjbFBuU0pKZ1kvaUhTUkdRS3lNZkU2RlZSUG11TFd3Mlh5WDFRd0tETmMyeFNNSFQ5VU5HTytIUlg1eC9WWT0=", + "authToken": "qcasKC0xQYxJsNxtIKeZ", + "transportToken": "MIIBCgKCAQEAsayTwt2A1H18sE5FinGFFVK8oEaAAA10H5sslqRpwH72JyW1g+Eq\nloSXMdVsWquqYxtrcS6sWWtA8KHoxEgATsqvFU2+fThWup39u+nE9ssP48vv5ymr\nn+kWsNYAx00UB9wpjUqqPHpnZcHbZHCDV5xwVO7VLJ5z0rxGBIA9pWsyr3mcSTRC\nEgsmfIfu/02NelJ/SnaVPXb6FRJakTtS26qWYQm/raaTelutUCD+MHL465G3Qqor\ncRuamWQEvJjUGDMBtTwJAjbTGOLcoXERMo8MuPkIImwd82CefdsmXE/U8/CzFVhO\nDWr+IBowE4nPMTxGN28AGbiArQnLM60YIwIDAQAB", + "contact_key": "MIIBCgKCAQEA3F1dQbvtCitZoarGL8DTCI9JkA/VgXj06JdydryblxIVtGMat+OLpbHjrJHlr1Ckhp0iRM/A+0rjusBETuFzDQpczm67fT0PNGcwW+fedmrBE+yll2NwWTrZiLul/xNeJM5NU8fkPhKPoTTHl8NxPxp2ze3I1jI2LMhS6drJhkSuUvVN4ZAQJwa7EtbXF4JT517d741BD2sBZusiSHPXLJoGOZ9IWgzn0BuxxVhCrAI61dc3YlmYy7Nica/qTFHBnX/719pXptS6wQK1cIy84sKvkxbLe3eQ3XM9Ro5CQFZyhhrnRQSARFGt5H564+3HdkjmGDEh+rMsnUuBIROE4QIDAQAB", + "privkey": "MIIEpQIBAAKCAQEA3F1dQbvtCitZoarGL8DTCI9JkA/VgXj06JdydryblxIVtGMat+OLpbHjrJHlr1Ckhp0iRM/A+0rjusBETuFzDQpczm67fT0PNGcwW+fedmrBE+yll2NwWTrZiLul/xNeJM5NU8fkPhKPoTTHl8NxPxp2ze3I1jI2LMhS6drJhkSuUvVN4ZAQJwa7EtbXF4JT517d741BD2sBZusiSHPXLJoGOZ9IWgzn0BuxxVhCrAI61dc3YlmYy7Nica/qTFHBnX/719pXptS6wQK1cIy84sKvkxbLe3eQ3XM9Ro5CQFZyhhrnRQSARFGt5H564+3HdkjmGDEh+rMsnUuBIROE4QIDAQABAoIBAQCFBZMK4C9JyTtU/Oqf3u1FKIHGhdhjTKnCUdGV3Wqqug8CEiUJxkEBJ64A+R1GRA7c97O9CBA9YUqw6+kQGMXDpHK7ZlqlUhuAjZ3CjOhcYTrmFR8skKk8I+s2v9eHb6CP5T0Giw67baboMB0f/qm45ve6fYST0EGlrNNoOVsXQfV+nnhlpl2n8s/Xr9BShY48PXIammoOBPZkgaRf+3RvCpx+1zw3/p2918qJs+ZSxVY+SE4Grj1Hba6cG4QorerhO1Ro3yVXCoQ3gn8ju8Es21WlFm0S7QihSFlC6UqbRjSdqSTHb33MrdnSGTDuUQacAiAszZJrw1j2WeQJ5PjBAoGBAPRg5CwbscJ33j28wsP68CXHDMxPuwrOVEA6uCk8agzU6Pys+IfETQnZ6X6XRYaAUDpiT/lprIs5O/jH2sqk1m5vJ9NFBo/HJVJFXn7tPFF2h41DizXGNo8bO6y1FCU8D9W/GrcjmJNstQnvlsU+SwETVxJBI+KklEvtKJmZu4C5AoGBAObYH/T5KMHMU5Ta7JhLw9PRaj+ymMBhv31+5gUuv/kIwfzm8XkG5XV6R3LC0dZG44SV4sd0a2lIFRQyD0HvuUS0U1ILhWirwZVkRR361aVDZUN6euHOECj26suloXKDvkF8LYpgzAf+V9tUWkJlFnOM/rrCQxJn7IP5JLHBgwFpAoGAS4CD/nyv9v1B1KE1K4ekGofdFGKtzzDgJtf9fgAEY+KD+U0XnBqyEpEY6tuhx2RtZRxqyQw1Gu6b8MkOd/1loskE7Okulc1ZYom8IEr7j8+nIaX0pLCQurYXQczQZJCh89APWPXOdf3oESHM2zPbyIFJLYKiq6tdhffHy20L2UECgYEAgPiIyi4WZkgI/mZdvyy9SO98JABdNUanXK70Rjr7SGBrOSeyC4Md2ceqeWR9JfFPFflDzVmu1RBProvVWGpdoRP6ZSFItNUY/6UYtIo6qO2BevTICLY+8xQY1BRCoh8WwbFmJCS2eVTRsxlqoCOoKoDApIj6PiNP0d/1b1aFIdkCgYEAj3uPL2bJVtWd2me8b7/zpz1/KoYAh4ufGOjqshae/ql/J8i/h2FYTLeEs0qn+HENgiUC4Yzd3nZ1hHmMOXprw6S1x89iV9YpGhyO8Y6V6Xm80jY2Cf+L0hKxuhIDvnXS5V4eWmVgH6NHpSuq+dN26Jl55OJNu9TkDBUO0VlREio=", + "exported_keys": "a2V5czo6QXdHWjRReE01NXpaVS9PRzZXR0wyYmxyQTFlSWFmMVc1aW04SmczcU5SWTc1TFJtQ0N0ejNxNTQ0dlBLM2FXZkVhS1kyNkoxZW9DaGhQeU9GeGtNbzk5RGZxalljWHBrbDRBV0RhRmdFWkdMMWpINGI3NEdtVjAvRnJjSjk0UUZlcVp5aWpjTlpmUXAvZDFXdnNLOXo0ZFVob1haSlpNeU5pOWtXWFhQZ2doRkR4UjBuMnlRaFMwaURoc0pHbWxBTU5UV3ZSQnh3dnJBWnp6YXk0bFlaT01IUXpYbDJlM29HNDRtUFpISWtlMGZhQW5PSThnUWYzNWV4VHZmWElQVi9TKzh4M0dFME12ZUpoNEJNaDUvUXZhQlp6ZWNGYXo2L29MNXU4Q09UbHA0dnoyUUMxblhVWFJ2NHZwdHFPOStUYnVaWFRucEMxVUNvcTFOTUdaMjFHQUU4djZRNFpIQ3pjdzFJaFJWYjdURHhnVXVBOVFtL1FySmN0NllET0l3ZHA4QWVCVlBObGloUzUrc2lKc0p0VFVNaWZhQ09yb2M3UE9VUWFDQ3hPbTJMTzRGclJIbVhUclJRU1JtOWxQb0N2MFBqMEh3cDkvNGpNbVBtMGlrcktLM0FHMUxYN0R4Z3RjVlRQUlpudWlXUEN0VHkvVmxDWFBZajZTWkRhcm1VdGw5YVRwdUNwUkx3RGc0VU1sVlZVN3BaMFhUT2swMDBMeTBWcWNBdFVVTFFjYzBIaGhETGpFS2tLQzdjYk0rWkN6SnJlcElwSDNNeEpMSGRULzFkYkw5YXFzVnpuenluSUxIa0QxdjQxdlpkekZLY0VNZUR5V0lYNnpYdDhZSjdsVVdBcEx6L0ZhOE5hMUV5OWdwSlhlYTRZeHVYLzZKTUpFUUgzOEdkb3BnWjBhbEY2SWpkeVN3VldxQ1Jrb1pEdnR3N0t0SnRMTTMxTlJxMzZrSU1yOWVKYXNPYnhpbGRyOERhWUx1MUxWcWJ4RXdyVmVEZzRsbnhyNzBGZnVtNmZLSVUyZHgxcnlhRG9wMkZ6cjNLdElMZE41bHhRcEZLeUh1S0FHZlFtVmRsOXNJd1F3eUN5UElTYXBEditZbjJvaHJHN2ZWQ08yQ0N1T0xUUFlGNU5OK3lkNzJHTVlPa1NNaUMra0lLRktaeFVDd3NUeGFzaEMyVEZZRkNZRDM5N0lHdWhzZ2lTUjd4dUVIYU5EYzBnb1NwSkFORDRsTC84LzdHSnBqRXlyQzZTeUpZY2J3SHFrdmQyOFVVYVN3ckZqNlhDaUYzYnJQazIrV3ZsY3lPZlV5cVNqODg1N3hUSDJsakV2T0NVM2lxZlFlOFVreGpjK3BXejdGYUxyaHhyRDV4cmkyR2k5ckw2NUgwWXNZaWhLNGRDZFRJYlFjeVg4TzVYdm9VaC8vdktzWUI3WTErVmhteSt2YWg1eUYrb2U4dTBpLzZkSHQzQ3g3aFJQQVhXYkhEKzlkZWY5WlZ2RjNkL3hkSXRJaXpJUVJSQTZUZzYwdHk0UGxjc1Z4MjFQT0Y2Z3dReFRVUFRCeTJNZnV0YmtVVXZSdkIzd3I5bzBWdVZybVExTVF2TkxlaUlJMjVveDU0bnJEZVpPUDB5OFdKQlZ2ZkR6Y04rV01uclpzV3RrbzNzT2xBOXorb0ZKS2RBWVFjNnkrL25lemVLMHRGS0kyZkhESTF5OTZLUW05WndlNGY5b2hMNGFNL05ET3FGNksrZnkvTUVGWko5ajdKVTRVVHliS2RCRk8yc0EweXNHT3lHWVd4MUIrUVFGR2VyYWN2R3cxbGliV1ExeS9UOVJyNkJmOFduamNWaXFkMVpFYnBSeG9YaXJES0NqeC85RlkrNVd4emNSQkZqZTl6OGE3SWFjVU9TKzdWbHlIaE5qVkhJek9IeUxIdyt2K1Q4citpWWtmWEtHNTV5aVQwcmZJOWRlRW44SXJnc1RCZTJQSEhDYWV6bDhkWjQzOWY3bVlvYU5iWGxUN3Y0NExrRkVRa2ZCMkh5RitFK2pNS2p6YWJsbDlCOGhlS0h5bGdlNXpISEMrdHh3a1dXOXZhU3E1YSt3cjcwZmhldVBvQWxxK29pRXBmVVdVazZjcUF0aTZQYVVRaWI4K1lrSVoycnJDOTd2NHhJVUd5NUg2MmtJdW5rR0ltcC85bGdMcWkwblo0NnY1TFRTUzg5dUFZbGs1WDA3Ymk1K0RFeTNRK29OSXB6eVA3V2FUME9ES0VmbjE5dTRwM3RWVTA2cG1tSWtQNWpjSjZoR0VnUzJlUFM3VnNrUlVMK2p6UUFpZWNTL1FOMVhjTHBkNytLa0VlcTRDNXN1ZWJwMnRUTzNmTnBnbk9LT0JlQ09YTFRvdHF6RSsya3FiU3JQRXI3Y2EyK2lZd0p5emRNNDRuZXZUQzJQRkpScHVPUnlsRHdvQjdSN0J1T2N0blRSTWQ3cVZkdlBmU2szSzhRRmdRVUJQcTdUNFZPSnJBUW1weW0zaHFmalNaUFI2SFlFVy84Z05SbTlTQ214aDk5SkF2LzZsNHdobGREMStOaTlyZEkrK3lPR2VseDQ3TnE0YndwTlhjL1lVcWhGZjIyOHZMN3JWenF1NW9pZ2oyY0pVSVMrWXFXa3hoNDl3dng4Q0VUUzJGd1h1VmpDMUhJNklJNE43M0cxeCtYSGNvRDQ1RGZJKytJc2ltT0JCaTVDdDZhNTNkRXZTbzRXZ3pFTGUvUUt1UWVCcVRXWlpOQ3BGOFluRWlSYTVRU2JzR2pPTG1ZRUNTU29EL0M5MFpTYjBkczcyejZXeFR1U3UvaXlSbUd6N2kzdHozVHNWZEY0NlBxSEtlcUdqMERwd3N1NzQwQVFOQWNFMGNCcXhPWVZueWUyT0Q2T2NSRHVLQlJwOCt0bEpURjhaWDNxMTJocWFTdC9oTFcyNXo3WXJlbUJxUFVLYStOL202MElUMlZuMlFtbDdGbUNscS9HaVdkR0dLOWxudm1hWEFmNVIzZGtYTXJJUjIxREZLc2pmNCtRYmQ0Q1ZLYWFYQXlDRTluOTZ3MnArSVZkNkJ4b1hPWDVSRXpvbE9EL05zTkVXb3RHdlUvMXdHdVNnTFdtNHpaUkZNTDlhMTVNS3NDUG9ZOC84UlBITlRPNXpsNkJ6M3Y4dXJQSmxmMHJWVEFCRjlpTDNKUDVndXFLUC9IMldxdTZUb3Y0VnhrdjlNUHNqS2cwNy9YWm0ycjFEMGs3QzdCaCtDMGlYRVZKN1lVZ05PdkQzV2JHZ1NVU1RvQzcyd0dRa3p6UE5kOURMdG51UThNeWUyV29wYUtHUHdvZ0QwcXlBckNLWW4xNFRSeG0vdFRWRWdBL25kQ2lLeEJ3bVNlSDFsL3RyelFHNCs0SE5GSGFscEFtZW9zWEFHTDgwL1I0OEFDNkVQZkExTWxvUlAyeUFzTnFoSjFOREhxR0RzYndCMnlwWStyVFBBQnB4N2VYdHMxaFUyVzMyUXlwWk1nUDl4QlN4TjBZL05jWGFUZ0VROUtKcmNUSC8vbU9YZmZMVnZ6ZXdva0hYTG11TjJjZmxWZGFZNGpWUm04Vm9nejRCdnJ1UU12VTcyVWtBU2lVRGU5dXBjQVd4K0RXL0JwZ0E1K054MDFONElVRkJVNEkvOWdFY0M0QnB3cVdoMmt5UFhqOD0=", "pin": "111111" }, { @@ -16,11 +16,11 @@ "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", "ip": "http://bob.sphinx:3002", "external_ip": "http://localhost:3002", - "authToken": "NyGRQzPu5KsM5gee3VCn", - "transportToken": "MIIBCgKCAQEAvlbjq1PGhk1MJg/xLk5K1HTgk7N0mQeL91FwIgnToutm+cafKywE\nZhbXqEf2RvuTFf1r/3gP0Hh8ViKfw/tA5/og87lIrEnzmjIj6FWPB3WzWJK7yFCY\npV8bCtXSdWvAKFy632Vu8yY5F2rZSfF8RUCht/oQRePnNSAtm68vilB8IgThwKcr\nIWhp7hDcbpgBz5IPYE+OnTN6ozvduBQ/MjwtEw0yD/xoV8kL7dWidxcv7GmoDe0K\nFxVN1DXVQxKLiKooAFRkxkjvwWROgbwn2WqNKlKUiKsjnSNSW9gYBJn/CdVX121w\nDASYHCTwYwbHVqf799Xr2rWBYm+ZtMtOaQIDAQAB", - "contact_key": "MIIBCgKCAQEAx9KQQWgIsNjRlgzZRb5fGHX1s2Bo2b0ru2Ww+/wOwpNNma9YhihM0P5P/ZnMz8wexbeQk9FMU5rYVXelvkaGfBkM45DsINcKwSrL1E2fj99aHcaJn3u3Kg3zvC1nNgdOo+GmCcjTCCidWCKW3O9VzgHA6TIRwi7D4C/j+n2aW1PFTb92ajh2EMPTBDc2Km36KoQQfAJ46m5CRwC+A/kmtcB0m1JrvxjWv9+QQegfagedfPgYPRWpNHUfuWaLy9B8ppQ+REHx9ZqxOoJyqDX8iZTfx7o0+kJzR+OLVpjwMKvQp2/UhkCreDW5PaTxnY8as7wZXsraByq8tukFANbpowIDAQAB", - "privkey": "MIIEogIBAAKCAQEAx9KQQWgIsNjRlgzZRb5fGHX1s2Bo2b0ru2Ww+/wOwpNNma9YhihM0P5P/ZnMz8wexbeQk9FMU5rYVXelvkaGfBkM45DsINcKwSrL1E2fj99aHcaJn3u3Kg3zvC1nNgdOo+GmCcjTCCidWCKW3O9VzgHA6TIRwi7D4C/j+n2aW1PFTb92ajh2EMPTBDc2Km36KoQQfAJ46m5CRwC+A/kmtcB0m1JrvxjWv9+QQegfagedfPgYPRWpNHUfuWaLy9B8ppQ+REHx9ZqxOoJyqDX8iZTfx7o0+kJzR+OLVpjwMKvQp2/UhkCreDW5PaTxnY8as7wZXsraByq8tukFANbpowIDAQABAoIBAB4UEwTVbSF5saq9imMWMehTsUVsCLxl3lRaDVcQ7QPa+n5cx52CKXX4IgBRi2PoHOW0KP4nLi8TiubqmLdYlFvPxYHnybNzyzmigIYXnSIiA8WhoguwqrSY3wx/ZR7b4LmIeN7WLPX4bx7aLg1ZtXfKCcjQcZ3iPjfb3ZxSFc8TO/OEFyOL0tKWas8na/mTidDBTDhkdg7CiLGZS8V3zuqdnPN0+nErVK1t4LBn/F1o/xoPDiMwG17PFSZHipB6DmA4+erOZUOpFPpTeMDa8gXT/PRAvJcds47w6y4ddU4vxeP6aHZrEpbislC7ieSjSHaqDUMXATug0cUySSgZPkkCgYEA4u6CFEvtQBa0WDhMCB/hO4xgdxW8sR5AESlF6QTpJOdLPhSxJLlBjaJtEVoJfo/IVoX0S/F6d5yeX5naaT+SzxRZywQxZl+vDT95pM9VCMC8Mziysk8JhqYZwddt8hohuBGxFu7PXDTeSvaVepooeKoLyxYFZgZQaTMkw65LH18CgYEA4WsZFnTkGcIUUnR1xvdv4K7SeqgJ+q4xRKc9qfoQpVWekCgRnni6nU3bLSD+qC+qkYtyV2H+uYXr4AhhvHVwwIieGIiWcnbZVDmC2K+ZfP1lQK1LolUB/vZScDoLr35j/7shussfLTehaPJWHIUYmQIs+RySKrqn5PdFJCuVkD0CgYAeJxrZn40SqvGjlzdjDPlcdDaNHDJKRn60yQsk/yYLZUA2K4GuI392VlKvr4r7ahdwh7QCMz/WjNTuVv8SZQQYx9d2hkQaGjSkSf7by0C9PP7Ev4/e6WmWnpNlkj5loNtCHfet2GVtFwlCZKlP9RPTlKSkg3SMLeKZV9ZWud35eQKBgAKcUesPqYCe3ctiq+aFAReyDp/7CDqN/+YSpcUtLzoq9q4muKWEMm0V9L7eDfT2sFwFKGrYqLGPWn76ud8L4SVpr6MLGerzc2rlS52k0vs+mAiauTCFGYPRaH0CPxZmOVRB348hQRgt98GWZObpp7JF8y1jZlH2XXFqZ7OWiaHlAoGASDusgI49DPpWKPcZBS5lqitRljiQSOPaJcTPBSiDrHusvFJHg4WQ1A3OfsbR+JOVB2FQnWUBrvDv8Gk95c7ezyL7Ae4DUuYUaY1y8s4QNNFGkf0Xi0ybGdJZAJVpOO8HZ+QYSORkZRZhNTN+hKwOesmi7PleJey7nGYG5xnPK3c=", - "exported_keys": "a2V5czo6QXdHdXpJL0NLTHh3bEljTUxoRDFTRW9nMTRJQWx2aFhYUVRTcmh5c3VQZFhWZEE4ek11SDJpV2hmREJaTEhPeWUxZWZkU2s1SjY4Smx6OHAzOVh3ejhCR1R1RW9OS2hLQnBDaGhYZHRYaGJZRWE2WmdlWFlYVElwVFhNdW5jZnVMZVNxYkMvcXRvS01SVjdwQ2J5czFuWkJFYlFXYmZDcHZRRURUbDU1ZXVZK0NpM2duSkVVaThRTGpBQk54Y3N4cFRZRmMzK1VNN0RhUG9CMnlHNk9CcTVwd3QxOHVYczRwM2Z6aFl1cmI4REFwZWw5VHhBMTlWT0tRZy9ndXNwcTRuSHFsWmlNTTJkR3kwaXZrS1dIdmNTZGJhelUvL21LbkM1cDMwU0ozVW43SG9OcTc2YjY4cm4rMC8vRlQxQzF6MUg1SXFXRHZtTUlPaFIvUkR3OXM1VXk2RmZVbEJCNks3OGQwOE9rN0ZrRlJMSUpyOXQ0U0o2Tlo1cFVyMXpmTjJUT0R6SVloUi9wSDArQ2tUeHlSSXB3ampXWHpuSlh3WmtrN1BNNGg1QUN0cUlKajB2OTBBSmVsSllRblFpWmZ6eDIvQ2JsSFRhbUNhK3RnYVJUL3lMSC9vYkY1YUd1eThBZjFPT1N3OC90QUVBN2lOeSt3QnpZUWtsRlIzZU1ackZoMFIyQi9ReUpiQitRVEFscFNHWDRpK2lyaWVlYnc3VjRudnFRRTNiL2x4SS96WHdjMWN0YzNGcjhFK2NTaHZuR0tvZks3RkdMd3dBTGF0V0YreWFvZ3BETVUwZkFlb3RjQi9KMlRoSVpOVXFXRFlYVzRZTkJJRG9iNForZUpBYjBzUVZ6dHVBU0dJTmNBSWEzN0RLYmNVVXZuZE1sTzlZR1dVdUs3TUFXSXNTbk40Q2wyMW5pWDJsRitYNEFyUGVSUVpaTis4a0J0eG1mK1BsVDNEdUFCUzNPdEdRQzFrTGM1RDZNOW9iMFZLOWpoUFZXTEFteldPZEZZWFFyQThKQ01lc3pvLzhqU1lCRXFLZHQxRnRUQ0k3bzZLeVU3YmFWUk9HTUZ1MnJPM0JXTW9CaVREU3ZTaVZJY2lWQXFsa3YyWjdCQXlOeDdnV3dlSFlEdkZiY05mQ2xQY0RUU3hqakVudEJHN3FyeUlxL1ZVeFJTNlpqTlFVaFhtYjNtT0FNMms2dkkzWFJtVUhKaGF5N2o2cG9CTkZlUEh3MWJJRTlpdGRobEFBZUQyZjNJaUNJbkk2WTM4cGw1dCtlbkZ1ZlhqdGRZdDdoT0JiNk54Vk9KWTBROTV1VWlEQ0ZqSFc3Q0NnSVU2d3hDbWpubzJsNUJXSWZpVU9DR1g4RWRwUnByei82N0N0VHhJd2paQ0VkQW11c1lxY3NXMDVJdkw5YkpyUFV6dHpBT0pQZnU4MUVSVHA4QllLSGM0MU1QUkFMOXNLV3B2QmM0RSt2Z0l6ZTllSjJzbVkraEZUVGxENzBQOTFVWmx6eGl2VHBUSDJXMzNhLzVTQnFWVmdoOStqekNVTVc2cmFJMzZLYjkrTlRJYTZTYmVyRXcxamlVU2R3Tnd3aG96aVBENDQyd0N5bW54S0xPQzA1NVp1bER6RVlCTDcvMnpuN1VsYk83N1hPS2tzaEt2c1ZJQnNpdmRZTFgvci9mWS9DTjk1c0VOcnV4QVQxaElEd1VkcmNRMzl3dUlCVG0vMCtSMjBGT3Vuc1JObFlaaVBMc2hlN0FkQlFIWnFvUWF1NUJTK2d5SlVkYmFsLzE4R1lmamFBTnZLcXV3MDhFSUtVRElzSUJpSGpoYVdlZktOSjhRRmN6bitiWVNjV1FrOXJ1QUVuR3Z1UWdzQVcyMnFENWJJOWtveVZWWTBDek1EaXdnRTB2TkJOTCtvNmhzRXNRa0x0WVFOT2t0cDArV1ZEWDd0Zll2MVU1aEdWVGRQdU1LZFA2eEhxbUN6SEF6ei80R0VuN1BOd3VhZmhuNGV3cWpRVHpBK25wVSt1RTdIN2VtbHh2ZWtzOHpSRWRPcjhadW9GUXFNNFRHT0xaWTRsRUV0MlNPSUVaLzJpd2NYTW1wTzlTWUJTd3JpT3NCUnpqZGZiVEVoNWh1M0pSanFqbWR5OTJ5S1JCM3NVVnZLSjN6YW9KSmx6dW5DT3hhSG8yNU9iVXFHMmVtV2x5TDN2S0ZTbHJ3SWNSaHJRVEllUmpOeDZWRFhDOVllS2k5TW0xR0ZLQjZZRjMxL21xc2JodGhiRW5GNkMwY1ovNEw3V0RGb1VUR3VjM09hNWgva2NYYjg1aHE2N2NPN3dMNmtvNGJHL0R2SEI0M2dPTTNWOG43MGlIc21ZMFZ5c2I0U1J2ZWkyaHYzdEdzZFVkTkZqT2RGWEMrakgvOWVYMWUyTDZaRXF4cVo4dFp2ckE3Z2xoY1hZMXFybnNnaVljQnNyam1DNHo0dFNkTDBNMTR5MzZvc09kRTJxSzV3aWc5RDlFaGFjZGZZMlFUWWdkSTdPMjR1ZjQ0SHducGRRREo3cXd3YWd2VUgreG5tK1pBMk0vQy9vVTM4VjVDbTFvc25iMHpuVHlpcGZxU3FqZmw1VW15d3FIRSthbTZsOHcxcC9GZXB4K0hhaG9KWTVxZ1IrQ1VZNCtFc3JwTUd4TzN5WG5xVzhKVUplSHZDakpxV2RQSmt5dWxtY0dueHl1empqa01qSW1ldVhOK1drdUxVRUhaOHArdHpxMkVCS1lsVDN6Y3ovazZqQkl4dXlaUkFCVFhEOFdCb3E5ZDlqcmpDRmEzZ0UrZzFjZHBybW5UT0tpS3pkUzdPTS9IQitNbmhYQ09jTFQ1bC9keW0zdFJ0dVdMKzdLcFY1YzNTN3E2cnV3S1ZjVXk4QzZ2dVBJVnpaMFFabnprVGVHYWRGR2JHcXNSTGw0MXJOS3pPWm82eU0yNEtJbFM3S0NDeUYxbHNHclVxejQrdnViUk5CQXpHRHN1TGVDVXUvTVhkUE1lUDNrNEFlNFVncFJWWjlJOVg3UW84aDQrS0N2UWliSkRmTHpHbmdrZ2V3UzErcTVIZC9jU0NiOFJXZkszbnRDcVRabjhMaElUbHd5UExUNlVyYlFFRTFtbUpFNDlRYllPa3Rqd2JvQllUVGk2YlJ5ZmxmWS9JdHArUHFaRHk3MzBUYkphVFBVVXJ4dXlOcUxScXdTQ2ROVnlkaDJ6cnhFY2RhQlFTVGtHZ2k5Q0UwUUsxWUZPa3ErZElnK295OEQwakZZWGJaSGlyNDZqZXdlQjZReWI3YWMvMUtNTi9rbXpsNGZmMWIvNjBVOWdKTXNhQjc5dnQ0TStqNnNWN3dESEowTVpxVVZQak9yeVZXQWNZMERBbUEzc04xVDlpUk4vVDZZa3hxTjBqTGhUY2RmNklIcU96RERGSkw4UHJZNGU2Z1hXalQrV2NMUEtydkFFSkwxWVlRRmhZY0hnd2J3Z20yanA5RDd1bU5mYkl1TTVrc0xPYThTdUxLTk9kMzhwVUprTlJZTnhFTkoxckwwWWl6clNQL2t3cHcyMVZYcjBwZ0xEOFRvdEtNQ1UxOHNmVVFEZDRlUUpCQ1VuUHd1SEpPKzYreng4YnFIdFF5RVJJcDUybXBIY2RtSEt1VjJoRDlzTmtWOUFCMW5kVXovVzNWTERER0IrOD0=", + "authToken": "BkUr7s7pWZBDcFY54P0n", + "transportToken": "MIIBCgKCAQEA3AzecNYn3FvCFetCN+eAZ+s2iqPxTOUfV32n+YXxzF7xsacdpwIp\njFqIUHATCDyT8O+muCcnfpuYYUYNHnGcgpv60MhWi0S7Nzd+5ryHmoyP8W0uvEoB\nTHlSPr0VgwxQHEwW9Ypw3iubK0LVgkpqnEoiscbQ7vJ7T51J+tZICMUSqk+q7x3Z\n3844TUvz9N3PwQXaEom88zloT5eBqlE+2dkUU0u79frG7bE07wd7ylCIeo0s9IY4\nsei/lrNHHbn7eXo4UfVVQRW1uXjOcNyQld2IjeJblwey8YkokeHHLb3h8EEixeG+\nEbDHP5pnEqgsWlt1hcAKqssPhTcyerJHQQIDAQAB", + "contact_key": "MIIBCgKCAQEA1lkbeDrNVlmvQSlNxAhWaTk2GF8uKsNuzeKBAsua1xl0stSqOyWSLKe5Ek4d4zvbMateyKlO22TFatt9B89BHnXR+64pkFwysqAubO6poSsDhEzg9Nkn3kk3yTtCS8ZaghZvzUxY/5dv9IkS3u3c240jH4MV59xrXOTNGaAXoqqi2Fk6x8U9UON14EHl+rBYo8x8zVjoNiyk7tjq3IK71qXBra8GGvyZWAnG/tzkdp35VeoTkKqc37AW/FlKB4RyJv2967HUV7qf9ZuzoLGKbVhMI9xl/0CWpzw2nO92UUicqle8qQ5bKQs+qIPQI7i+RwoJ4ClaGel9A8rMub/k3QIDAQAB", + "privkey": "MIIEowIBAAKCAQEA1lkbeDrNVlmvQSlNxAhWaTk2GF8uKsNuzeKBAsua1xl0stSqOyWSLKe5Ek4d4zvbMateyKlO22TFatt9B89BHnXR+64pkFwysqAubO6poSsDhEzg9Nkn3kk3yTtCS8ZaghZvzUxY/5dv9IkS3u3c240jH4MV59xrXOTNGaAXoqqi2Fk6x8U9UON14EHl+rBYo8x8zVjoNiyk7tjq3IK71qXBra8GGvyZWAnG/tzkdp35VeoTkKqc37AW/FlKB4RyJv2967HUV7qf9ZuzoLGKbVhMI9xl/0CWpzw2nO92UUicqle8qQ5bKQs+qIPQI7i+RwoJ4ClaGel9A8rMub/k3QIDAQABAoIBADDAj6jm5vEu8NeHR3LA2raQFqewblW3oaoeTG2QVaV62roZ+KX/Q6H4e/WX4uBeKtq/OY22RINOBkDpryRplUwSTDJMSJPXBIjwOd744YgQunoK6leGVLUQPin82nVVphxUchVluhBYJ1SdILenrkYZcdWnAQJ9dcXpHGUprnaGonC94d2s2wy91uAbSQQIE+MOgI7ja8P3KMF/BvJFJOxeyCxTjzw9BH7QJlvvPJpNRCD/niMDV3xLgitxydjHYkqfDO4+xF4tJ0TGyPkBt+kOHSZcthHxtofxllwfs5fRJ0ZEmzUUlv1ohlsByV50J+2TY8Aj1j7ynsC6alG17dkCgYEA78MsQoIa3PrNO2AsuRD95Mhs4fYdXeJr9olO4R7ql0xAE5l/0vTDBD0NgGn3uxI0J7OviQTH79L2XJO4G6h58zy5QCcw+UCZnsVKoxCSuu9c3mpr2eO9LFZ/8nrrVlTzZDaqp05+I0nLr1bSfwVfq5s7bKDr/vpaH9mgKfFQ8zsCgYEA5N1Rvyh086oNyQxBrAOuIERwaG1wddTjMG3a9Kmi35O18Xxv2fMTVwGOcXJ8HU8498GPFoGONElMoQsHyuNUos8thQ/EKyQEktPz0AaK2vxQ2Zrn+EtUjj/4pU9a7b3xa0w2LXjLKMI7aGA4O02V3QXzEdWOYKydYh9CCyqHVscCgYBoakoTKNAEHqFUU10Gt7SqdvKcMW+2nE3CTyfv+GPXwhhBsN6vA3MOnHwNyZheet4F0EYI2PEtq2UpChfqy6NYX8CZhLfaRNzh/S+09hnAmU+LeTNA7+JJtd4AvrFQpqxcn0YQmKlsOs4erSP8t11jwbXOaAJ+x46KQl9zBKnpUwKBgE9Ly44TA2qFah9Vqs9huwwdCmF0Qbnh2BGojmuk9vTGJg0Uk2CNkw7bUDJIe25gS5m0K9Kdctr05qMJwlpup519cQUgcFSONzN0Uo6qJaQ4Nf8fZ+4kk5hx28HTG+sxm5sUndTlfGaT3aeNZw5NFHavIAf22UzvodwkfmqGArxzAoGBAM1F48Y7x8GOldSbKGGT/3ND4ZMTkMIy9GMeeODnWBuZNM/qpmv8neym1IxOI69BtBzVhNKMeuP4etEEpX/RTDdJNIlP0GEXWnsMRrIkpWm89sjCItQ7hjfSqo0ae6NfNDd2UH0t9qoWX0G2JnrDs8nkXtemV/LsMEi/kj9kbebW", + "exported_keys": "a2V5czo6QXdFWnFGcWIxeU5CRWMxckdjS0pWb2lkNnJZalJuMjZqcjA1Tk9Pb2dpTStBV2FJK2pFRjFtZDM3dExtUThWUmdsNWNLMDg0VTErUFFGQnllcHlXZVozYWJsRThidmRYTy9oZGRqTk9xOURBc0UrSTBwTytpS05JYlpaendyK055cCtTb1RyYzllUGdLYTdpY1hIbXRKL2ZPSkdFT2NBaE9CMDVmcnlJclBBWDVLWWxjQ2gyRWFvWTVUU0tzMDU3dkJOZU5Sb2MrTHZ5SHFNbkdERGIvMzhBNzJpallQQ0drZ1QvelFsb1krQVRHakNJNC9KaHFxdmQ1SFQrUVpZa0Y5ZlJmZnhZbk90TFdYaS91UlFjM2o2Z0NTWCtwRDZ3SmJIUDd0Y3Z5eVBZWjE5WllURnpiSUdVTytpaXlRTkxISWFqMEcyODBxZ0N5SWNMUGZqcFBzR3NTK3JWQ0V0TVhENWVWUWxUUk80L0txY3JTd2IzVXhYZi9mWDdaSTNhdmt6aFZsQ3kvR3g4WWdxbW9jcEtpRDRXa0ZYOEp4d3FVaVJUZFlDMk1ibTlEQXo3M0Y2MFk5bjM2TEIxTWUyNTIrUnJ0NklCMkZDZE9qRXRvWm1QaS9EWCtuZFY0QlREZHlnQzFzT0VUa2ViUW00QVdqNVo4emJSU2lTb0g1SnZ0dnBPZjlqTVNXbXIybTQ4eTROeWFDZzJVK0c4ZGFWemZPVVJuVnhleUU0ZE04SDBWd29pcE9tdTVlMGs0YzBBQ3RiL1lUZ25PMFl6aEtDYWFGd3FhK3QxS293R1kxRjVPYTJOYzRZbE5lV0hlaHVhOTJZZXdkc01tR2JNR09rNzBlWG5kT3czMTBRem9uTm1KbVNTSzE4dU5Jd0J3TFd4WkxhRGFJZzFxTkJWZjVhUFBiU1JzUDVkRG83dGQ3eHlIWnVvejEvMWd1MzlZWHdsanovZlhpUEt5RU1OYlpvc2ZkK3pFN2VIV1Z6NFZmZ0hrbDBKVklsaUpKbmd0cXNtMHJKSGFta3dBelpRcTQ4aTFOMndSZWtuYXRIV2lON1FuemZaVjRqK2RuMmVLcnczbjF0VVRXSVkwRWxyazZ1WVhJY1BZa2lHdTlOQlRPa2poQ1p4c1hWR2FOU09mRnZ2WkhadkhxRFpyL2dBcVRxU25Wb0JxQ2t5NlJxbEVXNjIxeGFmY2drZGY4akhucmxJMTB2WmY4RWlJSkcxb2tZblBNOFBpUDJnbFEyeWttYUY0RzBVUXEyRjVZYURsdlV1d2FjREtsajRMaFNMKzA4Z3lUdEY4blRoRmhIODFMd201NVV4bmdZazE3eHB6dzlnT2Vsa0ozc2U1Q2ZtWmFHUnpkaDhlNHVRbExBcldMUFRwYkJkYzRiMHVud0dFc0dmN25WdXcxUnFTeENQTXQwMmlUZ3ZrbFo5WGhYeGN5NlVMN1pveERVcENQZ0VzNCt1bDlTWVNCeW1YWHhrb2lwWGNzRFgwY0tST1dYeXQzSzlKb3lDOUlFSnNTM2RYN2dKd0xib0tkR1FXRnEwVUtDYVZpYTlQREVNYUdldENiM1RBZmhWQ09ha25lV3dndkx1S2d6RWwrTTFqeUU3K21PV1BmWnFkRFYyYlF0UTFkNmM1UUgzKzJwYUkra1ZJUlF0T3ozNUhFdFRROUlxRXIyN2x6V0JuanFWbC8zWWN4SXVIMzY4OTZZTE95Y0ZNUFBNR0pDcmRZLytTdEwrcmJ0aDBlbFlEWHViTG9HaXVpbmtFMldEQ0VTM08yaERjSStKMVFoaWRaOTFGam9STFdncnc4eWg1UzlrYU5kUmRoUFBlWHVqWU9GSnRDR3Y4YWVrUzhnZG5pUnEyQlF4eUcwR0lpQzM4RXdTU3p6NU1ONUFiQmowN1JiYXhSSDBaYzdxcldLK3poWlpNR2F5UmRoUldjWDlxa1RZY1FHdHNTVTRiaWN3ZmJvMkt0K280aXMxZks3dkp3SFM3Y0h0YjhaZ1g1eld6K2lOMndMWjJQeEpsQ2NkZFJ6cTJpdEo5VHNVdWRxUDkxU1UxVFVPTWpaLzI2K09pbzB2bW9ja054dGdXYzJnTWU5RHZLblp1NU1lcEJDZWpQUi9nbjFWcG11aEJLZnNORG14a3U4dDBZdk5tbEhHOUNWR0E2K3d1Z0FSNjBwM0RIQk1NNFllVVZNckl3YkRxOHQyUWs0bmh5TFRiMG9aK2o5ZVB6b2dEdTlVZUhHT09WWmY0bkUvZmJ4QnBzUkxGRER4Ykc5aXpNL0xJdjg4a2hwVmFYOXFqcW5nS0g4ZzFiOVRGWkprdlFPcFRKbzVmRkU0Vk9jVGtvN050S3FiaFgrNTNQamRuVHZvWEEyS1I3NUhvaVRDZG15RTNIL2luSDRtZ3JaT081WERvcmVURWMxSFdmOGE1Z2VZRWhVeDhwRmVwQnFwSGExdXNITlU5YU0xc1hXc0JxaHJ1dXlodGJkNHZ6SUpoZzlwd2VobHl2WEEraEM1VGpSYUhIZmlTMHg1am9DTTA0QitLVVgvbWpVZVRGaE1hQTdZVm9Xb0hJWVFwRUgwcTNpeVNZcUZyZXNrcUVlTjRXM3Z2ZWc1MlpnS050cUZUaW4weStwcVZML1J2SC9vVjNpVk96eDE2MzVsWjhZaVJZcEt5SlFWMWN4VGlCWmlpTklMZ0FlbGM4eld1cHNCWXllRFVhNWpkOEZwV0RrYVVPN0tWWmtNOEorTVJPMnJrQlh5L1IwdFE1Q202cCtLalVXaG5LZE5VL2JFVThPSk9tVnFZQXRsOE5va3NBTGRvbU5obUhWaXFUMGtSdE1zbm9DTGh3eTBUQ21DYU5XZzRMSnh3dC92ZXloTzgwWEsxTHh4OHVBc2l6c0dEZk5uUkIxalZ1cXlWdUxOS1Y2d3dhNnJSR3JkTFJXc2I0TnZVMDZsMzR2OHA3RTgvSjRad0hXKzNnZnRBSGtBbWFrejM1bkgwdWkrb2ZBMlhkSTNkbVIrQU9jQUNqSllqSG5WT2s0dS9lRk1wU2FlTEtCWG16Qm1aRUowOE9qaWVUbGJiTmxIb2tmbkVHeTZPTVU0cWpmcFNPRXRkazBQbU5NdWhKdDU4RFRWVFR6OG9wZHM4V3BOR0JNc2YzeVl6TUVOWVVaL2lycSthOXdKRGs5RW9JVXh1VWJnbFcycFJvQzcrRVFmaC9DQ21ySnRxWWkwTWZaREl0L0hKZXlZWSsxbUZ3Z3NaNlNkSGRJeGhFODNIN1BtcjVlTXM0MDF6RmFpZUhUUW5HQWJvQ3MwQkdWanBnQ2xwK2VnYVgwTHVCL0V3RSthdW00NGFQMUxzdzNUZkVJTGNnNllGM3lzRG1pWlFkU1FlZ0VIajBZbW9OOTVOSXBnaE1VTGlQRVJIOWUvYlNPOW5WODVTQ2JaMFU4YTVjZTVKNzI0YWl3RTNUV3pKMy9odFJKOUh1MGRmemcxTUVEMXFQY3d6OHpGL1FPdzU1Uyt2d3FLaVJFR3RIL2ZGTVplaTNudk5mR2hYdWEraEdHUEh0OUdGSWQ3eFVTSnZCVDNML0xPY3oxVmorWmZ0UVNMMTlKZ25abHFBMWEzdEcwdGVmMVpDd21wQUI3b09peVBwNnJFalNyb1B0RzdzK2QxY0RFT0ZSdEt0UkZLMTlJSmtrQT0=", "pin": "111111" }, { @@ -28,11 +28,11 @@ "pubkey": "0364c05cbcbb9612036cc66297445a88bcfc21941fd816e17a56b54b0b52ff02b9", "ip": "http://carol.sphinx:3003", "external_ip": "http://localhost:3003", - "authToken": "/b/l42BsIxEAwaRrBRZD", - "transportToken": "MIIBCgKCAQEA5qgI7uviAMaK7aOH1SBiZdDk6WJaO6uHdQaNdVaKpHCflFCzhGKk\nv5zlPd3CLOp+spuyNghXpNZnbZq5ynUHmmdCFOj6z8fjQ3tvjz2XZS5Jx9THm7dA\nOHbI5/97lPSIETtDYj+cmYxoA6o1Qj60/bEBbUNk2DIpLX60PzwAnmlOUGtUG2Zg\n4H78kNjMOmY5W6z4IE9kac13pgwK2kFVwoti5uyPHeWXF1jhSMxncuC9ARmH/x4S\nAoGopIZwBnRe+f8ZRQUAgG5aBB5alANH+6EkeZSDE8avbdy4sQMPNfenHWcgoY0m\ni7tVAClHAoBLxkiLOse6U9vizjuMHPxqJQIDAQAB", - "contact_key": "MIIBCgKCAQEAvrCzyPu8H9CWJDM8OMwzM+sfgXuqG9bw4vjMczMSo6Icek9QmxT1DSi4VhxnRtl6YG9GvqobA0K4AM7ioQnzN1benOFphN8/aZfS7WGgPn+yDBp5NXP/13wkSGp0AJUtoEDd/pT09efUsBc93+b8K7sKSj0pgKyCJp9AyZUEO/6X9zz5cXZmCw21eAqaShaoVadBjWudgUVeUR+S/m4QwExhL0zC0OOd/0Vt8cm0vgn04E2gvLFXR4cl7i1IdpISGeb03FKYdnDF3WQt2TN37zBy+WNZxk4zk0g+o3Gn48JSvm/ZQI8KhBEpllu2nxA42bvH/gCHCR5O0qdjqpOT+QIDAQAB", - "privkey": "MIIEpQIBAAKCAQEAvrCzyPu8H9CWJDM8OMwzM+sfgXuqG9bw4vjMczMSo6Icek9QmxT1DSi4VhxnRtl6YG9GvqobA0K4AM7ioQnzN1benOFphN8/aZfS7WGgPn+yDBp5NXP/13wkSGp0AJUtoEDd/pT09efUsBc93+b8K7sKSj0pgKyCJp9AyZUEO/6X9zz5cXZmCw21eAqaShaoVadBjWudgUVeUR+S/m4QwExhL0zC0OOd/0Vt8cm0vgn04E2gvLFXR4cl7i1IdpISGeb03FKYdnDF3WQt2TN37zBy+WNZxk4zk0g+o3Gn48JSvm/ZQI8KhBEpllu2nxA42bvH/gCHCR5O0qdjqpOT+QIDAQABAoIBAAOxPjn1DeZ7znxy9YaQBanKsrh6IYgaeF2cvbC5W3IJsI15vbDTDg+sKy2XrTRE/8agQPluJ8m/X/q8Bs1hePEoYHUfNEDbZcnwo6fvDQBIzrTHSnOLhHeysq0oSoi8Wr7QorvMPJYKYCbsvEj6mwVpwMBBQO156ac/zCxbE1LqCX4ys2zgTocnc1nfetvdh43ZK1y4tMVayhZG106Dxmk9Bq7gpSacBwC4Z1nMBJLGkVgYSaxylKJPO8l9fy4kywcf8/BTi1A9hACD4ecnCHDsBM72nj7fD6MCD/obkCZ5pbEPox2/ytajo77q4UKLxW8JaM58/ihcXbMsMMYrX9ECgYEA+d9/6wbRy2H5jXNINfyhmFuKQ0CMqFF4thIqXYB5j0X2WNo40cC9BbD60rUUtKyjyhWlp5tdEgdETZeZpXrmO0oGFt2TVMh5XKsvFszqn85W3EiAlzefrFN00DBJk+q6WNbY+Zd4hB02TWVe4AVpleQS9zwJdSqlrWSduZzECHUCgYEAw12zcvcaiWuN5ssY/VlH/b6oWU3dpeSkOKyDg+UGRfa3r/4Qgaed5dKL9ClEKA2JperOWWkYVtLyvMGj14GgtYrjrbl0fm1yN8Ph5DQ9oRBqsIQ3cisqSk/S1Ep/x7WxZhe8w4qlCDsvG2xfc0LmL871TdpqVMX0rz2kzuYKDPUCgYEAsIwS1JuH5dy+twuqDMMH5h9fjG7yMwcFdBdXqaLZwLpc+aCOHt3AcGIAhpn9HD8Spvkuh0MFunQ59VzU6Y/xVhjSPpulunS/ExO8fK6iY/ElfBUaDj316os48NP9WK6zpYt/2LIGK8p8EKk8JKqOVKLGJ7tar1dHokCCFKBH/fUCgYEAgNbGhUbYxU+c4VuHO20pwPl/ZIWpasICWy3J/a2IGZO/R90xXZAA3ZOgoICmZhOndzgGpYhdeMTdOAYr2u+t4Iub4vGvFcFv1b7kte6Nxi5hbc+EEVLOLPu/eik3Y6k7OKzm274PYAJH6rnpqMWxsE24EIO+I/H4j6kDiz7B2hECgYEAi/GRUhbc6dplqD6+m8ysGcQykYrZFIojLDHDiYNS26x6LESGcZEjRa3rM+NFsUJ52zAGj9ZScjI+tRet51LmXrdY9DurfTVjjRyXYXLwsmytT6tnQOIdAX+6f82QEXCW9Dj4giEBCVkFr0l4N8le+gQKlux5PYLMPZDeC1MWxck=", - "exported_keys": "a2V5czo6QXdGU2Y0MWdaWk5YMjI4dndDTEYxU3hFT3BtK2xBZDlaNy9nNlhzOWlaOTFBRjFuUW45cXNzNis4bVhhSUlvRlE1ci9QV2crLzQ5NjVqR1UzY1lGd1hQRk9qeGhZbHVSRHQzUGpJZFRiaFM2ZjJOd2VHWG0xVWlsaGNOdE5HOExyMnlPcXoxY2F0U0NiY2lKZlRqbW9zb2hJRm1wSm13VWkydktLOWV4VVdCcUU0M2FUa3pla3ZDNGZSa1hSZWhkL3pQL3BTTHBCbWJlVVRvQ0crSmQ1enArN2lxTHdYS1I5VnlRQ1BWeEpiakkvVWhkSVRrWTRWZFJEUFhSWHd5VUx2NE1ib2U2dDVscGpDaW1oNXpNUjhJbWJRaVMvaW9QdENISG9xWm8ydnYwbnp6Y2dLMkQvZGhBWVh3YUsrRHpsRXdjbGY0aVh4TG1TS00rUmpJNmZOd3ZLOU9nU012U0JGcFR3WVFXak5icEs4SEZzQ29mcGRheGZ1WGp2QXNvaVVhQnpmQTl0RU80eVY5cnpkVk1vRjRFcFB4OFIzZ2Q0aUVObUkzL1FLcjFwYUNRNC9jblN4aHQxbDdBSkhUUlh6WGNONXhWSUltZ293V29oWWlPdjJ3T3FMbXhrNVFJSzdXY3cybUNHaU5IS0lyd29TS0J1UmI5bU5OOFpaSjVXRGlLbWRaT1pITjVHMUw2eG5zQVpmUjNabTdWaW4xeTI1NmtONGZWaDI0RXRUZWh3YlVBU05GUXZQdUJxYkx4THo2Zjl6LzdaR3Y4NjI3MG5hRXBDbEJEcVBCK1pjN1pCNzFSejZTdGVBY2JQcms0V1ZiRHAvRk9PS3pwRlRyTFA4UlQ0cnJMVS9iRzdjZml3NDdVOHBZQ2ZmbGFjc0RFanh6c2U1NUlEb1JpZ2RGampJM3BzcC9LcFhCS3dPcDdZNFp2MTgyeTB6eHNBSjhUdU5tUGlkNmVab1RpVm9iSWY2ZzFzMlh1QXc0T0xjQklmeWRMeHZGR3RaRTZ5YWExTHMwdGkzaitNck9oUURCamJQQk1UOW5mL1p0REJJTnk4OFA5cU9nd3pocU5FZFFCNnFmalJhL2ZUeGZMa1NRdStoTVE1Q3p2NW9ZZ1J6YjlXTlF3MlZobHd6RVRxQnN4aEVPTm1aKy9vSnc0azRLTUVXVDdiRzA2d1ptcDlmL1J5bHdaeFR4TWVKSzV3bHFhc1RWNDF0VXlPOGZDRXZHWFlscDhmazJDVmFTV1NpTW5jZVVpL0EzbURiOW10SlRnS0NGVC8zY0cxcFhjTEY3MFZaZmZDaWE0Y1N2RjZadlNjaFFJWUs0TXlLUWVrNGJCVTA3VFdzajdQbTc2cDVzVlIzaFdWT3dmdVdlWml0T0xIdXpNcGRRNHBQV1BPVmRUcDVpSEt6MzRRekdxajFBS0RMdWlYeXFJMnNGSW0wNzYrYldyYzNZL1Z3MTFCaVlmMmZzeUZYYVVwN01aMHlGUWFOQWNGUFBqSUhQbzJkcEFETFJLQUdnc2tyNTMwczUzZ0FGMUc5Vm9aQXVxcnNLcGEyMGphc2lYUjdibStkWlMvYi9tQnpScE9TUndveVRVZGo2QmJJcExxK1BJOUF5VGRCb0ZQTHhENGVhc3NwTUxrN3BxY2svbjBXdDJ3ZzQ3bkxuYUswK2xOMkdURzN3aXI2MGlwZWNpekhySWlDeGVpa1BtT1dEOW5WdW9kdWp4amRMeUkrb1lLMStTejBUUXBuNi85Ym1taWQ4dXB1Lys4bUU5N3NIY3Q2d2pLQUNsZmNpZ3ppM3IydU02aGkycjNTSFAxWUVNMVF4SnBGejVjUHJ3T2VLaVpHNjY2c2g3UjNTT3lYODFlbGtVZmhMRDVBVFMrejNqb04vdHA0ZHM0cy9FNmkwN1Q5T3ZKNExtVkdaK1pnemVXR0IyVmxoYzgvWnFvdTFyVlczOGt6cWxJN0M0L1hTdnM0T0JEbkNVejV1eVlqRzV5RlFqaUFOdkpicUd1WU1SRTZFWGVlR0tMNlA2Rzd4N2t4bCtTbUtKalVPMnVjbEJSMFZTNXhqSEwrU0FRNUJ1S3JiRjljeGpZMENvQmJhMFRKU2ZUZ3RCTEVqQWM0RXcrb1FnNElwdVF3cytOaEFpWUV6d1dwamJWWHlZMURvSWtQazBsRHZHNjMzNzM0T2ltRTlXa1ZvTFUwdnJHa1R6cmtpZlZhbWV1WkxRQXZaWmx3dDhtV01YQ29zSVFKSU5vZ0xnSXlXZWtQRWdSaVkrZVpMaVBxRDZCb1NCSUJoUUk0cVZGZzhBbFdxdi9DN2taeUM3bnhkRlRhSmxMOUdIVGxSL2JXNm9Fa2YzUUIvOGU3SHpGZzdLOVhTdVpSd0ptOEZyVnVoWTJ4MlBoYU1CelF6emZ4S1pGMFZUc2Z0SVZkZWxWNlhVamRvNlVFcU9tNnZnOVcxVS9Xa1V3blFKcXI2WDE5MGVGRXh2ZkRjL05ocEZ0cTk5d1M1VDNzNXl4dlZjTmhxbzJLSk5HYkg2dkFCZTBDQ3BDalM5TkNQM2pUT2JoZlExaXdaZTZ2VEJobXhrR0k2aXlyZzV5VnViTTdISVUzbE9mRVYxejFEQkxNaS9xeCtmQllPZngxWXlPd08xN1NibG9RZUVra0gwZnVpVnJja2lvTGFRRnVPSWFudWMvY0ZhOTV2R0F5alpCeDJJZEZMSlZVQVorMUNSeVBCc0ZQUXByRG1yRzBkQ2t4VmdZZzBoYi9ZRTlwbzg2SHBXVmQvaUI0bU8vTkorUitVbXM1blM0VzJ0NEd6bmJZczlmaDdNSkg3N1lkajRpT3VJUURrWDJURm1mQS9MbTJoWkhPSTZhS1ZOaE1BbEZtMUp0VG55a3VienlycjdoYnNXVUo3bW5tcmVMNTdOV21icC9ZakJtdjRDck8raHl3MnFOZlFnRUhvSC9BTERvMWQyaGV6bFNPQUlHNC9LZ3Z3bGJEVE5KcmpuNjNVUnBQVm5sUnJENXZ5b0w4NlRRdFM5NTFqejBqd0VPVjlYSFZuaWo2MmN1ZDlMS2NFUU9SalFIR2NLOHpDUVFvMWJmWm02Sm9wS3dIcDBhV1N4L3hNN05ZaHpNUk1uUENkVjd1d2ZMaEtVdGVGNUxqVVk3cUpkK20rZ2tSQ092eTVOTC9SRkllaEVTVnZ5MGVIUXhzT2NIbFcrWGtrNUE1SitjU3MzRER1YUVhb2pWYllhWGEwRHV1eVFmT2EvOXV2WGRwQnVzRmNzaHRyOWVuL21QcUdGTTdqcDFlSTN3enhGcU4xZElieXp1ZklTYnhiWXJjb1M4S2c4WWUrenkwazN0dHBndVZvU1QwK0ZOUC9LRVBpNE4wNUFIWmN1TVhoOXZzcXA5RUtuWTJtTERnTXg5V2lRUGhHTktZWFlDd1J0anhlT0IvMW54OHZFZHd3SXdNOWNZcHVZNWxhaFdReVd5c1MycFhCRFAzMzZaU0dWNTJDaXBvVFVzSG5jUzZyUlFFNWVNV3h4ZldTN2VpaE9hT2pqSW5KSVRFZUpJdDZ1bkI4UGZwakF5MklIU3hNbDVSQTlKaldadzJrelBUem9vWmVlSWpsLzRFSkZBSnhxUkhGaTlLY0VkNFp2akpTR0VGTTJBWno3RlNEOHgveEh0MGV3MDE3cGtETT0=", + "authToken": "SCy1ZKzscIm6/nI09T1n", + "transportToken": "MIIBCgKCAQEA5n/T5ym/QLZEiShIGnHq2KOvf4YzfkHlIOULE1fIxwBi5LsvmTY2\nZ81h/EMAqeojJTyAk25L//UKwESqnTQRzBOioRK0dLAWoCCDsV5TfCncPC3NIQZV\n0j5gk2zi4WvDiINP7UGnZxpPYQpP4nxJv/b03MlIAQAX7ZhpEB8TykmwoLVDm8Sq\n+aOjAxZMRefHqC9HFXVSi5YID6Z4lTSjkWtKRk5FM+Xo9I/FQEQZw3CyXPxh4I+J\nPd78cm/Geclgq9w1kcjlPDhsTZrpFtjP20e1JY4J7DUpcw+WBWx5JgMtDuF1UD6b\nW6UO4FpstSpv/rtIRQaMxSJsP+RYR2SkMwIDAQAB", + "contact_key": "MIIBCgKCAQEAubOmOA0JO3hFOXfn8HiZWAKMFdR24hsHqbofAmUsmGPELQn8vm3yTfvK/BLIkENdGRVrl97kx5tyPeNlicNV8i81ggQweJZ3FXR+Hd4UoQ4xOZP5YWUrp5JM9tdWJyOevXyQxOOhYw63ngfbSXN7INiknST9zhotKgRPod056pDVn8f1qX8S8ubcXaSB3C4/F7VX0kohtYd/Lxnzi9eSeO3uOWylts4NGMDFOdKACSwF9LoJFTc9A7bhn2o6T+Xcuiqg59flwtPNJiOvyTeMljNCweiujmZ4AGUrKooESAQDmSsj6PhU/o6EGrH73CjAuzlLILe74hJj/65Py7A6iQIDAQAB", + "privkey": "MIIEogIBAAKCAQEAubOmOA0JO3hFOXfn8HiZWAKMFdR24hsHqbofAmUsmGPELQn8vm3yTfvK/BLIkENdGRVrl97kx5tyPeNlicNV8i81ggQweJZ3FXR+Hd4UoQ4xOZP5YWUrp5JM9tdWJyOevXyQxOOhYw63ngfbSXN7INiknST9zhotKgRPod056pDVn8f1qX8S8ubcXaSB3C4/F7VX0kohtYd/Lxnzi9eSeO3uOWylts4NGMDFOdKACSwF9LoJFTc9A7bhn2o6T+Xcuiqg59flwtPNJiOvyTeMljNCweiujmZ4AGUrKooESAQDmSsj6PhU/o6EGrH73CjAuzlLILe74hJj/65Py7A6iQIDAQABAoIBADzXfz4eB0hUv1l0z6kZ2iPbscn1Mn4iHQCe2koOm+3RwhR/kS9TFnA2burnvI6Hg5kUS4wWmx5K78MXHc1lEmOm1AElHjxkD+AXqrpeaKPb4oTa1nnyi7r7U/wL0U5BfWDXzxay/c1WpRJBwLbv/wdj84sI857zNJjvkKeXs8IF4vzQoCgQbRpj6kpQOiQcM5dJg3coNh6+XOosWOjNEZ7pFw9hc8G+9GsoZs03ur1nuFnx/GC2QC5hrYOo0D4qUyVbLHCvAG75BiDurz0I9fZYfQOW+gpy89S2xBUjYfdPHMVKbVTpMj1qq5cfw51okYuQS0vTpZsZPoEvAzghjYECgYEA4qgqxACcbSB7bUVZXdIUy8XW5j82BF2CZBaxrSte+Q1Vw5ibPh8eB6M+743G/auOGG/YOg882k4nzUs/N5gZTZsNyp3caTENshgOR8mJus9zYfpv6DKjgZwhi+5Ox9gfTL8PpqromcspNejEtoIkP0ZLTkYebRQn7fvEwerE0t8CgYEA0b4m9Xd4ttyEjvkTARQiUwotexrCsUpsKwR1NbgmQejLypMsK0YzYaqTjU6XDPyudI6tp+Kn93JjopJ4mnrSE1Jyd4fXzRglnZthIs3K+FFzV9w3kCpj/AXm/54xbDC9LaSb1uhVFSkhq0O5ELxN9fY+N0XRkKGsWXe7uCRkR5cCgYANu8jTlYHk7tnrtg8DK06NRlCOJPhd7ViQPfvIFV+s0Y0HzABkFDial96hX0LWbgWvH1/HrNKwG5o3yz5qXPHzjNiaFVScnxdIWkLLQL/yrM09+5G6TQ8xNEeoFel6HHNRECafn612XCQEGzWIJXySxOydMox3aYg92EqEwXfpmwKBgDTaqTCkSawzB8iLpalY7IlmgC2MgdFxgq6Ycfz2idWEF47V5YSGLT6IYKR0UIY6SrAeoE41RMSLc+Ys6O1s0/GAjk3m0o/hbOE5nZHKsEJBLELQwMO4mveQeTSjJasw4QtWdtsCMyag9dYVu9YmzbKUufrtwjCjPS5SiOCPcyHDAoGAWQ4tmYyhrYuHt37wcgG9aED5XC2Kgfg11j2J4lb+OhNkA6qgpQMbSHtECS6Tsvq/mjBSLwebvARR9ozQ+7enxy/HWWq0ZL2KN40QvDp44bVQvoxO/ohgsX58Ih6s2VaX5i10JtRsiIZKMUOcf8nGcKVwlJ/wT7QZ64MISthnKx4=", + "exported_keys": "a2V5czo6QXdGYk5MeVZ0ZG9lV3lhZGlqN3JqRituY014blV0MG5BY0tRN3IzTVVrM0VyK1h4enNpdUt4ZC9qT1JhQXBrci9MVTU2cG1Xa3JlbHlOY1FzTmFUZmtTNm5vSGM1L3BYc0NPTXE1cno5YXpHbS9CQTc0Tno1d3Rja25IUzhZSEV0ZG5SZFFTWW94UGR2ckJ5OVFOQzllVUNyeVpmNU9DY0xUVW1KUkIrS0VrTzVVVmFTdUdHdGhvQU1UR3M1eng2bEJIazczSkJsNTFrQzc2d255WFpKWHFObDlQekxmQjJuNU8rQXhCTWgwQW43b1IyaUdjZm5RSUdFUlRYSHhReEY2NDZmMkl5U0RNUFNXMHBGSm9VbkJrc2MxaTVjRTVwakdSUXFnQmlXZ3I1T0VzRVFHZ0NkeTE2aFI3TER0MmdOanNzQ1dZVWNFK2x0Wmc2RHJBTjBybDY2Zkx1MXM0K1Q3VDlqaGhnVEdWeUt4dndIRkhmNGVyaXhyNUpqdS92MEhEMjUvazUrb000UW9tNDVBd2NYeXZvMXB2dzhIRk5TQkZySm5tNzJ5Zjdxd1VmaW83STcvSGJ0Uk5MeDdMTlFGV1NqVkJ5YnBwb1Y2eXNaeUVEcC9RckdDVlU5Q3JWbGtyTk1JNEtWVk5JQytlemwvMlpVd3QvRGpRTnorSkFqTzhsU1k2dUFQdkd3TXZBSUNFb1NYZnJ6TWdwMVl3WDF3Z29WVVdiNk9pbmNoWTFscmpLSnFTWjhXWnEzdUR3RGNORENkVm5zV2lZNFE0WVZkbmg4V2hVbkk0NGxqVUliUE50ZjFGNUxtTDlNV2k1SGVwZlhWZlNISWk3RUo3a01aQWNZSWRTTkRyN1hBczMxbm13V3h0bXFyaHRNY3dGRjRaU1QveGQ5SlZ4aTZDVnBOTjRRUlNadGRiNWZBZk5IRjRhalBUU2RhZmxIQmlpSGQzd3d1OXdhZ2F3YzFHUmhjNmFHL2wvYkpOcUJkZllxc1NLS2hCeXFJZ2pZYmN1T1VWRVM5aGt3NXN0ZzlEaTZYNHZadWdmWW0wM0pQa251eFhHM3hnWVBjU2Mvc2VWUHBlQ2JGNTVzYlJxQjR5R0lBYTF1M1ZqdGsxMHdhTkg4SU5Pb0FwZjhvSU1Bd2kvdzFMc3I2MVpjU2MzbDFsdC8zVE1KU1ZMSmRFS2ozUXBZK3dVTWtpYlE0ekVIZU12RXJ5dE1OTjZaMXJpNkVGT2RuSndlZ1FCUlNWWjRlYnhMUnl3YnRKWENrcldDWHo3dHQzWHpZNmFuT0FUSS8vSEwwb2VzWUhlQ0pLN29wSkhWNEFkMG50cCsxU2pUSkpuSmltQmNzc3hTeGdWQzBoUlIxZkdRUjVOYTJySGsvL21vOTFMUVRjVWVxa1hIaTcxbXI2VmNDaU5kRWxRNVptVTVWVklKMUtZcWthT1VjaTBYb1hCUDYzN0hOcFV2RFR5d1hBd21BOWoxdXhYWUQ2SzI2SkovWVpSUzd0SXFtLzVMa2xIbk5mQ2FkNDl4cjZQZU9UNGZSWmRyMjB4dkpFclEvUmZOOXBzZjhlcmlhTWNMK0tYNDY1ZHlIT1UvemFxcytMVlN1Z2cvQ0hJYWY5Nm1tYmJRZ0FlM2hJRE5HVER2SGl3Tm1scmMzRUhDVUlNMUlONytVeDA0VkFSNGNpMmFnTVd4cFZGSkFsRUZ6ekRKdmR5T01SSU1ndWxIc0xkUUZ4SnZnUDZyZ2tqZysyY2lsZ01YRThENlFZVS9YT1VuVElMMFUwYXdUbUt4VHJlRTY5NXR4YmZTV3NKWFhNUCtmZWdoWDdmbnNPcFBYMjhLK1k5WldjbnpEaW04Nm9rVnZ6TmpkQmlpc096Mm1QQy91c2JBelVCOUlrMVZQUGZ4d1BMY0FvTFUvN0hGeUlhNG0xVHdOOGpXNE9ENmg0ZzZ2MGtFd3NTaXJBcmpjaDdneDlTcUhYUGs5WVExVHd3NmsyQ2o5b3U5ZzRqR0c2Uy9tay9wQ0taeFFOcEhDY3RtbVJQdUlJWnF2UU1JRGRwZzJVelBPM3hJcHQzdUpRVXBWRFdPVE1ZVUk4Wi8veXJ4MXpLQXVQdmx5NFlmSjFYY3c2RUZ4SDgyK1JqV0hCTHlQbFVVM3BHbGwzZkExM0R4Q1FHcXlnOVZGcy94RjZZeHJSYzJZS3FDazAvZ05KaWhwSEdpVjRJOVVjTTlxUDBrajdMdUpmNVdscmJlYVZGbnBucG1xcWFaczA3V3VJUFBjejRLcEhsRGdydGZJL1pNaEZudGhCQU5tQU0yMVNWb1lReG1oazg4MUk3UVJVQU5OYlFweUg2WnZpdzFvWmxUNU9YU3IrZW1lMllHemtqSlF2Zk9Sa1EvdDFURVVtMEdDTE02SGlENXhzbVRsZFNyZEs0SEdtNXBheUZMTnJCenZ6QlNBdEJoSXhsdEpxd2xUbXNUQTBNMUhxRlRPL1lLSmM2VUl1SWFvd2FOSHF4bkpnOERwRVJQUDRkaE1yN3JOTzZ4OVEzTkhiazZha0U3Vy9BYmROb1RyNFdhd0hLd1ZWK0lWaWE3RmN1ditsWUVsanZKVi82aTlBUDQ0WDFIM085K3V5ZmkyS3RNWDdwbWw2UFBXazdBdlhNV0szSmdGNEJ3UnNoNExxSEpMSEJxaXprVUE5dHlWclNDNURDQUp4WnVVeENVb1ZoYm9vQkFSV1ZRcDJodlJMZDg4QnhRT0RPVWdIK0lxMkQ4aGRyeVBuZFN5eXNNU0ZUQ0UxZjNmS3NjNHV3VGpEOFJLYXlwV1RIZFNmN3B4VWVuZjNBbzlHd0FtQWRUN3AwWUl0b2txeEx6UnJ5SFNybTlFbzYwTXJxajkremg0aGJLZnU0WS8yUldBZjZpOUhReHNjekdVV2drSlhTZ3FBb2szaThvdHEvalpmMlFDZjJjZlN6NnhxOUZFNzVUSVBoang4UGlzQlJvaTVMeW1uQ29FbWtrK3MyU2U2clh6ejBzU3VKcjQ0UndiVzJMMTR0WXl5ZFRyMEkwUEcwS1lScmttMjc3em80NVJXT3VHYnd4MzAzZDNwSllQQmo2TU9GMFlmcUtQaW9FQzBaTE9SdnZ0ODcwWk1VejkyWUczMmFjL2x4bjlCRUdQZ3BVTkZER2dRdUU4bVoxdVQzMUM2VWU3UE9JQVpFSGpYTG1FODlWcWhIZUluMjAyL0FKckZoaHorZjdDNEh6L2wvejEyNzhCTWNuZDA3V2IrdnQ3ODhhMG0yS2lqWVFMSlJOcGt5eVFGWitvQ08zMkwxejlmTmFDOWVCUm9kd25FSjBxMlE4MXI2YlFHejFtTUlPeFJXekI2Ung4VDFGY3VCZDAxa0lMYzZWRVVMMHlYVW44NkdmUllXbVVpa3M2cThvMXljODIrcW5rN044RU00M1Rqbm11ekpYWGtWY1UxSG1yek9MUzUxQ0pLRWNRaHk1R29WQStnc2FrMUZXWmNCMFFheHZKWjkvTHRZMzFVbXlkZW9EL0YrYzM0TjBVWWNSQ0FTWGFuS2hRMVZwcDE3T1dDNStjVVJiSWhQM3hISzdPa09PQnp0RThaRUtIRmVjWktzY3NrODZHc2pXcjVpdmw4YWtiQ3d2a29kWno4Z2ZJS2QzT2VoakZIZ0hkSGZlWDZqTU53VGRxbz0=", "pin": "111111" }, { @@ -42,37 +42,24 @@ "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", "admin_token": "r46bnf8ibrhbb424heba", - "authToken": "kdSHrQr+U3pxar0x0G4w", - "transportToken": "MIIBCgKCAQEAzTwHXruzFOCnduCQGYsSDTWwB1+aKKBHbczfbFoCMbjlHb7qSnMb\ni2JiKmKUjujfXSSF4DEzMTWoIM/GJG9q24V3q6P+3izVV1E6ncTKxvqfZx9dnoRt\nIFN33g0xJWcTaMR0U5SUZByGM/HCNXKnuvuSj1G4IVd/HV1yUsXJx5ym2DHRlhVA\nITiXoyua2QZ1fkCKDq1O9ntuAyuRrVPNbct2/5gzbYsswn0QDb/hKdXNHwxZ+rqq\no+MUldwLCLkX6oImsiYSM0S8IE+rmhoqn08ptVT2qemLo8eMKz1ZOFZPXo+ac2ji\nmMCLPcFUtPdWSykaQi0zF2Fm6FLSxSU/HQIDAQAB", - "contact_key": "MIIBCgKCAQEAsfwBzpyHoRMlwm0brBsdrDpMdUXMLxolRHcHRXiW2L5Q1R/8RLX6w4aOtYk3H0fongNUNPZJaD69FY7QP52LEJHR1OSSqGHSjSeN62A6G4NN49eYVVDh9rP2JX7SIYVxzKEQZWw2qoeUg1jh2M2mKAJo8Y2sUkQzAA+4ITNo4GDIHuksRVGIu7ufd81Kk9Gh70/UthuNmNebAr2wZm0tjr1L++rE2/+D/n8aNJCc3zCHmYaPqo/ywV4Bftz4zC+hnm7b+LQqGAFyaHcliHswP8rZD8tIm0sJIcWDUoeAsLV/Q1hCnr76xxLcU478F2IzUG2d1zdTBOdcovPdlY/umQIDAQAB", - "privkey": "MIIEowIBAAKCAQEAsfwBzpyHoRMlwm0brBsdrDpMdUXMLxolRHcHRXiW2L5Q1R/8RLX6w4aOtYk3H0fongNUNPZJaD69FY7QP52LEJHR1OSSqGHSjSeN62A6G4NN49eYVVDh9rP2JX7SIYVxzKEQZWw2qoeUg1jh2M2mKAJo8Y2sUkQzAA+4ITNo4GDIHuksRVGIu7ufd81Kk9Gh70/UthuNmNebAr2wZm0tjr1L++rE2/+D/n8aNJCc3zCHmYaPqo/ywV4Bftz4zC+hnm7b+LQqGAFyaHcliHswP8rZD8tIm0sJIcWDUoeAsLV/Q1hCnr76xxLcU478F2IzUG2d1zdTBOdcovPdlY/umQIDAQABAoIBAFi8TaJWw//4beDrSNqbgkW1oxzsuYnaPS5PMZ7fKkXRTLeVBM6089q7oTa8vHCqBz2QZ1EoYRzJ+rdexlCRGR4ftT+w3bV5X+HkEIuDJDVHV3P6rwYKFz5KJrQ28EiqITxmKKiINRD8G30IuUC/9tEHso6LlZhGTC8Bp0lWOjly8jYneJ7oYHihvMV3XkL6GCommPcNqRb6X2iuOl72nDm/MEPXhJ5qLpYn8h0rxE6g1ZtvN9vsDNE7z8twk0B3hxhz2U2Fj4n5GCMI1SkEzovrQ5Slh1AXNp8EEpkllyRNwQ27v8ikfmgYFICe4OKHmPMTcper4MwmUqKbMhLXsskCgYEA2D1Wyp12c9deVw6W4INn0U92PPktzty+QpMFh/KhQJIJWZphkMg7fs23SF9zQaCKwnQ8rxnypOOLYlDbiiK5HOHSDkPw8u6gpcAWPeABLgOk+AZiafPLbbhQnO0VZK+zIzX2W2zWpiFgVOehW5eZh7v2cLnIt/GAk+X2iLR84OsCgYEA0rXy+wu+cRoQTRI6QW3hvmn8gyaCB1glBDvGvQ6Lm2AOFIyRPQ5+jCs6raRNv9O49sUxqDDvOIuY+srH0vkLZvLGsPTomH3JhVe/wOxT5x7IsZrBY73/E5lCnj4ExyLldBwTFkezx/Uz8URBu0CdUMhwjOmLj2bFxOxUb3yJrYsCgYAmgi3toUMR+B2l1URLMTuQy9zbmOhueWMsifAnOK88x4UAvvx3AyGNQGdObSkiW8u6O2b/K9jJQnh1Br9CB1L98L0uqyzCpnpXajDLzhOHtUBwpvppse/dV0CL4bC4oI1/TMHVoDlNlo4IMMPMgt/lizSk+IDlOQ3TyNUxnSrMBwKBgQCpH3UpXuG6cgsHcUvk3EdGyFbvBWd0caE0Zq47bINNcKmcgL7KXOnho4jzel8VSuC44Mncj3pSzmk5Uq1UfqRSOyaTPd+7Fas8JZQ5SvaFGUZIl0gFwKgNmQPJc0nuc+nraeVACskYA41vZzPDEjeycU81KvbjYL/4MSAMY881xQKBgGm03P8O8dDXNr+HNsEHnFYOX8E0p4r+i5u/Z7PvFS9adQuTgMTAIlO9IFRzlxKMYwmP61vFOBX+GdBQDQtGoEpvuKhwV1/i58IyeyA7vbjNztHMqwcBK2S/6UkandZ/v5wadEvFb1hEVUcZUvQWI62fNGxiAVwF1E5PfZD0G+L8", - "exported_keys": "a2V5czo6QXdGeWREMG5sOGZCeXhKM1lpV0h0SGIyL0l0bGVPcHF0aUFua3ZXeEU2RXM3S0R2WjRuOTBlUlNWcktRY29nL1lyYm03KytNOWpaczNoMEJISFk2OXRDeU5FcWxOTFg5SXoyOWxIWlJad2ZLNThvSE5IenFDNTZTTllUTE9Jb1AyM2tpTmUxdzRWRmd6UmRhMHhLTUc3dElRNUIrdys0MC9ydXY3V1dSRjllTm8wam5BQXZ2NVJKUlFVMHBhUHd6aEErem5UQ2FJUmJaTnFGNzJrL3N2N28rcVBkR2tkYUtjRzRVMzBJMkFGQUE4b0ZTalBBS2dCRCtyTm8yRzVzSHBKNDVHSTRvMGpiemhqeXJYZ3ZwL3hrWGpRYThuU3RmQkNTTFBkc3VnV3ZPVkNPUnprWWpFUytERkdrOGxrdjNOZGhic2NlRVJnaGlqKzBudmwza052OWVSbzFkZkdOMUw4UUliNEozalpPOU52dWRpanZXUmpUVlVDajVqOXkrcXYxZDhodFlSK016bWhIclRDRllLV3JOZzduOU5VUUs4TkVUSE9ienlGR1FuWTZ6Mk9VelhnaVZFZ2lwb0NJblFsUzE3U2E1TTZ5dks0YUlYRkMrOWJLNEZDZnlrNjZyMFlZbUFnNWE4WmRBOWRueDlKQ3RCSUFxUUZwRTZ3VzY0bFllQkpuVnhTb3J4KzEzQzlpaXo5czdnSHBFbHNUdHc4REc5WGxDZER0TnhTaVRyV3AwMUhXMmVrOGJ2L29ML1VmNnorekxXN3VrZUw5OVNiWFpnRzBvbHhnM1Ryb1pGTFJmQktSK2dka29MTFZoSEdFMmVHU0tSM2JqRWJ5bGo1WVVpU29ZZkE1TGR5c0pRTXNKZ05jdTRUdjVIYVhnT1NuRGp6Q09KZjhsbUVpbE1Fb3BtZHdHNXdzWmswU2tVMXZESy9aRU1TRXdWVW9VUm1YQnlRcWtPZUhUQXh3OWI5ME9BanZ5UEtXaTR1MGNOb2djQTdnTUlHMHFOV1p0ZjM4bmNXUnEvTkdhS0sxeDdVM0YzQk5rRlVqeWdKa1JHaXZQUlBOUGFUdTBJYXhyKzVPZ2FvNTB0d0FFUUpXcVVENjNsRko3Mi9XdkJhOGFyNU5ENHMycklJVTRQUmpyeStzUzVhTENtNVJpcE5rRUtIZHoyZ1NpOEpEWlYrc01SS200elRUSGVhcDNDNEk0RFhqdDIzNlhITVBUc01yV1dNQmNUdjF2SzBXUUV0bXFQSU5ZYk9lVjBacGpabW0zaGZjQmdKd24xUE1rS3hGcEcvdm55c1VOQXBFdnBLZHJiV2E2TDNiTlE4MHRRdk1jbUJlYldVSGl2eU8rcVFKR0Nqa1N3b3krRW1LZWQ1U0dwWDgxNTR2TjRHbUNxYlpuWkExZXU0VytzMDhWdThlSWZSN3VOWjR5S2VqcXhuVmhaNGozUm8yWWFlUUdGZWJrNEFYMlFZQTYyRkdhdVVXRzVWZ1ZDaHRmT2NtOGtBYmZmY0xjdUgwUjVwT1AxbVlQZldOYnVmdytzWVo3WStPRXlmcmlwL2VCeTRBNGhTeUl4UlIwOHdnZC9JNFpwZ2hpTFdBMlBHWXlTWjlGMDh0N1JCS3VlUHE4S0phN2NiZ0F0R1VoZmZKZjBYUnZJa0hRaEQzQUQ2VzIvUHM5ZWVDbWxOSFJnbmVqZUN5SmZnMW1NYlcyOVBUTUxmbTR1RVFaR2UxRzhyY1lVbkFMaG9CZ28weW0rVjZuTWlFcUR0NzNaanpOcUhTWHFDYjNLRHFOYTJNcVlkQU1xSWZrN3BhSnFlQ0phS1VuSC8yVHhsUDk4ajhnU0pZVkp5RzlzMTV1ckZvam5US0ZKM2lvZkZXcC9tRVZWMzFaQWxrSFgzMXVrbmREd2pCVnBSSU11QU5IWVdVODA1Y0M4OVNMQnBWaTVNK0sveUlMb1N3NEJFWmkvclpkWGxSdDg0cCtWZUZSMGVoVysyVHQxYllUbmh1aWJQTStoN3Fmd0V5bGxWcGN6RHFjTlVDVFZJVHFxSktEMERtV01rTGtOOHpLcE9jN3VyWHJFcjlQK051RE03bGZ5NlJFd3FlQ2FxeDBDU2JDNG1yMFE1L01VYkxBK1lOSFYrcEI5WVllRlA2YyswbUV3VXVUMWdQNjU4TnhlcVh2L3BGUDZpekxaSDQrSVFHOTJrWkpwUzZlU01PWjJtWmNCTzhPQU9rNFlaRFgwYkF5cmpCcHZSaXUwRXkzdjVVQmJ2dHFVZ21idmd6T1ZNK3J3aDR1L3NIMnk1cXFyOE5ydVJGV1BaUi9EbEI0RUphbGhzOWUvSTNiMDR0eEg0RUhKU3V5NmNZcTFkbCtkQm9jenZCNHozOTFvS2kyUm5JUEwzWUFiMjE1MmpDR1c0RG4ybUhNUUkrUzkycWYraS83a2pqOEFFOXlEaU5lQXZtRHVZNjhmcDI3MnB6WWFwY1N0WkF3d3VFaElHdGdFUGIyNTZjU1QvNFFEZEJxcUpzaXMwQXdnQlhNc0ZJVFpCdlc0SDVORXY3QXJ3cmxXYVk4VGZGSXZWalgxQ0JCU1RQQWdKUkxPbVBoY1duaEplQWFKWlpwVWx1T1VlbmNuWDIraW9FUXFoa3dKekpsY0JTYzdqNjVzbG1rZ2dXU2lSclVIWlNXVzNrMHNyWFhURDhZRHhNRy91clh1Wk50UHE0ZG5VYk15emZNNk9lZWNHVmx6dkVMeVFPcU9TUldXMlQ4QUlBQUwyVVBLaUNkbWZ6RlNTdE01bUcvVTBlcU1pM2haRmhpaXgvWWZTbDlsUFpRRnN3NGFIbThPeDg1MkJoaU51ODJYdURTUjFWUXNwbWxnMit4SDRPVklZcm5IZjBDWlE5b1ZuZTZUOFJWWDZxWkNnUXhKdXQ1eDlyZUtuQWFvQlM2bW1QQ0htVXVtVU11OW9hbk9sdzZTZGRyTnAwYnhKM1B0a0dQOUp4cVRCcjBLS2JXUHlMUkNmR3pvUFdCcjR0NUVhWmRIWlc5NEJFWmNSb2Y3Q1FITTkzcGFKUEs0TGJaK09oaDFrZnRycWZUSjRwbkduZS9BMUJ6YlBaM3h3cUJidUllWUhUV002d1JSeXh5QmVBRCt0M1NkL0Q2OHlSZHkvc0pyc0hvK3R4VWpYWEMrVEhzR1RBSE1GWUdBYVEwd21QNEc5Z0wxekhYUXZPWTh2WW9XVmdQdytjSXZNYjhxa1pTc3VONEVtdjBod05HRE5PQTBUTEZJYU5BYjhLMDJCK3BBcHA0cXhYTGFiaWh6eDhUUStsVkFLMlNYVnZKeGZnZFZFSHpWVktoMTBTeDBDUit2OVBWTU1nK1FjaHI4bWpvU2MyWFpMRTBxNmFqOG8yK0tNYnpveDNyQ1RlclpDaEFiNmlvRFAwUFY3aEI1bEE5RVRKNzI5SXNEWkFOSk9xTDZJT1R2OHIxakpJQXhjakN5NVZ3TTQzNmIySVNmM2wwRUlIdW9nZUF4TzB4bW90cnZFaTZkeE0xODc3blBhbWd0OEVDRUhxc3B2RjgwSDFGcytKSzM1c0VlejFoSW00eVIrUk9NcVI3MW9LdlVsNUR3aDBnUFZQVno2ZjVZY2dpTUhaQm9jL2xZR3llakR1SG83Z3hBWVBZbnVBQnZNeWxJUzBGSE9JeFFSaz0=", + "authToken": "tdgUwB5KXSYEa3TohyrT", + "transportToken": "MIIBCgKCAQEA2Zrbg9vEdzbv3GRM5+IqFegYVv7Ekqz24RH1tbqjMzOY81dMmhZK\nYSjihiJDTaCziXN3bs/VAy0LHop9SVzqUw5SBT5C9nieD04sCQlUgmyUJhPBGXFS\nmeRAM4muROQW5JijqniVxe+Tkgewo/reMAGpUdJOb/VtnWJYuw0ZO6vKGzgG+p15\n7/FpIyo2raaH+xHQ1wJUeMPkacwlVl45xAX4sc/igx1XRlSGHOe8aJWOunFJzty9\nPFnoEPcvfRe5KbOY1eDgHOhQUEcCDAuSiDuZvRu2sf3MN745RDaohER/cHKjvd0j\nmMUgr+0kL8bsrn/gZ6FIzYTHAeRfkx+67wIDAQAB", + "contact_key": "MIIBCgKCAQEA03DDw7Hl3Fceewh1DrwuhPrQssU910KP4MwO5wLcrsrmcbB1aBHI9iYaC/akg81iBK4OGB2yV+sZrsPemCYfvCfK/cJPdmNqgYTQ9PK3CxkvgqxYtj/Vp1DHN72UIZsoGCAKHSsMeuX5b0lx3ONMzl9c2nRt3PGIPXrHmS4O4Lt7bB627r8Cqv9PLJiLUn1VY0ukHyBw+NpAMcfHhKy3fh+yA250XFCk+WUjvl5pgvBbyLzDuMw1QjovaadOVyokc26G3Z2uGNZ5izm5kS01XOVCUgHzKYm0axrrEdc1mCvVktVURq5izAjDsRTVdBt73f2JVVq+s4GuYfBqOacVewIDAQAB", + "privkey": "MIIEpQIBAAKCAQEA03DDw7Hl3Fceewh1DrwuhPrQssU910KP4MwO5wLcrsrmcbB1aBHI9iYaC/akg81iBK4OGB2yV+sZrsPemCYfvCfK/cJPdmNqgYTQ9PK3CxkvgqxYtj/Vp1DHN72UIZsoGCAKHSsMeuX5b0lx3ONMzl9c2nRt3PGIPXrHmS4O4Lt7bB627r8Cqv9PLJiLUn1VY0ukHyBw+NpAMcfHhKy3fh+yA250XFCk+WUjvl5pgvBbyLzDuMw1QjovaadOVyokc26G3Z2uGNZ5izm5kS01XOVCUgHzKYm0axrrEdc1mCvVktVURq5izAjDsRTVdBt73f2JVVq+s4GuYfBqOacVewIDAQABAoIBAHbS4lExwnmnQ+vkftQ/EO2OfoZYrj4wm+a7BozwYNCiGgs+HVzU0djy5KRggWfInhL/NdB7r+QUrSQ30voyQpdczYj6D+n6SLpsx3lAhXlpN/f5nwkcqpcSoEJE+eBA77FPIB/wN11BrIHMBn8aBencUbQ6xhrqaaQTQeRlq9rCu+MBRxTJ5MPCv7zrd6aPLDytYAR9FpEHA2V5IlxaIPGAMOKahdl4dEjStZ5Alna+eoyTBze8C8VKYn91WS46diQtv+8/1F5Wn9IeRU8HvlpmvQsQjKjH1XEnotBeKQL8JeTV8BW2Vcr0yKAcklNavQtVmqtsyXVKWVDN9rZqxbECgYEA9Y/mrBp9em/BgN+UBKcbA9C6B+xaToXzHRRvNU4JhyoBPbAcddLx0fb7q2Q0IHSwsKlul68b5T9ZGuMhNiOnibcNvRBXs2PdyeJDk3TtQL/ZADkGHrjzXiiIEfBVaClkLuNxcmCpwxh3MZQPqTmEnZg6U4sr8MHUcQqRbXsaZ9cCgYEA3G2RLfHDNd297XFnazowy5Mycrdxt067yedq5Q6qqK2jWiEOSjCT/HEI7v8ipfq10vGAjaLusWW4JB/RrHdFBG0VXueXR3iTU+PAT8A2k36/m6deLCZ82oOZLHUstuPdreEeJSEuSmtb8Nx3W77UMyflrCRMKKNlxEb1SDM+ev0CgYEArTdtutcQzg4JDDQqAEIz/zP8Fdy2Mw+v10Jz08ERXYPWzkHtQXukUryK+HI9hutpO6S4u0ytO7+8xgeThNIPu0gh68ycYJFAgMkXa+ud8/+gPdT7qS5DlZa3rRe/1zLjVWPgwZLIDTOz2Igdp/xHvLcF5aqVO0Yu6fJPdU/R548CgYEA1KX/AMvS/wxEReS5WIBywnHmoTTHx4d1MnrGbOORT9jzVee92WSz3z1M2QPZcTZEYpQI6JremtT+qBrqM+977aEulLfnAVQZDT0SMd3EyNXmE0uLVhxrJoL+Kh2AXY/GNBCQ/FDeT3zy3ZJSs3eNTyyWLVN3BV1ct9Wcm2KUTCECgYEAm41+W4CDgM3e5F1t5Qh0omfHOgtm0Mzxc9ciUMNefB//xuiXCxDCqgn78Ovm1ctSwcCDZqmmawXCKXAFT8WTbbatkkWUIPaYlxJZZ+4GK1SjDq6v/b2dQQPfxZCMoXKUmRmU6kTaUoDS7ekTV3Orx4Upq+2z7yjdYhvHqsEpCq0=", + "exported_keys": "a2V5czo6QXdHWnRMbllqRDhjbWY1alRjY2FlWVYzdWFyY2g0NlpjYUovN2lsRzJHbFBPUFVMOWRzcnRVcGdOTGpwZkFSaG4rNjUxdWpSWFZzZ3pubWdzTDlmVWFaRFhHMlcxb1JrUnp0N1U0QUJqakZGQnRndU1oTzZLa041eW1EaGpxKzMwSXZWaFZ2YzB2cFViWE1KamRQN1NGWnY4bnkybWJVQlBDcU1wYkVHQ1BxZGU5UzU2Y3NZejk4S240c0pvaVNXU0Z6aU1CbkxGL0o4UkFKVHNGL3orRTU1ZTRLYk95UldaUmxIbm8wK3F4alJaaTRZQ2N0ODZtUmNoT3duYXpscU5RQWx4N3ZIbkEzTE9JWXZLUVVUQk80VWlHUTlzSzF2bE0rMytxWkI1WlJlb0F6OGF5eHBQVlFCYnZicDVmbm9XaGhkclZDTWxyQWpXc0VRdkpNcFVsYkhnMllham95TFAwaE9wdUxEczg5THdSTlFscnVsV2krc2kzaU9LcGVSZ0JodklOcGI3dUg2TVhOTGkzV1VvTXQ3QTYxNXpZUHVMUGtqK05mSkM0emIwV3VPcnR4RUpka1hoNnFISXRYSEFWczBWUlpoeHB1VHh1ZnhrVXBsc0pXZ3JRVVJjMTl3RThkSWlobjNGTk5RaEwwRVdPWFM5WlR6M1ZrU3ZoZWVxenloSG1EMkhiOVU2RkRoVmJtYUNEM202S2VZY0NlOXExbFZNTnNwN01NcXp6UExoNEdPMEhpOVczNkpTWmxBbVJkbC9sQlBhdkIxNzYzSVRFZXo5RnpSck1CRDBJK21kQTFkWXZIMEl0YkhWVFlyU1kvTXhwSjE3RmxqZ0VFQllCeEJFMnRNY1RWVHJWY2VlNVJDcUpVUFB5NUNXVU8zNmZNV0lkVUltVFR5QjNrUE5mdUlkem5uS1hWTmk1aHY4R2lYcUplOER6RnJYV1RweGFQNXhYaFJQeFZwbW5sMlFQcTMvYTRVNUNXWFVMYmgwbUNUUWJLdlhJSXBReG5FZkR3QUZKZ3ZTRTlQcUo5d1ZwU2ZMS0NYSUZGNWhPVnBZcGt2STVXNDZvbnlOcVRldHQyR3hEaFExOHViT2xiVXpuQ1d2RkkzakRFOFBMZnhRWEFBWklvZmJaTGNFVDNheXBCVkxmUEZuOTBXQzk2R3h6WlE1WTNWWVFWa3M5aXpaVE1vNXlIcm5lL3QrMXhDTXBrM3FKaXIxNmRWN2N5cVFyaURjcFJURm1lcjlMMUZvYWJlMWo0ZkpjRytoMlk2MVJRMU1peVVzU2tGczZhYWp1eWpOSkhnRW1Kd2ZNZUFkYmpIby95SWRKMklSK1BFOUE2OG5PbEdRdHBqRVYwNDFxL1JDanltejRSbkZRZ20wSDBpWVR0UEJVTFpGN1pSRWxCRjVKRzdqdWNCNXBWSVJ3VkdRdVhQL2dPTVcwalAzT09OcWFQaEUzOEFyY3JYMEJveEZjNTdIai9yK3c0WDlDQlpXckIzd3U3dmo2d3pubjB1STZQMDBPT2FPWXkrYjNMd1hYWkxYeGR1cTA1YTFSdWZyUFRUcmdjeEVNZGxTUDdrTXgrT1VxN1hDTi9oM0ZFZjFlSnVYbkNobW5jd2l3a1lXMUxrZnZacGtWb0pPTDlPZUo1NGhlczJDeHNUZWhwZWN6akUwcFJZQ1ExM0U0VFZGNEVrTzFQeVA1ZWxuQ0VtVDVCZmRYN1YwV3lubmRFY2UvLy9zR3VCNm5rMTFscWpseDZjMEpaNWp6eUhEczUzZXRBUE9vSG1EMXNPdnlhUVl5dWtyQzBFZG9zY1BtNWU0a1QxWWZCaXIrdzl3bDFHcUw3VHFmVFU5ZzhyaFQyU3plWGdaWURFeCsxVXJKbTRvcmtMaTJOb2VORlVuRXlMSGRGUnlsVXhUU2FvSlZEWVJkQk9uU3gzWVhuck5HRmVsTG91YTAzNjJ1N1VuZVVFU3Z6NlRtQjh4NEkyVWQ5VGY2dytZYm1qcTFBcXNzb0N0MTNmQmtrUzlQOEFFbjZuc3h3b1hjU1Rhb0N3T0kzRUtPSS81ZHFaaFRUY1BPT2FBb1E4Q04wK2N6Qi91QkR2WnVwa3paWmN4YXl2cmtBV2NlOERmOGhvTDc4VVBsQnJoaWtNS1F3K3ZmVTRRbnZvM29SY2lKRzdLUmFJUFA5b2RGSnJzOHdyblZ0Z1pVQ0w4Rk1hOStveTRHTWR0VWxjOHk0cUduZlRrUWpYSE9iWnNSa3hZWVN1QjRnN2V1cTFDTC9QWlFzVG5lSmdMbW14YUNFU2Y2V1lvak9Ddk13TCt3NTVPWVV1U3hXaHd2N1BuajNJQ0xUWjRzMk1FMVF3SThtbVhCdWQzRWNJWHBFSTFKM2o1MU9LWUYzS2p4VitmNWpJVk1SYm1nV2RsaEpQVHZIb2ZMOFpIc0NGWFMza0lKM2dWK0wxeVczUGNFbFNQZ2xLaExMdmxlUU5PTmFKZ0ZkWXF5QzBCS0Z3dnYvcWdvQld3UkxQY3kwc1Yxb2owZDh0a0NqMm9WdXlzbGIvWjZKbWx5eGtvTDhjb2hwOElWcFFvb01UQUlXQmVMU01tZ01KVDZmSlJ0Lys0bDVESG5SSUJRT3N3MFc3WEovekJxSkppang5Y082NWF1cVZuNHpncFdEUUxLWEdPYkxqM1RteEJsRHF3RlE5c0RTMmc4WnpETUhjMENRbVNMd0VjYk1TUi96d0lHY0xHRmw1VFVsd1ZCcDlGeHp5WjE3UmU4QjJuSk5RMWRrUmhsT2dlWStzYzRLcHgvQXlkdWZrRkZVdTZWVDMyeFFjRlNKYjZvckhwbDBrSndpaGh4S20vNkcwOHU3bHJiSXJHRnN6MFFIdFk5bEc0dEZKSVhMZzBzL0hDWEM0OU9lblNCTVAzOEluTGM5RVo0cjVnaEwwNXlsbUNEWmV0M1ZJSkI1WEFqMXBIQkZGNmlZRE1hS1FBMlpMb01KNHZOQUJGWXhLbHhsUHd4WHFPcXg0OWpKdjNpZVpKTXl3ZTU5b0szZEo3am1aRE5hQjMzQ0RsS1M5WUliZEpuSjZtVDQvYkE3aWlJUENFaTZ2b1I3UWVmQy93VldWbXZueWhaNkNxUlNPY0lNWStlTHZYY3JwVDgyVk5XdHVxaVMrOVVtTi8wellPbVk3RWppb3pIUlV4RUF5UkRVOG01SHJ4VlMyUjZNSGUrelUvNDUwRlcrQldna2sxRmRlNXRVUEgvMjRlbWFUTkFDWERNU2RyUWRCZ0tOdmxjZlBhbkdWckxjVXdPVXF2SUluanBOWE8xU2FBYnVhNE5MK1dqVXNBakJ5YndtSHdKR0VmZVoyNXFJOEFacWJ0WGd3eWpWRU1nVEN1TStkL05wb3NNRWFxcDBObU12Q0ZHQmlPSWt5YXEvZ2V0QjNkVXdWRnZZMmRsRGdFZmpUSjB3aStzc1B1N3haV0ZTUm55aWszMFVRd2wvYXdSU1lncTRQMUFHTnV1Nlp3WHpZNkVWL1J6cnZnSFdGOTZxQVdZNUlJSDhPaksvYkoxbnNTQk9aenBPSWJwYmZpeUpWSG1DUzFIWHZsTktjQkk2WGxDQjZlOW5tN29ldkVUV2xneVhkbmw1aUEvTi9CSTBkYkdpb25IenhjTWFrRk5YQ1NGcy8wNnFOd3hzMU1tWT0=", "pin": "111111" }, { - "pubkey": "031eac22492ef19825d93646095eaa8e5f71b9dd99e494657ed954d59770a99d6b", + "pubkey": "02cf1835552fcc10ee8bae58f669d22d596663e2ef12ff2b01ad4b231ce6ba1de2", "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023386625", "alias": "virtualNode0", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "jbdDdBee8ggWiN3Qv6c1", - "transportToken": "MIIBCgKCAQEAzTwHXruzFOCnduCQGYsSDTWwB1+aKKBHbczfbFoCMbjlHb7qSnMb\ni2JiKmKUjujfXSSF4DEzMTWoIM/GJG9q24V3q6P+3izVV1E6ncTKxvqfZx9dnoRt\nIFN33g0xJWcTaMR0U5SUZByGM/HCNXKnuvuSj1G4IVd/HV1yUsXJx5ym2DHRlhVA\nITiXoyua2QZ1fkCKDq1O9ntuAyuRrVPNbct2/5gzbYsswn0QDb/hKdXNHwxZ+rqq\no+MUldwLCLkX6oImsiYSM0S8IE+rmhoqn08ptVT2qemLo8eMKz1ZOFZPXo+ac2ji\nmMCLPcFUtPdWSykaQi0zF2Fm6FLSxSU/HQIDAQAB", - "contact_key": "MIIBCgKCAQEA5hk2+YRDVhgQFgAv9FWRk5IFnsMJ4t9YauWlitCCS05Yk6n4EwCJlEMMHb7e3j8N5fruKAX7efZfhySeUKsYsO1/lrAZHGjz60Ane5jGgqzd+IiXJtraMc5lxmKlypuhzfNezqOuVIdYdjXEpycjvhLCBJ4Mpm9r0Pb6JBfP3bRKqjQYfjf1GGO5RHlk1D75ku//3vdzP7RUF/+JcVwRnqAEiqKir0bybZRdBci6HLpSoBn+Gs55NzH1iluo/NfI0tllh4+b/yAZENCEfa1PZKH8ntepXopWMvOOSve+LygTGTTAvpJ1A/w5T7IOdkqqtC2yoaTNnJERSyPPV+nGVQIDAQAB", - "privkey": "MIIEpAIBAAKCAQEA5hk2+YRDVhgQFgAv9FWRk5IFnsMJ4t9YauWlitCCS05Yk6n4EwCJlEMMHb7e3j8N5fruKAX7efZfhySeUKsYsO1/lrAZHGjz60Ane5jGgqzd+IiXJtraMc5lxmKlypuhzfNezqOuVIdYdjXEpycjvhLCBJ4Mpm9r0Pb6JBfP3bRKqjQYfjf1GGO5RHlk1D75ku//3vdzP7RUF/+JcVwRnqAEiqKir0bybZRdBci6HLpSoBn+Gs55NzH1iluo/NfI0tllh4+b/yAZENCEfa1PZKH8ntepXopWMvOOSve+LygTGTTAvpJ1A/w5T7IOdkqqtC2yoaTNnJERSyPPV+nGVQIDAQABAoIBABm8RDvQIT/l3Ra42qQ3VdrtgBdrtRVc6aS7HrLR82C82IdbgVWOv9SHUzmYeZDd+I36bNypHqFbfv+8hsB7An33ckfGVmipDG8Jc+ENC1beQs1jaZR88d6UOSnhKq3ojkZcrAPsprjpkmlWRjJz3DmMG4ssqjmLSMHMfdm/mA4xv7xYOpfR/eZEwgUg4gn5SeZ1C1OniJPYH9+zquqb55o7E4Au2ByHGUE2gFLFlpMNvD//JoB4dNIEujDFxfmpEl2mt0Vyyt1vp0BnchyIC25zl9BM7urR+1dJiLq2BtKOBoTSbd5EZRaCwOpIK2jxX8D2+ZwN5ZEMY3+NfKd671kCgYEA+694YBL/PUL74RH2lZN9ZPrVvwbv02jQtWA8IKtDNSJgrkj2j+F2PZKWh3EWYZN4J7x65bo//zUez5ts5+MX6vZ8BRfRFcB+vUHYmfJy0nczssvXASmD8LT4NsEx7fLJ0t7BUM1Bov9pT0XUY9eA+Q+kbSz1nFt9iMAvwKc7Ls8CgYEA6gsCchQHRi2+K0C6lDMoru+7MfEBihFmHAjgBrHhvgaqkOLxkFiieTFVpuBqxcJQpppMy2pxGDOdO/QaUIWzbrRNjvNovNv77hJ9K/55tBdx12nsFCJGGA3XlAUIDCWRRhDtTSIP0AfK4lGiPCYPT1oe3qusaWFrGyjrY4YoYZsCgYEAweo6NtusKEk5w/mRIUGX9XuFwD7Z/OrfEz/oU8tgZsnr75xrzAOMlHgi3ov1EI0MoKEJl4Je2ITXDmHUEP3ZacErYMku4TGE9NCM0GAKs7n/7Rw8tbqE26qzK4zCqXDMq1nRXC4pCir7uoY01BAwYLT6nNttCWE8YWah5C902+UCgYAlf0YRCOxxbfq960z5WYj3HimbwsVAXbFCZJmf+Pf1/hNtyy5wtgKx8BmM9v+kV5GcX7RWEuOzwPE8HcvpgsJQxkp20MDDIWunpQaw+cB9/hObM7lDMIqSaAVWDchQSeSQmT2r0f0+k0EKKZIYmPBzAjlX66Ff8N+8Jj4wX9owaQKBgQDoEbtb37d6GhpRzhyPCD/ajJ15Z4NyNfis1zSxQofFT9cCtxcLezM7v8fmApkVlDgXqcHCi7ugMSggRxfyXW2q05vijqVfx3OMTxqnZ3saGoOswbAOvM9r0GdCs2CpLJeovaH4rYSHm3NN9BFiof1kBbR+T17CPWbqJl3+Bj5Kjw==", - "exported_keys": "a2V5czo6QXdHRERoelZPbExYaWlKSHVMdnV5MkxhRk92U2NIdTlLVHdIK3ZtR2dYR3B2empEdjF3M0VyREdVMnBYOGpIdUpUckp4Y3VKd2d0UVlDVVliTTJLRjY4UkVtTGRJSUpHa0Fqc2xTdHUzcHNPNzhlYWc4bWFzV0xYNlBGZisvQWdzZ0ZZVis1NzVtcDI3bXFCckp3cW5YK0U2YWJKM2tKYVRrb3ptejVjVnozR0MwSkNyd0xxWElSeXJBWjJWQnp1TDViaFY1UVhVQ20xYlBleml1UDBtT2ZIcGVBSDVBSmh3cUVDbnVNZENEdnhqODA2YktVdUFJTXJpNm1VMk1NY0FOalkreUZUTDNma1V1U3E5MTdvaTdacTB6cm1rS1hBVExmVUlINmtFbU9DN2ZrNjFwTkk4WUFuWG84Y3NPaHVnYUFBd1cvSVhaWVA3eUkwMytMbDh2N2x3V1ZxZmx5UFp3NWgreDlFNGU0anVSaW5GQUt5OSs1cTYzaGtEd2xXNmRoNFJpdnVqQ09ubWlHUGlyZ3pHZUY2U1dsZjZGRGdFTGFuZStUdDJuYUFTTGdiNzdVSHJMZm15anl4Z1pEa2NVSFZYcnIvWjhkQklEWmVsTGN5dzYxVGRuVk9iWWhSZjkrUnpEdGJ1bmdXOEdhYVlaNFNGVEIvcnBPY3ZjUlZBUHlYbHJvWlhCNlhBdXJlR1ZnV3hReXAzeVpXc0RCbm5nckRsRFp4VzZETnBlbzR2b0x2UW16azBPVndnVmJLRU50c2tUWlBtNWMyYmRUYW1ScWJlWGpxMC9DaGV6R2NENmNqdmt4c2xCYUh6WHhpMDZ6bmg1OTVibnBuc3pXa2x1dWhXZmRMRFJLOUpHMC9rU2hTM3RZUE5oamVPNG9KY09rRGM3STJJNmxhSW5HdjZYTkJacU82aWVSTlNlUUFzMHJXa3k0cnViQUlYS1RCVEl6aXppc0ZZMmV1Tm5IWnFWdndPd0E5SnFvRFB4OHMvZGZIN09CV0lpQ0JFRUZyL3FyaXloUk5CWDBJaDZqT3VvWDlEa3pzSm9xRWpWcmhnYkRJWk5CYjJFNG1scy9TMUE0K3UrREVkdWhlaTdyWkVGRWVZc2Y0QVhHOFRQdTI5RkRMdDZ6N0lJY0pZR21tcVhjZ253UFJLeHN2d2dNWUQrK2R6SkVXdVEyc2huSHdYZEZ6Q3VhT0VqbG45bjlBdEt6YUNuTEgrTHRQMFRia0NyS3RhQzdsbmVpd3AwTmxVWU9qeTkwNlpKM0MwU2YxeE1RUkdqNmFvdXIydTNzdGxCR1hVSjQ3dFdmRGVrcHlWYWJEMHFhWkh3N1VkL3k0SnEyRTM2RmRwUW02bGRIY0dyeDhhK0xBTUxYMVk3RWxJSXgrQnc3YnJ5bFJKNDFoMUdZQWg1TndTbWRnSktjVmovUmdxVGVLdFFLUGJxbExtWURrYThiL0xBci85TWNwaXMvbWxhZzBpQmpvdjRrR3d0Q21lZ2QwTWhjb0tiN2hjVzV1aTBBemJZSCtJNlJZR0Y3bFlVNEFsWXF3TFA5Snl4aGpGeGNnb2s5d0VmZ3VtTHVYQ1BYUVV6QzRXQ0FsSjRxdEExaGxBVWZrV2dweHRpbWNQTWlLVVRVQm01M2ZMVzFlZmIzS1lybGpHZDB4YlpkdHhHTlJrS1Q1a0pZaUd1THFKUjgxVmRPR2R3NWZzelV4QzNXMy9qdmZaUjdaazNxeHZCcXlVTldTT1FFcDJGK2RkSldmdVhhT0tkR251dnAyenFJd3hia1dicFBkNnkyYU4xR2htV2YrSGNsNzZYQldmM2sxUVEyb0lGdWtaZWI1U3VLTmxOdmlJcm4xam5CN2FvSU04VGdCMmpmb0FyVHRSME04TmY1KzZERnBBWERiMnlHTkladnNiNUlnRWlOSzhETk1HNysvTVljK2JKSVZha1IvWW00eFBjS3F6SlJjQzRrY1NseFJHM29KV2wyQ0E0MVJ5SzBNTUQvbDNjbWFPQUpWK2lHUHp2endzaTZaM3dkSXJiN0tud3RQd2UzcUFCM3NDTlhiN0Q3V3lnU25Jd1ZFbkYyZ3oraUNjWUFHK1BIMjdiQlJWSmNWdVJKMTVaMWVacXV2YjFRV3p4MGo4TEdIREZuS0k5UEF5MjdycE5JT0JMRVV1TXJLSzRwZXZvSjM0cWZHQzFKTDFRQWhvamViOEo5ZnVLSW9sc2JKdHk3eGozdUdHQnlyQ2x2M2pxMFloY2hrSFBQS1g0RGtoYWEzOVJ1U1dDNTVCSnVqRTR2TnVzQTl0Mm1pL3VET2djRjZzTEE3S2Z3RVAvWWhFc2g0UTRVbFdiWHgyVUdRQURKMDl6RDcySHVOYk5yTWhQQjNSSjh3K1V2aVM3MmszQ2QxdndYZ2I2ZnIxMHM3cFJSdXQ2Q0pzYTFrUG4zZ3U5WkgvSHdrQnJISWdtcUxnaEdjYXBMcE1iWHNvU3BJVGlXWGZtYlpsNDRUT1lmL1hsd0pWWEEzSitBL2NaeThGYzFyN0NCcUFHa3EvRExrRmczb0xydzBjQm9XUFlDaVduYUE5eUp1VlRXcDlUaTJKUXFJOElTRkJIUXpBdWZGYmVEVUljazVMWW42ZnJpYXh3aE1oWFF1TVJ2WDY4YTVrT3NmZG1NWE04WFJFTmMveWI1T0x2MHljSDRFVTh1TkttTUpFZjVxRFoyV09MT08zUUl2WVNwK0N6dWRKMGY2cjlJb0hGN29JNkk1UHBXMkptV3NFUWt1QTZzL2RXdkJoVm0vRUlCNjZQeUhTSmpHNGlOZE9MamVZTThHSkFOU29jRytHOENRdVdVOFZVL3owcHdwZVlIaE51ZkdSa3RKMXU1K0Z3YmhvSFpzQjZZMVZSd0JTK1NzbDRaVnNGcFpha1dkWEJQWWJwc0NtZm1GOGViVXNPSFNmVVR1eWRKbWFvcmxzeDcya29oUGh5N0kveDlibUxGU3FSRU41bnoydXRHajl4L09vbG8zS1lQL1RFVVY3NFY3RnVhSlA3QjVGRXdFN3pQY256a1lLVVdpNzlZUHI5c3czSStIUU0yclhwVjhPdWpaM2UrdW5yS0ZVbmRwRjd6UWV1SmxxYkY0azU4cnlGcmlrc29RQ2hYYkdHbm9KTnVBNDJOUjJsUUQ2c2huczFXQzU5bGNyVGJVY2NOa3VlKzVQeExmTzlrbjdFbExFem9DbG05NnRITnlydHJwbG5VODc5L3NwUnA3bVNQSG5xVjJYQ2YwN0FmNVdjWHRtR2U3ekpZWDhRb1BLOVlCZzljbUJrU0FqVk9aTHZaODk1cWM0RElDbU41eENsR1BXUUwrY3NOZUNFWjdkTzIrRHVxZTAvckkvL294THNGcVZ6QjNxWU96alhOZUdsRzZwYzZOVkx6aEorZHZhZDNCSzk0WVZOWEdJVWZWMnI1V1l1VEVzZVBDT1M1Z3RoYnYwRDY1bVI5cS9MZ3FkSUJIaWY0RmxWa0xSMW5PMjJOLzdDSkljK1ZEU3Q2N1NNdHNyNUxxdzRNSHdVakhIWDRiYVVLbS9Ob3ZEK3YxTDg2VU1INEJJQk5NMzh6V0lJaW1nLzVINkU1MitEOXNLR0VxQlVEdjQrbDIvcncrWHVtYjNqc2VxeXA0eUlYRjd4ckRaUVBudDZtS2N1QT0=", - "pin": "111111" - }, - { - "pubkey": "03ba193291602885e8df7a1f6f569c89e7efac90211c6b53377cff8aea50836860", - "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023452161", - "alias": "virtualNode1", - "ip": "http://host.docker.internal:3004", - "external_ip": "http://localhost:3004", - "authToken": "OiQctyCY5snjlHKp5cr9", - "transportToken": "MIIBCgKCAQEAzTwHXruzFOCnduCQGYsSDTWwB1+aKKBHbczfbFoCMbjlHb7qSnMb\ni2JiKmKUjujfXSSF4DEzMTWoIM/GJG9q24V3q6P+3izVV1E6ncTKxvqfZx9dnoRt\nIFN33g0xJWcTaMR0U5SUZByGM/HCNXKnuvuSj1G4IVd/HV1yUsXJx5ym2DHRlhVA\nITiXoyua2QZ1fkCKDq1O9ntuAyuRrVPNbct2/5gzbYsswn0QDb/hKdXNHwxZ+rqq\no+MUldwLCLkX6oImsiYSM0S8IE+rmhoqn08ptVT2qemLo8eMKz1ZOFZPXo+ac2ji\nmMCLPcFUtPdWSykaQi0zF2Fm6FLSxSU/HQIDAQAB", - "contact_key": "MIIBCgKCAQEAszq76xTtZPvQ5hHXgy0IoTXz+ed0Q6ydc9e58O/nodfgRaL//rcLWzk6l5dc6CKjM9SXz9xlKbhl4UOmXIa96fFKVxcT1M68T2S5Tcdv6mSz0Ne75jjM9VcfOVG9YaBJLdDa/odJuupSX+RO8KRhrOFQ4iIaCTqsp5/pKjZyhlltSlL9+mtOCc57s//gE3nfK+3TVi8SjoydmFWIcqCpIai/TBHVLC7AYlFr/81OSn9lCV6AS3lKsTeP++f1aXLNF/iRbxx1xLd9wR5P1jabof6fPtWyuVunHj+rQTcV4N5qKvbJCqjbL7woUi6pf71YMNx/eeddPEJ9AZqEKeKCXQIDAQAB", - "privkey": "MIIEogIBAAKCAQEAszq76xTtZPvQ5hHXgy0IoTXz+ed0Q6ydc9e58O/nodfgRaL//rcLWzk6l5dc6CKjM9SXz9xlKbhl4UOmXIa96fFKVxcT1M68T2S5Tcdv6mSz0Ne75jjM9VcfOVG9YaBJLdDa/odJuupSX+RO8KRhrOFQ4iIaCTqsp5/pKjZyhlltSlL9+mtOCc57s//gE3nfK+3TVi8SjoydmFWIcqCpIai/TBHVLC7AYlFr/81OSn9lCV6AS3lKsTeP++f1aXLNF/iRbxx1xLd9wR5P1jabof6fPtWyuVunHj+rQTcV4N5qKvbJCqjbL7woUi6pf71YMNx/eeddPEJ9AZqEKeKCXQIDAQABAoIBAEQFsZZ5/dNKwzDeaqXNbK4KlQsurfCVTbjOkjKASrAhB2xGfdQFUpkPsk4gU1GC+9/K+scYBYj9BCWnkDcjqGZmfmlpR8yHne6f8rgzTiVujNRhXF33BsrCgwY1IKQxujRaRRM+81uuXQ8pzlAEg1GivhjlCm6gRzDjPxIXUgXsvbQFkNSvSKEUydfPP/2M6i+z2H5y5lLH1R27QgUuATQvbr6EZrxyeMKka45YBAjToApOD1eegQc1gTxv2Nl7YwCamyrdrhgfix5PcRLudhEfhJxeoa3XjgEkuRlcOm+qdswFbLHXG50YKtQfSbACjZ0XNC2qZDiHtWtaBoMKW+ECgYEA5+JSXbUg94hjkt2YttRI6gsMJ+CKRUWjO+kQU8v2RHssP77jLALlhjKiWHnRc6GVw+O4hmL+y6+9WxptsfnQtN61gt5kcEG8Qc7SJyLzfulXFKkdBnFBnglzh0sZ+j6Fa6ZKaZN6GFuuS+a2GuDBG2NPSlmDdHIbEJWl65DSsbkCgYEAxd6JMiajhxIx5BtxUliSr3wHmEWN3Nw+fVLskjFvq/awAwkz6uOtW9nlVcw+TBe7r6Oqgiki3wkmYbGopdZTwUuOLB6xMrpJGmUnVEjDKzeVS73Gxd0HVgJGLHD9a4toO3l2dwBUUr5HJg7hXYta/f4nVOu1X7plsT7e5ByZN8UCgYASosLB2zO6EREHlZ2XW/o8LQUeE1KpfI5A21s/kM3K9Sc6PEofmF//6APaHngx1dOmeZ+z1TLrBcWvE7GrMwuN7bQiv2LNDstlcoy7LnjpQzGHbIvzn5iJbfMF9Ygx72Jjo2qpj3uph3y7huAtytBaNiICNK1251C7hXtfMjVsqQKBgF1XcVkbKSFaz/ZPi9HQvsHRvLN0fEuoCkKMj9UXRRrWMIn+GWPBK9Kco7cptmmm+H8Osizcwvp8EoMbj/dLeA9DWTou8GCByGKPPVJhUNBeVCt6xv4oGoHUaM4mLyZAiVclIWFZ4m12HZIyitXaG36eGmfRGaqi/73xbqwlYZIRAoGANjsIoqJESkH/HVBlZ2w97RwXlp2exnLYsBeAR+EOhIeziIcXqDPbw0rUvV9H/3eceLsBmDmUqNwBOH330zFk2XaTaDjux2MXK9BCifzhs1TsZsNe4sxNdylO3wnegWfTmbc5AUOj1m29GwA2RNkIJRhXVYrKMvv0b+/FhvRF5tY=", - "exported_keys": "a2V5czo6QXdHUEpVSVR0aW8zOVBuSmh4cUV6enpBQ0ZjK2kyOU1OcmxWZWdodlN2Q1JjYjNHb1NwSzVCdllOQ1lvazRXL3NrSVFXZEY3bnZLT3B0Qzk4bnFHMzRLT0pJZ1E1VDZ4cldCdDBWVDVLK3hDN01obUtLRllIWlVLaDJyT3RHRFJFYUhNKzhPQ0NsZTlUNFY0VFNoamhDajJldWo0UUJURHR5K2RHQUJTR0lnL090K2VFa2dZM2lxeUVBeitLRzBqRFFVcG9jNG9VTXRyWDlhVXNxdVZZRE1RRXMwYi9PVXAxT3ZyS3g4aUtjK1BRVlVEMGNubjJyZ2ZpVDdqUkp1V0dzNzhYYmFkSVI3NUVPbyt6ei9Dc0lZZzd1L1pRcTZKRWlCTWZSdFNmTEdWLzJkNVFJcVJUZmloMlhCcExGcDdNdEpWYTJ3OEdkV2JRYm8ycUpYVDhpMVVDNzlPb3NqSkFCazdoNEtsRkdUaHhRRnlOZFltaGpzeUFrclgxelZ0NzEzMHF4emxjSUIyS05ybTNkMG11WGFKN3h2aXJjZTVsY2kvWDVpQmpzcC9nWnBQdkNTT2VwZlBDenhaVmN6UW4vRnU1eGR0T1lmbDVPSDhEZ0JCcDQ3cWpxaDR5dzliNlBBZ3lyQVg5THRhZm1DWkdwZmhyVXRiYjVBUUVLbCtrVklvOTg5QVgrYlVHcnFkeUpWMGNIUXlaalN2NHhpaEIweXBxb3hRNmpOcVd6L0JmWU5XVElvTkd1TWNCRFhlRUNodHNvOTRNS1JrbFkxNWxJZE0rQ0M2WmRObnRxdUVRWlJ2TW9zVU9jdDVQNlM2K1J3UUV3ZEVEaVNKR2dvc0hIVDVNRHdHREJxUmhyeFBNWmFYNWY1RmR5YkZaZ0ZLVkw3SmJ1RkwyK3ZkTGNQTVd4R3ZubTQwSG50TlBScG14c2FDc3lKTldwakprQ1AzTzZDYXJNSTBWalhBQ1VtdCtFV29tM3dhcWhPMmFFNSt4cGpnbC9xL2hyTWpMR0JmTjZpVU1DR2NwVXZRRG5NeHl3ZVlJbHRJY1gwd3ZlV3VtdVhleU5lNUZXK29aa2M2RkI4Qk96TjV4VTRlRWhvT21HbWpiRi9XTWNBQm83SWNwTGo4RlR3V1VvbXFvQVVWTWNWZUllL0padE05eVhTSEVybXpBR2Y3Vm0zaFRNVEFZclZ6QktYa3R2WllDSDlKOS81bjFadHRDMnZEODV5UEpCbHRTejhURU9RRXNQMHpyVWxaNVVBdVN2azFBQVNtMjE0dFZmU0hoakQvSGtGVzhkWk9ROHU3M29GdnVPMWZOVlE0OEdwQmlJYTVSNkxqaEJ5Z0xJd3UwZTB0RWhIelFkT1VNalFyTG5EMlU1NE9kZU5FRzFqUUFiNkR6dUI1NXNxSjY5dTlpWVBtcHhHaTV0NmpLVHY2VnB5cmdVVnB5QnZYZFFTL3Z3NUxvNkFWMUZZL2EzZy8yRmJ2RGlCK21DTUgwUDZ2d1dHNzlBYkxGeEMrdW9VSUIvbkRSM2NVQ2VnaHNaV2g1empBc1BIREdWL0JNVFdSdFBmcEtERlhVMFJFRHloSGdaRlRubWJaSm5oQ1hDWXJYcGg0NUxYREhaTXlvelEwTUtkRGFJcTFqUEc5aDhQaFpwNEtyNXJtK1psL0FKOHF1UW5pRVlJMlpKaENMcmhtNGNOalVtMUFKS0N1dTFxY0h3Q2NYR2l0QXdrWWRCWWxhMklybDdCbEp0VWV2eC83WkdmSkQrNTl2QVBtc09hWEErb1hDQXFVUVZMM21XcXN1VHdqYzZIM285SDMwZ3FSWklWaUJlempXZkxtdXdDbnNrUzB0aEhVN2NjZmlLd2d2dHM4Q2pTQU9EUGpZT3dxUXBPSmZaamw1OGJnVjlyZmk0SmFYb2hwMHJ0YUtkQ0dEM2NFNERwUEF6OTBwUXkyS0x0MGxIRjVybmszWHNFblg0MjFaUzNZNzkxMkZHKzR1MXhLQmR4OGZjNVZzV2t5WGxXR3NOUzU5QmRxSmI5MnZGZTZST00wRHpLZXNDaGJFVCtGWngyS0Z4T1NvTWRack5FcHFPbEZvdWpIOFNla0FrTStoOGErYm9jTENzNzMwT050SHJPVktIYmh1K0hFTVo3T2VMTFJRaEg0N2pXSE05c0RsY2F2dnNTb0FDdmxNSS9rcG1nRzFWaFdsbEI5NlFPWWFSVytRNlppUkJMM1NQV3pKWUNzT3hyY3Uwb1d1TU1Za3U0emlhWTl1SzJsVzUxVDFHdzkxMFFKdVd6ZVhFeitIUmRLcm5FL2ZSbk02dzZ2YVRDbXV3UjdtNjREbmIyS3paaGRyVmRGRDRub3o2d1FqUjJ3MjlBenhPZ1krTUZwQXRjK0JRbE1rdjJycFRqRDBqakx4bkhZMFkxMjluMEpxcHo0cXk1N3lKUFdoVDN2Y1BSdmlLc1R4ano5a3dwN1JpcXEzbUpwT05xVmtMbmNESWdmdStieS9lZ0crUzZyaDlKdHpqSERDWUpDOU9rUnVUb2xIUG1OUmpOdWlaK0xNV0h1QWRvaFMrQjJaZ2pGMzNWZ2hMVGlzaTRXYmVYYmFVbEdsSFNKU1FMOURKcDZZTkpwTFFmd2JZemhWUXJYTVNMQkIxNnAxajQ4TEE5VlVYZUpTK21PdWdLTGNZOUlNQWMwbW9IUnhDK0tpaEYxUVhWZ2JFemtBMENveDFGQ3VDQmtGeGtQRTEvZFYreDhPVlRqVVJaZWxQRWdnQktzKzc0bjU3M1lvK05wckNHUnBPT3cwM0R3Rmk1ak02bzM3WDk0V1l1MHQwdXhxRWNOSEVSUUtkNDZnTW1VMmtLM1oyVUFIK3hpUXpXeU1lMnFvQjdmQ2RzRldobG5WRStRUGhGRE1VWms1TFpjblF6emFaSU51aTNFeXJyemdycTFQMFZUbGRPV2wwMGVqSXFKcjM2WVNveVRielFlQW82enB4TlExclpndTlxYXZVWGhvNk5uT21udFdvV01pYkdPNTFMclc4ZUNBaldVYzdVQmFmRGdZeno3V1FFcUFPbTBsNktPbkY1aHdKeG1Eb0FsODRTQmZuTnROMmszRDkzc2pScE8vTFZhTktVSnZRUTg5dVhoTnBuckF1QVh5d0NsTGc5S0x4a0lNQTJ0Q3c4eDc0ZDJpU1JUNzM1MTRlVmtaMG1SYzNMeHo2K0dWdmFESTNycjQyVjZMR2lESzNmZW9IUFA3VTFZK0o2MVFoV2hjREYzZGZnREpURDNFRTdqVTJBNlRJd3FscjIrQ25kUFVjYWQxYkNiSTRVdmRWVmxIejlZZ2dpOHQ2M1M4SGxFaGhQNGc0SVJGbFdZc1J3TEdvR3JOdE5RQk13S0t3Ym1tNFZrN2ZUcFE4YkFaWkE3RXdiMVYyQk8wdFpUdTFFV1B3YTNYRzg3dStKaVEyMVl5MW9pc01BYUNCYlM0YlhIVjZYSzlqZUFjTHBZclhEdDE5dGFEVVlFRElOZ0J1MmpxNHJVVlRlWTg3cHBTWDJWWjlBd3FydHo4MWNlMmJSRnc2RHBSb25seG9POTg1VWdDQVJHQ3Z5SUZzY0hzTlkvQXpIQllDYmhLQ0NScXg4Qzd3NThqVlZoNVgrUVhNamNFYUhxbko0V2MyekJqSXl3MFZhU05idz0=", + "authToken": "bgcP3C+4rWm+QlASiuDd", + "transportToken": "MIIBCgKCAQEA2Zrbg9vEdzbv3GRM5+IqFegYVv7Ekqz24RH1tbqjMzOY81dMmhZK\nYSjihiJDTaCziXN3bs/VAy0LHop9SVzqUw5SBT5C9nieD04sCQlUgmyUJhPBGXFS\nmeRAM4muROQW5JijqniVxe+Tkgewo/reMAGpUdJOb/VtnWJYuw0ZO6vKGzgG+p15\n7/FpIyo2raaH+xHQ1wJUeMPkacwlVl45xAX4sc/igx1XRlSGHOe8aJWOunFJzty9\nPFnoEPcvfRe5KbOY1eDgHOhQUEcCDAuSiDuZvRu2sf3MN745RDaohER/cHKjvd0j\nmMUgr+0kL8bsrn/gZ6FIzYTHAeRfkx+67wIDAQAB", + "contact_key": "MIIBCgKCAQEAuz50Pu3f7BgGnfBr9fruHwmOHY2jaMJx3Q4xHj1/DaJXPfy3LYgc/zhLrn3km26y1DVNZde+X1PTEdsqzxulVOpurnCVyBj2mmJxCM/fnMkLZmV+Htsxev7F8H332Dw5AFiqGp/UjXfSUdQ9kd9iNEUpqTvr2e7v3OfHfN8B1TYtpU4XGSBkfe8UB1J3cuh9RexbgtCTn7SUD43nHQbZHaXN166+8Egr2vFe+YexQ0KjeOvVAR1O555YpOdAvvkgpQW7Tb8lzIZDFJwa6YfpC5JlXN93S+FAOu1VjCujo2AlMd50j6vE0/ndlNEdmWyZdv+sBwf7PsKlXErX9bTitQIDAQAB", + "privkey": "MIIEowIBAAKCAQEAuz50Pu3f7BgGnfBr9fruHwmOHY2jaMJx3Q4xHj1/DaJXPfy3LYgc/zhLrn3km26y1DVNZde+X1PTEdsqzxulVOpurnCVyBj2mmJxCM/fnMkLZmV+Htsxev7F8H332Dw5AFiqGp/UjXfSUdQ9kd9iNEUpqTvr2e7v3OfHfN8B1TYtpU4XGSBkfe8UB1J3cuh9RexbgtCTn7SUD43nHQbZHaXN166+8Egr2vFe+YexQ0KjeOvVAR1O555YpOdAvvkgpQW7Tb8lzIZDFJwa6YfpC5JlXN93S+FAOu1VjCujo2AlMd50j6vE0/ndlNEdmWyZdv+sBwf7PsKlXErX9bTitQIDAQABAoIBADtMbR4c0WSAu1+7a0VsYYscyJAdchnUMqEyRGXyTdFwjzaHWS+nQp+lIXqyTfrXlPTVqJxPNfAUqOynvyf19mctEz5VU2oaVcbQ1EFZK9UIan7UN5voCQSNuPwPuLUXZWnxqnViFrtyrf3SPGl9GCm7mZUJ8AiFvhr0oF2wdnEh+1djZ1cNFS7Hsetczswi24nKxgCtddX8Ap2EqgiV5uH8azTf32trk/TZy4VmwVe82f075oAiwbx6L47asAIFLLwCIAR/X5s25wJHfPGIh5+BFp13DcIHQWkx7x33Y+xOu2iElloEQjUdme6+/ge5dMg++jp8u7U5ZdfZgRAhQoECgYEA6jPEU9GExs7DlIQY3HQK7vhRCqrtJIVbWYsP0wiDo6hfUYKdGr33GZcVChyenbN1HxwIyIaKB7RpsGUUDBNMMjXeUq/8ztUJzO3rwheLQc9a7tcFOchGXxoQnkGp21WQWoJiicVUDH6M7NxX0gO1sfGxpXtQZNDLfph+DRnwIWECgYEAzKvVY2L8J3xRGNQEwCwM76zP2bZbnSREbOjHpWzjnvFt8ON348bSlwoTwfIcHoVaan8g5YbCLM0zi/QptVvYXR7iMBSCe72YPFzBstxnVNQuA2yIu2Ko4saO1TcpEAg2imVHzlcCOkvhj66IgZzmP/MVbfnjZZxRFJ4wK+wVPdUCgYAMvHv0wvQhi6T/Mp/XfUgK7t4ZYmo7DjWFjRZzN4dRIxrr59p7VdFWRu0R+7R0hwnbgz7HCOoAuUL2IMkSTwpZwKwyeveYl+VMi7PCfl1IWuprCq5yEf4htd0pfhCqqOCMy4JoU57afxdS2ji8Zw8+ehJbGXWpxeELJWfVdo+kgQKBgQChLjVnBn3jLqDC970iBc7ONP6eymCNeRE133/SQ9Vhx2m4SbqRs3MGpVX3543Db2tL8P/cIerq01LjxY3PGBxlATxJdu1nO2EXMEkObUom4M23vpJTV5f+tzWmrcD1sjIZfTc2RQkpFbb1qxIvWHtvIyTeLeupipfDr+vpuwrjXQKBgCwE5IrNxJXH7sd3s0OTzCL/ttaQ6/fhcfQHzjEqZDgr3xtxU0N72QY6MESMXy+7n2Sar1MnKFdY76WkQejEAaX8n74wfBfkqrufd1FNZdAo9aaEDhjFZIE8b3DceIMGw6riI6348eFWaeJBX7j4S+udTtqQEFbEMSiaYKdu1ZLV", + "exported_keys": "a2V5czo6QXdIbm5CZ1FTbG1ha2VvcTZBSDBOeFpScW9UY0FkNFJlcWowWGpPVzBrMjVSQUNkb1hKejZEUldVTm9zS3U1YVdiT1g3bXdmM3h5QktsQ3l1TDZpblJ5QWlPR0pwWTJZaWR4ZWJDWTFPWi9NN3FraGk2bVg4V1pKWFNjc3ozSmZxeTVlYW1lcmRjdkpDS1p4bDlQTDNveTJQZ3hjT3VjU1dlYkl5N21TMllmeUVRSERESGQ3eEZBK3Y3S21leDVCT1ZCemdvYXVaMDJ5VVBER244Skh0UTR1VDdnandwZHA1WXJObWtYWmV3VldMNXFlc3prYWtyWEc2MW43M1V1alZTUTdxL0FJcjNkVTNHU3B5QmVrVWhhTXpyYVY1YzVIRzlKM09PK1dTYlY0NDdlZDFNeEcvdzFyLzlXTjhIUG0xSVIvWGZZa1lYS00vY1JGSTA4cTlkMkh5ak1RTG5RK2dWVy9mYll3ZVZWWWk5RjZKTUNxUjQzNk9Ya1gyYlYyTkJFajN3OUxaOWtIdFpETnBHMzJLb2tTbkdzc3lMa1NxMHhHRzhSWVIrVXlaTGlHbDVXSDgvd3hLS3k2SjVlTFJESWpiWC9BTHBaVmtzMmExZnFab2QwNjNNZ0loemxtUjVPay93aHh4SXl1Q2h4dUZud21HWUJScUdkZ1FIMFhDTDZqNlppQ1M5MjlSUWZWZEVIL201YUNwMXQxYVYzS3pnMy8rUnJLajJoMEVmdW1nVmZXYXBWb0J1TWNWME4rZis3dTc5a0JhMWVoQkgya0hGcHZHV2FRYnpWWGFXQTN2UFdPY0NWY3hlWkhqTnZENksrUEx6dHViOUNPcHRXeEUwRFlPL0pjblJZUWk1WTNXN1RpQ1pINVh5TERvZ0s2bnhDUm8wQURmVjNCNTJacGRINXY1RlpIcVpkaStYYU9MNStJWStmR3RvYzJPOVBOZGhFU2lWYjZ0ZFR2L3cyMGdDbm1JTWRtUFBYSWl6U1E2RzVCeHlJcVA5eVhEemRoTytBUDNBZ245cmFlaVNMZXJURG1YYk5HUm1kVVZaOEd0Z2N2TnBkR2JLZGpEK0hvRUNMdG1Ta3h5NHlMTWcyZ0NlbXdYOWorVTJEeml1ZmNFUUpFRjJBL0phZDhFOWpiTGpLcEI2anB1OXllQUNRMTA3ZVJaR2c2SVN3bVRtUXllV3hTbVZudDNmVmluRlRrRkUvV05ZYlR3UlppVW01cFJXNnczV2xHUkV6dHI1R0N3Q0pRaE5FOGFLa2tEeDRmTjYzbzZhYm0vM0F0SDFGK2RWdnkyQ2xSaGdBbDNoTmd1bEUzU1BoeTE3RTRoNzAwdm5nelVyZ0xveFpuODExeGx1ajgvOXlpY3dPam5UdDF1OFhwelBJL0x6ZGlOZ2ZXYlQvOC9uSEFTV0VjZzdQcUxWYmMvNFo3TnArYmhkdUpLRlJuT1I0OHdCbkVRZzZqVSswZUw1ZFpqVFBvbnJnTC9OMUljYnBEUmNMQzdkcDk1cllWemozWC9JcFB6R2w5N25ZVXU2OHM3SjA2bXlTNXhNZ29uMlZqNU5tVUlyRlpoVlNGeHRVbHZvKzBETFRVTHg2VzBya294NVVUNzdJdWJsdnpNbk1UM0pEQmtqSW9PYXlIL2lKS0k1UXZvcjF2NDcyc3grRytIVWpHOUhoSUJGdklSaWt0N1hhVVI0ekhZVjNRT0lpT3NTck1yOEcwTmxqRHZQU0J2V3VvUk9hMHhMUzhYUmJGbDh2TmJUZzBHTDcxQmhaaEpyZFdBSWZseVB2bTgxWElGV3U3dFVmQ2FsQUdQMlpnNE1aVmMwT1hUeFZ3TEFveEUzNGpwREIxMnViWk1OMkd3b2pKaUJDSDFGRFdDU2Z6dC84c1Q3M1IzMEVnWjdTSlNPTVhUd3JmendZUUJEMFFFM3RzakhMM0VSdFdwY0NnVXRiUUVUS1ZQU0w0RXVITTJGMkVmZjRQaU5Wa0ZjNlZyMys1MldERU9tc0tyYkVLRkN0SGxXZHZEbXpib0JnOEc4a2RDZzFxbFMvREhhKzM4UWFkbHNKUUoxZEVyc1F6aVBKQUExeURnckNBcU9qaHJxdnc2VzYweHdwNEZiOFZKZThhaThkWFdKNW9JNHY4QzU0S21CK1ZKOTJwNVFJdUljSVVkK1pOS2F2Y3V5emtrd0U5V3kwODRFQm1sQnNFLzFMZWV3V3ZrN2JCVmg0UGdKeUNyb3B0U0xnSlV3UnRVZjgxbFl2a25GWjhkR0YyVDVtNEdZanAzVUZ5dGFpeVhSWi9qMERJM0liaUd4RWpPZjNieUsyU0RrTXpJb0hVYnZjUVNjVVBZd2VhNTErWEJkTUdKUGZKaldKR1dsRVFPYXpBYXJab2IrRzRESld3WjlUczRSeVcvdGMvT0pZSVZyWjBzY2g3UlFXY0loR3pzQ1lENkxqM0Z5RXZSY3gwMklDaElGSE9FZk5BWHQxUUFIemFoQllGdURVdGx6YWJ3MGFvdHlIOHIvZWNNMVU0QStOczZIWU0rTVpXNnAxM0RIckIzVHdTZDdkWERKNkR2cWhiMnZhcUsrUlhDdHYrODJSN3dVa1pLSGltcXltYVRoc1MybVpob1BSajhzNGIyOVZZQUhmb3dlaEVNOStBK0dlbmdaQ3gvQ1lwZ3RYNkxETXd2SC9QTFhZM2hVcEl0Mk9nVjJxWlI1UnpZV1lYdTEvR0xMNjBxWEVtTGdBem50UDR5M2kvbUJMUXpNMm1PSzVmTzN0NmJhclBLNUpOeGJrazJSYWxjU3JaRFhnOXNQQmdNVDBmVUszc0JHMDh0WGtuL1hnZGczMUZiUW8xQXVrZFAySzcxQXZhSHFubWIyNHVDdUJSdmRvY1JQNUNMSVJEbGl6RE5FT2FZTlNrQU5uK3o2VTlOaGRmMmt5QnVieGZ3bEtKV3luTDZvMENMdWhRS2cxaDBMSzNYMVV5eGV5VWdrMXNkd3hMQmk1QlpTRDZZQ2NjTnNDTHZud2RWVVVqSTR0bCtIZmgzci9ra2E3UHh6MGVBNmhKaEJ1UlhtU21WYzU5MzFSU0lVSS9WeE1qWVlsY1BMV2pXVTJXQkgxdS9MN3NtQTB1OTBlRFNaa3BvbHJiWGlIc0tyQnBRUUs1ZzgrdVppU1EzYi85ZUkrRVpGeHJaMTZaL0tJbnJUbWFXUUZzcWxKSkFpSUVPdUxZQUs0R0xHV2JZVHMxUUtPVUJnWXBzaERPRG1pTmp5bXdjOEcrWVRqK2ZiN0JPYjdJbkRlZFNtMHJVTnJNV2NHQlg2dlRmejhWQUxOUGIxZmMrZWVxY0Y1eDExN1ZQWk82WUdZbnZzdWFVaDl4UmpvRktVRThrY05WUFFMRzRlbzVMbGZqLzF2eXF1M3JJUkhaemw2aCtkaDNhcmVzaVAwc054MlcxTWhyK0VZc0FrUXcxRUNuZkVpa3FZNXFKcWhjaENmTlZIRkVZYUJDcGM5anFUODdHWVRZOU5MMlhDeHJ3VzcxV0JhM1hUdGxyREhTY2JwNjU1TmJIOUdaMlM1cGJNdFJLQnpYZm5uYjBjSnBCVnhiSS9RZ3hTMkVWbG40Y2VxdWJYUFpuQXl5UzlFSG9pQ0xmUTE0WjI5bXdxL2NIay9vTWM0Q0xMZGI3VWZDY2I2Sjlhcz0=", "pin": "111111" } ] diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts new file mode 100644 index 000000000..b469e2aa8 --- /dev/null +++ b/src/tests/controllers/mlBot.test.ts @@ -0,0 +1,197 @@ +import test from 'ava' +import { randomText, sleep } from '../utils/helpers' +import { deleteTribe, leaveTribe } from '../utils/del' +import { createTribe, joinTribe } from '../utils/save' +import { sendTribeMessage, decryptMessage } from '../utils/msg' +import nodes from '../nodes' +import { getCheckBotMsg, shouldNotGetNewMsgs } from '../utils/get' +import { Message } from '../types' + +/* +npx ava src/tests/controllers/mlBot.test.ts --verbose --serial --timeout=2m +*/ + +test('test ml-bot: create tribe, join tribe, install bot, send messages, receive bot response, leave tribe, delete tribe', async (t) => { + await mlBot(t, 0, 1, 4) +}) + +export async function mlBot(t, index1, index2, index3) { + let alice = nodes[index1] + let bob = nodes[index2] + let virtualNode1 = nodes[index3] + t.truthy(virtualNode1, 'this test requires three nodes') + + console.log( + `Checking ml-bot response in tribe for ${alice.alias} and ${bob.alias} and ${virtualNode1.alias}` + ) + + //ALICE CREATES A TRIBE + let tribe = await createTribe(t, alice) + t.truthy(tribe, 'tribe should have been created by alice') + + //BOB JOINS TRIBE CREATED BY NODE1 + if (alice.routeHint) tribe.owner_route_hint = alice.routeHint + let join = await joinTribe(t, bob, tribe) + t.true(join, 'bob should join tribe') + + //VIRTUALNODE1 JOINS TRIBE CREATED BY NODE1 + let join2 = await joinTribe(t, virtualNode1, tribe) + t.true(join2, 'node3 should join tribe') + + //Alice installs ML Bot + const install = '/bot install ml' + await sendTribeMessage(t, alice, tribe, install) + + let botAlias = 'MotherBot' + const botReply = await getCheckBotMsg(t, alice, botAlias, tribe, 1) + t.truthy(botReply, 'MotherBot should reply') + + botAlias = 'MlBot' + + //http://ml-bot-sphinx-server:3500/text + const url = 'http://localhost:3500/text' + + //Alice Set Text URL + const urlCommand = `/ml url ${url}` + await sendTribeMessage(t, alice, tribe, urlCommand) + + await sleep(20) + + const botReply2 = await getCheckBotMsg(t, alice, botAlias, tribe, 1) + t.truthy(botReply2, 'MlBot should reply') + + //Alice set API_KEY + const api_key = '/ml api_key qwerty' + const apiKeyMsg = await sendTribeMessage(t, alice, tribe, api_key) + + const botReply3 = await getCheckBotMsg(t, alice, botAlias, tribe, 2) + t.truthy(botReply3, 'MlBot should reply') + + const checkNode1 = await shouldNotGetNewMsgs(t, bob, apiKeyMsg.uuid) + t.true(checkNode1, 'BOB SHOULD NOT SEE THE API_KEY TRIBE COMMAND') + + const checkNode2 = await shouldNotGetNewMsgs(t, virtualNode1, apiKeyMsg.uuid) + t.true(checkNode2, 'VIRTUALNODE1 SHOULD NOT SEE THE API_KEY TRIBE COMMAND') + + //Bot sends Message in tribe + const text4 = randomText() + const bobMessage = await sendTribeMessage(t, bob, tribe, text4) + + const botTextResponse = + '
This is a response from test ml-bot server built in sphinx-stack
' + const botImageResponse = + '
' + await sleep(8000) + const botReply4 = (await getCheckBotMsg( + t, + bob, + botAlias, + tribe, + 1 + )) as Message + const botResponse = decryptMessage(bob, botReply4) + t.true(botResponse === botTextResponse) + + //VirtualNodeShould Node See Message + const checkNode3 = await shouldNotGetNewMsgs(t, virtualNode1, bobMessage.uuid) + t.true(checkNode3, 'VIRTUALNODE1 SHOULD NOT SEE Bob Message') + + //Bot sends Message in tribe + const text5 = randomText() + const virtualNode1Message = await sendTribeMessage( + t, + virtualNode1, + tribe, + text5 + ) + await sleep(8000) + const botReply5 = (await getCheckBotMsg( + t, + bob, + botAlias, + tribe, + 1 + )) as Message + const botResponse2 = decryptMessage(bob, botReply5) + t.true(botResponse2 === botTextResponse) + + //Bob Node Should not See VirtualNode1 Message + const checkNode4 = await shouldNotGetNewMsgs(t, bob, virtualNode1Message.uuid) + t.true(checkNode4, 'BOB SHOULD NOT SEE VIRTUALNODE1 Message') + + //Alice change Tribe kind to image + const imageKind = '/ml kind image' + await sendTribeMessage(t, alice, tribe, imageKind) + + const botReply6 = await getCheckBotMsg(t, alice, botAlias, tribe, 5) + t.truthy(botReply6, 'MlBot should reply') + + const imageUrl = 'http://localhost:3500/image' + + //Alice change Tribe kind to image + const imageUrlMsg = `/ml url ${imageUrl}` + await sendTribeMessage(t, alice, tribe, imageUrlMsg) + + const botReply7 = await getCheckBotMsg(t, alice, botAlias, tribe, 6) + t.truthy(botReply7, 'MlBot should reply') + + //Alice sends Message in the tribe + const text6 = randomText() + const aliceMsg = await sendTribeMessage(t, alice, tribe, text6) + + await sleep(8000) + + const botReply8 = (await getCheckBotMsg( + t, + alice, + botAlias, + tribe, + 7 + )) as Message + const botResponse3 = decryptMessage(alice, botReply8) + t.true(botResponse3 === botImageResponse) + + //Bob Node Should not See Alice Message + const checkNode5 = await shouldNotGetNewMsgs(t, bob, aliceMsg.uuid) + t.true(checkNode5, 'BOB SHOULD NOT SEE ALICE Message') + + //VirtualNode1 Should not See Alice Message + const checkNode6 = await shouldNotGetNewMsgs(t, virtualNode1, aliceMsg.uuid) + t.true(checkNode6, 'VIRTUALNODE1 SHOULD NOT SEE ALICE Message') + + //VirtualNode1 send message in tribe + const text9 = randomText() + const virtualNodeImageMsg = await sendTribeMessage( + t, + virtualNode1, + tribe, + text9 + ) + await sleep(8000) + + const botReply9 = (await getCheckBotMsg( + t, + virtualNode1, + botAlias, + tribe, + 2 + )) as Message + const botResponse4 = decryptMessage(virtualNode1, botReply9) + t.true(botResponse4 === botImageResponse) + + //Bob Node Should not See VirtualNode Message + const checkNode7 = await shouldNotGetNewMsgs(t, bob, virtualNodeImageMsg.uuid) + t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message') + + //BOB LEAVES TRIBE + let left2 = await leaveTribe(t, bob, tribe) + t.true(left2, 'bob should leave tribe') + + //VIRTUALNODE1 LEAVES TRIBE + let left3 = await leaveTribe(t, virtualNode1, tribe) + t.true(left3, 'virtualNode1 should leave tribe') + + //NODE1 DELETES TRIBE + let delTribe2 = await deleteTribe(t, alice, tribe) + t.true(delTribe2, 'alice should delete tribe') +} diff --git a/src/tests/utils/msg/decryptMsg.ts b/src/tests/utils/msg/decryptMsg.ts new file mode 100644 index 000000000..0c5f370f1 --- /dev/null +++ b/src/tests/utils/msg/decryptMsg.ts @@ -0,0 +1,7 @@ +import * as rsa from '../../../crypto/rsa' +import { NodeConfig, Message } from '../../types' + +export function decryptMessage(node: NodeConfig, message: Message) { + const decrypt = rsa.decrypt(node.privkey, message.message_content) + return decrypt +} diff --git a/src/tests/utils/msg/index.ts b/src/tests/utils/msg/index.ts index 983249879..a3fa4220b 100644 --- a/src/tests/utils/msg/index.ts +++ b/src/tests/utils/msg/index.ts @@ -18,3 +18,4 @@ export { sendDirectPayment, } from './sendTribeDirectpayment' export { getTribeMessages } from './getTribeMessages' +export { decryptMessage } from './decryptMsg' From 54364d41376ad234381fe94faffe95f0bdce291c Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:25:25 +0100 Subject: [PATCH 40/93] update: unified ml botname --- dist/src/builtin/ml.js | 2 +- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 3 ++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 2 +- src/builtin/utill/ml.ts | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index dc798000f..2db99dd15 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -96,7 +96,7 @@ function init() { } exports.CALLBACKS[process_id] = function (msg) { const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') + .setAuthor(exports.ML_BOTNAME) .setOnlyUser(parseInt(message.member.id || '0')); if (meta.kind === 'text') { embed.setDescription(msg); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 69e86a3d6..f6b6952a0 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 3e7ac1400..4e4ae8b3a 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.mlBotResponse = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); const Sphinx = require("sphinx-bot"); +const ml_1 = require("../ml"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { return __awaiter(this, void 0, void 0, function* () { if (!newUrl) { @@ -75,7 +76,7 @@ function defaultCommand(botName, botPrefix, message) { exports.defaultCommand = defaultCommand; function mlBotResponse(msg, message) { const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') + .setAuthor(ml_1.ML_BOTNAME) .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')); message.channel.send({ embed }); diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 1249068f3..2fe37bf42 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 33493b58f..33ae1a452 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -135,7 +135,7 @@ export function init() { CALLBACKS[process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') + .setAuthor(ML_BOTNAME) .setOnlyUser(parseInt(message.member.id || '0')) if (meta.kind === 'text') { embed.setDescription(msg) diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 659f13bd9..3f80da7d6 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -1,6 +1,7 @@ import { ChatBotRecord, ChatRecord } from '../../models' import { botResponse } from './index' import * as Sphinx from 'sphinx-bot' +import { ML_BOTNAME } from '../ml' type ContentKind = 'text' | 'image' export interface MlMeta { @@ -139,7 +140,7 @@ export function defaultCommand( export function mlBotResponse(msg: string, message: Sphinx.Message) { const embed = new Sphinx.MessageEmbed() - .setAuthor('ML Bot') + .setAuthor(ML_BOTNAME) .setDescription(msg) .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) From a3591780fb61557a09d5be00309c5108c17702fd Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:28:05 +0100 Subject: [PATCH 41/93] update: changed ml-bot server to docker-internal url --- dist/src/tests/controllers/mlBot.test.js | 4 ++-- dist/src/tests/controllers/mlBot.test.js.map | 2 +- src/tests/controllers/mlBot.test.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index 9a3ddf397..2334d5ddd 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -49,7 +49,7 @@ function mlBot(t, index1, index2, index3) { t.truthy(botReply, 'MotherBot should reply'); botAlias = 'MlBot'; //http://ml-bot-sphinx-server:3500/text - const url = 'http://localhost:3500/text'; + const url = 'http://ml-bot-sphinx-server:3500/text'; //Alice Set Text URL const urlCommand = `/ml url ${url}`; yield (0, msg_1.sendTribeMessage)(t, alice, tribe, urlCommand); @@ -92,7 +92,7 @@ function mlBot(t, index1, index2, index3) { yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageKind); const botReply6 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 5); t.truthy(botReply6, 'MlBot should reply'); - const imageUrl = 'http://localhost:3500/image'; + const imageUrl = 'http://ml-bot-sphinx-server:3500/image'; //Alice change Tribe kind to image const imageUrlMsg = `/ml url ${imageUrl}`; yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageUrlMsg); diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index 26da1eae6..bd2028ae0 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index b469e2aa8..c9e73862c 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -49,7 +49,7 @@ export async function mlBot(t, index1, index2, index3) { botAlias = 'MlBot' //http://ml-bot-sphinx-server:3500/text - const url = 'http://localhost:3500/text' + const url = 'http://ml-bot-sphinx-server:3500/text' //Alice Set Text URL const urlCommand = `/ml url ${url}` @@ -126,7 +126,7 @@ export async function mlBot(t, index1, index2, index3) { const botReply6 = await getCheckBotMsg(t, alice, botAlias, tribe, 5) t.truthy(botReply6, 'MlBot should reply') - const imageUrl = 'http://localhost:3500/image' + const imageUrl = 'http://ml-bot-sphinx-server:3500/image' //Alice change Tribe kind to image const imageUrlMsg = `/ml url ${imageUrl}` From 32ed39e04ec6adb3a1772991e03579add7d82d3b Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:34:34 +0100 Subject: [PATCH 42/93] update: added ml-bot server branch on stack --- .github/workflows/cln_proxy_integration_test.yml | 2 +- .github/workflows/integration_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 23c957843..6e1329b79 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -70,7 +70,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b feat/ml-bot-server https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 666e4ac62..c3fb0abdf 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -70,7 +70,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b feat/ml-bot-server https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From 00ac6bcca028e2dce743a4b1ef43adc6790f2e70 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:37:10 +0100 Subject: [PATCH 43/93] added ml bot to array of test --- .github/workflows/cln_proxy_integration_test.yml | 1 + .github/workflows/integration_test.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 6e1329b79..8386e8516 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -51,6 +51,7 @@ jobs: 'externalBotApi', 'externalHostedBot', 'spamGoneBot', + 'mlBot', ] node: [16] steps: diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index c3fb0abdf..b07ea2122 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -50,7 +50,8 @@ jobs: 'fees', 'externalBotApi', 'externalHostedBot', - spamGoneBot, + 'spamGoneBot', + 'mlBot', ] node: [16] steps: From 54ef5ad38039bf42da07a4f44bb0ae8b51595173 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 01:55:42 +0100 Subject: [PATCH 44/93] update: added log to workflow --- .github/workflows/cln_proxy_integration_test.yml | 4 ++++ .github/workflows/integration_test.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 8386e8516..ec1473cf3 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -103,3 +103,7 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m + continue-on-error: true + - name: See Logs + run: | + docker logs ml-bot-sphinx-server diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index b07ea2122..5da28a18f 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -103,3 +103,7 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m + continue-on-error: true + - name: See Logs + run: | + docker logs ml-bot-sphinx-server From 0211c7182c905a03eee3cc4ff6f19f98457f0f96 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 02:11:34 +0100 Subject: [PATCH 45/93] updated added alice log --- .github/workflows/cln_proxy_integration_test.yml | 1 + .github/workflows/integration_test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index ec1473cf3..d91a1697e 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -107,3 +107,4 @@ jobs: - name: See Logs run: | docker logs ml-bot-sphinx-server + docker logs alice.sphinx diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 5da28a18f..522f714cc 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -107,3 +107,4 @@ jobs: - name: See Logs run: | docker logs ml-bot-sphinx-server + docker logs alice.sphinx From 9f06a4ad37b268c25f525e140668c45b2c7b02bd Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 02:55:47 +0100 Subject: [PATCH 46/93] update: removed logs from github workflow --- .github/workflows/cln_proxy_integration_test.yml | 5 ----- .github/workflows/integration_test.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index d91a1697e..8386e8516 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -103,8 +103,3 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m - continue-on-error: true - - name: See Logs - run: | - docker logs ml-bot-sphinx-server - docker logs alice.sphinx diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 522f714cc..b07ea2122 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -103,8 +103,3 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m - continue-on-error: true - - name: See Logs - run: | - docker logs ml-bot-sphinx-server - docker logs alice.sphinx From 0c0efa7401fc859723878439277eda0c9a0ef7d1 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 15 Aug 2023 02:56:44 +0100 Subject: [PATCH 47/93] update: removed a sleep function --- dist/src/builtin/ml.js | 8 +------- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 2db99dd15..ab442cd63 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.sleep = exports.init = exports.CALLBACKS = exports.ML_BOTNAME = exports.ML_PREFIX = void 0; +exports.init = exports.CALLBACKS = exports.ML_BOTNAME = exports.ML_PREFIX = void 0; const Sphinx = require("sphinx-bot"); const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); @@ -117,10 +117,4 @@ function init() { })); } exports.init = init; -function sleep(ms) { - return __awaiter(this, void 0, void 0, function* () { - return new Promise((resolve) => setTimeout(resolve, ms)); - }); -} -exports.sleep = sleep; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index f6b6952a0..96ed5843b 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 33ae1a452..bfa26e0a5 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -155,7 +155,3 @@ export function init() { } }) } - -export async function sleep(ms: number): Promise { - return new Promise((resolve) => setTimeout(resolve, ms)) -} From 1126fdd2ccac6c7207005e62e489f359b4c40af5 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 16 Aug 2023 11:37:12 +0100 Subject: [PATCH 48/93] update: added attachment to message type ml bot accespts --- dist/src/builtin/mother.js | 4 ++++ dist/src/builtin/mother.js.map | 2 +- src/builtin/mother.ts | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 7d24e3b14..d61048567 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -54,6 +54,10 @@ const builtInBotMsgTypes = { constants_1.default.message_types.boost, constants_1.default.message_types.attachment, ], + [`${ml_1.ML_PREFIX.substring(1)}`]: [ + constants_1.default.message_types.message, + constants_1.default.message_types.attachment, + ], }; const builtInHiddenCmd = { callRecording: ['hide', 'update'], diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 3edca1c9d..5e860e3ed 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index b1c0d1a1d..671a93e12 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -47,6 +47,10 @@ const builtInBotMsgTypes = { constants.message_types.boost, constants.message_types.attachment, ], + [`${ML_PREFIX.substring(1)}`]: [ + constants.message_types.message, + constants.message_types.attachment, + ], } const builtInHiddenCmd = { From 4fcef4084384b23ec9740ecfd72fb9a697f54e99 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 16 Aug 2023 17:41:28 +0100 Subject: [PATCH 49/93] feat: added the add new model command --- dist/src/builtin/ml.js | 5 ++- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 42 +++++++++++++++++- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 6 ++- src/builtin/utill/ml.ts | 75 +++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 6 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index ab442cd63..fd36d8e47 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -40,7 +40,7 @@ function init() { where: { uuid: message.channel.id }, })); const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); - let meta = JSON.parse(bot.meta || `{}`); + let meta = JSON.parse(bot.meta || `[]`); meta.kind = meta.kind || 'text'; const url = meta.url; const api_key = meta.apiKey; @@ -60,6 +60,9 @@ function init() { const newKind = arr[2]; yield (0, ml_1.addKind)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newKind); return; + case 'add': + yield (0, ml_1.addModel)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, arr, message); + return; default: (0, ml_1.defaultCommand)(exports.ML_BOTNAME, exports.ML_PREFIX, message); return; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 96ed5843b..f666d4d9d 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 4e4ae8b3a..f65586570 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.mlBotResponse = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; +exports.mlBotResponse = exports.addModel = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); const Sphinx = require("sphinx-bot"); const ml_1 = require("../ml"); +const logger_1 = require("../../utils/logger"); function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { return __awaiter(this, void 0, void 0, function* () { if (!newUrl) { @@ -74,6 +75,45 @@ function defaultCommand(botName, botPrefix, message) { message.channel.send({ embed }); } exports.defaultCommand = defaultCommand; +function findMetaByName(name, mlMeta) { + for (let i = 0; i < mlMeta.length; i++) { + const meta = mlMeta[i]; + if (meta.name === name) { + return meta; + } + } +} +function addModel(botName, botPrefix, tribe, msgArr, messageObject) { + return __awaiter(this, void 0, void 0, function* () { + const cmd = msgArr[1]; + const name = msgArr[2]; + const url = msgArr[3]; + try { + if (!name) { + yield (0, index_1.botResponse)(botName, 'Please provide a valid model name', botPrefix, tribe.id, messageObject, cmd); + return; + } + const bot = yield (0, index_1.findBot)({ botPrefix, tribe }); + let metaArray = JSON.parse(bot.meta || `[]`); + const meta = findMetaByName(name, metaArray); + if (meta) { + yield (0, index_1.botResponse)(botName, 'Model already exist', botPrefix, tribe.id, messageObject, cmd); + return; + } + const newModel = { name, apiKey: '', url: url || '', kind: 'text' }; + metaArray.push(newModel); + yield bot.update({ meta: JSON.stringify(metaArray) }); + yield (0, index_1.botResponse)(botName, 'New model added successfully', botPrefix, tribe.id, messageObject, cmd); + return; + } + catch (error) { + logger_1.sphinxLogger.error(`error while adding model: ${error}`, logger_1.logging.Bots); + yield (0, index_1.botResponse)(botName, error.message || 'Error occured while adding a model', botPrefix, tribe.id, messageObject, cmd); + return; + } + }); +} +exports.addModel = addModel; function mlBotResponse(msg, message) { const embed = new Sphinx.MessageEmbed() .setAuthor(ml_1.ML_BOTNAME) diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 2fe37bf42..a245d26bb 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index bfa26e0a5..51220cfa5 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -11,6 +11,7 @@ import { addKind, defaultCommand, mlBotResponse, + addModel, } from './utill/ml' import { sphinxLogger, logging } from '../utils/logger' @@ -46,7 +47,7 @@ export function init() { const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) - let meta: MlMeta = JSON.parse(bot.meta || `{}`) + let meta: MlMeta = JSON.parse(bot.meta || `[]`) meta.kind = meta.kind || 'text' const url = meta.url const api_key = meta.apiKey @@ -95,6 +96,9 @@ export function init() { newKind ) return + case 'add': + await addModel(ML_BOTNAME, ML_PREFIX, tribe, arr, message) + return default: defaultCommand(ML_BOTNAME, ML_PREFIX, message) return diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 3f80da7d6..734c92ab3 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -1,13 +1,15 @@ import { ChatBotRecord, ChatRecord } from '../../models' -import { botResponse } from './index' +import { botResponse, findBot } from './index' import * as Sphinx from 'sphinx-bot' import { ML_BOTNAME } from '../ml' +import { sphinxLogger, logging } from '../../utils/logger' type ContentKind = 'text' | 'image' export interface MlMeta { url: string apiKey: string kind: ContentKind + name: string } export async function addUrl( @@ -138,6 +140,77 @@ export function defaultCommand( message.channel.send({ embed }) } +function findMetaByName(name: string, mlMeta: MlMeta[]) { + for (let i = 0; i < mlMeta.length; i++) { + const meta = mlMeta[i] + if (meta.name === name) { + return meta + } + } +} + +export async function addModel( + botName: string, + botPrefix: string, + tribe: ChatRecord, + msgArr: string[], + messageObject: Sphinx.Message +) { + const cmd = msgArr[1] + const name = msgArr[2] + const url = msgArr[3] + try { + if (!name) { + await botResponse( + botName, + 'Please provide a valid model name', + botPrefix, + tribe.id, + messageObject, + cmd + ) + return + } + const bot = await findBot({ botPrefix, tribe }) + let metaArray: MlMeta[] = JSON.parse(bot.meta || `[]`) + const meta = findMetaByName(name, metaArray) + if (meta) { + await botResponse( + botName, + 'Model already exist', + botPrefix, + tribe.id, + messageObject, + cmd + ) + return + } + const newModel: MlMeta = { name, apiKey: '', url: url || '', kind: 'text' } + metaArray.push(newModel) + await bot.update({ meta: JSON.stringify(metaArray) }) + await botResponse( + botName, + 'New model added successfully', + botPrefix, + tribe.id, + messageObject, + cmd + ) + return + } catch (error) { + sphinxLogger.error(`error while adding model: ${error}`, logging.Bots) + await botResponse( + botName, + error.message || 'Error occured while adding a model', + botPrefix, + tribe.id, + messageObject, + cmd + ) + return + } +} + export function mlBotResponse(msg: string, message: Sphinx.Message) { const embed = new Sphinx.MessageEmbed() .setAuthor(ML_BOTNAME) From 2aa739136b6324783a9b7b7b0e210ccdb5c9d0f7 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 16 Aug 2023 19:20:21 +0100 Subject: [PATCH 50/93] updated: updated meta to use object instead of array --- dist/src/builtin/ml.js | 3 +- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 59 ++++++++++++++-------- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 12 +---- src/builtin/utill/ml.ts | 85 +++++++++++++++++--------------- 6 files changed, 89 insertions(+), 74 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index fd36d8e47..425364301 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -49,8 +49,7 @@ function init() { const cmd = arr[1]; switch (cmd) { case 'url': - const newUrl = arr[2]; - yield (0, ml_1.addUrl)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newUrl); + yield (0, ml_1.addUrl)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; case 'api_key': const newApiKey = arr[2]; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index f666d4d9d..129db2745 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index f65586570..894c85e86 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -14,16 +14,43 @@ const index_1 = require("./index"); const Sphinx = require("sphinx-bot"); const ml_1 = require("../ml"); const logger_1 = require("../../utils/logger"); -function addUrl(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newUrl) { +function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { return __awaiter(this, void 0, void 0, function* () { - if (!newUrl) { - yield (0, index_1.botResponse)(botName, 'Please provide a valid URL', botPrefix, tribe.id, messageObj, cmd); - return; + const cmd = msgArr[1]; + const name = msgArr[2]; + const url = msgArr[3]; + try { + if (!name || !url) { + yield (0, index_1.botResponse)(botName, `Please provide a valid model ${name ? 'url' : 'name'}`, botPrefix, tribe.id, messageObj, cmd); + return; + } + // const bot = await findBot({ botPrefix, tribe }) + // let metaObj: MlMeta[] = JSON.parse(bot.meta || `[]`) + // const meta = findMetaByName(name, metaObj) + // if (!meta) { + // await botResponse( + // botName, + // 'Model does not exist', + // botPrefix, + // tribe.id, + // messageObj, + // cmd + // ) + // return + // } + // meta.url = url + // await bot.update({ meta: JSON.stringify(meta) }) + // await botResponse( + // botName, + // 'URL updated successfully', + // botPrefix, + // tribe.id, + // messageObj, + // cmd + // ) + // return } - meta.url = newUrl; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, index_1.botResponse)(botName, 'URL updated successfully', botPrefix, tribe.id, messageObj, cmd); - return; + catch (error) { } }); } exports.addUrl = addUrl; @@ -75,14 +102,6 @@ function defaultCommand(botName, botPrefix, message) { message.channel.send({ embed }); } exports.defaultCommand = defaultCommand; -function findMetaByName(name, mlMeta) { - for (let i = 0; i < mlMeta.length; i++) { - const meta = mlMeta[i]; - if (meta.name === name) { - return meta; - } - } -} function addModel(botName, botPrefix, tribe, msgArr, messageObject) { return __awaiter(this, void 0, void 0, function* () { const cmd = msgArr[1]; @@ -94,15 +113,15 @@ function addModel(botName, botPrefix, tribe, msgArr, messageObject) { return; } const bot = yield (0, index_1.findBot)({ botPrefix, tribe }); - let metaArray = JSON.parse(bot.meta || `[]`); - const meta = findMetaByName(name, metaArray); + let metaObj = JSON.parse(bot.meta || `{}`); + const meta = metaObj[name]; if (meta) { yield (0, index_1.botResponse)(botName, 'Model already exist', botPrefix, tribe.id, messageObject, cmd); return; } const newModel = { name, apiKey: '', url: url || '', kind: 'text' }; - metaArray.push(newModel); - yield bot.update({ meta: JSON.stringify(metaArray) }); + metaObj[name] = Object.assign({}, newModel); + yield bot.update({ meta: JSON.stringify(metaObj) }); yield (0, index_1.botResponse)(botName, 'New model added successfully', botPrefix, tribe.id, messageObject, cmd); return; } diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index a245d26bb..37d580ba7 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAA8C;AAC9C,qCAAoC;AACpC,8BAAkC;AAClC,+CAA0D;AAU1D,SAAsB,MAAM,CAC1B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;gBACjB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EACvD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,kDAAkD;YAClD,uDAAuD;YACvD,6CAA6C;YAC7C,eAAe;YACf,uBAAuB;YACvB,eAAe;YACf,8BAA8B;YAC9B,iBAAiB;YACjB,gBAAgB;YAChB,kBAAkB;YAClB,UAAU;YACV,MAAM;YACN,WAAW;YACX,IAAI;YACJ,iBAAiB;YACjB,mDAAmD;YACnD,qBAAqB;YACrB,aAAa;YACb,gCAAgC;YAChC,eAAe;YACf,cAAc;YACd,gBAAgB;YAChB,QAAQ;YACR,IAAI;YACJ,SAAS;SACV;QAAC,OAAO,KAAK,EAAE,GAAE;IACpB,CAAC;CAAA;AAhDD,wBAgDC;AAED,SAAsB,SAAS,CAC7B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,SAAiB;;QAEjB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,8BAgCC;AAED,SAAsB,OAAO,CAC3B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,OAAe;;QAEf,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;QACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,uBAAuB,OAAO,EAAE,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,0BAgCC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,SAAiB,EACjB,OAAuB;IAEvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,OAAO,CAAC;SAClB,QAAQ,CAAC,eAAe,CAAC;SACzB,SAAS,CAAC;QACT;YACE,IAAI,EAAE,cAAc,OAAO,EAAE;YAC7B,KAAK,EAAE,GAAG,SAAS,YAAY;SAChC;QACD;YACE,IAAI,EAAE,kBAAkB,OAAO,EAAE;YACjC,KAAK,EAAE,GAAG,SAAS,gBAAgB;SACpC;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,GAAG,SAAS,oBAAoB;SACxC;KACF,CAAC;SACD,YAAY,CAAC,IAAI,CAAC,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAxBD,wCAwBC;AAED,SAAsB,QAAQ,CAC5B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,MAAgB,EAChB,aAA6B;;QAE7B,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,mCAAmC,EACnC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,IAAI,EAAE;gBACR,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,qBAAqB,EACrB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,QAAQ,GAAW,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;YAC3E,OAAO,CAAC,IAAI,CAAC,qBAAQ,QAAQ,CAAE,CAAA;YAC/B,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,6BAA6B,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACtE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,oCAAoC,EACrD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA5DD,4BA4DC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,OAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,eAAU,CAAC;SACrB,cAAc,CAAC,GAAG,CAAC;SACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAND,sCAMC"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 51220cfa5..726d7cf06 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -58,17 +58,7 @@ export function init() { switch (cmd) { case 'url': - const newUrl = arr[2] - await addUrl( - bot, - meta, - ML_BOTNAME, - ML_PREFIX, - tribe, - cmd, - message, - newUrl - ) + await addUrl(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return case 'api_key': const newApiKey = arr[2] diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 734c92ab3..a57b5085a 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -13,37 +13,53 @@ export interface MlMeta { } export async function addUrl( - bot: ChatBotRecord, - meta: MlMeta, botName: string, botPrefix: string, tribe: ChatRecord, - cmd: string, messageObj: Sphinx.Message, - newUrl: string + msgArr: string[] ) { - if (!newUrl) { - await botResponse( - botName, - 'Please provide a valid URL', - botPrefix, - tribe.id, - messageObj, - cmd - ) - return - } - meta.url = newUrl - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( - botName, - 'URL updated successfully', - botPrefix, - tribe.id, - messageObj, - cmd - ) - return + const cmd = msgArr[1] + const name = msgArr[2] + const url = msgArr[3] + try { + if (!name || !url) { + await botResponse( + botName, + `Please provide a valid model ${name ? 'url' : 'name'}`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + // const bot = await findBot({ botPrefix, tribe }) + // let metaObj: MlMeta[] = JSON.parse(bot.meta || `[]`) + // const meta = findMetaByName(name, metaObj) + // if (!meta) { + // await botResponse( + // botName, + // 'Model does not exist', + // botPrefix, + // tribe.id, + // messageObj, + // cmd + // ) + // return + // } + // meta.url = url + // await bot.update({ meta: JSON.stringify(meta) }) + // await botResponse( + // botName, + // 'URL updated successfully', + // botPrefix, + // tribe.id, + // messageObj, + // cmd + // ) + // return + } catch (error) {} } export async function addApiKey( @@ -140,15 +156,6 @@ export function defaultCommand( message.channel.send({ embed }) } -function findMetaByName(name: string, mlMeta: MlMeta[]) { - for (let i = 0; i < mlMeta.length; i++) { - const meta = mlMeta[i] - if (meta.name === name) { - return meta - } - } -} - export async function addModel( botName: string, botPrefix: string, @@ -172,8 +179,8 @@ export async function addModel( return } const bot = await findBot({ botPrefix, tribe }) - let metaArray: MlMeta[] = JSON.parse(bot.meta || `[]`) - const meta = findMetaByName(name, metaArray) + let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) + const meta = metaObj[name] if (meta) { await botResponse( botName, @@ -186,8 +193,8 @@ export async function addModel( return } const newModel: MlMeta = { name, apiKey: '', url: url || '', kind: 'text' } - metaArray.push(newModel) - await bot.update({ meta: JSON.stringify(metaArray) }) + metaObj[name] = { ...newModel } + await bot.update({ meta: JSON.stringify(metaObj) }) await botResponse( botName, 'New model added successfully', From 8df7cfc771d6835878e6457d8190dadaa74f5d2b Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 16 Aug 2023 22:16:38 +0100 Subject: [PATCH 51/93] update: updated the url commad to work with model name --- dist/src/builtin/utill/ml.js | 42 ++++++++------------- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/utill/ml.ts | 63 +++++++++++++++++++------------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 894c85e86..40d7f2c18 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -24,33 +24,23 @@ function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { yield (0, index_1.botResponse)(botName, `Please provide a valid model ${name ? 'url' : 'name'}`, botPrefix, tribe.id, messageObj, cmd); return; } - // const bot = await findBot({ botPrefix, tribe }) - // let metaObj: MlMeta[] = JSON.parse(bot.meta || `[]`) - // const meta = findMetaByName(name, metaObj) - // if (!meta) { - // await botResponse( - // botName, - // 'Model does not exist', - // botPrefix, - // tribe.id, - // messageObj, - // cmd - // ) - // return - // } - // meta.url = url - // await bot.update({ meta: JSON.stringify(meta) }) - // await botResponse( - // botName, - // 'URL updated successfully', - // botPrefix, - // tribe.id, - // messageObj, - // cmd - // ) - // return + const bot = yield (0, index_1.findBot)({ botPrefix, tribe }); + let metaObj = JSON.parse(bot.meta || `{}`); + const meta = metaObj[name]; + if (!meta) { + yield (0, index_1.botResponse)(botName, 'Model does not exist', botPrefix, tribe.id, messageObj, cmd); + return; + } + metaObj[name] = Object.assign(Object.assign({}, meta), { url }); + yield bot.update({ meta: JSON.stringify(metaObj) }); + yield (0, index_1.botResponse)(botName, 'URL updated successfully', botPrefix, tribe.id, messageObj, cmd); + return; + } + catch (error) { + logger_1.sphinxLogger.error(`Error trying to update URL: ${error}`, logger_1.logging.Bots); + yield (0, index_1.botResponse)(botName, error.message || 'Error trying to updare URL', botPrefix, tribe.id, messageObj, cmd); + return; } - catch (error) { } }); } exports.addUrl = addUrl; diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 37d580ba7..a4c6af963 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index a57b5085a..4d4afe5cd 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -34,32 +34,43 @@ export async function addUrl( ) return } - // const bot = await findBot({ botPrefix, tribe }) - // let metaObj: MlMeta[] = JSON.parse(bot.meta || `[]`) - // const meta = findMetaByName(name, metaObj) - // if (!meta) { - // await botResponse( - // botName, - // 'Model does not exist', - // botPrefix, - // tribe.id, - // messageObj, - // cmd - // ) - // return - // } - // meta.url = url - // await bot.update({ meta: JSON.stringify(meta) }) - // await botResponse( - // botName, - // 'URL updated successfully', - // botPrefix, - // tribe.id, - // messageObj, - // cmd - // ) - // return - } catch (error) {} + const bot = await findBot({ botPrefix, tribe }) + let metaObj: MlMeta[] = JSON.parse(bot.meta || `{}`) + const meta = metaObj[name] + if (!meta) { + await botResponse( + botName, + 'Model does not exist', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + metaObj[name] = { ...meta, url } + await bot.update({ meta: JSON.stringify(metaObj) }) + await botResponse( + botName, + 'URL updated successfully', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } catch (error) { + sphinxLogger.error(`Error trying to update URL: ${error}`, logging.Bots) + await botResponse( + botName, + error.message || 'Error trying to updare URL', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } } export async function addApiKey( From 824dcd2ac45e77850e94744a01a0eb959baf09c4 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 16 Aug 2023 23:10:11 +0100 Subject: [PATCH 52/93] update: updated the api_key command to use name --- dist/src/builtin/ml.js | 3 +- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 33 ++++++++++++---- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 12 +----- src/builtin/utill/ml.ts | 65 ++++++++++++++++++++++---------- 6 files changed, 75 insertions(+), 42 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 425364301..6ae21ca7b 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -52,8 +52,7 @@ function init() { yield (0, ml_1.addUrl)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; case 'api_key': - const newApiKey = arr[2]; - yield (0, ml_1.addApiKey)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newApiKey); + yield (0, ml_1.addApiKey)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; case 'kind': const newKind = arr[2]; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 129db2745..7d6a75d7d 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 40d7f2c18..f6b50dabf 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -33,7 +33,7 @@ function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { } metaObj[name] = Object.assign(Object.assign({}, meta), { url }); yield bot.update({ meta: JSON.stringify(metaObj) }); - yield (0, index_1.botResponse)(botName, 'URL updated successfully', botPrefix, tribe.id, messageObj, cmd); + yield (0, index_1.botResponse)(botName, `${name.toUpperCase()} URL updated successfully`, botPrefix, tribe.id, messageObj, cmd); return; } catch (error) { @@ -44,16 +44,33 @@ function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { }); } exports.addUrl = addUrl; -function addApiKey(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newApiKey) { +function addApiKey(botName, botPrefix, tribe, messageObj, msgArr) { return __awaiter(this, void 0, void 0, function* () { - if (!newApiKey) { - yield (0, index_1.botResponse)(botName, 'Please provide a valid API KEY', botPrefix, tribe.id, messageObj, cmd); + const cmd = msgArr[1]; + const name = msgArr[2]; + const apiKey = msgArr[3]; + try { + if (!name || !apiKey) { + yield (0, index_1.botResponse)(botName, `Please provide a valid model ${name ? 'api_key' : 'name'}`, botPrefix, tribe.id, messageObj, cmd); + return; + } + const bot = yield (0, index_1.findBot)({ botPrefix, tribe }); + let metaObj = JSON.parse(bot.meta || `{}`); + const meta = metaObj[name]; + if (!meta) { + yield (0, index_1.botResponse)(botName, 'Model does not exist', botPrefix, tribe.id, messageObj, cmd); + return; + } + metaObj[name] = Object.assign(Object.assign({}, meta), { apiKey }); + yield bot.update({ meta: JSON.stringify(metaObj) }); + yield (0, index_1.botResponse)(botName, `${name.toUpperCase()} API KEY updated successfully`, botPrefix, tribe.id, messageObj, cmd); + return; + } + catch (error) { + logger_1.sphinxLogger.error(`Error trying to update API KEY: ${error}`, logger_1.logging.Bots); + yield (0, index_1.botResponse)(botName, error.message || `Error trying to updare ${name.toUpperCase()} API KEY`, botPrefix, tribe.id, messageObj, cmd); return; } - meta.apiKey = newApiKey; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, index_1.botResponse)(botName, 'API KEY updated successfully', botPrefix, tribe.id, messageObj, cmd); - return; }); } exports.addApiKey = addApiKey; diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index a4c6af963..7cae8d521 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 726d7cf06..1689cd90d 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -61,17 +61,7 @@ export function init() { await addUrl(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return case 'api_key': - const newApiKey = arr[2] - await addApiKey( - bot, - meta, - ML_BOTNAME, - ML_PREFIX, - tribe, - cmd, - message, - newApiKey - ) + await addApiKey(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return case 'kind': const newKind = arr[2] diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 4d4afe5cd..b5cbf6f98 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -35,7 +35,7 @@ export async function addUrl( return } const bot = await findBot({ botPrefix, tribe }) - let metaObj: MlMeta[] = JSON.parse(bot.meta || `{}`) + let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) const meta = metaObj[name] if (!meta) { await botResponse( @@ -52,7 +52,7 @@ export async function addUrl( await bot.update({ meta: JSON.stringify(metaObj) }) await botResponse( botName, - 'URL updated successfully', + `${name.toUpperCase()} URL updated successfully`, botPrefix, tribe.id, messageObj, @@ -74,19 +74,57 @@ export async function addUrl( } export async function addApiKey( - bot: ChatBotRecord, - meta: MlMeta, botName: string, botPrefix: string, tribe: ChatRecord, - cmd: string, messageObj: Sphinx.Message, - newApiKey: string + msgArr: string[] ) { - if (!newApiKey) { + const cmd = msgArr[1] + const name = msgArr[2] + const apiKey = msgArr[3] + try { + if (!name || !apiKey) { + await botResponse( + botName, + `Please provide a valid model ${name ? 'api_key' : 'name'}`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + const bot = await findBot({ botPrefix, tribe }) + let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) + const meta = metaObj[name] + if (!meta) { + await botResponse( + botName, + 'Model does not exist', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + metaObj[name] = { ...meta, apiKey } + await bot.update({ meta: JSON.stringify(metaObj) }) await botResponse( botName, - 'Please provide a valid API KEY', + `${name.toUpperCase()} API KEY updated successfully`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } catch (error) { + sphinxLogger.error(`Error trying to update API KEY: ${error}`, logging.Bots) + await botResponse( + botName, + error.message || `Error trying to updare ${name.toUpperCase()} API KEY`, botPrefix, tribe.id, messageObj, @@ -94,17 +132,6 @@ export async function addApiKey( ) return } - meta.apiKey = newApiKey - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( - botName, - 'API KEY updated successfully', - botPrefix, - tribe.id, - messageObj, - cmd - ) - return } export async function addKind( From 061523811ec429aaabb5cd9f05465be74b1b1df9 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 00:31:17 +0100 Subject: [PATCH 53/93] update: updated kind command to use model name --- dist/src/builtin/ml.js | 5 +- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 41 ++++++++++++---- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/ml.ts | 14 +----- src/builtin/utill/ml.ts | 82 +++++++++++++++++++++++--------- 6 files changed, 97 insertions(+), 49 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 6ae21ca7b..7b2b2d28f 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -55,11 +55,10 @@ function init() { yield (0, ml_1.addApiKey)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; case 'kind': - const newKind = arr[2]; - yield (0, ml_1.addKind)(bot, meta, exports.ML_BOTNAME, exports.ML_PREFIX, tribe, cmd, message, newKind); + yield (0, ml_1.addKind)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; case 'add': - yield (0, ml_1.addModel)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, arr, message); + yield (0, ml_1.addModel)(exports.ML_BOTNAME, exports.ML_PREFIX, tribe, message, arr); return; default: (0, ml_1.defaultCommand)(exports.ML_BOTNAME, exports.ML_PREFIX, message); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 7d6a75d7d..831aaa545 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index f6b50dabf..e4a40a2b6 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -38,7 +38,7 @@ function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { } catch (error) { logger_1.sphinxLogger.error(`Error trying to update URL: ${error}`, logger_1.logging.Bots); - yield (0, index_1.botResponse)(botName, error.message || 'Error trying to updare URL', botPrefix, tribe.id, messageObj, cmd); + yield (0, index_1.botResponse)(botName, error.message || 'Error trying to update URL', botPrefix, tribe.id, messageObj, cmd); return; } }); @@ -68,22 +68,43 @@ function addApiKey(botName, botPrefix, tribe, messageObj, msgArr) { } catch (error) { logger_1.sphinxLogger.error(`Error trying to update API KEY: ${error}`, logger_1.logging.Bots); - yield (0, index_1.botResponse)(botName, error.message || `Error trying to updare ${name.toUpperCase()} API KEY`, botPrefix, tribe.id, messageObj, cmd); + yield (0, index_1.botResponse)(botName, error.message || `Error trying to update ${name.toUpperCase()} API KEY`, botPrefix, tribe.id, messageObj, cmd); return; } }); } exports.addApiKey = addApiKey; -function addKind(bot, meta, botName, botPrefix, tribe, cmd, messageObj, newKind) { +function addKind(botName, botPrefix, tribe, messageObj, msgArray) { return __awaiter(this, void 0, void 0, function* () { - if (newKind !== 'text' && newKind !== 'image') { - yield (0, index_1.botResponse)(botName, 'Please provide a valid kind (text/image)', botPrefix, tribe.id, messageObj, cmd); + const cmd = msgArray[1]; + const name = msgArray[2]; + const kind = msgArray[3]; + try { + if (!name || !kind) { + yield (0, index_1.botResponse)(botName, `Please provide a valid model ${name ? 'kind' : 'name'}`, botPrefix, tribe.id, messageObj, cmd); + return; + } + if (kind !== 'text' && kind !== 'image') { + yield (0, index_1.botResponse)(botName, 'Please provide a valid kind (text/image)', botPrefix, tribe.id, messageObj, cmd); + return; + } + const bot = yield (0, index_1.findBot)({ botPrefix, tribe }); + let metaObj = JSON.parse(bot.meta || `{}`); + const meta = metaObj[name]; + if (!meta) { + yield (0, index_1.botResponse)(botName, 'Model does not exist', botPrefix, tribe.id, messageObj, cmd); + return; + } + metaObj[name] = Object.assign(Object.assign({}, meta), { kind }); + yield bot.update({ meta: JSON.stringify(metaObj) }); + yield (0, index_1.botResponse)(botName, `${name.toUpperCase()} kind updated to ${kind}`, botPrefix, tribe.id, messageObj, cmd); + return; + } + catch (error) { + logger_1.sphinxLogger.error(`Error trying to update kind: ${error}`, logger_1.logging.Bots); + yield (0, index_1.botResponse)(botName, error.message || `Error trying to update ${name.toUpperCase()} kind`, botPrefix, tribe.id, messageObj, cmd); return; } - meta.kind = newKind; - yield bot.update({ meta: JSON.stringify(meta) }); - yield (0, index_1.botResponse)(botName, `bot kind updated to ${newKind}`, botPrefix, tribe.id, messageObj, cmd); - return; }); } exports.addKind = addKind; @@ -109,7 +130,7 @@ function defaultCommand(botName, botPrefix, message) { message.channel.send({ embed }); } exports.defaultCommand = defaultCommand; -function addModel(botName, botPrefix, tribe, msgArr, messageObject) { +function addModel(botName, botPrefix, tribe, messageObject, msgArr) { return __awaiter(this, void 0, void 0, function* () { const cmd = msgArr[1]; const name = msgArr[2]; diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 7cae8d521..19ba5f1b4 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAA8C;AAC9C,qCAAoC;AACpC,8BAAkC;AAClC,+CAA0D;AAU1D,SAAsB,MAAM,CAC1B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;gBACjB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EACvD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,OAAO,CAAC,IAAI,CAAC,mCAAQ,IAAI,KAAE,GAAG,GAAE,CAAA;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,GAAG,IAAI,CAAC,WAAW,EAAE,2BAA2B,EAChD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,+BAA+B,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACxE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,4BAA4B,EAC7C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA3DD,wBA2DC;AAED,SAAsB,SAAS,CAC7B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACxB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACpB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,EAC3D,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,OAAO,CAAC,IAAI,CAAC,mCAAQ,IAAI,KAAE,MAAM,GAAE,CAAA;YACnC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,GAAG,IAAI,CAAC,WAAW,EAAE,+BAA+B,EACpD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,mCAAmC,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YAC5E,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,0BAA0B,IAAI,CAAC,WAAW,EAAE,UAAU,EACvE,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA3DD,8BA2DC;AAED,SAAsB,OAAO,CAC3B,GAAkB,EAClB,IAAY,EACZ,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,GAAW,EACX,UAA0B,EAC1B,OAAe;;QAEf,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;QACnB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,uBAAuB,OAAO,EAAE,EAChC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;QACD,OAAM;IACR,CAAC;CAAA;AAhCD,0BAgCC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,SAAiB,EACjB,OAAuB;IAEvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,OAAO,CAAC;SAClB,QAAQ,CAAC,eAAe,CAAC;SACzB,SAAS,CAAC;QACT;YACE,IAAI,EAAE,cAAc,OAAO,EAAE;YAC7B,KAAK,EAAE,GAAG,SAAS,YAAY;SAChC;QACD;YACE,IAAI,EAAE,kBAAkB,OAAO,EAAE;YACjC,KAAK,EAAE,GAAG,SAAS,gBAAgB;SACpC;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,GAAG,SAAS,oBAAoB;SACxC;KACF,CAAC;SACD,YAAY,CAAC,IAAI,CAAC,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAxBD,wCAwBC;AAED,SAAsB,QAAQ,CAC5B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,MAAgB,EAChB,aAA6B;;QAE7B,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,mCAAmC,EACnC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,IAAI,EAAE;gBACR,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,qBAAqB,EACrB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,QAAQ,GAAW,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;YAC3E,OAAO,CAAC,IAAI,CAAC,qBAAQ,QAAQ,CAAE,CAAA;YAC/B,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,6BAA6B,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACtE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,oCAAoC,EACrD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA5DD,4BA4DC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,OAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,eAAU,CAAC;SACrB,cAAc,CAAC,GAAG,CAAC;SACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAND,sCAMC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 1689cd90d..0faad18ff 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -64,20 +64,10 @@ export function init() { await addApiKey(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return case 'kind': - const newKind = arr[2] - await addKind( - bot, - meta, - ML_BOTNAME, - ML_PREFIX, - tribe, - cmd, - message, - newKind - ) + await addKind(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return case 'add': - await addModel(ML_BOTNAME, ML_PREFIX, tribe, arr, message) + await addModel(ML_BOTNAME, ML_PREFIX, tribe, message, arr) return default: defaultCommand(ML_BOTNAME, ML_PREFIX, message) diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index b5cbf6f98..8bb804e2c 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -1,4 +1,4 @@ -import { ChatBotRecord, ChatRecord } from '../../models' +import { ChatRecord } from '../../models' import { botResponse, findBot } from './index' import * as Sphinx from 'sphinx-bot' import { ML_BOTNAME } from '../ml' @@ -63,7 +63,7 @@ export async function addUrl( sphinxLogger.error(`Error trying to update URL: ${error}`, logging.Bots) await botResponse( botName, - error.message || 'Error trying to updare URL', + error.message || 'Error trying to update URL', botPrefix, tribe.id, messageObj, @@ -124,7 +124,7 @@ export async function addApiKey( sphinxLogger.error(`Error trying to update API KEY: ${error}`, logging.Bots) await botResponse( botName, - error.message || `Error trying to updare ${name.toUpperCase()} API KEY`, + error.message || `Error trying to update ${name.toUpperCase()} API KEY`, botPrefix, tribe.id, messageObj, @@ -135,19 +135,68 @@ export async function addApiKey( } export async function addKind( - bot: ChatBotRecord, - meta: MlMeta, botName: string, botPrefix: string, tribe: ChatRecord, - cmd: string, messageObj: Sphinx.Message, - newKind: string + msgArray: string[] ) { - if (newKind !== 'text' && newKind !== 'image') { + const cmd = msgArray[1] + const name = msgArray[2] + const kind = msgArray[3] + try { + if (!name || !kind) { + await botResponse( + botName, + `Please provide a valid model ${name ? 'kind' : 'name'}`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + if (kind !== 'text' && kind !== 'image') { + await botResponse( + botName, + 'Please provide a valid kind (text/image)', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + const bot = await findBot({ botPrefix, tribe }) + let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) + const meta = metaObj[name] + if (!meta) { + await botResponse( + botName, + 'Model does not exist', + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } + metaObj[name] = { ...meta, kind } + await bot.update({ meta: JSON.stringify(metaObj) }) await botResponse( botName, - 'Please provide a valid kind (text/image)', + `${name.toUpperCase()} kind updated to ${kind}`, + botPrefix, + tribe.id, + messageObj, + cmd + ) + return + } catch (error) { + sphinxLogger.error(`Error trying to update kind: ${error}`, logging.Bots) + await botResponse( + botName, + error.message || `Error trying to update ${name.toUpperCase()} kind`, botPrefix, tribe.id, messageObj, @@ -155,17 +204,6 @@ export async function addKind( ) return } - meta.kind = newKind - await bot.update({ meta: JSON.stringify(meta) }) - await botResponse( - botName, - `bot kind updated to ${newKind}`, - botPrefix, - tribe.id, - messageObj, - cmd - ) - return } export function defaultCommand( @@ -198,8 +236,8 @@ export async function addModel( botName: string, botPrefix: string, tribe: ChatRecord, - msgArr: string[], - messageObject: Sphinx.Message + messageObject: Sphinx.Message, + msgArr: string[] ) { const cmd = msgArr[1] const name = msgArr[2] From 9078ac5f0478c9fb4c223035c0fa907f714fc28e Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 00:50:38 +0100 Subject: [PATCH 54/93] updated the helper function for default comands --- dist/src/builtin/utill/ml.js | 6 +++--- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/utill/ml.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index e4a40a2b6..ccbc96054 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -115,15 +115,15 @@ function defaultCommand(botName, botPrefix, message) { .addFields([ { name: `Add URL to ${botName}`, - value: `${botPrefix} url {URL}`, + value: `${botPrefix} url {MODEL_NAME} {URL}`, }, { name: `Add API_KEY to ${botName}`, - value: `${botPrefix} url {API_KEY}`, + value: `${botPrefix} api_key {MODEL_NAME} {API_KEY}`, }, { name: `Set content type`, - value: `${botPrefix} kind {text/image}`, + value: `${botPrefix} kind {MODEL_NAME} {text/image}`, }, ]) .setOnlyOwner(true); diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 19ba5f1b4..33d5bc884 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index 8bb804e2c..a5f1f6e19 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -217,15 +217,15 @@ export function defaultCommand( .addFields([ { name: `Add URL to ${botName}`, - value: `${botPrefix} url {URL}`, + value: `${botPrefix} url {MODEL_NAME} {URL}`, }, { name: `Add API_KEY to ${botName}`, - value: `${botPrefix} url {API_KEY}`, + value: `${botPrefix} api_key {MODEL_NAME} {API_KEY}`, }, { name: `Set content type`, - value: `${botPrefix} kind {text/image}`, + value: `${botPrefix} kind {MODEL_NAME} {text/image}`, }, ]) .setOnlyOwner(true) From 2f6fd1f9226b3916ce817550c33dc4e3dd97571d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 18:02:35 +0100 Subject: [PATCH 55/93] update: ensured users enter correct models commands --- dist/src/builtin/ml.js | 43 ++++++++++++++++++++++++++++++----- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 46 ++++++++++++++++++++++++++++++++------ 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 7b2b2d28f..90882fdc0 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -39,11 +39,6 @@ function init() { const tribe = (yield models_1.models.Chat.findOne({ where: { uuid: message.channel.id }, })); - const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); - let meta = JSON.parse(bot.meta || `[]`); - meta.kind = meta.kind || 'text'; - const url = meta.url; - const api_key = meta.apiKey; const arr = (message.content && message.content.split(' ')) || []; if (isAdmin && arr[0] === exports.ML_PREFIX) { const cmd = arr[1]; @@ -65,6 +60,42 @@ function init() { return; } } + const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); + let metaObj = JSON.parse(bot.meta || `{}`); + const modelsArr = Object.keys(metaObj); + if (modelsArr.length === 0) { + (0, ml_1.mlBotResponse)('No model added yet!', message); + return; + } + let meta; + let content = ''; + if (modelsArr.length === 1) { + meta = metaObj[modelsArr[0]]; + if (message.content.startsWith(`@${modelsArr[0]}`)) { + content = message.content.substring(modelsArr[0].length + 1); + } + else { + content = message.content; + } + } + else { + let modelName = ''; + if (message.content.startsWith('@')) { + modelName = message.content.substring(1, message.content.indexOf(' ')); + content = message.content.substring(modelName.length + 1); + } + else { + (0, ml_1.mlBotResponse)('Specify model name by typing the @ sysmbol followed by model name immediately, without space', message); + return; + } + meta = metaObj[modelName]; + if (!meta) { + (0, ml_1.mlBotResponse)('Please provide a valid model name', message); + return; + } + } + const url = meta.url; + const api_key = meta.apiKey; if (!url || !api_key) { (0, ml_1.mlBotResponse)('not configured!', message); return; @@ -76,7 +107,7 @@ function init() { const r = yield (0, node_fetch_1.default)(url, { method: 'POST', body: JSON.stringify({ - message: message.content, + message: content.trim(), webhook: `${host_name}/ml`, }), headers: { diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 831aaa545..cf8e1ed49 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAAiC;AACjC,4CAA4C;AAC5C,2CAA8B;AAC9B,mCAQmB;AACnB,4CAAuD;AAEvD,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAC3B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,IAAA,WAAM,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBACxD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,IAAA,cAAS,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBAC3D,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,IAAA,YAAO,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBACzD,OAAM;oBACR,KAAK,KAAK;wBACR,MAAM,IAAA,aAAQ,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBAC1D,OAAM;oBACR;wBACE,IAAA,mBAAc,EAAC,kBAAU,EAAE,iBAAS,EAAE,OAAO,CAAC,CAAA;wBAC9C,OAAM;iBACT;aACF;YACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,IAAA,kBAAa,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;gBACzC,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YAED,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,IAAA,kBAAa,EAAC,qCAAqC,EAAE,OAAO,CAAC,CAAA;gBAC7D,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,IAAA,kBAAa,EAAC,2BAA2B,EAAE,OAAO,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,kBAAU,CAAC;qBACrB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,qBAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;SACzD;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAlGD,oBAkGC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 0faad18ff..27cb2d6b4 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -45,12 +45,6 @@ export function init() { where: { uuid: message.channel.id }, })) as ChatRecord - const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) - - let meta: MlMeta = JSON.parse(bot.meta || `[]`) - meta.kind = meta.kind || 'text' - const url = meta.url - const api_key = meta.apiKey const arr = (message.content && message.content.split(' ')) || [] if (isAdmin && arr[0] === ML_PREFIX) { @@ -74,6 +68,44 @@ export function init() { return } } + const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) + + let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) + const modelsArr = Object.keys(metaObj) + if (modelsArr.length === 0) { + mlBotResponse('No model added yet!', message) + return + } + let meta: MlMeta + let content = '' + if (modelsArr.length === 1) { + meta = metaObj[modelsArr[0]] + if (message.content.startsWith(`@${modelsArr[0]}`)) { + content = message.content.substring(modelsArr[0].length + 1) + } else { + content = message.content + } + } else { + let modelName = '' + if (message.content.startsWith('@')) { + modelName = message.content.substring(1, message.content.indexOf(' ')) + content = message.content.substring(modelName.length + 1) + } else { + mlBotResponse( + 'Specify model name by typing the @ sysmbol followed by model name immediately, without space', + message + ) + return + } + meta = metaObj[modelName] + if (!meta) { + mlBotResponse('Please provide a valid model name', message) + return + } + } + const url = meta.url + const api_key = meta.apiKey + if (!url || !api_key) { mlBotResponse('not configured!', message) return @@ -87,7 +119,7 @@ export function init() { const r = await fetch(url, { method: 'POST', body: JSON.stringify({ - message: message.content, + message: content.trim(), webhook: `${host_name}/ml`, }), headers: { From 96895b2aa0297f04c9fb6d481dad35744a1d771d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 20:47:12 +0100 Subject: [PATCH 56/93] update: updated test to adapt to new change --- dist/src/builtin/mother.js | 2 +- dist/src/builtin/mother.js.map | 2 +- dist/src/tests/controllers/mlBot.test.js | 44 +++++++++---- dist/src/tests/controllers/mlBot.test.js.map | 2 +- src/builtin/mother.ts | 2 +- src/tests/configs/nodes.json | 67 ++++++++++++-------- src/tests/controllers/mlBot.test.ts | 58 +++++++++++++---- 7 files changed, 118 insertions(+), 59 deletions(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index d61048567..0cea32e2d 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -65,7 +65,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], - [`${ml_1.ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind'], + [`${ml_1.ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind', 'add'], }; const builtInBotNames = { welcome: 'WelcomeBot', diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 5e860e3ed..5200ebf46 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index 2334d5ddd..fa7efb728 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -49,17 +49,23 @@ function mlBot(t, index1, index2, index3) { t.truthy(botReply, 'MotherBot should reply'); botAlias = 'MlBot'; //http://ml-bot-sphinx-server:3500/text - const url = 'http://ml-bot-sphinx-server:3500/text'; + const host = 'http://localhost:3500'; + const url = `${host}/text`; + const model1 = 'gpt'; + //Add Model + const addModel = `/ml add ${model1}`; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, addModel); + yield (0, helpers_1.sleep)(1000); //Alice Set Text URL - const urlCommand = `/ml url ${url}`; + const urlCommand = `/ml url ${model1} ${url}`; yield (0, msg_1.sendTribeMessage)(t, alice, tribe, urlCommand); yield (0, helpers_1.sleep)(20); - const botReply2 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 1); + const botReply2 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 2); t.truthy(botReply2, 'MlBot should reply'); //Alice set API_KEY - const api_key = '/ml api_key qwerty'; + const api_key = `/ml api_key ${model1} qwerty`; const apiKeyMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, api_key); - const botReply3 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 2); + const botReply3 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 3); t.truthy(botReply3, 'MlBot should reply'); const checkNode1 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, apiKeyMsg.uuid); t.true(checkNode1, 'BOB SHOULD NOT SEE THE API_KEY TRIBE COMMAND'); @@ -88,21 +94,31 @@ function mlBot(t, index1, index2, index3) { const checkNode4 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, virtualNode1Message.uuid); t.true(checkNode4, 'BOB SHOULD NOT SEE VIRTUALNODE1 Message'); //Alice change Tribe kind to image - const imageKind = '/ml kind image'; + const imageKind = `/ml kind ${model1} image`; yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageKind); - const botReply6 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 5); + const botReply6 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 6); t.truthy(botReply6, 'MlBot should reply'); - const imageUrl = 'http://ml-bot-sphinx-server:3500/image'; - //Alice change Tribe kind to image - const imageUrlMsg = `/ml url ${imageUrl}`; + const model2 = 'image_gpt'; + const imageUrl = `${host}/image`; + //Add new Model + const newModel = `/ml add ${model2} ${imageUrl}`; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, newModel); + yield (0, helpers_1.sleep)(1000); + //Alice update new model api_key + const imageUrlMsg = `/ml api_key ${model2} twesting`; yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageUrlMsg); - const botReply7 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 6); + const botReply7 = yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 8); t.truthy(botReply7, 'MlBot should reply'); + yield (0, helpers_1.sleep)(1000); + //Alice change new model kind to image + const imageUrlKind = `/ml kind ${model2} image`; + yield (0, msg_1.sendTribeMessage)(t, alice, tribe, imageUrlKind); + yield (0, helpers_1.sleep)(1000); //Alice sends Message in the tribe const text6 = (0, helpers_1.randomText)(); - const aliceMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, text6); + const aliceMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, `@${model2} ${text6}`); yield (0, helpers_1.sleep)(8000); - const botReply8 = (yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 7)); + const botReply8 = (yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 10)); const botResponse3 = (0, msg_1.decryptMessage)(alice, botReply8); t.true(botResponse3 === botImageResponse); //Bob Node Should not See Alice Message @@ -113,7 +129,7 @@ function mlBot(t, index1, index2, index3) { t.true(checkNode6, 'VIRTUALNODE1 SHOULD NOT SEE ALICE Message'); //VirtualNode1 send message in tribe const text9 = (0, helpers_1.randomText)(); - const virtualNodeImageMsg = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, text9); + const virtualNodeImageMsg = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, `@${model2} ${text9}`); yield (0, helpers_1.sleep)(8000); const botReply9 = (yield (0, get_1.getCheckBotMsg)(t, virtualNode1, botAlias, tribe, 2)); const botResponse4 = (0, msg_1.decryptMessage)(virtualNode1, botReply9); diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index bd2028ae0..a39919476 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index 671a93e12..58252e380 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -59,7 +59,7 @@ const builtInHiddenCmd = { sentiment: ['threshold', 'timer', 'url'], jarvis: ['link', 'hide'], spam_gone: ['add', 'list', 'remove'], - [`${ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind'], + [`${ML_PREFIX.substring(1)}`]: ['url', 'api_key', 'kind', 'add'], } const builtInBotNames = { diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index 6fa370bd5..580fe1ae4 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -4,11 +4,11 @@ "pubkey": "03a394d0ebf0d003124ab130c6b12b8b990a50a30a464354800a51981ba745bb07", "ip": "http://alice.sphinx:3001", "external_ip": "http://localhost:3001", - "authToken": "qcasKC0xQYxJsNxtIKeZ", - "transportToken": "MIIBCgKCAQEAsayTwt2A1H18sE5FinGFFVK8oEaAAA10H5sslqRpwH72JyW1g+Eq\nloSXMdVsWquqYxtrcS6sWWtA8KHoxEgATsqvFU2+fThWup39u+nE9ssP48vv5ymr\nn+kWsNYAx00UB9wpjUqqPHpnZcHbZHCDV5xwVO7VLJ5z0rxGBIA9pWsyr3mcSTRC\nEgsmfIfu/02NelJ/SnaVPXb6FRJakTtS26qWYQm/raaTelutUCD+MHL465G3Qqor\ncRuamWQEvJjUGDMBtTwJAjbTGOLcoXERMo8MuPkIImwd82CefdsmXE/U8/CzFVhO\nDWr+IBowE4nPMTxGN28AGbiArQnLM60YIwIDAQAB", - "contact_key": "MIIBCgKCAQEA3F1dQbvtCitZoarGL8DTCI9JkA/VgXj06JdydryblxIVtGMat+OLpbHjrJHlr1Ckhp0iRM/A+0rjusBETuFzDQpczm67fT0PNGcwW+fedmrBE+yll2NwWTrZiLul/xNeJM5NU8fkPhKPoTTHl8NxPxp2ze3I1jI2LMhS6drJhkSuUvVN4ZAQJwa7EtbXF4JT517d741BD2sBZusiSHPXLJoGOZ9IWgzn0BuxxVhCrAI61dc3YlmYy7Nica/qTFHBnX/719pXptS6wQK1cIy84sKvkxbLe3eQ3XM9Ro5CQFZyhhrnRQSARFGt5H564+3HdkjmGDEh+rMsnUuBIROE4QIDAQAB", - "privkey": "MIIEpQIBAAKCAQEA3F1dQbvtCitZoarGL8DTCI9JkA/VgXj06JdydryblxIVtGMat+OLpbHjrJHlr1Ckhp0iRM/A+0rjusBETuFzDQpczm67fT0PNGcwW+fedmrBE+yll2NwWTrZiLul/xNeJM5NU8fkPhKPoTTHl8NxPxp2ze3I1jI2LMhS6drJhkSuUvVN4ZAQJwa7EtbXF4JT517d741BD2sBZusiSHPXLJoGOZ9IWgzn0BuxxVhCrAI61dc3YlmYy7Nica/qTFHBnX/719pXptS6wQK1cIy84sKvkxbLe3eQ3XM9Ro5CQFZyhhrnRQSARFGt5H564+3HdkjmGDEh+rMsnUuBIROE4QIDAQABAoIBAQCFBZMK4C9JyTtU/Oqf3u1FKIHGhdhjTKnCUdGV3Wqqug8CEiUJxkEBJ64A+R1GRA7c97O9CBA9YUqw6+kQGMXDpHK7ZlqlUhuAjZ3CjOhcYTrmFR8skKk8I+s2v9eHb6CP5T0Giw67baboMB0f/qm45ve6fYST0EGlrNNoOVsXQfV+nnhlpl2n8s/Xr9BShY48PXIammoOBPZkgaRf+3RvCpx+1zw3/p2918qJs+ZSxVY+SE4Grj1Hba6cG4QorerhO1Ro3yVXCoQ3gn8ju8Es21WlFm0S7QihSFlC6UqbRjSdqSTHb33MrdnSGTDuUQacAiAszZJrw1j2WeQJ5PjBAoGBAPRg5CwbscJ33j28wsP68CXHDMxPuwrOVEA6uCk8agzU6Pys+IfETQnZ6X6XRYaAUDpiT/lprIs5O/jH2sqk1m5vJ9NFBo/HJVJFXn7tPFF2h41DizXGNo8bO6y1FCU8D9W/GrcjmJNstQnvlsU+SwETVxJBI+KklEvtKJmZu4C5AoGBAObYH/T5KMHMU5Ta7JhLw9PRaj+ymMBhv31+5gUuv/kIwfzm8XkG5XV6R3LC0dZG44SV4sd0a2lIFRQyD0HvuUS0U1ILhWirwZVkRR361aVDZUN6euHOECj26suloXKDvkF8LYpgzAf+V9tUWkJlFnOM/rrCQxJn7IP5JLHBgwFpAoGAS4CD/nyv9v1B1KE1K4ekGofdFGKtzzDgJtf9fgAEY+KD+U0XnBqyEpEY6tuhx2RtZRxqyQw1Gu6b8MkOd/1loskE7Okulc1ZYom8IEr7j8+nIaX0pLCQurYXQczQZJCh89APWPXOdf3oESHM2zPbyIFJLYKiq6tdhffHy20L2UECgYEAgPiIyi4WZkgI/mZdvyy9SO98JABdNUanXK70Rjr7SGBrOSeyC4Md2ceqeWR9JfFPFflDzVmu1RBProvVWGpdoRP6ZSFItNUY/6UYtIo6qO2BevTICLY+8xQY1BRCoh8WwbFmJCS2eVTRsxlqoCOoKoDApIj6PiNP0d/1b1aFIdkCgYEAj3uPL2bJVtWd2me8b7/zpz1/KoYAh4ufGOjqshae/ql/J8i/h2FYTLeEs0qn+HENgiUC4Yzd3nZ1hHmMOXprw6S1x89iV9YpGhyO8Y6V6Xm80jY2Cf+L0hKxuhIDvnXS5V4eWmVgH6NHpSuq+dN26Jl55OJNu9TkDBUO0VlREio=", - "exported_keys": "a2V5czo6QXdHWjRReE01NXpaVS9PRzZXR0wyYmxyQTFlSWFmMVc1aW04SmczcU5SWTc1TFJtQ0N0ejNxNTQ0dlBLM2FXZkVhS1kyNkoxZW9DaGhQeU9GeGtNbzk5RGZxalljWHBrbDRBV0RhRmdFWkdMMWpINGI3NEdtVjAvRnJjSjk0UUZlcVp5aWpjTlpmUXAvZDFXdnNLOXo0ZFVob1haSlpNeU5pOWtXWFhQZ2doRkR4UjBuMnlRaFMwaURoc0pHbWxBTU5UV3ZSQnh3dnJBWnp6YXk0bFlaT01IUXpYbDJlM29HNDRtUFpISWtlMGZhQW5PSThnUWYzNWV4VHZmWElQVi9TKzh4M0dFME12ZUpoNEJNaDUvUXZhQlp6ZWNGYXo2L29MNXU4Q09UbHA0dnoyUUMxblhVWFJ2NHZwdHFPOStUYnVaWFRucEMxVUNvcTFOTUdaMjFHQUU4djZRNFpIQ3pjdzFJaFJWYjdURHhnVXVBOVFtL1FySmN0NllET0l3ZHA4QWVCVlBObGloUzUrc2lKc0p0VFVNaWZhQ09yb2M3UE9VUWFDQ3hPbTJMTzRGclJIbVhUclJRU1JtOWxQb0N2MFBqMEh3cDkvNGpNbVBtMGlrcktLM0FHMUxYN0R4Z3RjVlRQUlpudWlXUEN0VHkvVmxDWFBZajZTWkRhcm1VdGw5YVRwdUNwUkx3RGc0VU1sVlZVN3BaMFhUT2swMDBMeTBWcWNBdFVVTFFjYzBIaGhETGpFS2tLQzdjYk0rWkN6SnJlcElwSDNNeEpMSGRULzFkYkw5YXFzVnpuenluSUxIa0QxdjQxdlpkekZLY0VNZUR5V0lYNnpYdDhZSjdsVVdBcEx6L0ZhOE5hMUV5OWdwSlhlYTRZeHVYLzZKTUpFUUgzOEdkb3BnWjBhbEY2SWpkeVN3VldxQ1Jrb1pEdnR3N0t0SnRMTTMxTlJxMzZrSU1yOWVKYXNPYnhpbGRyOERhWUx1MUxWcWJ4RXdyVmVEZzRsbnhyNzBGZnVtNmZLSVUyZHgxcnlhRG9wMkZ6cjNLdElMZE41bHhRcEZLeUh1S0FHZlFtVmRsOXNJd1F3eUN5UElTYXBEditZbjJvaHJHN2ZWQ08yQ0N1T0xUUFlGNU5OK3lkNzJHTVlPa1NNaUMra0lLRktaeFVDd3NUeGFzaEMyVEZZRkNZRDM5N0lHdWhzZ2lTUjd4dUVIYU5EYzBnb1NwSkFORDRsTC84LzdHSnBqRXlyQzZTeUpZY2J3SHFrdmQyOFVVYVN3ckZqNlhDaUYzYnJQazIrV3ZsY3lPZlV5cVNqODg1N3hUSDJsakV2T0NVM2lxZlFlOFVreGpjK3BXejdGYUxyaHhyRDV4cmkyR2k5ckw2NUgwWXNZaWhLNGRDZFRJYlFjeVg4TzVYdm9VaC8vdktzWUI3WTErVmhteSt2YWg1eUYrb2U4dTBpLzZkSHQzQ3g3aFJQQVhXYkhEKzlkZWY5WlZ2RjNkL3hkSXRJaXpJUVJSQTZUZzYwdHk0UGxjc1Z4MjFQT0Y2Z3dReFRVUFRCeTJNZnV0YmtVVXZSdkIzd3I5bzBWdVZybVExTVF2TkxlaUlJMjVveDU0bnJEZVpPUDB5OFdKQlZ2ZkR6Y04rV01uclpzV3RrbzNzT2xBOXorb0ZKS2RBWVFjNnkrL25lemVLMHRGS0kyZkhESTF5OTZLUW05WndlNGY5b2hMNGFNL05ET3FGNksrZnkvTUVGWko5ajdKVTRVVHliS2RCRk8yc0EweXNHT3lHWVd4MUIrUVFGR2VyYWN2R3cxbGliV1ExeS9UOVJyNkJmOFduamNWaXFkMVpFYnBSeG9YaXJES0NqeC85RlkrNVd4emNSQkZqZTl6OGE3SWFjVU9TKzdWbHlIaE5qVkhJek9IeUxIdyt2K1Q4citpWWtmWEtHNTV5aVQwcmZJOWRlRW44SXJnc1RCZTJQSEhDYWV6bDhkWjQzOWY3bVlvYU5iWGxUN3Y0NExrRkVRa2ZCMkh5RitFK2pNS2p6YWJsbDlCOGhlS0h5bGdlNXpISEMrdHh3a1dXOXZhU3E1YSt3cjcwZmhldVBvQWxxK29pRXBmVVdVazZjcUF0aTZQYVVRaWI4K1lrSVoycnJDOTd2NHhJVUd5NUg2MmtJdW5rR0ltcC85bGdMcWkwblo0NnY1TFRTUzg5dUFZbGs1WDA3Ymk1K0RFeTNRK29OSXB6eVA3V2FUME9ES0VmbjE5dTRwM3RWVTA2cG1tSWtQNWpjSjZoR0VnUzJlUFM3VnNrUlVMK2p6UUFpZWNTL1FOMVhjTHBkNytLa0VlcTRDNXN1ZWJwMnRUTzNmTnBnbk9LT0JlQ09YTFRvdHF6RSsya3FiU3JQRXI3Y2EyK2lZd0p5emRNNDRuZXZUQzJQRkpScHVPUnlsRHdvQjdSN0J1T2N0blRSTWQ3cVZkdlBmU2szSzhRRmdRVUJQcTdUNFZPSnJBUW1weW0zaHFmalNaUFI2SFlFVy84Z05SbTlTQ214aDk5SkF2LzZsNHdobGREMStOaTlyZEkrK3lPR2VseDQ3TnE0YndwTlhjL1lVcWhGZjIyOHZMN3JWenF1NW9pZ2oyY0pVSVMrWXFXa3hoNDl3dng4Q0VUUzJGd1h1VmpDMUhJNklJNE43M0cxeCtYSGNvRDQ1RGZJKytJc2ltT0JCaTVDdDZhNTNkRXZTbzRXZ3pFTGUvUUt1UWVCcVRXWlpOQ3BGOFluRWlSYTVRU2JzR2pPTG1ZRUNTU29EL0M5MFpTYjBkczcyejZXeFR1U3UvaXlSbUd6N2kzdHozVHNWZEY0NlBxSEtlcUdqMERwd3N1NzQwQVFOQWNFMGNCcXhPWVZueWUyT0Q2T2NSRHVLQlJwOCt0bEpURjhaWDNxMTJocWFTdC9oTFcyNXo3WXJlbUJxUFVLYStOL202MElUMlZuMlFtbDdGbUNscS9HaVdkR0dLOWxudm1hWEFmNVIzZGtYTXJJUjIxREZLc2pmNCtRYmQ0Q1ZLYWFYQXlDRTluOTZ3MnArSVZkNkJ4b1hPWDVSRXpvbE9EL05zTkVXb3RHdlUvMXdHdVNnTFdtNHpaUkZNTDlhMTVNS3NDUG9ZOC84UlBITlRPNXpsNkJ6M3Y4dXJQSmxmMHJWVEFCRjlpTDNKUDVndXFLUC9IMldxdTZUb3Y0VnhrdjlNUHNqS2cwNy9YWm0ycjFEMGs3QzdCaCtDMGlYRVZKN1lVZ05PdkQzV2JHZ1NVU1RvQzcyd0dRa3p6UE5kOURMdG51UThNeWUyV29wYUtHUHdvZ0QwcXlBckNLWW4xNFRSeG0vdFRWRWdBL25kQ2lLeEJ3bVNlSDFsL3RyelFHNCs0SE5GSGFscEFtZW9zWEFHTDgwL1I0OEFDNkVQZkExTWxvUlAyeUFzTnFoSjFOREhxR0RzYndCMnlwWStyVFBBQnB4N2VYdHMxaFUyVzMyUXlwWk1nUDl4QlN4TjBZL05jWGFUZ0VROUtKcmNUSC8vbU9YZmZMVnZ6ZXdva0hYTG11TjJjZmxWZGFZNGpWUm04Vm9nejRCdnJ1UU12VTcyVWtBU2lVRGU5dXBjQVd4K0RXL0JwZ0E1K054MDFONElVRkJVNEkvOWdFY0M0QnB3cVdoMmt5UFhqOD0=", + "authToken": "4CowQnkTC3XRbvQqRdCc", + "transportToken": "MIIBCgKCAQEAqhnxh3o4R3lpxrXLUa4iZJAzV0vNPa4fiDgHp+Z43DgfAS239+yv\nP6lhYAt+Wu2NdKAkRBE8EKdCCP3Y+NHPerQf0gaDD5VnvCG1780fOBSIcoAcUzMs\nwanHNjFpXxehNSS2GnE6zhava/sxVIb9v1nqvhq+dbqMyjhjpbeord125L8QoM7E\nKJdlbydezYIIQAd1FXUuY4wPXO2z1680zOgvmA6UEzWFjoDwMPcO55119V1ZgFD5\n2TC4kVsxq7N5jK1TONBuvq+WwjDV85eh1WWyFZZOEZFYVQ7L6hB0pC25V9S1vbp/\nS6fUBoCZeOGskrgsMa1sbF58Qwf/ZqpFMwIDAQAB", + "contact_key": "MIIBCgKCAQEAusfvpMgHfdPHzD633pLhfr3qYckiMSTuXm4NhHtTGx9j82W8DFeQXPUxrrXPwOL9/PAn08WGr6ah1GO1CNv75I2xxPoRvZa0Ebs7vR1VfWTaQCpXyh7Q6D3yXxxJ+t5cPWHzboq9KJHGW0CIOXz4QUwyqx+KXS1y65FzDD2W1BDZxGIO9cqAvGvkhe2K06yx2RVi+3Upf+5kRIVOZFtl3Z7rqN2Zy8h/buW68IKmyyGVGPIBdHmvaSW0tq0q7AFYqbJx0uUJu8QwIoh13Z1TJ45rTif4tpZJsGUEQVbV3wxO67/x8BY76a4WAColSdbrOkCIjcXdRkVMJIuJufBCbQIDAQAB", + "privkey": "MIIEpQIBAAKCAQEAusfvpMgHfdPHzD633pLhfr3qYckiMSTuXm4NhHtTGx9j82W8DFeQXPUxrrXPwOL9/PAn08WGr6ah1GO1CNv75I2xxPoRvZa0Ebs7vR1VfWTaQCpXyh7Q6D3yXxxJ+t5cPWHzboq9KJHGW0CIOXz4QUwyqx+KXS1y65FzDD2W1BDZxGIO9cqAvGvkhe2K06yx2RVi+3Upf+5kRIVOZFtl3Z7rqN2Zy8h/buW68IKmyyGVGPIBdHmvaSW0tq0q7AFYqbJx0uUJu8QwIoh13Z1TJ45rTif4tpZJsGUEQVbV3wxO67/x8BY76a4WAColSdbrOkCIjcXdRkVMJIuJufBCbQIDAQABAoIBADP9ZwUU8JDjnB+L7Z40gDPJJS5mz++h+f+q3nRb53wLNsUPMlK1JOfbECMzVEq6ZDw9lLhrqNvHpA/8WO3IXcr2bd8IRFvjUOgGl9BCFAO9SMrHfnwyK7AZXhd/RlBgCIjFdP71+0UJno7T3Zcy4985GHltZBQfjHdpmv5zPkJ0nGOrcLkgfoqdoGAaQ1JDlWOl03ctGb3doEUAdmToky37HY7YKOP/ISv5z28vehD8tkOwkqsoF4cYX5C6w6gWz6it+2PYP3IOJ4kKR4QXPsUXoKBKeG04it754kK9F6EYuuBwAOB9GLpjun52YYgqYnxYhW7aYfK7oo+Kg8MHzQECgYEA5kTVcbuwFTdsFllGscQp94tTIRYVJUYzYRRhJn3NntEp83h8+cS/P9ZLVs8Gy4Uz1ufxNtSD8yIPaN4VuXBSJQi49X4d+SlqD81pSk1SHV6GFVvMSVa7Fn7Wh8cfzsVl8fTymdzM0c0ZkpaY5thXQldK9N5HCJ+qPstTb9tzAeECgYEAz6cR9JeFgClNOoRommhNYIcjlBcofKXalga7Y837RBub56+jO2edXsNdEqNWZb/s6VMtVDarZ3hnAgrMinNtFEHGp7mvE8uO9E548vJ2OZHRqju8+84z1acXS8WySxN4VV6cJuxGHRMdd+b1eLsl3SpR3Vel44ntTHR1C2SSag0CgYEAv2QnJMkjqf7O0CSUJd0uJJqhFbcNDFY1DlOqDBw0c/TWMY/MEK3/aEfthtG8jBzC4bUXQMOSiNueg0NUOzWokS+WzDVvJFHP3iKViTSLM+4E9GvAeJSmHCSAm4peXbak7V7y5gAoHZmjz7tsizL2FCYKH01BLWHIVzkYuLhl9wECgYEAqCKmBj896HUIxE38CLJVnMgvhbRuoucEI6AV0Q0y24XjaeisKeiO4vEbBoFc7oxFvvMLa/nMNb6m4V9vGNe3RcSwnpRZ75RODwEPK+Ao3Bp3AvjV36mqDN/7m+3anLGKKM2vcFC1wMr+fFx0/CnE0dx3ZtqWRrQigVp2fyAS8W0CgYEAhUzIsge3oN2vFIm72ZAD+Nfls36QX+b8gQBbKGUAaBYW3AUXunuITEGM6KjwHgiLQTTOrMgwMK/hGEb9gZuPOfPJW9bpwYXcCciMDcslLT3vvGlU7f8MiuQQ9I9gDHmv6D39OILUlbI2Z5qfU6bURy6RfHS6szINmpeiR3Hg1RY=", + "exported_keys": "a2V5czo6QXdFcThOck5IaXVyMG83UlU1cVkvYzJGNkJ6amYvR2NwOVYyeGJWa3I4TTBHTWN5M0ticGtIYlhwQlU1c3N5R0pxaTlDdVdHTGwxeTZZL3MzdVFpcGhJOEI2TExUd1J0UU15eGJsaWZyMDh6WEg3UFR1VUhEYzVQVUM2enFsQ0luQzV5UmFYU2tqQ1M1Zk9UVDlHZ0t1ajN2bHhLMTZpdjRMVlpNUDhhcU53UTdFQkRTMDVxQTRwU0RBUmhrL1YydUJRKzh4SDJXMTZ3Q2MzWXJRSG02Q0s2MkNBajNKSklvcHo1bXdUNHBmSDRuUmttVEY3WC9UNmhTbEF3VXdwV0xJSzdlMVhFOWJHcTNOaUl2cFE0YjlZbnRrSFV5bFVQWDJzcjRPQkZSRDVrYThTZk85b2pYcDcvYUhXNk8xSkFFRjJ3NHU0TnViYTdOTXAwNUxNTStUZUdoOHRVQUtVOEk5ZnBmTG9iWTI5NjlPYzlYUlBHUkdFYUt5TjFldXdIbVNpOEhEb2kybCszTWhGRjBMeW1XZE4vY2pzTUZPd2lhMFhYaERvaDNLWWNrZWNVdWZ3YzJZNkh2K2VrSTc1N2t5TWp2TTN0eUw3OVF6M0tZcWsyMVNhSTdoT1o3b2czMnYvVjl2YXY2YWoyZHdRSFRuR1ZLdGVudHFBalluUTl0TjV5anh6cDlZLzd1SG10MURnZ3NkbjRya0Y5NXgzY05tR2YvcjVRZDcydUVsQU9nZVp4d284dFlFZ2U2RDJsUnZody8rcHBRUDhzWjRtTGVQYlk4SXBlMUxmUnBSOExaRDFPU2s2enRBRXpjS0RBQWEvOE1pYmVEVWtTMEN2S3FmV20vaUsxLytZdU5ISTIyeC8vSE5FQVFtNGVYUlV2TXFnTGVKRHF2V0s2R1ZxMDR5RElveER0R09pTUFkNHNiSEY3Wm40Zm1JR3g5TXY1N2N6SmpVUE44TnIzQmJDWmJ5aHF0MythU3hOR3VpRmRBZGRPZGwyOGhieVpGdUhwc3hZRlFXbzFUYmZ2c25xbHVGNUpadTVESmY2N2trcDkrQnBXcyszeXBWNVRESWg4WEk1bUZzK0FrK2h2UkFOTnBxNmlIeFMzRHNTNjlYQmsyRW9LTWNPekE2RW1hS0ZwQmVHSGZkdXZJNmhtT3JDUDhpSVZGa2hNVm9FZjZoMWtDS01veURrcjk0bkIvemJWY29hRTAvbnZweDR2VHYxblBEUWZrd2xOaFlBOWh0MlM0QmRPWHk5Ly9oMndINXVCL1RkN3ZvcVVRNUtLNzVydlZiVWtuTXVwSS84Sm5aRzNzNzdTQXBvT3E0YTZVV1gzVk5vcFpZV0FyeU9uTmhWK1E3SGxuaEJYK1ZybkxRTXNJK3RFc29ud3J0THpGMFRCcEh2NklWSmd1bXp2ZTVrV00yRndMSzJ1WFFKQXE3b1YwRjRhanpsblBXYkFISjgzTDVUdU5BWXlYYWhEYWJ0Ui92bXFJaFhyb216MFd4RUI0cFVmMmNQV0dEdHZKcUNuRVdXRjNodE9haCs1Q2JxOXV1Zm1ockx5dm9kQmppWnAzQ0FydnR4dTIrbGJVaHBNNndjc1FZRXJ5WTdWUG8yZUs1K1RMSW43L0Y2RXl4UjJ3UElrTzByRXNWZ3pCcjNocDBCQXF3Z1BLeW9hdUtCejY3NlhvVG9aWXNDSWNVcU1lM3p6blN6U21LVXhuYlVlNm03ZTJBY3AvSG5vQzFlTEZUWDBjaVc3OHBQUmN5WmF3cEQ3ekFTalQ2VDdiL0hDeFRzTDBrL0xuejd1c21MSDJSaFg5T2ZLTithWHNSTk1FQWNrWElUVmNuWHJuWTBzblBxQWkyLzU0aGZidWNDVmcvUW9VbzNTakxDYkY2RGdrRnBZRGVOUXVKYnFQc3IrQksrMHdKZ3grZjdpbndQUjMvZXpyZTdsRjhxVWFOaUFDZjJmNmdjdGk2N1lTVkxZb2laa2VVbVk4dnNPeWVBYmFzZVY4M0g2UGpVblFjMUlyVmRtYTZBUlJHZDRURnhSSCtPdm5QcllUQVRJenNGYis2TzNUMnM4SDFZNGw5WktQZk95YUp1YlM5VEUxM3R6MTBGNWdvb3pzYnV6QVNyVmFBRndqQS9LbG9ROFM4dlA4UnNEN25lTzJZWkRQUFVnZk1hR2RCTzYrUjVpRXQzbWtuSDZ1NEpjUU9DOUl3TElVMlNwc0RITzJhQTNNQk81VGNOeDdKNjNpL05nMWdLa2JtbWQ0eSs5MVQrZVEyUVUxWHh1VWQ2QUJseU5YbG9OZlF6bE1TWUZlVkQrQXlsQVd2L0RqcFFJOXBvcE9NNzNHSXFIOGtoMzhPWnFnRFdwMWFXTDA0MjNKNEM2Y29UZ3dheHBHTHhCa0tSZWNLaXpjNlF1QzhFNzY0WVJaOTc0MW9vUjNZMnZjL2ZYbEFXdTJMbkZuNTNoZmFNRUJ3eWFkUmRlcm96ZXZpTWk1KzlHK2RmWXp2N3k4WDEwKy84dmQ2Y3l6cWNBNml5SDVMTWZNRHQ5aTB5UnpRekZFZUlJQk5RWk9BaDF5QXl0Qk04NFFwN3hiWUN0Y05PekVBcHFtakxqOUVVbU9PSWg2WlBteXJvSUZ2anRCc2hBaXpQVUhuRWxmWmxzZkZJd09hREU5RHZ5Z0FXeXI0TmdPd1Jvc085dlUrTW5lS2VmditGazRZN2dUSTY4SSt5TVhGc0J2MXJ1dFAxOEQxQjJSZE9yNWFqN1QweUVlb3dQNGE2OFNjYnJMQ3haSWxvUE9OY0tBdlh6Ykp2a3JBS3FZN010aVd0UmY0ZjA4K3Zyd3hMbW1majBPZGtlRDRnN0N6bXZYUUdXSmhvNzAya2N2RFZEcVRFczREVlB3cGkrTVRyMVBzUENiTmhKVlJMMG9uOUJyeERGK3k2cktXK0QwejBMRXpoV3I3cGI0MzNJVHM5WWhxQkkvOE9kWGxFUEw2d1E3a0xEU1lMTnFWUHVuZklGamhUZWcxMG0vWFJxcWQvT1ZSSFB2M2F1TllFWjllK3hVL0N3eURzc3R1NFdkM1E5UkM1bERZSDBjSXVqSWd5UkVOWVpWdERNQmNrbkg5Nm9OVUlsbWVTVC9OaXFBQ0VYTXRzRmpHcjFXSUxRRGdSNEErVURJT2UzZkNWUFpPcld4U3pTNzVYcVVraUM4VEJtMFREVUNmUm9pT2pnRUg3TlB5aHRWUUVUdTFlNnJoRWV5T2M5QmN6ck93TkMwU2F4UlVBTytocHJWRFI4U0ZGRnN2M1Bod3E1U1ZuWGVSUHpSZWxEUTNmaTdENEtucllsaS9vYVJPTGRqTFMrSGZMUGNZaDI4UzR3dkY2ckVzeGV1U3RyZ1pQanEvVCtuRHRTYWNCTUZKUE5JUzBXOTE5M2tqcmw2VkZaQ1BhYTNRbGVmVDJvai8vdDBMeXhBcG0vMmRPZThzdTQ2Y1kvZUs3TUMvV2JLUEhKbVFGc09BbkYyZzJOeGM5WmpJV1Nlb290aWFwd2o5dUVQTlM4NWtuVGZvVndqbS8vRDBnZjcyRm9ZT09ZQ3Y4MkxLR0hRZTFmRzFQUkVRL1VKQnUvUnhEenN6SlVzeDcwSk92R2Y2dkZZQnNLQW5xWVZjeElEZXBDb2JGUjNPNTNtMTJjNHV6Ukp0az0=", "pin": "111111" }, { @@ -16,11 +16,11 @@ "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", "ip": "http://bob.sphinx:3002", "external_ip": "http://localhost:3002", - "authToken": "BkUr7s7pWZBDcFY54P0n", - "transportToken": "MIIBCgKCAQEA3AzecNYn3FvCFetCN+eAZ+s2iqPxTOUfV32n+YXxzF7xsacdpwIp\njFqIUHATCDyT8O+muCcnfpuYYUYNHnGcgpv60MhWi0S7Nzd+5ryHmoyP8W0uvEoB\nTHlSPr0VgwxQHEwW9Ypw3iubK0LVgkpqnEoiscbQ7vJ7T51J+tZICMUSqk+q7x3Z\n3844TUvz9N3PwQXaEom88zloT5eBqlE+2dkUU0u79frG7bE07wd7ylCIeo0s9IY4\nsei/lrNHHbn7eXo4UfVVQRW1uXjOcNyQld2IjeJblwey8YkokeHHLb3h8EEixeG+\nEbDHP5pnEqgsWlt1hcAKqssPhTcyerJHQQIDAQAB", - "contact_key": "MIIBCgKCAQEA1lkbeDrNVlmvQSlNxAhWaTk2GF8uKsNuzeKBAsua1xl0stSqOyWSLKe5Ek4d4zvbMateyKlO22TFatt9B89BHnXR+64pkFwysqAubO6poSsDhEzg9Nkn3kk3yTtCS8ZaghZvzUxY/5dv9IkS3u3c240jH4MV59xrXOTNGaAXoqqi2Fk6x8U9UON14EHl+rBYo8x8zVjoNiyk7tjq3IK71qXBra8GGvyZWAnG/tzkdp35VeoTkKqc37AW/FlKB4RyJv2967HUV7qf9ZuzoLGKbVhMI9xl/0CWpzw2nO92UUicqle8qQ5bKQs+qIPQI7i+RwoJ4ClaGel9A8rMub/k3QIDAQAB", - "privkey": "MIIEowIBAAKCAQEA1lkbeDrNVlmvQSlNxAhWaTk2GF8uKsNuzeKBAsua1xl0stSqOyWSLKe5Ek4d4zvbMateyKlO22TFatt9B89BHnXR+64pkFwysqAubO6poSsDhEzg9Nkn3kk3yTtCS8ZaghZvzUxY/5dv9IkS3u3c240jH4MV59xrXOTNGaAXoqqi2Fk6x8U9UON14EHl+rBYo8x8zVjoNiyk7tjq3IK71qXBra8GGvyZWAnG/tzkdp35VeoTkKqc37AW/FlKB4RyJv2967HUV7qf9ZuzoLGKbVhMI9xl/0CWpzw2nO92UUicqle8qQ5bKQs+qIPQI7i+RwoJ4ClaGel9A8rMub/k3QIDAQABAoIBADDAj6jm5vEu8NeHR3LA2raQFqewblW3oaoeTG2QVaV62roZ+KX/Q6H4e/WX4uBeKtq/OY22RINOBkDpryRplUwSTDJMSJPXBIjwOd744YgQunoK6leGVLUQPin82nVVphxUchVluhBYJ1SdILenrkYZcdWnAQJ9dcXpHGUprnaGonC94d2s2wy91uAbSQQIE+MOgI7ja8P3KMF/BvJFJOxeyCxTjzw9BH7QJlvvPJpNRCD/niMDV3xLgitxydjHYkqfDO4+xF4tJ0TGyPkBt+kOHSZcthHxtofxllwfs5fRJ0ZEmzUUlv1ohlsByV50J+2TY8Aj1j7ynsC6alG17dkCgYEA78MsQoIa3PrNO2AsuRD95Mhs4fYdXeJr9olO4R7ql0xAE5l/0vTDBD0NgGn3uxI0J7OviQTH79L2XJO4G6h58zy5QCcw+UCZnsVKoxCSuu9c3mpr2eO9LFZ/8nrrVlTzZDaqp05+I0nLr1bSfwVfq5s7bKDr/vpaH9mgKfFQ8zsCgYEA5N1Rvyh086oNyQxBrAOuIERwaG1wddTjMG3a9Kmi35O18Xxv2fMTVwGOcXJ8HU8498GPFoGONElMoQsHyuNUos8thQ/EKyQEktPz0AaK2vxQ2Zrn+EtUjj/4pU9a7b3xa0w2LXjLKMI7aGA4O02V3QXzEdWOYKydYh9CCyqHVscCgYBoakoTKNAEHqFUU10Gt7SqdvKcMW+2nE3CTyfv+GPXwhhBsN6vA3MOnHwNyZheet4F0EYI2PEtq2UpChfqy6NYX8CZhLfaRNzh/S+09hnAmU+LeTNA7+JJtd4AvrFQpqxcn0YQmKlsOs4erSP8t11jwbXOaAJ+x46KQl9zBKnpUwKBgE9Ly44TA2qFah9Vqs9huwwdCmF0Qbnh2BGojmuk9vTGJg0Uk2CNkw7bUDJIe25gS5m0K9Kdctr05qMJwlpup519cQUgcFSONzN0Uo6qJaQ4Nf8fZ+4kk5hx28HTG+sxm5sUndTlfGaT3aeNZw5NFHavIAf22UzvodwkfmqGArxzAoGBAM1F48Y7x8GOldSbKGGT/3ND4ZMTkMIy9GMeeODnWBuZNM/qpmv8neym1IxOI69BtBzVhNKMeuP4etEEpX/RTDdJNIlP0GEXWnsMRrIkpWm89sjCItQ7hjfSqo0ae6NfNDd2UH0t9qoWX0G2JnrDs8nkXtemV/LsMEi/kj9kbebW", - "exported_keys": "a2V5czo6QXdFWnFGcWIxeU5CRWMxckdjS0pWb2lkNnJZalJuMjZqcjA1Tk9Pb2dpTStBV2FJK2pFRjFtZDM3dExtUThWUmdsNWNLMDg0VTErUFFGQnllcHlXZVozYWJsRThidmRYTy9oZGRqTk9xOURBc0UrSTBwTytpS05JYlpaendyK055cCtTb1RyYzllUGdLYTdpY1hIbXRKL2ZPSkdFT2NBaE9CMDVmcnlJclBBWDVLWWxjQ2gyRWFvWTVUU0tzMDU3dkJOZU5Sb2MrTHZ5SHFNbkdERGIvMzhBNzJpallQQ0drZ1QvelFsb1krQVRHakNJNC9KaHFxdmQ1SFQrUVpZa0Y5ZlJmZnhZbk90TFdYaS91UlFjM2o2Z0NTWCtwRDZ3SmJIUDd0Y3Z5eVBZWjE5WllURnpiSUdVTytpaXlRTkxISWFqMEcyODBxZ0N5SWNMUGZqcFBzR3NTK3JWQ0V0TVhENWVWUWxUUk80L0txY3JTd2IzVXhYZi9mWDdaSTNhdmt6aFZsQ3kvR3g4WWdxbW9jcEtpRDRXa0ZYOEp4d3FVaVJUZFlDMk1ibTlEQXo3M0Y2MFk5bjM2TEIxTWUyNTIrUnJ0NklCMkZDZE9qRXRvWm1QaS9EWCtuZFY0QlREZHlnQzFzT0VUa2ViUW00QVdqNVo4emJSU2lTb0g1SnZ0dnBPZjlqTVNXbXIybTQ4eTROeWFDZzJVK0c4ZGFWemZPVVJuVnhleUU0ZE04SDBWd29pcE9tdTVlMGs0YzBBQ3RiL1lUZ25PMFl6aEtDYWFGd3FhK3QxS293R1kxRjVPYTJOYzRZbE5lV0hlaHVhOTJZZXdkc01tR2JNR09rNzBlWG5kT3czMTBRem9uTm1KbVNTSzE4dU5Jd0J3TFd4WkxhRGFJZzFxTkJWZjVhUFBiU1JzUDVkRG83dGQ3eHlIWnVvejEvMWd1MzlZWHdsanovZlhpUEt5RU1OYlpvc2ZkK3pFN2VIV1Z6NFZmZ0hrbDBKVklsaUpKbmd0cXNtMHJKSGFta3dBelpRcTQ4aTFOMndSZWtuYXRIV2lON1FuemZaVjRqK2RuMmVLcnczbjF0VVRXSVkwRWxyazZ1WVhJY1BZa2lHdTlOQlRPa2poQ1p4c1hWR2FOU09mRnZ2WkhadkhxRFpyL2dBcVRxU25Wb0JxQ2t5NlJxbEVXNjIxeGFmY2drZGY4akhucmxJMTB2WmY4RWlJSkcxb2tZblBNOFBpUDJnbFEyeWttYUY0RzBVUXEyRjVZYURsdlV1d2FjREtsajRMaFNMKzA4Z3lUdEY4blRoRmhIODFMd201NVV4bmdZazE3eHB6dzlnT2Vsa0ozc2U1Q2ZtWmFHUnpkaDhlNHVRbExBcldMUFRwYkJkYzRiMHVud0dFc0dmN25WdXcxUnFTeENQTXQwMmlUZ3ZrbFo5WGhYeGN5NlVMN1pveERVcENQZ0VzNCt1bDlTWVNCeW1YWHhrb2lwWGNzRFgwY0tST1dYeXQzSzlKb3lDOUlFSnNTM2RYN2dKd0xib0tkR1FXRnEwVUtDYVZpYTlQREVNYUdldENiM1RBZmhWQ09ha25lV3dndkx1S2d6RWwrTTFqeUU3K21PV1BmWnFkRFYyYlF0UTFkNmM1UUgzKzJwYUkra1ZJUlF0T3ozNUhFdFRROUlxRXIyN2x6V0JuanFWbC8zWWN4SXVIMzY4OTZZTE95Y0ZNUFBNR0pDcmRZLytTdEwrcmJ0aDBlbFlEWHViTG9HaXVpbmtFMldEQ0VTM08yaERjSStKMVFoaWRaOTFGam9STFdncnc4eWg1UzlrYU5kUmRoUFBlWHVqWU9GSnRDR3Y4YWVrUzhnZG5pUnEyQlF4eUcwR0lpQzM4RXdTU3p6NU1ONUFiQmowN1JiYXhSSDBaYzdxcldLK3poWlpNR2F5UmRoUldjWDlxa1RZY1FHdHNTVTRiaWN3ZmJvMkt0K280aXMxZks3dkp3SFM3Y0h0YjhaZ1g1eld6K2lOMndMWjJQeEpsQ2NkZFJ6cTJpdEo5VHNVdWRxUDkxU1UxVFVPTWpaLzI2K09pbzB2bW9ja054dGdXYzJnTWU5RHZLblp1NU1lcEJDZWpQUi9nbjFWcG11aEJLZnNORG14a3U4dDBZdk5tbEhHOUNWR0E2K3d1Z0FSNjBwM0RIQk1NNFllVVZNckl3YkRxOHQyUWs0bmh5TFRiMG9aK2o5ZVB6b2dEdTlVZUhHT09WWmY0bkUvZmJ4QnBzUkxGRER4Ykc5aXpNL0xJdjg4a2hwVmFYOXFqcW5nS0g4ZzFiOVRGWkprdlFPcFRKbzVmRkU0Vk9jVGtvN050S3FiaFgrNTNQamRuVHZvWEEyS1I3NUhvaVRDZG15RTNIL2luSDRtZ3JaT081WERvcmVURWMxSFdmOGE1Z2VZRWhVeDhwRmVwQnFwSGExdXNITlU5YU0xc1hXc0JxaHJ1dXlodGJkNHZ6SUpoZzlwd2VobHl2WEEraEM1VGpSYUhIZmlTMHg1am9DTTA0QitLVVgvbWpVZVRGaE1hQTdZVm9Xb0hJWVFwRUgwcTNpeVNZcUZyZXNrcUVlTjRXM3Z2ZWc1MlpnS050cUZUaW4weStwcVZML1J2SC9vVjNpVk96eDE2MzVsWjhZaVJZcEt5SlFWMWN4VGlCWmlpTklMZ0FlbGM4eld1cHNCWXllRFVhNWpkOEZwV0RrYVVPN0tWWmtNOEorTVJPMnJrQlh5L1IwdFE1Q202cCtLalVXaG5LZE5VL2JFVThPSk9tVnFZQXRsOE5va3NBTGRvbU5obUhWaXFUMGtSdE1zbm9DTGh3eTBUQ21DYU5XZzRMSnh3dC92ZXloTzgwWEsxTHh4OHVBc2l6c0dEZk5uUkIxalZ1cXlWdUxOS1Y2d3dhNnJSR3JkTFJXc2I0TnZVMDZsMzR2OHA3RTgvSjRad0hXKzNnZnRBSGtBbWFrejM1bkgwdWkrb2ZBMlhkSTNkbVIrQU9jQUNqSllqSG5WT2s0dS9lRk1wU2FlTEtCWG16Qm1aRUowOE9qaWVUbGJiTmxIb2tmbkVHeTZPTVU0cWpmcFNPRXRkazBQbU5NdWhKdDU4RFRWVFR6OG9wZHM4V3BOR0JNc2YzeVl6TUVOWVVaL2lycSthOXdKRGs5RW9JVXh1VWJnbFcycFJvQzcrRVFmaC9DQ21ySnRxWWkwTWZaREl0L0hKZXlZWSsxbUZ3Z3NaNlNkSGRJeGhFODNIN1BtcjVlTXM0MDF6RmFpZUhUUW5HQWJvQ3MwQkdWanBnQ2xwK2VnYVgwTHVCL0V3RSthdW00NGFQMUxzdzNUZkVJTGNnNllGM3lzRG1pWlFkU1FlZ0VIajBZbW9OOTVOSXBnaE1VTGlQRVJIOWUvYlNPOW5WODVTQ2JaMFU4YTVjZTVKNzI0YWl3RTNUV3pKMy9odFJKOUh1MGRmemcxTUVEMXFQY3d6OHpGL1FPdzU1Uyt2d3FLaVJFR3RIL2ZGTVplaTNudk5mR2hYdWEraEdHUEh0OUdGSWQ3eFVTSnZCVDNML0xPY3oxVmorWmZ0UVNMMTlKZ25abHFBMWEzdEcwdGVmMVpDd21wQUI3b09peVBwNnJFalNyb1B0RzdzK2QxY0RFT0ZSdEt0UkZLMTlJSmtrQT0=", + "authToken": "juhN/i0W9LbfLDz7/Gf7", + "transportToken": "MIIBCgKCAQEAwd0m8erEjxY1XLldNz9eqHH9Z290FgTYW0vrvykbzE95PZgSjScS\nILSKx+QpacPx+A/zbKvOOjQmBreSzknZeUi6wItekOtMH8buCH6STj+ka58VQ+Le\nlYee9rY2wqwf+9m7jpoRqWSvFZv8n8PvBIMgxPw93Qc6dQK1qvjGDBTmd4bKOLDg\nbUB59bIb7iV0yqfOBwVX5fZ8QO/Uy6hWfhizpncATv4enHnIPk/LtVGcDgWl7tyb\nZQHWsP8E6J3zfIMtvuYdSLrV4I9/x32jYRGAPHnOqpWdoxu2cs34ko/dgIcKQLp5\npM+Dqvbn2vEQsYXvZfTJ2mBm0L168VDHdwIDAQAB", + "contact_key": "MIIBCgKCAQEA0yxNamXLjMfRBcctz1z60l+Hr3PfXPzxl+JwjukNe6RENcPUIUmqlwy2wMYuZNgGka1jdCceik4CuFBGeg8KY/dIEtF0T6cK/KS1mlSd0+FkWkW+kUnEIjekYIhkMEmk4u2eW2b4ukB4mVAjwIvMGtqlaEZ7CsmQ7qCB0z7V1JZHR263ZZ5iuC+VumdwBSDQKhpI2n5DIH97dFLlNp0PkQ76eew5FIyrGYBWGcyrXOvc98YQIMwM15otELTB04D2MD84stZvy0aN9dvNdv4nFp4/w5sjiPbh7AFfvE7GsytsfaYnjS2wtJqdf+iyhIIB9yuTbbZ8lEUz1Hfbo+pGRwIDAQAB", + "privkey": "MIIEpQIBAAKCAQEA0yxNamXLjMfRBcctz1z60l+Hr3PfXPzxl+JwjukNe6RENcPUIUmqlwy2wMYuZNgGka1jdCceik4CuFBGeg8KY/dIEtF0T6cK/KS1mlSd0+FkWkW+kUnEIjekYIhkMEmk4u2eW2b4ukB4mVAjwIvMGtqlaEZ7CsmQ7qCB0z7V1JZHR263ZZ5iuC+VumdwBSDQKhpI2n5DIH97dFLlNp0PkQ76eew5FIyrGYBWGcyrXOvc98YQIMwM15otELTB04D2MD84stZvy0aN9dvNdv4nFp4/w5sjiPbh7AFfvE7GsytsfaYnjS2wtJqdf+iyhIIB9yuTbbZ8lEUz1Hfbo+pGRwIDAQABAoIBAQCUZExeWPwJiJxcaBPL5LWowVKSu2UZbfHDXm7kLea4nL0F3v+hCKgkjt2ZZ2pQmPE8y0/Y3mh6nckRhe+QdCNEDg+Kkb8e/e4djQzET3O84WTofpwkcmat+NW8s/tbZ1TD1mByMFDWaNmWOpd1BYe+0yhqtyRddzkuRoIUVNJkGJNhR4NP/fcW6dV/t6JxyXfBd4csi8Ic7fgt6sc4sGbnAimfmxiBstElKjjG4HSDUm6Evvckabg87bdtnBP5WFiWBncDcu/TSkyoqCzW6SrTI0FXPYIK36yYVrcuwPYG+0h8QHKZoMlaK8pAD/urCu7I15Drl5Nq7G/8rTxcBytxAoGBAOsApaYaGnJ478l1X2Ci4qd8UiVqhmdKxZz6fQsZ0utbv0SHqdJimjS1ML6C4fNC7HLXymOVOcbARMe47pXgwT+XluFPADfW1vh/E3tungHP1MfR0fddZnScZc+ZzM2GzC9G+apyB8JvUbtzzsCJMIgcG1UGykEuNgebs+ShQmppAoGBAOYKlvIt87s2C1N0+E42cgZxRcUD1T7zQnLO0wQoHt2WOS1mo+bwJJN263Yp8Mxexvc3vSB6SjBlpXlhbUy4fDUaCeX37ICYm/GGE2JGbEmbcn+NPpK2IsVwuEQN5RO6ZHTMeRkp6nDAvVUMfqZyy8mai8GfW9BjhQrUTi3TCTUvAoGBAL33AvCXb0OT0ToH4Das1Q1QqNLIHqeGwOGZdtUvZdmNi7qo87U2sbLjuOh3wpCzS5G2MEt5iH/KUo8kRfDwAycVsgilpOZ+i73Kc4Q2shGC4F06lkEgxj6DYqWDjROi4JFjDVUj4nPhKq+d+MaY35tXJR0BZSN1aIWT7sJlPNvpAoGBANG+EgbaEwI8snLzkXpudeSd3slVR1dQIOPg49FEa3AKCjP1A7gKeK7jnKhucRlFyQ+bCJvWJFKgOxHC3Q84njckeKXvOPm/K2A5qO7P2uf6DZlyxPyriGSQ89FJAfbM2c8Mp9VjvFf1xCsJa2iD/n7gpFBz5hjIxIMtM+LgKeMNAoGANst3/1+KxzoQqUobJSrToDKucEiPvKb1fLyVrJjW7A8n5Icob4DePqGvdSa45Z/VjaapIHgmaB9EKy72x9YcSc53R2yyVFobOPfUY/b9E+oYcM/2zF4MdKEd2WZ3phB0Uw4JJgWdJDydSKM6NFCKnsFB3FtryI40alWS9/NtsuI=", + "exported_keys": "a2V5czo6QXdGTkg1ZnBtTmsrRGlRKzR2OTlsNHFKWUM1d3dWcmhlU2RBSWQ3SkRNK2NDWHVwaTZvMFdTSmRZMEQ4NHBqSzJhaUpTbEo2ZzJSWFpta1NrZlp4YzBhdWZKWFd2SnJRRzNVTjRJRWZ4alF6aFI2M0k3V0JydThCNE9wbXVSaEY5aTdZbi9RbkNEVE1WU3NZS2ZJR1hMYlZXZUJYY21UakxsSEJxQWFhYkhueGFwTDVYeGJES1FLSzBWS2RmcmRWcGFhZElIcEtHcFRndmVIRklnR0twZXZhckJMTW1hM24zcytmRXNEazVOT05rWFhNckRjcjdxRVpCbXVBN0ZwbkFDZEJtTTBQSEFRUm00WjJEc0M0eGdKYVVaZmxWZm5CcWluNFpHaEZVRi9TMEVxdnpBNnkvWXViSk1XeVdzc0IwaEJseWN4cUtTME5HL0tUb21NKzZvQ1oxVG1LcE1PSnZWTTM2dURRbWxKWkoycVZLTXhJOVZqbUlKUEk4anJtR3hCN3FTWmg2RzVscUIrWnByTkZNN09VMmh2SFBJRS9NcS9PYVBvYUxRNWFXK0tqb1I5UkVxTXNDTzBhOHljKzRUbXROTHlkR0UxakxQRUM0SzZjUzR3ckhqcE9XOEhwZjQrMmV4Rmh4Qjdpa0ordG9QTDBGcXYycFJkVjVNQlFLSHdaelNoQXh1UlJqY1RqdG4rOTJRMEw2ektsTVZUVng0c1Nlb1huYnJMQTkvbm9EdnB0QnpBcGFKUGxwOEw3YTh4ck1ValBTMjdvdnpNYXl5YTNzN3BtUGJJeW9pT2cza05rQ01Lb1NZb3hxWTRrNzY5LzgyNXRTYjZiT2lvQW8yd3RRUW5KbTJkSkZta28va0YxQUxuV2tyVld3Nk1BdmRFV0tUVjZrZnRnaTg5Z1I2MlZYM0VWbXc5enVmUUhydUg1VG42b2o0K2I4ZEd1c0VFazBXZ2wvM01WdFZYeTJsS0VSVnM0ejBMRTkxVnM5SlRXVEFzNTVGNnJ4YklwTHh1U2dnUHUzWlY1cEZJN1J6cFFzSDl2bzhjdFc2V2MxdWlFdUFZMDVxNEdQTXBXaUp0Wmg1Rnd1QkJzMU1JUjJTRlZQcXJVK05XOHdxR2ExVXN5VVd2clFRNzdDVmcxcVE4WjM1YTB5RGFoeEREQklOQTVNTzVYcXJJUldMcXkwZkxqV0FSTTgyQVM5K1I5dUI2a1pjL1h6VGwrNy9obk9sSEtMY3B6TXdqRHpyOWRoeFI3RjZLZUFjNFMrYTIzcFRXQzBRWWsvdldORlFGSXdUeWhXam9qVCtQUjJjUlI5bElTbUE1MkJjeitzNis2cVdTcXg1VTJBSVBuWjh3a2VaZjdmdnZSK0kwOUV0Y0kxc3g1RksvaXczYm03OEFZT1JSOHNtTnFxemZGL1RwZm1vV1ZiRGMzTjZQckRZS0xCbFA2TTBjcUlxc2JydEtzb3JyTXF6cnJJNUlEM1FJOWRzdm1Hbm9MWjBtM1EyNHhhTitrSHpJZ1ZuRkpTMWFrSnRDdGZudUEyRXV0NEYvTGI3YkY2QjF0Y0pVaktrT1Y2SlV2VTNKY1p2Q1BzWlBkeHN0djBRSCtsN1c0WWdsbzZqQ2lzUFZWK0ZNY08wZjluM2FNdHlNUFB3WGJQeDU1RUtsaFZUNlgrSmhiSjVKYUZ4S0tYNGVVS3lWK3hjRWNqc29HeVlEMU9VNDByUll4L0g0NGNQVXYzWTZFSzNIckFjSmZBL1BwYkZQTW5DVWF4clVjeVB2L3Z0SDdka1BqT25Vb1BXejhoQk1kNHNhZTlPbEhqUjhrNTVMeHdhZTZBNDNsSU9IbjN5VlUzQlJObFVoUFJ6ekJDVEU2cHppMlc1VDlEM0lpd3ZVWXpIcGhOd2xYNzZ3SitrbXI3NzE4S29wYitrN0Z6S21JbHZNSjZER2ZnU1BYK01JOGVXN2hwS1FRYkVDcFdtcDVqdFRuSDZ0Z1FqVi9uQWhZbkRTLzgrL3plZGlsa1FxRG54bUNtSDZZUjErajFpUkhBTnV0ak9GaTB1eDc0eTlYNUNmQXZ2RmNFQzM5cCt4N05yLzhLd1c3OHpRdnRFYzJNK1hSVFZMNTlRVElzMUErTFBCOFd3VXBXMm9zN0xKeE1KTGIvNnNvODd4eWxLV29lRWhKUW5KNDJML1lEcDd3SlQzT1YvT1JDM0x4U1ZhZTIxUTg5WERmNVNPR2JBaVJCMU5lWVo5REozNGFnaWdySGN5TkNvT1VRZzdvbktCTndtbU8yb3FHelFETFFIN0RxMmY3TkEyVWZrN2Y3UGRnaWVJcTVsR2VzTzhUUXhjRWhLSkZrUk82U2k2QmI0TXQ0cE1KN2FLbm0xcTROcU1MWmppKyttcjVMc2pEbkg0MHRUUUZ4L3loMWo0cEJPYlBROUF3WFllQmNVUlNzU2NhOHdHalBHWEpzN2xXVVNZbWRhS0lmREo1a2tDMVlOeGo5R1Mza3Y0bDVxelhIeStGU2dwNVVCNUhIVGVGRDR2M0xWZGdTczBGdGNTVGhNZmNIM0FKZm9Xb0NUYVJnMXl0NlFBc2tMRGVyZlI0VWh0c0VoVi9jK2lnWkV4T21zV1ZOTmtwTTZDZzE5bW83Y2VRUUJpUlRzbDNnNmg1OFYzNDJTN25hd01NMjhKNW02ZVZMUnhjWGZ2N1N1QzE2Zytvc2xUT3FPR0pRK2UvU2NDOWFrVzJhYTdSalJHUjNCTEVjQWFFS1NQU3gzVHRJYWRscmwyL0FCRVlrazZHVkNqRzh6cml3QTE3SmFQOW9WaCtzMDVGRUcrUXk2NmZObTVFR2ZuWEF1QUpXc0RxZVhGN2VUbmozK3dnUUR2dDIwTW0wQ0o0SzFoUmxHWktGZDZndmozVFEyZ3l5V2VPa1JZb3E3NkVNMjM4QTJLWGRJVm5namhLZkN2dDgwTS9QaW5GbTlGZFVhN0tJTUtRL0NWRVZQR3Q3RXBZSTg4NGxENVBOYmt5OUFody9naHUrTGE1TFptaUl1bDY3YjNBZUtwZHZjR1ZyNzhLQVpteTBPc0lKWUtYUUhyVHhBYzY4Z0VMaG1mcWlocm1aaHIxZHdlb1RPVm95bmJCS3JFNXRLc3M4anBMUHcwWWZ4dDlLL1Y3VEJrTFZ1SCs0MjhKNndMbWg1MkRac3UwU01oWUN1OWIwcVFUNXFSeUo3OVgzRHBGMERaM3VmZVJsN3diNWdlWHRNVnpZZ1Q1RWEydjM3dFJlMTJNbGNKWU5IeUNzSWdMNVQvYnVJNzdNajNOSk5lYUlPT2UybFp1QVhuZEJIRW5VajBXTjRxcTdOcHQyL2NsY0Yyd1RUSUpvSnZ4ZXRSMDRHNDV4ZGV2VnZKQmJzaURhOVMrNjRqa2M4RTRQZitDWHRxMUYvOG1uZkNrZW50VjhUSHE1VFl6cGF4M01oMHd4eGFBa0dIMEMyNUV1TWkxVVYwQ2pJWWtsSVBGUzVpa3ZHdnZGazh6WkRkRGNVS3l4alF3K2xjM2U4ZzhBUUJuemlXVWJvSjVRblM1VVVQTGpMb0hZSko2L3dleW1mZmNRdUZvRE11eXpNNWxaLzZROWtxWFV5akpmNWJLZFo4YnVZS3Z0V1JCang5cXk4Z2dNWU1taWVML2ZNNDV0dnRQMmw4QW1KOD0=", "pin": "111111" }, { @@ -28,11 +28,11 @@ "pubkey": "0364c05cbcbb9612036cc66297445a88bcfc21941fd816e17a56b54b0b52ff02b9", "ip": "http://carol.sphinx:3003", "external_ip": "http://localhost:3003", - "authToken": "SCy1ZKzscIm6/nI09T1n", - "transportToken": "MIIBCgKCAQEA5n/T5ym/QLZEiShIGnHq2KOvf4YzfkHlIOULE1fIxwBi5LsvmTY2\nZ81h/EMAqeojJTyAk25L//UKwESqnTQRzBOioRK0dLAWoCCDsV5TfCncPC3NIQZV\n0j5gk2zi4WvDiINP7UGnZxpPYQpP4nxJv/b03MlIAQAX7ZhpEB8TykmwoLVDm8Sq\n+aOjAxZMRefHqC9HFXVSi5YID6Z4lTSjkWtKRk5FM+Xo9I/FQEQZw3CyXPxh4I+J\nPd78cm/Geclgq9w1kcjlPDhsTZrpFtjP20e1JY4J7DUpcw+WBWx5JgMtDuF1UD6b\nW6UO4FpstSpv/rtIRQaMxSJsP+RYR2SkMwIDAQAB", - "contact_key": "MIIBCgKCAQEAubOmOA0JO3hFOXfn8HiZWAKMFdR24hsHqbofAmUsmGPELQn8vm3yTfvK/BLIkENdGRVrl97kx5tyPeNlicNV8i81ggQweJZ3FXR+Hd4UoQ4xOZP5YWUrp5JM9tdWJyOevXyQxOOhYw63ngfbSXN7INiknST9zhotKgRPod056pDVn8f1qX8S8ubcXaSB3C4/F7VX0kohtYd/Lxnzi9eSeO3uOWylts4NGMDFOdKACSwF9LoJFTc9A7bhn2o6T+Xcuiqg59flwtPNJiOvyTeMljNCweiujmZ4AGUrKooESAQDmSsj6PhU/o6EGrH73CjAuzlLILe74hJj/65Py7A6iQIDAQAB", - "privkey": "MIIEogIBAAKCAQEAubOmOA0JO3hFOXfn8HiZWAKMFdR24hsHqbofAmUsmGPELQn8vm3yTfvK/BLIkENdGRVrl97kx5tyPeNlicNV8i81ggQweJZ3FXR+Hd4UoQ4xOZP5YWUrp5JM9tdWJyOevXyQxOOhYw63ngfbSXN7INiknST9zhotKgRPod056pDVn8f1qX8S8ubcXaSB3C4/F7VX0kohtYd/Lxnzi9eSeO3uOWylts4NGMDFOdKACSwF9LoJFTc9A7bhn2o6T+Xcuiqg59flwtPNJiOvyTeMljNCweiujmZ4AGUrKooESAQDmSsj6PhU/o6EGrH73CjAuzlLILe74hJj/65Py7A6iQIDAQABAoIBADzXfz4eB0hUv1l0z6kZ2iPbscn1Mn4iHQCe2koOm+3RwhR/kS9TFnA2burnvI6Hg5kUS4wWmx5K78MXHc1lEmOm1AElHjxkD+AXqrpeaKPb4oTa1nnyi7r7U/wL0U5BfWDXzxay/c1WpRJBwLbv/wdj84sI857zNJjvkKeXs8IF4vzQoCgQbRpj6kpQOiQcM5dJg3coNh6+XOosWOjNEZ7pFw9hc8G+9GsoZs03ur1nuFnx/GC2QC5hrYOo0D4qUyVbLHCvAG75BiDurz0I9fZYfQOW+gpy89S2xBUjYfdPHMVKbVTpMj1qq5cfw51okYuQS0vTpZsZPoEvAzghjYECgYEA4qgqxACcbSB7bUVZXdIUy8XW5j82BF2CZBaxrSte+Q1Vw5ibPh8eB6M+743G/auOGG/YOg882k4nzUs/N5gZTZsNyp3caTENshgOR8mJus9zYfpv6DKjgZwhi+5Ox9gfTL8PpqromcspNejEtoIkP0ZLTkYebRQn7fvEwerE0t8CgYEA0b4m9Xd4ttyEjvkTARQiUwotexrCsUpsKwR1NbgmQejLypMsK0YzYaqTjU6XDPyudI6tp+Kn93JjopJ4mnrSE1Jyd4fXzRglnZthIs3K+FFzV9w3kCpj/AXm/54xbDC9LaSb1uhVFSkhq0O5ELxN9fY+N0XRkKGsWXe7uCRkR5cCgYANu8jTlYHk7tnrtg8DK06NRlCOJPhd7ViQPfvIFV+s0Y0HzABkFDial96hX0LWbgWvH1/HrNKwG5o3yz5qXPHzjNiaFVScnxdIWkLLQL/yrM09+5G6TQ8xNEeoFel6HHNRECafn612XCQEGzWIJXySxOydMox3aYg92EqEwXfpmwKBgDTaqTCkSawzB8iLpalY7IlmgC2MgdFxgq6Ycfz2idWEF47V5YSGLT6IYKR0UIY6SrAeoE41RMSLc+Ys6O1s0/GAjk3m0o/hbOE5nZHKsEJBLELQwMO4mveQeTSjJasw4QtWdtsCMyag9dYVu9YmzbKUufrtwjCjPS5SiOCPcyHDAoGAWQ4tmYyhrYuHt37wcgG9aED5XC2Kgfg11j2J4lb+OhNkA6qgpQMbSHtECS6Tsvq/mjBSLwebvARR9ozQ+7enxy/HWWq0ZL2KN40QvDp44bVQvoxO/ohgsX58Ih6s2VaX5i10JtRsiIZKMUOcf8nGcKVwlJ/wT7QZ64MISthnKx4=", - "exported_keys": "a2V5czo6QXdGYk5MeVZ0ZG9lV3lhZGlqN3JqRituY014blV0MG5BY0tRN3IzTVVrM0VyK1h4enNpdUt4ZC9qT1JhQXBrci9MVTU2cG1Xa3JlbHlOY1FzTmFUZmtTNm5vSGM1L3BYc0NPTXE1cno5YXpHbS9CQTc0Tno1d3Rja25IUzhZSEV0ZG5SZFFTWW94UGR2ckJ5OVFOQzllVUNyeVpmNU9DY0xUVW1KUkIrS0VrTzVVVmFTdUdHdGhvQU1UR3M1eng2bEJIazczSkJsNTFrQzc2d255WFpKWHFObDlQekxmQjJuNU8rQXhCTWgwQW43b1IyaUdjZm5RSUdFUlRYSHhReEY2NDZmMkl5U0RNUFNXMHBGSm9VbkJrc2MxaTVjRTVwakdSUXFnQmlXZ3I1T0VzRVFHZ0NkeTE2aFI3TER0MmdOanNzQ1dZVWNFK2x0Wmc2RHJBTjBybDY2Zkx1MXM0K1Q3VDlqaGhnVEdWeUt4dndIRkhmNGVyaXhyNUpqdS92MEhEMjUvazUrb000UW9tNDVBd2NYeXZvMXB2dzhIRk5TQkZySm5tNzJ5Zjdxd1VmaW83STcvSGJ0Uk5MeDdMTlFGV1NqVkJ5YnBwb1Y2eXNaeUVEcC9RckdDVlU5Q3JWbGtyTk1JNEtWVk5JQytlemwvMlpVd3QvRGpRTnorSkFqTzhsU1k2dUFQdkd3TXZBSUNFb1NYZnJ6TWdwMVl3WDF3Z29WVVdiNk9pbmNoWTFscmpLSnFTWjhXWnEzdUR3RGNORENkVm5zV2lZNFE0WVZkbmg4V2hVbkk0NGxqVUliUE50ZjFGNUxtTDlNV2k1SGVwZlhWZlNISWk3RUo3a01aQWNZSWRTTkRyN1hBczMxbm13V3h0bXFyaHRNY3dGRjRaU1QveGQ5SlZ4aTZDVnBOTjRRUlNadGRiNWZBZk5IRjRhalBUU2RhZmxIQmlpSGQzd3d1OXdhZ2F3YzFHUmhjNmFHL2wvYkpOcUJkZllxc1NLS2hCeXFJZ2pZYmN1T1VWRVM5aGt3NXN0ZzlEaTZYNHZadWdmWW0wM0pQa251eFhHM3hnWVBjU2Mvc2VWUHBlQ2JGNTVzYlJxQjR5R0lBYTF1M1ZqdGsxMHdhTkg4SU5Pb0FwZjhvSU1Bd2kvdzFMc3I2MVpjU2MzbDFsdC8zVE1KU1ZMSmRFS2ozUXBZK3dVTWtpYlE0ekVIZU12RXJ5dE1OTjZaMXJpNkVGT2RuSndlZ1FCUlNWWjRlYnhMUnl3YnRKWENrcldDWHo3dHQzWHpZNmFuT0FUSS8vSEwwb2VzWUhlQ0pLN29wSkhWNEFkMG50cCsxU2pUSkpuSmltQmNzc3hTeGdWQzBoUlIxZkdRUjVOYTJySGsvL21vOTFMUVRjVWVxa1hIaTcxbXI2VmNDaU5kRWxRNVptVTVWVklKMUtZcWthT1VjaTBYb1hCUDYzN0hOcFV2RFR5d1hBd21BOWoxdXhYWUQ2SzI2SkovWVpSUzd0SXFtLzVMa2xIbk5mQ2FkNDl4cjZQZU9UNGZSWmRyMjB4dkpFclEvUmZOOXBzZjhlcmlhTWNMK0tYNDY1ZHlIT1UvemFxcytMVlN1Z2cvQ0hJYWY5Nm1tYmJRZ0FlM2hJRE5HVER2SGl3Tm1scmMzRUhDVUlNMUlONytVeDA0VkFSNGNpMmFnTVd4cFZGSkFsRUZ6ekRKdmR5T01SSU1ndWxIc0xkUUZ4SnZnUDZyZ2tqZysyY2lsZ01YRThENlFZVS9YT1VuVElMMFUwYXdUbUt4VHJlRTY5NXR4YmZTV3NKWFhNUCtmZWdoWDdmbnNPcFBYMjhLK1k5WldjbnpEaW04Nm9rVnZ6TmpkQmlpc096Mm1QQy91c2JBelVCOUlrMVZQUGZ4d1BMY0FvTFUvN0hGeUlhNG0xVHdOOGpXNE9ENmg0ZzZ2MGtFd3NTaXJBcmpjaDdneDlTcUhYUGs5WVExVHd3NmsyQ2o5b3U5ZzRqR0c2Uy9tay9wQ0taeFFOcEhDY3RtbVJQdUlJWnF2UU1JRGRwZzJVelBPM3hJcHQzdUpRVXBWRFdPVE1ZVUk4Wi8veXJ4MXpLQXVQdmx5NFlmSjFYY3c2RUZ4SDgyK1JqV0hCTHlQbFVVM3BHbGwzZkExM0R4Q1FHcXlnOVZGcy94RjZZeHJSYzJZS3FDazAvZ05KaWhwSEdpVjRJOVVjTTlxUDBrajdMdUpmNVdscmJlYVZGbnBucG1xcWFaczA3V3VJUFBjejRLcEhsRGdydGZJL1pNaEZudGhCQU5tQU0yMVNWb1lReG1oazg4MUk3UVJVQU5OYlFweUg2WnZpdzFvWmxUNU9YU3IrZW1lMllHemtqSlF2Zk9Sa1EvdDFURVVtMEdDTE02SGlENXhzbVRsZFNyZEs0SEdtNXBheUZMTnJCenZ6QlNBdEJoSXhsdEpxd2xUbXNUQTBNMUhxRlRPL1lLSmM2VUl1SWFvd2FOSHF4bkpnOERwRVJQUDRkaE1yN3JOTzZ4OVEzTkhiazZha0U3Vy9BYmROb1RyNFdhd0hLd1ZWK0lWaWE3RmN1ditsWUVsanZKVi82aTlBUDQ0WDFIM085K3V5ZmkyS3RNWDdwbWw2UFBXazdBdlhNV0szSmdGNEJ3UnNoNExxSEpMSEJxaXprVUE5dHlWclNDNURDQUp4WnVVeENVb1ZoYm9vQkFSV1ZRcDJodlJMZDg4QnhRT0RPVWdIK0lxMkQ4aGRyeVBuZFN5eXNNU0ZUQ0UxZjNmS3NjNHV3VGpEOFJLYXlwV1RIZFNmN3B4VWVuZjNBbzlHd0FtQWRUN3AwWUl0b2txeEx6UnJ5SFNybTlFbzYwTXJxajkremg0aGJLZnU0WS8yUldBZjZpOUhReHNjekdVV2drSlhTZ3FBb2szaThvdHEvalpmMlFDZjJjZlN6NnhxOUZFNzVUSVBoang4UGlzQlJvaTVMeW1uQ29FbWtrK3MyU2U2clh6ejBzU3VKcjQ0UndiVzJMMTR0WXl5ZFRyMEkwUEcwS1lScmttMjc3em80NVJXT3VHYnd4MzAzZDNwSllQQmo2TU9GMFlmcUtQaW9FQzBaTE9SdnZ0ODcwWk1VejkyWUczMmFjL2x4bjlCRUdQZ3BVTkZER2dRdUU4bVoxdVQzMUM2VWU3UE9JQVpFSGpYTG1FODlWcWhIZUluMjAyL0FKckZoaHorZjdDNEh6L2wvejEyNzhCTWNuZDA3V2IrdnQ3ODhhMG0yS2lqWVFMSlJOcGt5eVFGWitvQ08zMkwxejlmTmFDOWVCUm9kd25FSjBxMlE4MXI2YlFHejFtTUlPeFJXekI2Ung4VDFGY3VCZDAxa0lMYzZWRVVMMHlYVW44NkdmUllXbVVpa3M2cThvMXljODIrcW5rN044RU00M1Rqbm11ekpYWGtWY1UxSG1yek9MUzUxQ0pLRWNRaHk1R29WQStnc2FrMUZXWmNCMFFheHZKWjkvTHRZMzFVbXlkZW9EL0YrYzM0TjBVWWNSQ0FTWGFuS2hRMVZwcDE3T1dDNStjVVJiSWhQM3hISzdPa09PQnp0RThaRUtIRmVjWktzY3NrODZHc2pXcjVpdmw4YWtiQ3d2a29kWno4Z2ZJS2QzT2VoakZIZ0hkSGZlWDZqTU53VGRxbz0=", + "authToken": "UbO77cjm7Peg59oT124s", + "transportToken": "MIIBCgKCAQEA4UP1X3HhARf0CtZ4bBLlPWjHFbI3NDStDFzTLLAXah84Dy82eA9u\n4lRSj238jXbbTFmL5+oUGUMBySd9qK27iNLuCm9YwLDJ4leWDcLrlDZaPQDHTp4v\nqshogUW3BtOIwPTBDcnHmgC3kTWnliPQwhXMeU0oHJwoVORN5s1CLC0Uvosw+SdA\nJPsqdMH+ZtJP+deKG4iIG3w7l5/LWQTqhAUhCMLTUukJlbMcGS67C7MqiUeCFJ/F\niu8+IKpWq0TVV5CXQNPDttSqfdijTsSYjofd0OgpGmH0dDy6yi9QM+Bb03mS1g+J\nTJSXj7jPNsZjISMOyue/Vne3qT6uqnkOTQIDAQAB", + "contact_key": "MIIBCgKCAQEAv7IrzfQgGkE1AQBUKyZFox5WF0yB3Ql28vexXTEUUuAhD/1DG01Q4cd/aBcPmRpOqiELy1tntPRIMON9eCDevGuv3wV8FR502RtsngFI+hhfM8kFD+Q2J42Bd+QLbyANu/Ha2Q3mTvc/OnJ6ejzYLbLonST522LSMF2ls9MLPMQn1zsEPxr4SMMNOXQT6amrZfHEwoXsXVS68bG2tG5E/a9criMlLxOCEZQd+4dvfejDq2RjWZ9iQPs/50HyBwIur4SUm1CoeLGlI878LdMIShqOvEELrHKQqoVS8aPYU+NGCmQtcxT2cZKXZGHl0xcFhSuZXQb38nlVOnxETttnPQIDAQAB", + "privkey": "MIIEpAIBAAKCAQEAv7IrzfQgGkE1AQBUKyZFox5WF0yB3Ql28vexXTEUUuAhD/1DG01Q4cd/aBcPmRpOqiELy1tntPRIMON9eCDevGuv3wV8FR502RtsngFI+hhfM8kFD+Q2J42Bd+QLbyANu/Ha2Q3mTvc/OnJ6ejzYLbLonST522LSMF2ls9MLPMQn1zsEPxr4SMMNOXQT6amrZfHEwoXsXVS68bG2tG5E/a9criMlLxOCEZQd+4dvfejDq2RjWZ9iQPs/50HyBwIur4SUm1CoeLGlI878LdMIShqOvEELrHKQqoVS8aPYU+NGCmQtcxT2cZKXZGHl0xcFhSuZXQb38nlVOnxETttnPQIDAQABAoIBAEeu3biPUK3gsmxkbhUQo7vCrVjbEDjSwDtNKnL51mrDSznKcBy2hcdYLamD7h5HeyEdaGasEJTXQGOfvhx81i3JayPPzj2rfPBu0+gl/N8g3ADma9Esep/Bx6dIjIoKh3g/kaHXE8d1p5w4kNpDBGfaXifdWt2SD51sd3lOMwaOgcmh4ZpYzjujMOBsC119n7BR7ju8FHWbzJyI+I1Di/sV9X6Mhux1d3DRTSthunB26IHhbGzeR4EW5LkgoZ7yMlBprhQ/zZRqJqSjgBkCOaAj4p5lKWOGJs4CRkzjfemiMz6pWAgg0gbEkt7YvuWVH61VB4/bA4T9/dDmEakgaeECgYEA4uDkBqWXHU5q+JD1Z+OJiUwyJf/WGn6/DsIHfpzE9ssRPG0XqpIBQ+tgU//9RSCBdOm8JabbZn8XIj1FRbs8CMkBfEOOmfrMXfUUcnxxwOGXsFxIiyR53YKwvXxyjp+avK/vMSH5V7CYNw6lV3K+75qqwLXypVLgAFPBI+SkyEkCgYEA2E0zo5AxZiqJlt8eJItSkIlGIKDsDKRTG8GhlFFSfHoxu3c/tuXFdI839QNQBmMHwifUh2GdHCgx62smkGjbieobBuYTVAdLaxvHM39nKfJclitTP6ov2etDgbE3ps7eAnHcPK4cMWt9/+dONRSe8CYkfo6hNuOmNqv2hvNjr1UCgYBR286qT0jMvCSAdtz0lPZk4WceqsY3XQ/WZU+K8UlnujEH2ly1oGRwexaQeEaLkITlCAholWGIA8b3BaBe3oV0rgGpMj7bc9AU/n5YKGpqq3qtmT5bZdfKgoL+e05iA1gzSE9HLPjoGMFy7AfgG3ikvutpCLz5xYMo2w9OwgpqcQKBgQC4N8grHbt0z/Wu0QfTB/Whs8hOMb/YZHuDwD3lG/2slkWU69MP6lFpHDEEM3YMens5GMMhKjmsqW8amX+WrjeMFh4+meUMQ8ovxtC5Q2CRkSDZpLyaFE/8wSoVYuGK59SdMGvqIj9Qt8PwFwe8nXtf/JxITSFwpiIBniOwe8oCoQKBgQDL01LN6b8MLj5FW270lY3h+x/THcOVjugyhUjRp8URzcjpLQClFX1QihdC18o6ovVUd5VngVED2EPJYDwKFKf+8YYgNUwlZ4acCRw9wVdk8T1b/Q8GW9B8I3CTC/lVfr/e5JFMGnjstwVLzFscgNKKW0057ukDdNR4RAwQ2e5iIg==", + "exported_keys": "a2V5czo6QXdGYmNWNzJPMjB4cjcwNFR1bXVNZE1pS01LL1grbmRVT2U3ZjlMK29WK1JobmlSRWpDVVRJSEh2SG9zSGlOVExpdEgxQUhudTFGdDZJUHo1RzBNQlEvN2F2NVY5b0RnRGhZc3JzYTkxSnR5eHV3ZU5lN1Rsc0IwN3k1b1hkZ2tJenQzUGl0c2w5OEdTc09tdnZBUnV4Qll4dm1nQ0xVbURqeFRBcXRNS0lFSXE2MG5UNUZYV3FSbUNSUHE4OGZXWHY2UDZwQ285My9rUGhJS1YvR2FYMzNWaXRlZC9OOUViUVRoOXZISXl3NTdZSmN2dk9NWTNjTVp0L3IyZnpJNWNTUUNxMnV2RkRTUFhKcklRSXNTdUcyTDQ2M1hzUDNEQUFqbFRlWkdtQUY1TXp3aDdPcnhKZ0FSN3VNcEE2Wng2QzZ1U2J0Vmo4UjdIdDNHN2ZmSzg1VmpSUXIyR0cxaFVMSHRSbFVLVkEzeDRTQVl1NnRvMFFoYURHdUhhQmgrMUxsVStoeTBSUGp5bFp0Ync3bS9CVzBpd2o0SjhQcFBybWJxa0FJRzVWOWUwR0pZYjlTYUFKUHJEWkhhRnNOVnJRYjJNK05MdTlFOTROYjZKcmJsSW9ybjNreU5Md212TTJoU1h2VzNxdkZWUzBDaTUxRmFWcGNqaVdGNWJnQVYvQWRKTi9Od2dTV3RISHNxWU5CdnJmRlZ6RnJwNWZPeHJwRUZoQjM1ajIyRFJLZmZpK3o5OHhXOFpLa2J1SEJKN2ovMmsyUDVQK1g3N3BxQmlocmxlTktzTGlYR3BTVDh0dFlhdnY1TEVaS09IWHB4OGlUL05LK3FENGdhbk1VZ1RjY1FyVXlLTktycW00MTlyWGJqWDRBK3c4Y09CWU5kQ3ZjYVVQS2JvM2doZmwvaU5nNWFuNERhUG5tSzl4WG1rSG42VUdlS2R4TGRDcExobjlzbFdBODZ4bXlpdFJMZEo3enBWVnVRbHdkcy8yQnhiaHVqQ21xY09ENHNiZmtRSC85R2VqMXFKYWRBTFhYaUZGSElIOVNMTHFBNEZQcEdLL3RPVDRLRC9sU0xWZm5XU2I3dVFVdWNXVWc0UmNWY0JlTHB1ZXVWODdYMjlJM0JqMzdLY0Flc2xaK2FWUmc0WnQyWVBCRDI4SThkTlVmUG5DS21jQW10ek1wOVdsc29WK1VOR3YxYlltQzlrZU43TlovcDNmYm9Ta085WWVZdVptRzErUGZzT1JpQXk2QWFEdjFrVFVYZjFqanZXUGNzUXlJNFhPZXp3TjROYThrL2I2cVBzZ1J4SzBNSmxEaVZ3Uk9CLzNJRm1GeEx3YVNBUXVSczVJTWRwWEVqZS9CZVZKL2tNSlpKaG1jRzMwY053RWlYYTZEUlUrVXdEakdJakI4aHJvTkxyNEVLZ0gzcTk0SmtLeEorUUdMdGxKa0lZMVh2U0U4OWxSNEpaelBkdGxuWlREV3JJNDlFeWhLcFUwK1BBU1hlNUxPMHpBdmJhUVJDanMyM3JUckd0cmswQzFwS2F6b3YvNXl0MUVHQnFQdDB6UXl4RVpVOTFXa0s2OXgwWkpjd2w2VUJqVjltN1Zoa0hFOXhGcGxqMVNrdm83MnRHUitLcXpPekIzKzRpZi9kZExmbWVrTU1LRjE1QWtSWXVYTkMrZDY3dHJKUnFpWTdUQWJ3T2xFekZpb05sanhVNUNpMXNJVzVHZ2gveDZqaWtOdWxlMTJ2SDc5MEcyaGppbkNLU1NTakdFaUxrMWJrdjViOHZMUkZSR2pCODhUUVFYT1BpRWZ2WWJvSTdxVkpDRExPQ0p2OU9nOWswUXR0ZmJvQkQ5OGhRaFdzZFVsRUhPWDF6TlpJV2N6RTBIOEtkMEpjaVgxTnRvdS9lTEk5KzVSV0xlNW9DZmJNN0QrREh1ZzdTa2JPUE5qVkxCVXdxVERnekg1MEZmd0djMkZPcVFzQ2phL3JNaCtOWGF6L3p2cXBFRGlZVVoxeGFXY0FGZ0lKVWtCSS9LcGQxSjRaZ1ByMmNKbHZOT3FjbWhUT09RMWpCQmNIc0tWUVk2Nlk1VXEycUNMRWJ4bG14YXdEV0VENnMyTUhhc1U4OUJ5OFArV2pLcHZvV0FqOHJ6NWI1eitaaXdBdDhrbEpTSjRIYTc5b08yV1NLOURwZnBnVmdzdkVXcitkUzUzallzRnREcXhrSGtiaUhlMHdjeC80MVpzbmkwL1FhWWdseXcrRjNjajNJNmZNRlgzRm1Mc0ZZMmpNRVhKOTg2c2ZJa2NvdGhubTUwUjZScFBoMFFYVFNzU1JXQTBzSDFpaktlMVJqa1RNcVEzYVE5dEp5a3FtcnpoaFBYaSt4TjUyN1o2ckU2KzhaZW83a0dCcnFxbC9VcjhVRGFuTDVVUjhtaWpFQnFnMCt1VXlpdEt4Y2JQYjFIakZwNTEyNTlaRkFvZjdoU2theW5CZUVsK2ZTUENTeEF3RjhDVStEY0JzVGNVby9XNXBCejNYMC84Q1B2SjJOSk8zempEd0NnRzZBbytOK3djQjJPTSsrYjJXbmhIVmZaVVplQUJOVDFxK1ZON1hDc2lkR01Velhlb2xrVm9kbFpvVDg5dGNpdC9kWkhra0puNHZNZGZLT1MxZlcxRnloVnpmRENTRXB5OFpRSStKU2FGeC9PZVFWcVZGRWN0WktxOGUvOGhadXh6aGtwS0hhSEwyZmRoQkhPTU9SaC9PYUtoT2habmVndEFSSHpVL0IzUnEwdHNPdElYa2VvL1lBRmRaZjJwYjN0eDd4TzZjdi81TnZVS2JoU1hHaDdVT21iU3RlUHZGakRrMVJ5WlFWbi9HNVE4dk5UWGc5dWVuM1dGWUR4Y2t1STN2M1Q0ektIWTVEYVZZVUJ2S0Rta2hWODVqWFU0eTlyNGdVdkFERWRPUE93QjdmNlVHblRWeEp0UXV5cVMyODU2Y2lrRlhQbzEzNTNOS3R0V0QveElwdjE4R2p0M2t0aWMrcCt5Uzc1SE9oVzJXbVZuWVJJWTlRaFBNYVhFT3BQcHpQTnI1SzdLOE42YTFiNTh4SldPU2F0aVErWnZLQ0tEb2JLV202RTFwdWdobWZUQVVkUkdDSFZiSlFrNGp5Mkd1cS9aTUs1Qk9NUWp2ZXZSbW1Da1U0RTlBcGZydTJFdVRrSSt1bDZTSDN3S1J6eDl1YUJlWCt6OGVscnJGeDlqeCthMGExb0gxVThCdzhnM1N3dmJjdFBHWm95YmlyWm1IdDdzalJLc0tzRS9SYlRKZ29aNlh2QnZWVHpKWmhmS0RKcnBadlZLaTUvYjc3V2RxdjBSbTQ2aFNWYlpHb09RYk1idVN1VzhTb0xpdUlJWGN0OU0xVG9FMVJlTi91N2N5YTJXSU81Q28vVEhKUitpSXMyaFd2NUp3ZEpNZngzM2hrL2pFT3FrbU54c0FPVFFxSHRSUThaanNaYzZqT3dNaU52THpDM0ZPMTJnQVZQQ2VKTlVXcDBYZ0NRQm9PQXNNMGtUSTNud3oxdkwwMHlKUzNvWVFZQ2xrSWQ0VHRNRU9kRS9tSktkSnZJTnNTMEdFVEhRNkdIWDlPUE8rZnY3YVR0TDNYSGRHUEJ4ekhjZUVxTFllRlhKTHNodUU3MkVmbVYzVWQ3eWRGVyt4MTNrcjltdz0=", "pin": "111111" }, { @@ -42,24 +42,37 @@ "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", "admin_token": "r46bnf8ibrhbb424heba", - "authToken": "tdgUwB5KXSYEa3TohyrT", - "transportToken": "MIIBCgKCAQEA2Zrbg9vEdzbv3GRM5+IqFegYVv7Ekqz24RH1tbqjMzOY81dMmhZK\nYSjihiJDTaCziXN3bs/VAy0LHop9SVzqUw5SBT5C9nieD04sCQlUgmyUJhPBGXFS\nmeRAM4muROQW5JijqniVxe+Tkgewo/reMAGpUdJOb/VtnWJYuw0ZO6vKGzgG+p15\n7/FpIyo2raaH+xHQ1wJUeMPkacwlVl45xAX4sc/igx1XRlSGHOe8aJWOunFJzty9\nPFnoEPcvfRe5KbOY1eDgHOhQUEcCDAuSiDuZvRu2sf3MN745RDaohER/cHKjvd0j\nmMUgr+0kL8bsrn/gZ6FIzYTHAeRfkx+67wIDAQAB", - "contact_key": "MIIBCgKCAQEA03DDw7Hl3Fceewh1DrwuhPrQssU910KP4MwO5wLcrsrmcbB1aBHI9iYaC/akg81iBK4OGB2yV+sZrsPemCYfvCfK/cJPdmNqgYTQ9PK3CxkvgqxYtj/Vp1DHN72UIZsoGCAKHSsMeuX5b0lx3ONMzl9c2nRt3PGIPXrHmS4O4Lt7bB627r8Cqv9PLJiLUn1VY0ukHyBw+NpAMcfHhKy3fh+yA250XFCk+WUjvl5pgvBbyLzDuMw1QjovaadOVyokc26G3Z2uGNZ5izm5kS01XOVCUgHzKYm0axrrEdc1mCvVktVURq5izAjDsRTVdBt73f2JVVq+s4GuYfBqOacVewIDAQAB", - "privkey": "MIIEpQIBAAKCAQEA03DDw7Hl3Fceewh1DrwuhPrQssU910KP4MwO5wLcrsrmcbB1aBHI9iYaC/akg81iBK4OGB2yV+sZrsPemCYfvCfK/cJPdmNqgYTQ9PK3CxkvgqxYtj/Vp1DHN72UIZsoGCAKHSsMeuX5b0lx3ONMzl9c2nRt3PGIPXrHmS4O4Lt7bB627r8Cqv9PLJiLUn1VY0ukHyBw+NpAMcfHhKy3fh+yA250XFCk+WUjvl5pgvBbyLzDuMw1QjovaadOVyokc26G3Z2uGNZ5izm5kS01XOVCUgHzKYm0axrrEdc1mCvVktVURq5izAjDsRTVdBt73f2JVVq+s4GuYfBqOacVewIDAQABAoIBAHbS4lExwnmnQ+vkftQ/EO2OfoZYrj4wm+a7BozwYNCiGgs+HVzU0djy5KRggWfInhL/NdB7r+QUrSQ30voyQpdczYj6D+n6SLpsx3lAhXlpN/f5nwkcqpcSoEJE+eBA77FPIB/wN11BrIHMBn8aBencUbQ6xhrqaaQTQeRlq9rCu+MBRxTJ5MPCv7zrd6aPLDytYAR9FpEHA2V5IlxaIPGAMOKahdl4dEjStZ5Alna+eoyTBze8C8VKYn91WS46diQtv+8/1F5Wn9IeRU8HvlpmvQsQjKjH1XEnotBeKQL8JeTV8BW2Vcr0yKAcklNavQtVmqtsyXVKWVDN9rZqxbECgYEA9Y/mrBp9em/BgN+UBKcbA9C6B+xaToXzHRRvNU4JhyoBPbAcddLx0fb7q2Q0IHSwsKlul68b5T9ZGuMhNiOnibcNvRBXs2PdyeJDk3TtQL/ZADkGHrjzXiiIEfBVaClkLuNxcmCpwxh3MZQPqTmEnZg6U4sr8MHUcQqRbXsaZ9cCgYEA3G2RLfHDNd297XFnazowy5Mycrdxt067yedq5Q6qqK2jWiEOSjCT/HEI7v8ipfq10vGAjaLusWW4JB/RrHdFBG0VXueXR3iTU+PAT8A2k36/m6deLCZ82oOZLHUstuPdreEeJSEuSmtb8Nx3W77UMyflrCRMKKNlxEb1SDM+ev0CgYEArTdtutcQzg4JDDQqAEIz/zP8Fdy2Mw+v10Jz08ERXYPWzkHtQXukUryK+HI9hutpO6S4u0ytO7+8xgeThNIPu0gh68ycYJFAgMkXa+ud8/+gPdT7qS5DlZa3rRe/1zLjVWPgwZLIDTOz2Igdp/xHvLcF5aqVO0Yu6fJPdU/R548CgYEA1KX/AMvS/wxEReS5WIBywnHmoTTHx4d1MnrGbOORT9jzVee92WSz3z1M2QPZcTZEYpQI6JremtT+qBrqM+977aEulLfnAVQZDT0SMd3EyNXmE0uLVhxrJoL+Kh2AXY/GNBCQ/FDeT3zy3ZJSs3eNTyyWLVN3BV1ct9Wcm2KUTCECgYEAm41+W4CDgM3e5F1t5Qh0omfHOgtm0Mzxc9ciUMNefB//xuiXCxDCqgn78Ovm1ctSwcCDZqmmawXCKXAFT8WTbbatkkWUIPaYlxJZZ+4GK1SjDq6v/b2dQQPfxZCMoXKUmRmU6kTaUoDS7ekTV3Orx4Upq+2z7yjdYhvHqsEpCq0=", - "exported_keys": "a2V5czo6QXdHWnRMbllqRDhjbWY1alRjY2FlWVYzdWFyY2g0NlpjYUovN2lsRzJHbFBPUFVMOWRzcnRVcGdOTGpwZkFSaG4rNjUxdWpSWFZzZ3pubWdzTDlmVWFaRFhHMlcxb1JrUnp0N1U0QUJqakZGQnRndU1oTzZLa041eW1EaGpxKzMwSXZWaFZ2YzB2cFViWE1KamRQN1NGWnY4bnkybWJVQlBDcU1wYkVHQ1BxZGU5UzU2Y3NZejk4S240c0pvaVNXU0Z6aU1CbkxGL0o4UkFKVHNGL3orRTU1ZTRLYk95UldaUmxIbm8wK3F4alJaaTRZQ2N0ODZtUmNoT3duYXpscU5RQWx4N3ZIbkEzTE9JWXZLUVVUQk80VWlHUTlzSzF2bE0rMytxWkI1WlJlb0F6OGF5eHBQVlFCYnZicDVmbm9XaGhkclZDTWxyQWpXc0VRdkpNcFVsYkhnMllham95TFAwaE9wdUxEczg5THdSTlFscnVsV2krc2kzaU9LcGVSZ0JodklOcGI3dUg2TVhOTGkzV1VvTXQ3QTYxNXpZUHVMUGtqK05mSkM0emIwV3VPcnR4RUpka1hoNnFISXRYSEFWczBWUlpoeHB1VHh1ZnhrVXBsc0pXZ3JRVVJjMTl3RThkSWlobjNGTk5RaEwwRVdPWFM5WlR6M1ZrU3ZoZWVxenloSG1EMkhiOVU2RkRoVmJtYUNEM202S2VZY0NlOXExbFZNTnNwN01NcXp6UExoNEdPMEhpOVczNkpTWmxBbVJkbC9sQlBhdkIxNzYzSVRFZXo5RnpSck1CRDBJK21kQTFkWXZIMEl0YkhWVFlyU1kvTXhwSjE3RmxqZ0VFQllCeEJFMnRNY1RWVHJWY2VlNVJDcUpVUFB5NUNXVU8zNmZNV0lkVUltVFR5QjNrUE5mdUlkem5uS1hWTmk1aHY4R2lYcUplOER6RnJYV1RweGFQNXhYaFJQeFZwbW5sMlFQcTMvYTRVNUNXWFVMYmgwbUNUUWJLdlhJSXBReG5FZkR3QUZKZ3ZTRTlQcUo5d1ZwU2ZMS0NYSUZGNWhPVnBZcGt2STVXNDZvbnlOcVRldHQyR3hEaFExOHViT2xiVXpuQ1d2RkkzakRFOFBMZnhRWEFBWklvZmJaTGNFVDNheXBCVkxmUEZuOTBXQzk2R3h6WlE1WTNWWVFWa3M5aXpaVE1vNXlIcm5lL3QrMXhDTXBrM3FKaXIxNmRWN2N5cVFyaURjcFJURm1lcjlMMUZvYWJlMWo0ZkpjRytoMlk2MVJRMU1peVVzU2tGczZhYWp1eWpOSkhnRW1Kd2ZNZUFkYmpIby95SWRKMklSK1BFOUE2OG5PbEdRdHBqRVYwNDFxL1JDanltejRSbkZRZ20wSDBpWVR0UEJVTFpGN1pSRWxCRjVKRzdqdWNCNXBWSVJ3VkdRdVhQL2dPTVcwalAzT09OcWFQaEUzOEFyY3JYMEJveEZjNTdIai9yK3c0WDlDQlpXckIzd3U3dmo2d3pubjB1STZQMDBPT2FPWXkrYjNMd1hYWkxYeGR1cTA1YTFSdWZyUFRUcmdjeEVNZGxTUDdrTXgrT1VxN1hDTi9oM0ZFZjFlSnVYbkNobW5jd2l3a1lXMUxrZnZacGtWb0pPTDlPZUo1NGhlczJDeHNUZWhwZWN6akUwcFJZQ1ExM0U0VFZGNEVrTzFQeVA1ZWxuQ0VtVDVCZmRYN1YwV3lubmRFY2UvLy9zR3VCNm5rMTFscWpseDZjMEpaNWp6eUhEczUzZXRBUE9vSG1EMXNPdnlhUVl5dWtyQzBFZG9zY1BtNWU0a1QxWWZCaXIrdzl3bDFHcUw3VHFmVFU5ZzhyaFQyU3plWGdaWURFeCsxVXJKbTRvcmtMaTJOb2VORlVuRXlMSGRGUnlsVXhUU2FvSlZEWVJkQk9uU3gzWVhuck5HRmVsTG91YTAzNjJ1N1VuZVVFU3Z6NlRtQjh4NEkyVWQ5VGY2dytZYm1qcTFBcXNzb0N0MTNmQmtrUzlQOEFFbjZuc3h3b1hjU1Rhb0N3T0kzRUtPSS81ZHFaaFRUY1BPT2FBb1E4Q04wK2N6Qi91QkR2WnVwa3paWmN4YXl2cmtBV2NlOERmOGhvTDc4VVBsQnJoaWtNS1F3K3ZmVTRRbnZvM29SY2lKRzdLUmFJUFA5b2RGSnJzOHdyblZ0Z1pVQ0w4Rk1hOStveTRHTWR0VWxjOHk0cUduZlRrUWpYSE9iWnNSa3hZWVN1QjRnN2V1cTFDTC9QWlFzVG5lSmdMbW14YUNFU2Y2V1lvak9Ddk13TCt3NTVPWVV1U3hXaHd2N1BuajNJQ0xUWjRzMk1FMVF3SThtbVhCdWQzRWNJWHBFSTFKM2o1MU9LWUYzS2p4VitmNWpJVk1SYm1nV2RsaEpQVHZIb2ZMOFpIc0NGWFMza0lKM2dWK0wxeVczUGNFbFNQZ2xLaExMdmxlUU5PTmFKZ0ZkWXF5QzBCS0Z3dnYvcWdvQld3UkxQY3kwc1Yxb2owZDh0a0NqMm9WdXlzbGIvWjZKbWx5eGtvTDhjb2hwOElWcFFvb01UQUlXQmVMU01tZ01KVDZmSlJ0Lys0bDVESG5SSUJRT3N3MFc3WEovekJxSkppang5Y082NWF1cVZuNHpncFdEUUxLWEdPYkxqM1RteEJsRHF3RlE5c0RTMmc4WnpETUhjMENRbVNMd0VjYk1TUi96d0lHY0xHRmw1VFVsd1ZCcDlGeHp5WjE3UmU4QjJuSk5RMWRrUmhsT2dlWStzYzRLcHgvQXlkdWZrRkZVdTZWVDMyeFFjRlNKYjZvckhwbDBrSndpaGh4S20vNkcwOHU3bHJiSXJHRnN6MFFIdFk5bEc0dEZKSVhMZzBzL0hDWEM0OU9lblNCTVAzOEluTGM5RVo0cjVnaEwwNXlsbUNEWmV0M1ZJSkI1WEFqMXBIQkZGNmlZRE1hS1FBMlpMb01KNHZOQUJGWXhLbHhsUHd4WHFPcXg0OWpKdjNpZVpKTXl3ZTU5b0szZEo3am1aRE5hQjMzQ0RsS1M5WUliZEpuSjZtVDQvYkE3aWlJUENFaTZ2b1I3UWVmQy93VldWbXZueWhaNkNxUlNPY0lNWStlTHZYY3JwVDgyVk5XdHVxaVMrOVVtTi8wellPbVk3RWppb3pIUlV4RUF5UkRVOG01SHJ4VlMyUjZNSGUrelUvNDUwRlcrQldna2sxRmRlNXRVUEgvMjRlbWFUTkFDWERNU2RyUWRCZ0tOdmxjZlBhbkdWckxjVXdPVXF2SUluanBOWE8xU2FBYnVhNE5MK1dqVXNBakJ5YndtSHdKR0VmZVoyNXFJOEFacWJ0WGd3eWpWRU1nVEN1TStkL05wb3NNRWFxcDBObU12Q0ZHQmlPSWt5YXEvZ2V0QjNkVXdWRnZZMmRsRGdFZmpUSjB3aStzc1B1N3haV0ZTUm55aWszMFVRd2wvYXdSU1lncTRQMUFHTnV1Nlp3WHpZNkVWL1J6cnZnSFdGOTZxQVdZNUlJSDhPaksvYkoxbnNTQk9aenBPSWJwYmZpeUpWSG1DUzFIWHZsTktjQkk2WGxDQjZlOW5tN29ldkVUV2xneVhkbmw1aUEvTi9CSTBkYkdpb25IenhjTWFrRk5YQ1NGcy8wNnFOd3hzMU1tWT0=", + "authToken": "G6OaAIhl+CHta7ltKmJC", + "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", + "contact_key": "MIIBCgKCAQEA0NMz+pczCYOUmO8N9zwG8R7p2fU/LhSe0kONh5mcRql8zBwCoD18PVDpF8ZXo3OasB79WNJQ/TQD8Rcw0mwDXof9rkVlB+F0R+qamDL1/TwwAw1wiql7uI4NICQy1MmTLfnYDOHe+YAhaCimJcZyNr6ksl2184vIlN4BWINnRe7a7/dndmO6BhtkWkA6uzkBIEMFtRu9yIqCC3kpJj3YMKATe/gqhVKL0FhAdTEBrC/In51COqgax2LF7ADh4LtoIjijQQfYwPv1AVW0XnF1sKPxB2fvZ+5DL5nC9t1WrHKGzPU7FovQ6xPJQgy73eqte1jurgRdTIcJUUt0eTuwxwIDAQAB", + "privkey": "MIIEogIBAAKCAQEA0NMz+pczCYOUmO8N9zwG8R7p2fU/LhSe0kONh5mcRql8zBwCoD18PVDpF8ZXo3OasB79WNJQ/TQD8Rcw0mwDXof9rkVlB+F0R+qamDL1/TwwAw1wiql7uI4NICQy1MmTLfnYDOHe+YAhaCimJcZyNr6ksl2184vIlN4BWINnRe7a7/dndmO6BhtkWkA6uzkBIEMFtRu9yIqCC3kpJj3YMKATe/gqhVKL0FhAdTEBrC/In51COqgax2LF7ADh4LtoIjijQQfYwPv1AVW0XnF1sKPxB2fvZ+5DL5nC9t1WrHKGzPU7FovQ6xPJQgy73eqte1jurgRdTIcJUUt0eTuwxwIDAQABAoIBAE35PuRoBrebuSWtxYI2mMT57QnkiDXVn0QV00f5tJ+x85ZnMxfQPY7Lom2tMtYmeXEf8St0RKd2/63LIgDAMjXfA3tKECJ0La4YzKbeCHoJOkg5gXdVN4w/Bmmk+pH3vowhSWnuAQsaq96vpvJd+hG099xeH22UGU504v3A+xPiIj/g61NAMvvmFEtVSk5Pt0cfJzjMm/HGRahpJ3AZ3lf+qs3IXJdf/ctUGlHeVq0gr8jjCp4RykD8Df6gnqg7E6JD1zlWqwqAsQT/ysEXDRWUu1pzhCQSj+xOTWN2/rUjasIeu3+QvUe4coAGD5FJRRIxp7Jn8pWqGgp4mrTFySkCgYEA9gHTly7iUmH+UeWr0MlwP53+pI+rZ4KY+1TWvUh9F2c3ng0VNId3IzEB+PGn3wJFXIY7PFe69RlW5CrchjNAAFH5gCfI4QFr01WYW0D7XrTFmPNw3YcLv9UeXAjGuFN8JuDv8GgGJq3O02yd3wVIY3eZY9x6MbGB/yAQWN0E5k0CgYEA2U66VwpyjsaoBJRNjWb2MaKsAZJdQhbYGcBNf2JrtT/R8VfhWz1Mk/M09ABFJCz+Jz82h6M2X5NNz0BrQyMKBtVDW765lNhD3Nv37y8/ZV0+rEeSh6rQKfZlVPBda1N4CK3VTIptjZy7btMtkS+fMwQF6BIJqb4EJ1eWATkDpWMCgYBn25WMugpqZVyNDr1ew+xTr0wWBWGDrasQUFzoRHYrLzRX0YYmSxqNDN+cTcllaPwHd9QCQbd4Sl5YrY+0SGa4u+Ltq94uv/7ZlcVgoSp+bSsOy5fWrnDTaBININdkcjpz33rsr74JDk/HCpAL25sYAyIK+sXLvPj40HyWR5kN8QKBgGcI/y16FKtB4jSZpNPg9+a8/NWZ8oH9luVO2vAFWJCN/Bt00bOTMxYLgRYYcrAebTtqq45Qgt16WLBmGPWyTXTD9bYwjonWqQa1fa95NZP4TFkfbojJIv5ih9VoSsMyxn1G/xXVpPA6WlzH4JkwfUmRJMPOmapUIGAPFV7rC6GFAoGAIM8ekINJdgmFp7209HrW5weOGZeU21JK+LusiNV8m1j0RUvUDKmGzB/sZsi5vgvw/UQfwreojGtOpBJdPXBn9/Ndr3EuVC63uK+p4LO1dQRjfx8Xw6CvYph+/kW8F7K+snkPrX5UckCvPD5/LFUrPqm57Og4EHF7FV/lO3hcWzg=", + "exported_keys": "a2V5czo6QXdHS2RIOWZ2WEEzWGVQZ2JWOGEyeCtaR3FBMkN3THY5YnFST1J5WmU2a2JxbUpRZEk0WXhKS05KZ2pRdmpSRE5GaTJPZFBCakY5MlJjZGhDbUxsdHhySXRsZ0NNQko3UFpSY1RkWE1HZHNqRjlZZ0JBK3krTXg3bVFlZThGSFV5ZXIyU3I3YktmT3lzais5V1JqOWdUaUlRQTNiZjl4RE9PQ0VjNTlCd3FtRklJSUZrV3htRjdxNjh6ekFZY3pNbWNtd21mVEZVRURQZThpSmw0QVFqTlE2dHM3dWNvdVpQMVEwVlF2UDNyVElzWVBKbldNMnZyMXlvZFZDWHhEMC84RWtVZnlaMkd3b0Q1bWorQS9GeGhJTDNERElFaUNrc2FaNVJIcWFWVVJKNWJnWDlLZWdYaWZ4VTM2d3ZLdHZnUGZEeC9ucllyT1NRZkdCdER4aXhyVEJQakh0WXgxTVJoRkZTMHJiYUlISnUrSEYrVVh6czhVVUM4djhVZEZaemgxWWlwNmlXMFBnSVU5bjBTbFQ4emVTcE1LRmlJUitRbjdBVTIveVp6RzRsNnY5eU5EWlN5eCtuQUlPbGZ0UFZPa1pDMENjTVdVS0hyVU53WGM4UVU2VGNxaDRMbVlXYlhjYmtwM0hjazY0S1BGcXcvajI1dEthUEYyQjBVZ3VtOUNjY1lRSTVoUEQ4T1ZuNGU4N0tuSm1JeGsyd085U3BoellHV0VxYXlvQnJTY0daOHRNUk1Jdk5KSTBTVVpXZmtzRFQyNjBkb1FFYjZGM0prTWxuRG9paXFweXhJS1ZiNzZYVFZtLzRmN09SS016VXkxNWMyQStxcnliU2dsaVVLQzNRSUVJREdKNnlUbmgzQ0hHeU5ZVktaUUtzNWhSOFdHdUJseHFGSFdMbzdwVldzbFZUVVRtd1p2Z1IwdkJLSkh2VVcyOXJkK2pSOUJ1YlVBeW84VnhGa2ROK3BhOHZWQ0xWVE1FTk5wVkh2eTVLam00NW9FQzIxdG5UN3lISmpGR3hpRUc5YzVCU1lWRWYwSUtRaGdVMlI4dGg3TUlUTGxveW00WkRwSnlKTmhaTUR3VjBNR1Zac3p6NkVST3lBZHQwLys3Zzd5K1k4VXhyUnViMm42WFdBNFpBRWpqdlpFRnpwVXhFUHZlSXcvdTR2N3FGdWRPV3FpRkU3SklRaFBHZzZabUYwek1IRkw4TldqVjNKL2k0dWdXT3JZbzZNOFhSSU1obWp4QmE5MGxtU2gzVklKVS9Pdm91ejh2K0dPV3BwdEJmL243U0pneElyOHNaWjlCdGVvckltT2c3YjM3NEJLZlVhbmNCUjVwZjhVOVFqWWxlcytPVlA2MFh4NS9qWS9LVHBCUjR4OVFkczFVbC85dklRbFhrcmswSXRtWUhWa2ppNVphMERUYzIybjBNWEtLZks0eUhwdzJzc0t0NURXWmhqSzNENmZETkVEbmFMUGkwMHh0ZnFieTdzWGJ0WHYvVG9kcENkQWExQjB3YTFFWlZMMHBIRjd6b29heUZGRE9MaklDTUJlQkg1MTJuWFdmZXZKSW1rNXlNSDdxTXd6T0J0Kzg0QWVKQmh3R2E1d3UxaDhMUVBUd1p0dFk2eEFYS3Viczd5T3QvMXluMnprWGZxN0RubGVoakpDRk5yUGZMYTYvRTU0TGJ0TEtFSVhjU01uRlhTdWNmbi9iaWFka2VzYXRlZ3RKdmtSRm8yRG40THlsNG5NcnVObUFOLzFrUnBCc0Jsc1M1eWQ2UlFKaGN2eWdkV2VITGFUS08xNUJDQlRxZFZIMjZYNHlsZ2gyTTBxellYL2JiZWR5MXd5R2VEOUhXUC8rY2oySVoxZW5JYU45czJyRkNQWlRrYlBnOFRjZ0FiQXN6UzhTOVRqUXNkR2Y5Y3YzbVA3anVOelVVbDkySVdaeGdVYnpoRlpKTHdzcGtPZEJCUVZkUWRXNndkcUFCUDNZZDhlckJsL2NqcVphMVVKNi9wRzFzdVczQlE0NzRsTkFGdEZpL0NRMUtVRHZ0SWFWdzBpLytEY3JmZjVZTklGNjRIRC9LL3lwYVBUMHl3bmUzUW1uZUp5OXg2Vm9ENG9BazFlNHRpSFF3bWRlYUFEV0wyQ2w0UlZCU0FJK3NwdVFtdFBSSjlXdWlwamw3Z2w4YXJaamJCZW1JUGN2NjM4bWxnZ0I0bk83bktoelpKMGlqUHNEb1RyVVNxU0tHd01mRUYzL3ZJV1NQV2xaY1N0K2taWkNPNVV2RHFhMkRGSEFybHQwMkZTQU1IbmlQS2d6RDZXSXhTSjFSbjFMOGVONmtyMCs4RUZLOUJUU2Y5NXJPd3o1QS8wcU1vcURTaDFWaHNlR1ZGajhydlM1S0lSMGhzTDNmbEJjcVYwTmxLSytLN09DMVg0dWJxTndCYlJHQnhZSDZ1bEg1cHRycE8zbmQzVGpjdFRRMi9XREc5OGt2ZGFscDZoUWplckp2UCtCa05sM016YnM1Yy9YUWFQMGNEUkIxRHhybmpkZFhqSEhDNjRZdll2WWowVkhvNkVxLzVtL3hldEYycTFGYVd4bjg3Y3AyY0ZWaVlVVG9BVlJIZmVxUXVHZW8zS1d6cVB1b2V0dnBHVkE3WDArV2NTYlZGNzRPemJ4SndLN3BadzI5ek5LSXpTNy9FWGlCTEhtNXMwdGEyeTdIRUg2TFhMWU9pd2ZpM2VtN0pCKzcrTXdGU2VwR093QkhENVg2RGFmZXphaXIvR2F0Q05MNGR3RHlmOExwMVFpSDkzeEdEbjJ1QkFuVXQ0YktyTndETlcvT2oxdllPMlg1NnB5djFzWCtmOVkrMWlMUVpKYkVWcHlFbmRUNkVsOHl6V28vU0VRYmxGaXJwMjVlTTVnTERtWC9OQlpBVzUyQWZNTVBPRGYvZ2NtZnA2QlBvUFJ6aXNBZm91dzBsTVQvanJKZHlaVmdJVFZzRS9WQ09YbTJzcjJLcVNRS0xlWWhkNGFyS3dIbXBBNWpma01RWjVQVkMrTy8ydDN3dnpoWHZQbTdPYzVOemtaaTZKNWRSc2p6dGJXclFyLzlLYWhNUVBMRXFsVXJJOWFwall3dXptck9KaHp6dUswd3JhT0FCeW1MbjRlTEprVWQvVEJVR3p2K1pISjZEeEFVVkYzU2dqQ3RxaEJDOWNlZVV4a204SFpOcnRyamZpWUg1dkxESWlOcldMKzVMUXBPRUQ4a3EvU09ldTlWRWhiU2UzTzdMbEQwNXhleExTcTZESW5rd0tFVXgvYUVqRVRDUjZ1cFlGVTdBMVNsclQyNFBMVjljajA4YklQV0g2amVYb050Z3pJa0owMlhlS3FLbXoxRnNlZ3lTVFlCVkRaVk4zWmc4ZE5NT3dVcVBNK2huQlNycHNNb3E2WEs2TEd0b1oveW5qc1R3TElyZ1dadnk5ZFZZaVpOYW1zQmU1UVdybFdSYmZ5OG1tNEpmMjJSVk9tN2N0Tmc0Y0hxUjN6OVU3QzNRNk00Q2hGMGtpdUYzK2tYUUIvV3NPTVF4Y0RvWTVIcUcxUUVSdjc0Q0RHeEFsTGIzNnUveVBGVEFTL3RpOTJUOW5WNHFBN3pOSU9HVVFJYmVOT3ZGNlZLbTZ0Z2NPTHVyQ1RyTThyYjQxcGJYT2JaekhDMy9hdzI0UT0=", "pin": "111111" }, { - "pubkey": "02cf1835552fcc10ee8bae58f669d22d596663e2ef12ff2b01ad4b231ce6ba1de2", - "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023386625", + "pubkey": "02c770adb674dd5fb22c913e6c80d441b73e3f5266f10e46e31440d3dc6e0fea67", + "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023452161", "alias": "virtualNode0", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "bgcP3C+4rWm+QlASiuDd", - "transportToken": "MIIBCgKCAQEA2Zrbg9vEdzbv3GRM5+IqFegYVv7Ekqz24RH1tbqjMzOY81dMmhZK\nYSjihiJDTaCziXN3bs/VAy0LHop9SVzqUw5SBT5C9nieD04sCQlUgmyUJhPBGXFS\nmeRAM4muROQW5JijqniVxe+Tkgewo/reMAGpUdJOb/VtnWJYuw0ZO6vKGzgG+p15\n7/FpIyo2raaH+xHQ1wJUeMPkacwlVl45xAX4sc/igx1XRlSGHOe8aJWOunFJzty9\nPFnoEPcvfRe5KbOY1eDgHOhQUEcCDAuSiDuZvRu2sf3MN745RDaohER/cHKjvd0j\nmMUgr+0kL8bsrn/gZ6FIzYTHAeRfkx+67wIDAQAB", - "contact_key": "MIIBCgKCAQEAuz50Pu3f7BgGnfBr9fruHwmOHY2jaMJx3Q4xHj1/DaJXPfy3LYgc/zhLrn3km26y1DVNZde+X1PTEdsqzxulVOpurnCVyBj2mmJxCM/fnMkLZmV+Htsxev7F8H332Dw5AFiqGp/UjXfSUdQ9kd9iNEUpqTvr2e7v3OfHfN8B1TYtpU4XGSBkfe8UB1J3cuh9RexbgtCTn7SUD43nHQbZHaXN166+8Egr2vFe+YexQ0KjeOvVAR1O555YpOdAvvkgpQW7Tb8lzIZDFJwa6YfpC5JlXN93S+FAOu1VjCujo2AlMd50j6vE0/ndlNEdmWyZdv+sBwf7PsKlXErX9bTitQIDAQAB", - "privkey": "MIIEowIBAAKCAQEAuz50Pu3f7BgGnfBr9fruHwmOHY2jaMJx3Q4xHj1/DaJXPfy3LYgc/zhLrn3km26y1DVNZde+X1PTEdsqzxulVOpurnCVyBj2mmJxCM/fnMkLZmV+Htsxev7F8H332Dw5AFiqGp/UjXfSUdQ9kd9iNEUpqTvr2e7v3OfHfN8B1TYtpU4XGSBkfe8UB1J3cuh9RexbgtCTn7SUD43nHQbZHaXN166+8Egr2vFe+YexQ0KjeOvVAR1O555YpOdAvvkgpQW7Tb8lzIZDFJwa6YfpC5JlXN93S+FAOu1VjCujo2AlMd50j6vE0/ndlNEdmWyZdv+sBwf7PsKlXErX9bTitQIDAQABAoIBADtMbR4c0WSAu1+7a0VsYYscyJAdchnUMqEyRGXyTdFwjzaHWS+nQp+lIXqyTfrXlPTVqJxPNfAUqOynvyf19mctEz5VU2oaVcbQ1EFZK9UIan7UN5voCQSNuPwPuLUXZWnxqnViFrtyrf3SPGl9GCm7mZUJ8AiFvhr0oF2wdnEh+1djZ1cNFS7Hsetczswi24nKxgCtddX8Ap2EqgiV5uH8azTf32trk/TZy4VmwVe82f075oAiwbx6L47asAIFLLwCIAR/X5s25wJHfPGIh5+BFp13DcIHQWkx7x33Y+xOu2iElloEQjUdme6+/ge5dMg++jp8u7U5ZdfZgRAhQoECgYEA6jPEU9GExs7DlIQY3HQK7vhRCqrtJIVbWYsP0wiDo6hfUYKdGr33GZcVChyenbN1HxwIyIaKB7RpsGUUDBNMMjXeUq/8ztUJzO3rwheLQc9a7tcFOchGXxoQnkGp21WQWoJiicVUDH6M7NxX0gO1sfGxpXtQZNDLfph+DRnwIWECgYEAzKvVY2L8J3xRGNQEwCwM76zP2bZbnSREbOjHpWzjnvFt8ON348bSlwoTwfIcHoVaan8g5YbCLM0zi/QptVvYXR7iMBSCe72YPFzBstxnVNQuA2yIu2Ko4saO1TcpEAg2imVHzlcCOkvhj66IgZzmP/MVbfnjZZxRFJ4wK+wVPdUCgYAMvHv0wvQhi6T/Mp/XfUgK7t4ZYmo7DjWFjRZzN4dRIxrr59p7VdFWRu0R+7R0hwnbgz7HCOoAuUL2IMkSTwpZwKwyeveYl+VMi7PCfl1IWuprCq5yEf4htd0pfhCqqOCMy4JoU57afxdS2ji8Zw8+ehJbGXWpxeELJWfVdo+kgQKBgQChLjVnBn3jLqDC970iBc7ONP6eymCNeRE133/SQ9Vhx2m4SbqRs3MGpVX3543Db2tL8P/cIerq01LjxY3PGBxlATxJdu1nO2EXMEkObUom4M23vpJTV5f+tzWmrcD1sjIZfTc2RQkpFbb1qxIvWHtvIyTeLeupipfDr+vpuwrjXQKBgCwE5IrNxJXH7sd3s0OTzCL/ttaQ6/fhcfQHzjEqZDgr3xtxU0N72QY6MESMXy+7n2Sar1MnKFdY76WkQejEAaX8n74wfBfkqrufd1FNZdAo9aaEDhjFZIE8b3DceIMGw6riI6348eFWaeJBX7j4S+udTtqQEFbEMSiaYKdu1ZLV", - "exported_keys": "a2V5czo6QXdIbm5CZ1FTbG1ha2VvcTZBSDBOeFpScW9UY0FkNFJlcWowWGpPVzBrMjVSQUNkb1hKejZEUldVTm9zS3U1YVdiT1g3bXdmM3h5QktsQ3l1TDZpblJ5QWlPR0pwWTJZaWR4ZWJDWTFPWi9NN3FraGk2bVg4V1pKWFNjc3ozSmZxeTVlYW1lcmRjdkpDS1p4bDlQTDNveTJQZ3hjT3VjU1dlYkl5N21TMllmeUVRSERESGQ3eEZBK3Y3S21leDVCT1ZCemdvYXVaMDJ5VVBER244Skh0UTR1VDdnandwZHA1WXJObWtYWmV3VldMNXFlc3prYWtyWEc2MW43M1V1alZTUTdxL0FJcjNkVTNHU3B5QmVrVWhhTXpyYVY1YzVIRzlKM09PK1dTYlY0NDdlZDFNeEcvdzFyLzlXTjhIUG0xSVIvWGZZa1lYS00vY1JGSTA4cTlkMkh5ak1RTG5RK2dWVy9mYll3ZVZWWWk5RjZKTUNxUjQzNk9Ya1gyYlYyTkJFajN3OUxaOWtIdFpETnBHMzJLb2tTbkdzc3lMa1NxMHhHRzhSWVIrVXlaTGlHbDVXSDgvd3hLS3k2SjVlTFJESWpiWC9BTHBaVmtzMmExZnFab2QwNjNNZ0loemxtUjVPay93aHh4SXl1Q2h4dUZud21HWUJScUdkZ1FIMFhDTDZqNlppQ1M5MjlSUWZWZEVIL201YUNwMXQxYVYzS3pnMy8rUnJLajJoMEVmdW1nVmZXYXBWb0J1TWNWME4rZis3dTc5a0JhMWVoQkgya0hGcHZHV2FRYnpWWGFXQTN2UFdPY0NWY3hlWkhqTnZENksrUEx6dHViOUNPcHRXeEUwRFlPL0pjblJZUWk1WTNXN1RpQ1pINVh5TERvZ0s2bnhDUm8wQURmVjNCNTJacGRINXY1RlpIcVpkaStYYU9MNStJWStmR3RvYzJPOVBOZGhFU2lWYjZ0ZFR2L3cyMGdDbm1JTWRtUFBYSWl6U1E2RzVCeHlJcVA5eVhEemRoTytBUDNBZ245cmFlaVNMZXJURG1YYk5HUm1kVVZaOEd0Z2N2TnBkR2JLZGpEK0hvRUNMdG1Ta3h5NHlMTWcyZ0NlbXdYOWorVTJEeml1ZmNFUUpFRjJBL0phZDhFOWpiTGpLcEI2anB1OXllQUNRMTA3ZVJaR2c2SVN3bVRtUXllV3hTbVZudDNmVmluRlRrRkUvV05ZYlR3UlppVW01cFJXNnczV2xHUkV6dHI1R0N3Q0pRaE5FOGFLa2tEeDRmTjYzbzZhYm0vM0F0SDFGK2RWdnkyQ2xSaGdBbDNoTmd1bEUzU1BoeTE3RTRoNzAwdm5nelVyZ0xveFpuODExeGx1ajgvOXlpY3dPam5UdDF1OFhwelBJL0x6ZGlOZ2ZXYlQvOC9uSEFTV0VjZzdQcUxWYmMvNFo3TnArYmhkdUpLRlJuT1I0OHdCbkVRZzZqVSswZUw1ZFpqVFBvbnJnTC9OMUljYnBEUmNMQzdkcDk1cllWemozWC9JcFB6R2w5N25ZVXU2OHM3SjA2bXlTNXhNZ29uMlZqNU5tVUlyRlpoVlNGeHRVbHZvKzBETFRVTHg2VzBya294NVVUNzdJdWJsdnpNbk1UM0pEQmtqSW9PYXlIL2lKS0k1UXZvcjF2NDcyc3grRytIVWpHOUhoSUJGdklSaWt0N1hhVVI0ekhZVjNRT0lpT3NTck1yOEcwTmxqRHZQU0J2V3VvUk9hMHhMUzhYUmJGbDh2TmJUZzBHTDcxQmhaaEpyZFdBSWZseVB2bTgxWElGV3U3dFVmQ2FsQUdQMlpnNE1aVmMwT1hUeFZ3TEFveEUzNGpwREIxMnViWk1OMkd3b2pKaUJDSDFGRFdDU2Z6dC84c1Q3M1IzMEVnWjdTSlNPTVhUd3JmendZUUJEMFFFM3RzakhMM0VSdFdwY0NnVXRiUUVUS1ZQU0w0RXVITTJGMkVmZjRQaU5Wa0ZjNlZyMys1MldERU9tc0tyYkVLRkN0SGxXZHZEbXpib0JnOEc4a2RDZzFxbFMvREhhKzM4UWFkbHNKUUoxZEVyc1F6aVBKQUExeURnckNBcU9qaHJxdnc2VzYweHdwNEZiOFZKZThhaThkWFdKNW9JNHY4QzU0S21CK1ZKOTJwNVFJdUljSVVkK1pOS2F2Y3V5emtrd0U5V3kwODRFQm1sQnNFLzFMZWV3V3ZrN2JCVmg0UGdKeUNyb3B0U0xnSlV3UnRVZjgxbFl2a25GWjhkR0YyVDVtNEdZanAzVUZ5dGFpeVhSWi9qMERJM0liaUd4RWpPZjNieUsyU0RrTXpJb0hVYnZjUVNjVVBZd2VhNTErWEJkTUdKUGZKaldKR1dsRVFPYXpBYXJab2IrRzRESld3WjlUczRSeVcvdGMvT0pZSVZyWjBzY2g3UlFXY0loR3pzQ1lENkxqM0Z5RXZSY3gwMklDaElGSE9FZk5BWHQxUUFIemFoQllGdURVdGx6YWJ3MGFvdHlIOHIvZWNNMVU0QStOczZIWU0rTVpXNnAxM0RIckIzVHdTZDdkWERKNkR2cWhiMnZhcUsrUlhDdHYrODJSN3dVa1pLSGltcXltYVRoc1MybVpob1BSajhzNGIyOVZZQUhmb3dlaEVNOStBK0dlbmdaQ3gvQ1lwZ3RYNkxETXd2SC9QTFhZM2hVcEl0Mk9nVjJxWlI1UnpZV1lYdTEvR0xMNjBxWEVtTGdBem50UDR5M2kvbUJMUXpNMm1PSzVmTzN0NmJhclBLNUpOeGJrazJSYWxjU3JaRFhnOXNQQmdNVDBmVUszc0JHMDh0WGtuL1hnZGczMUZiUW8xQXVrZFAySzcxQXZhSHFubWIyNHVDdUJSdmRvY1JQNUNMSVJEbGl6RE5FT2FZTlNrQU5uK3o2VTlOaGRmMmt5QnVieGZ3bEtKV3luTDZvMENMdWhRS2cxaDBMSzNYMVV5eGV5VWdrMXNkd3hMQmk1QlpTRDZZQ2NjTnNDTHZud2RWVVVqSTR0bCtIZmgzci9ra2E3UHh6MGVBNmhKaEJ1UlhtU21WYzU5MzFSU0lVSS9WeE1qWVlsY1BMV2pXVTJXQkgxdS9MN3NtQTB1OTBlRFNaa3BvbHJiWGlIc0tyQnBRUUs1ZzgrdVppU1EzYi85ZUkrRVpGeHJaMTZaL0tJbnJUbWFXUUZzcWxKSkFpSUVPdUxZQUs0R0xHV2JZVHMxUUtPVUJnWXBzaERPRG1pTmp5bXdjOEcrWVRqK2ZiN0JPYjdJbkRlZFNtMHJVTnJNV2NHQlg2dlRmejhWQUxOUGIxZmMrZWVxY0Y1eDExN1ZQWk82WUdZbnZzdWFVaDl4UmpvRktVRThrY05WUFFMRzRlbzVMbGZqLzF2eXF1M3JJUkhaemw2aCtkaDNhcmVzaVAwc054MlcxTWhyK0VZc0FrUXcxRUNuZkVpa3FZNXFKcWhjaENmTlZIRkVZYUJDcGM5anFUODdHWVRZOU5MMlhDeHJ3VzcxV0JhM1hUdGxyREhTY2JwNjU1TmJIOUdaMlM1cGJNdFJLQnpYZm5uYjBjSnBCVnhiSS9RZ3hTMkVWbG40Y2VxdWJYUFpuQXl5UzlFSG9pQ0xmUTE0WjI5bXdxL2NIay9vTWM0Q0xMZGI3VWZDY2I2Sjlhcz0=", + "authToken": "HelxYyNTtDVN7cQHso7u", + "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", + "contact_key": "MIIBCgKCAQEAyUbJQqGZQ5+eapGlCv8NCt04PpQ2QJjHelHLivtcLKI8dXtKjf2uVDaCLMrsdQKtH7t//kN0V/P+EUpIwcGNcYLnFVPMxAaE68CeESmuaK6goyeBAx1qO2k7qg1CMYt3+69vx6pX2oD2Gq3d8rCxWm0NrwUEAmLHwHa2aUKIgu+GHiudS+8fzIcI7ryrr+tnHe4LUJfwl+NueyEyw+O8UH/md0IoxyUYIiHzHjBgd8q+NljUxFlTzZgDAECo2/XL3lfD+U0Yu1jQSLbjFdby0uMiTh8OA1WcyfOf2C3368xs17ufn5WNckDTcwjdpi7bZlToImSIuprhFVhE/L1mwwIDAQAB", + "privkey": "MIIEpAIBAAKCAQEAyUbJQqGZQ5+eapGlCv8NCt04PpQ2QJjHelHLivtcLKI8dXtKjf2uVDaCLMrsdQKtH7t//kN0V/P+EUpIwcGNcYLnFVPMxAaE68CeESmuaK6goyeBAx1qO2k7qg1CMYt3+69vx6pX2oD2Gq3d8rCxWm0NrwUEAmLHwHa2aUKIgu+GHiudS+8fzIcI7ryrr+tnHe4LUJfwl+NueyEyw+O8UH/md0IoxyUYIiHzHjBgd8q+NljUxFlTzZgDAECo2/XL3lfD+U0Yu1jQSLbjFdby0uMiTh8OA1WcyfOf2C3368xs17ufn5WNckDTcwjdpi7bZlToImSIuprhFVhE/L1mwwIDAQABAoIBAEVuLJjWg7cHBa9/RC5x4r7fpro3iCtqSE1Sj+MGaDphUHe6KvKmEo+sKeVnrn+Ch9PNaw57mFOKsBaoyEZGDROd8zaxLI5mLU3hqOUEuswTiQge5Wr8p5uM5m73meDbWm0wjF+UzC9skviLB2fjOZqWycSY91QXXQ5wJOZUdCCt//1l2xHoQFoPc34/isZctYtdugt2jcz52H4GqC3LwO33gLUTgX2ALa7A5W2NyalrppB7djwS0jtMLQ0yFnPqqduvWUnW2Ij2IMD+/EywaDrBo3/5Hzy2eeIO7Xob0r502EKKpcD3JKqBsU14TDASVNGklOPQh6WVCTR3ZXppxtECgYEA+jRQzxepqgc7WYE6kgdDrUgKEM/toXOOP4BkFbSEqFH6YPsvyjcmT+w88KL+No6s8HeMVhbIANHtRc0jN/6W5JGb/rk8dBmz6y7IQvjS+NLOabA4+2YDCUAzvbbxeAP2CFD2JViaiNs+Y3RYMFd91WOd2DTWt0XSOt8D/+I1NnkCgYEAzfBVcDT7KSwQAHzivQTTkr6VNGNrjIjExods7S1nOR4CLcwEKasY3s1yi57F9g5Vqi/J5L7tNuAww92BKdGAfioaQfVh170NRVG9SKPDIv23OlkcMt3wrJprpl+A0YxG4F8yALgkRnFGLer9tMnPiAg/ebv2NU8uPRYmrjEb6BsCgYB7vrYcxoo+Mpdy3Aw4vukE4bVAvWW8zScUVw6pAX/+s5TOtEzdiUskiiVVqndqSkRUJfw9c8T1St48AIojnoHIiA+L+tdgYHnwnlGjdeb582DtOp/kDn7/60Xr1Xg1sFfVox0qOVksyKphi+A2AH+Ws08U6IUtXZXtUfFrc9h3mQKBgQC2GROTWmXULDAiHkvn08K5eWg5oMfSxoUo/0rkFke2C8DlegccSTx+lq/4oXZucpJxIDyn1eOvqGG2b8Dsl2HFLbl2JWJU/8giSXrUJmpAIJTKNU1n9TQBi7IwtTYVFLL/Z22xkSISX8ssgyO/nsuxf4mRPREiZld+kH23fZktjQKBgQCi0Idq0babTTIEPWZdBZiqr+XaBb01i+/ZXseUlqKr+RysNugpAJgf43p17+uNkiwlIcTiBkThw5fh07noLgwQAEPbwPc2jEL4ccAdZa55VXrzGA+tlndJE/+9Cc9LHZG5/NGMMT9RHIRhXK/7IiPCEP7rIwtebcPOoUXUjdLAJQ==", + "exported_keys": "a2V5czo6QXdGbUNXS29VN2tLNlNQdHdSQXJzN2VtK3B5RHNsL29CNm1wVVFSaUVKTy9GTEhqbWdJSllueS9rQi9xWVJiRXhzQ1BNbjBMSndpUHNXRWRyZ21IOE4xbFE2ckVuNkdJckdBS0tTOUFMUWhYYUlMMDZjQ1B3d3QxYkluNlN4aCtKb1NEWG13eUtpMWVDSFpsU3J2T24rS2hFcG91MEZPejVFc1daVnBCQ0JRUGp0WWQ2Z0NkcDB4RTlQL0FVMk9NRlRZTURRRDAwWTlVYld4VG5tYzBKVlRNcUhOdTRQTmI4MGl3bjF1TmUyR2pTY0hYSm5rbHMvMEcrUkVnM01QUWw0b0xDWFdRTjNMZmNxTnoyd1hwWldkeWU5aXN1SHdkbmRrRlZTa05RS3k3dWxReld6b2hPTkJ3MU4rZWtSdFFFN2FDb2g4TUVxMkVaWWI0c0ttMzBLcVFtZUVUeXlyeUtwZUgvbjQybjQ1aFpFcVZXZnk1ZkFVTU83VHlXd2FidXFMU3hTemg5eUZYRk43djVRZmxxSll5U1pIZXhPbVhwUVgxenIweXRKSmh1dWJydnZkL0hEcEVJbkw3V0tKcDFCNVgzS3p2Ym1aN0tCcnVTTE9QZWFLZFRwK1NGZE1HWWd6bUQxTFczUzIrNUVla3NxK1dNSVdVTldTQlNYNDZCYW1UOERMaHRLMkF5SVVEMWE3K3dONEc1eElDbkpEblpHUGt5ZTM0YnptQ1hOMVpXL1IrYkdraVFhbGpZRll2bW5oZHZIY3ZBcnlvNjNHcXNuelE3T291RGtuODFIMjRYQjJpcUloOG5MZHVDc1ZsU0V4VStmTHNYNU9rV1JBU3M1TERSTkxrd1ErQ2hhdWVCM0xvM2ZDWk8vUHJSNTJ6cjBvaXdYNW5RUitDRnFGZmtlWUVEQnBtTnQzUHhKNGI4dm1tUS9LamlmbkpTVXhpbEwxWEo3NlRMWkFuaHFQbWRMRllqWDhFanpZdVdRamZuNE1yV0FzUGRMeDZKczZCTE9xMGFubUJZOVhySnNyVmxaQkxXamdhSi9OVWRid1c4M3MvM3lzNlhpYUNHRkRUWTRPWTBFaVZzMkRmYVFsQk95WXVjRTZXdXY4U01uR1BHYXJad3VtRXRzZnArbHAwRzM5eTR1Sm9VaGVsb1EyU1FIM0ZoRVlPVVVxRVg0endmT1VvSkF4Sm9PbzBDOTdTOUVvTUJPS3QxdGZOVFVjb1VRb2tnSncyOXZHZlNzUWwwQ2RlZVA3enY0azEvelZGZi9ueHRzSTJqR2NBVzdEQnMvQTBVWFA5aDQxLzdpQXgybDE1SVdEU1YwSEl4ZWxjM01pTWJGUWxlbUQ5RTZ4cE1zd0VxU0JtNFdZT0ZMTnNlazNuYkJyTU1SWTd0NlduNWEzMWtwOWxDeXNrSW9WdHZTdjdGRjBaekRaVmRUZ3ZQOTFXaE1ET2dmekRkZ0RlUVFRUzREb01zMTNhRGUwZldoa2YvaWQ3Z2VnaVRBc0pETWVzRUJWRWdSU0NFejFwMTIxZmlpSlpqMHRnR3dSb1FkbE50TTZ3SUxsSFBqbEs2RGoyY0E1VmxwTWVpb1dCbjJYZHlTYXQyY0NHblRKcngxdmp0R0RhVDZnVldHNW9NdHdtV3Azdzk5ajFDdlRmeTR5TXhycTdrTWlSZW16SXFIME5lL0FqMXovRzVkZ1FPRE9NUjBncERKbmlRUDRIUUdLemkwb1E0cVVWeVRKaEVMSk9welFYV2ZsRlFWSUFCcnZOTFZGUDVFWk1Yc0JubjlUcndyRjdCZXZvQTFlakRnamR1MStsNU5NL1BkNkthQllpTXJqRlJ3RmJLZDdrNW1XdU1KODNKVUF3ZkcvTjkvcWF2T0xzeXlxSDROOGZhZGhDMkdtYWhtbjcvRWZ0SUdNTTMvNHppb1NFMzM5Z3J0YytuWUVTV0RHWTcxTDk4NitGVTdLOVRoZjltMTJLQ1hseGdQcC83SG5jUGxwbEErK3pGRXgxVU5oWUJMd2s5QVhtNjNnQXlQT2dkLy9qbFhVZGovZUdQWmw2ZjIvckdPYmpuakVGK3BsUnFuOHFTd1hxY0NPT1FWV3loWjZtcVhxNWJGMjZZMzM0N3RFUzIzMENlallGZUdJenFsUGV0aUszeTJ2elFnbmZwd2xGclFweWFHRnlPZndzZjNEUlluTjcySmh4WUtYRU1NaDNEZHJHWVMvb1FsSXJCdTFTNGk2YnpOYXRTNU1qZlpWTFB5ZkxDSjBJN0xRSlZwWHo2TVR3dVlCU2tnVGxYVlpQeHFqRW5EdXQ3K3V0MHF3K1ZoNGpmcXZwZytRZWlObWJMUlZnbW5kbHdUdk9QOTM2Y2lFbnptcnFoZGpDUTJNL3BNYm5iSW94b2pmYUgrb05qenI5cTd6VENhS1NJODN2bmlPTDlHVkZHWHBVSVlCbjA0TnFCY3RWZVBoa2dNR0o3RkI3MmYxSXR5N0hkOG5XODQycm1LbjcwNUVpS2tSQk5pTVNBdmRQdVprZkpoUG9zQkM5b0kvUmNycTVTbG1wRE16bkJCM0RyUjdVMzNTdEZVMUhQYy9KazZwMUZHeDQyZWlzd0NXUnNZTUwxeUN0cDh6QlA3WENFLzVDb1k1bG1ldlRodjJaU2NZTVZ2VGhWRHFFYkxZUE5MVFJVcDk5S29wRm5iTkFuZm4wWUJXYm8yVGdvSE9hVU9EdmcwNkFDRDJiY3JSd0VZUVdYOHJSWnJleXYydkhzNFRBSWt4SnNOanVXRjg5RnJQUVlIVUpqaXV3Ulp6VlZjRXF3OE5aaklieE1Fd3NKOG5ORndQajErZy9aRGJSdEZyWEtISlVqbWNMbkxPMmhTRWVSQ1Q4MEx2T2RUZFRrT0VjdDJ0ZnNYN0Z3NmRxUDRXUnFNalQ4L2dMQkhPdDl0cUdDYW9xMzFtVFR3bVBrT1lKdWd1aEFJSHZWZ25jSUxKaWp6cjR4NmpEUlB3N3JhZitrQkJtb2dwSWdvazFFeE9nalFxaSsvOWJIcDkyZkt1SkJ0RnZWRVFzU0pQWHJNWUU1Uno2UVMyQWlyQ3Y1QTVqb2tsTFRGcWZGUzY3WDZQL1VzVVN0NDB6K2gxWmt1dlVWRncwYmNyTFJOQ29OKzA0WWRSbkxteVNucHhUcnhLUUQzRmtSMHNJTlJCZHVOMzMrZmtUQ2pkTCsyZVFSY0xvRzEyRWQxcWd5K0Rjd2V6NjFhck5hNERORStOUHRHVW90RWZYVnFTVkFrTTMzRlM5TkxWY0hNMkpZdUU3dmFZS2JGQTZweVFKRVV1M0NYajFWcXJJQ2FyS2JvSjJhT3J2UVhmTm5xMkFzM2NLeGtZVFJjQUErRzhtUXE1RXJTNE0zeDBWam44WE5pUndoUSt6WHlETlFwWFRyMDBZZWx2dU5aK25MMFhtZzZKSS9lQWNNN25Ma0tkbUUxK1VGOTRQVkN4RmdwRERVYy9vVkFudVJESG95aWtpZm1RcTBlSDM1MStNQURsS0FzOENyaG9Bc2Vjamx1NVBsdUZvVXJIOE9vR2lybEsybENQL3lwZWE3VFQ2aEI5d2NXZDZZYldSclkra0haZERpYTNqdVVJdEMwY3NqMlBRRkI4bTlsSVRlcHdNUE10K1RuZ1pPbG5iei96L2I0cz0=", + "pin": "111111" + }, + { + "pubkey": "032a8584180847b52aca8b9fb54b2b80b07f22e58cef812f82780242eefbe83cab", + "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023386625", + "alias": "virtualNode1", + "ip": "http://host.docker.internal:3004", + "external_ip": "http://localhost:3004", + "authToken": "SLeaO/kn0h+L8Yvs6Shl", + "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", + "contact_key": "MIIBCgKCAQEApRoSC8CE+/3Uc+IsTCK/5BjMRHqsGIBZBwBfFOqRUT7Jtqvn1Yr1s35W6e2ovnQS97zXZlxdUGQSKY6Ge8PUunJQ1g+8HLxaORxMdEinq1rheApQCobOtxvf+baZzwy2C52z1wqzu9WG0Bzf3LeDQOM0Glw/Q5yFdu0lDiR+wabDFqpBn0VWSlIUqtg3B4yBGSz9FUBj8JyEC5KPTa319Y8OjFH17ICn1Yq1mAn79ECpLAdodMRsjQRk4U6o/DfGdcl45zTKbYfQJQ/UxyUziK4FgKqLSa6sa/W6i7/X6OBIZRZIKdGVOIrvg7xG6mV/TxMPaWvL0MkUOA/7GL49sQIDAQAB", + "privkey": "MIIEogIBAAKCAQEApRoSC8CE+/3Uc+IsTCK/5BjMRHqsGIBZBwBfFOqRUT7Jtqvn1Yr1s35W6e2ovnQS97zXZlxdUGQSKY6Ge8PUunJQ1g+8HLxaORxMdEinq1rheApQCobOtxvf+baZzwy2C52z1wqzu9WG0Bzf3LeDQOM0Glw/Q5yFdu0lDiR+wabDFqpBn0VWSlIUqtg3B4yBGSz9FUBj8JyEC5KPTa319Y8OjFH17ICn1Yq1mAn79ECpLAdodMRsjQRk4U6o/DfGdcl45zTKbYfQJQ/UxyUziK4FgKqLSa6sa/W6i7/X6OBIZRZIKdGVOIrvg7xG6mV/TxMPaWvL0MkUOA/7GL49sQIDAQABAoIBAGFEVLFbwHz887c53kMUjdyBx4Xoh47/vnNjgqC9+NLWnNvjtveVoF8Y5Xd3rlxV4f7V4EjLzaXY7uJQt2Ye3yrgwkL6jiaXyMewplIzo6ROLFseKD2rYgl6gJ+LNl5G7NE3HYZpJa5Zg80D1dcgvlDyCfYltpfMlMyVtaj5UzweYpTf07gm+f662pl1M7xUB0Q8mnjyl1YQvJxplq1aCzFKMpU5sN+Gp29VuiU76fyzdUMqgJmxa0hVeo4ZHyCWYot62c8FDvnU/JM8VhbxKpkS0yAte24eE6oWUURvOlx1yMUlwP6qugm/SAU4Y7t6xJ6X4Y9HIYu6kzoH0jBb4AECgYEA1VogGYMMglotq1MZDavHwqa8rYxWwwc18u9WkLWwhMGn0oeJP0Rl2Hht820T9Mzdb+NMTD2X3dCBShiAHzGtrZ/pkveiByISXqUKLqEcZh2z3sNyMF6SwaOB+Ru8JPQBxZVNlX3L89QLZNknOg80C5liarg/OpWAgTNS91sDzQECgYEAxhrVqOmkADRgcpjEDACMiLZjUtpd4lzcsI6sgVoz/lryd5p0/1FebwzuBH31x/mrATn8hwDpIhQzah0HQoeMjlclH9VZ1Y/wFwUkLgzYAXOj6jkxAuHsLfzb6QrpJUex/HyYbXloReBmBCHOtxYN+olh34JmDCdTPi9gz4udgLECgYAj0dTP07O28uL1/6aWKAAKyymkTYqHhd9l4Q78jrSLJWRCsWS2jYo31MhI9UhDcl2/Gj9GEZU8tXPvd7uTASkynEV/2jmGzw6ce0MBXyVAc74uKUwzmL0063m31BM7dQgTHyT+czdZwYEENn0if0jypZbjafmboVwI1RAZ3Vr/AQKBgB6rVNybnzow4aWcJO2+wAMCSYowKEy9F6V10RsNffMo3VTK4sYMMNR8afTkE0LsUh8UfRXhfDY8bmFFMTSJi6cVsrek7g10BTVrJFjEwEQpRP0j8YSCuW+9L8Z6W/HbkaCHIYoBO7VlsiV9nmUV0wAweKiDpYzIIckEyLYY5T9hAoGAL3Fk6kMasyMkaRbErDICySFHNhvugd0WvyjtDZLCB0uhOQpnNN8MnLe+K+MT5+Vp44gttzsrgxZFvhgXCRgeKkQQL9C8PIq5ophDQ/UcCqN+A1fPpkwkCN/Qd/BsE8Ah9vHh8WcdFF/q6hV7/X8nKm63krfV8YzUIiGcdIw4z3I=", + "exported_keys": "a2V5czo6QXdGMFRFbGVENjdXclBxV1RUWk1tODFTY0R2M3laZWlGTVVCb1RsYXcvV084M2FSVTlEZVVqRUtpWGpMMi93QlBHL2NRd3BjNUJhZXpoQXE4ZUhKUzBYYUZuUzhXVnJXNmwxb29ScFk4VU1KZWhvUzUwMkZ6Qi9JcjlWRGUrSm5oUGxuV1psbE05Ui9RcWVqU01Wand4VVd0dkhDQ3RQYWFVVFFlTGx4UHJIdXM1QkZUUTJ2ZElPYnA1WUhOdUJkYXBvZ2RPcnowMkI5bnRqKy96R1lwMFhFdWk4b0pib3FZU24vVGpYcFUyVUhSZTdOSW1CNUxPVHRsaGMycEdtTlBVa1hpMjF5RWdSMlpoNmVjWGZIbDFrSzY5SDd4ZWh4RlF5Zk5uYStIa3RIYzMzYWk1SFNybEplR0cweERBRnBBY3B6YW9NT1Vsa0hjdnRXTzNlclo1VnpaYXNMY2hSM3RTd05ERWdqWEN1Mk9FRzNWMHorQytHWlllM3BxNmZ5L3I2Z1oreXRhQjBSNjV0c05yMFRsMm16dUlEbmJsY1o4ZnZBVHY4SFdEcFhPaTFKVDEyTHZXcVFwc0FUMzhUblNUcFRaWGg3UmZKbGNzQXFOejRKcGhDbUk0MnNwQ1ZDWkYzQ20wZzUvNlg4bTY1clJiYTVRdXBhRTZMQUlUWll0VXJaSEV6ajk4OEg3R0hpbDBxRDFqSjBqd0RhVWRkRWQ3V29ic21rRHM3UEhPeENYd0oxMDZNSkRnaW50eUNXNitzTnNKWUhRZHNLSUVHelN2TTJCZ0MrYXJwN05iUEtXNlpCbS9KdVJWenZ1NEtvREd2bTRZcDlwdDNPaFMrbHdMK0tiS1lnZEw4UEpTa1cyaUxPOE5UbFZDODkxQTcyZTRhWjRhYTBCTTJXTDNFT2QzV1AyNDFmdVpIQ0dvY1FrUS9jVmxEQ2NGTnpTd2I5dVpveFRITUw3NDhGenNNMDc0ZmNUWWZBdERFTEUvUXUveXpsYWkySEViZWZKcWY1cWI2alI1V2Y3NUYvUlgvWFF4M3d4SU5WMmM5aU9Yd250U25RYk1TUDB0dDJyd0tNTFNrdU9La2ttWUw5a2U1UE93MDBHUTV2U2NTWkxtM2RpUStMQXc5cG8wVXNTVXZUVnNpR3J5YmZsMXlMSzA5TnRVbDdrdXdjN3NtVHcxN1ZzZnZjRzQzcENHWUdvQ1ZEVkVYYXhzK2NSaWcvMTRkRVlDa3ZNRElLSGYrbzBPcUE5dnVhT3FmNjVIR3B0OGhrb3dBUzF6WGtxYjBkakhYZUc0WGljTTE1a25GNzJYNDNpN3AxK0RIbkZJQ3NMUVBQc3pOVWhFaUpYdGRwdEpIMGJaNlByd2JQRHlNVklRcTZ6K1UzQ29hNTQ5M0M4eG9tTlJ4L1JUL3FDTThTbXFkTGVLRDVqaUZCTXM4Q3hueUVKUWJEK2xSb1FwVldQSldhOE5Qdy85dDhjRXhNemxHczFvcHJYSEhrYWQxYUt3TGQyeVRLbXhOR2FlSUtuTTRHYmFHaTdIK0VrbkRpbm1jRis5RkF4UEc1L1R1VjdlOG1PZEphekZSbGhoSG9hZzdRTzQ5ZnBUSDZrQ085WHhMKysvS2lCNGFVdWxDNFovTG9iSHVHZE4xcDltLzlTQTlSNXY2ZlRZVms3YkJtZFJTZlRmTnVNdkxnVEdhalhmS05QZzBxdXJMZUs2T2JZd2QvWDZBdE9SbmtDQ0RYVjlTYk4wTHZydzBvNVlQaC8vY0w2VGl2OXJacmdXZEdYOFVXczlQMk1Tb1IzMDZ6cjJNNEphYTNsSStIVm5ITWR5QUpldlpPNW5VZnMzc3hWdG5OUktYRDhLZzFBNUNleGlsQ2hLNzZ3d1hBa0tZaS8xOXhRWFNOaHlSVVBiQ0pmeVlLRFlHWWNnNkpQeFNLaEEzTTBlY09qSFJvYUhHTTgycjZtNWs4amhvZThoQUMzVmFPalo4T2l5bTdtNTBtb2Jmdm95dmV5dFFRZVZLcDlyeFRTQTBpbVh4TjFRNVRzcUl4Q3kyTjlGNVNWQ1gwOGtvYnptMnVqTUlsTkZsU3ZnbkVkLzI2QmRPWCtQTndBVzEzZDY2Wm5UdSszdUJoVytYWm5PSk1YZTdjYk8xQ3N2MXNsbDhiQk5lNkF2NDVFV0xvUCtySU10Z2liQkVSbU52QVpSRHc5WVN6c1pCQlEzK2ZNaEd0ZTdmclp3ZG5TMkE5WFRmdWxmWDFrMCsxRGlUemkvK0xvTEJUdFFqS0FMK1l3YXVWL0FtZjlnMk9kUkd4U2dLUk5pQ3M2dEFvZzE4ajRVdGJBdWV0cWwvTWZjL3hFY2hCbnpFR1RzcFR3TDJFOGc2eTduUTg5V3BaLytVRUhZU2dLWkwzVXFDRGk5UHpxV2pWZ0JtUWsxWmljbDVYWC9vQmtHYmtKSU5YTERxaEw1cjlTcWhjMlRLYnErZWt4U24xckdxc2pEVDJSbll1eTcxQXFkTkNHRDRNd00zaEcxNXUySUxJYnFpZGk0aUFXUUNxZ0p4ajFwdWgyYUhCWjk2Rm5qQ0dPVzBjQzJLWjg3bGJsR2FCempGSEhBKzEzbWFnaSt2bEcramMrbFAxSjQ0OCszYVpraGtJbVVmZFc2bWV5RHVSWVFTSkpmc3R5Tmd0NWVZZFNPT0FkQmU3V0dvekY0dlBQRTdBQnNyRmNyVkE5T0xLQTJYQTVjLzNVNUFQeVJIYTJZZlUzQ21HSlVjNnViTFNOMnQzWXVxOE9yTHYvTzdqdDMvWXZHT2lINURoL1NHbDJHbWJOQ3BFL2toKzg1cnpPVWZURUZpdDVIaTlMOEdxNSs0MW1KaStSSy91alRHZlhSR0pWbmNxRytEVXZxajV5N2RpeWkxMzU1L2xNUC95Ujh1SW5GS2xkZU56YjFIVEtNV0lzQkEyUlVHeWcvMWZ4c2M4SnJ6cEtrZGNvZ3d3NmxQZzVCTStkZm9FUW1rVlZWSjNxYk5pVk9FWnJLMFQxUHZWSjRJY3BMK2pXNDE1V1d6UmdDOXRtcURlS1g3ZXJXQW9UcFZEMUx6OFZxcE50aWNmdkFRZ1VZM3FKbXlRV1lSV2RsNFNrTERKaW84cFBZdXNSRXNPUDZCczU2S3AvZDhpY0N4eXo5czhKYXFJT3ZJdkZIdTFpR2had0VVeWVhellXNGI0Q3VuMHM2TWdjMGgvRlVBeDBXaHg3a0IvM1ZXQXJJbTFEU3FvYzFFM2xQblBOaFdvMWFlOU93TEcyM1NOT2xpWTNPcVdQRUVBQjF6WHNVTk5nWEl0QndaUEVFcm9zRHF6WWdRMDQ3NnhIaHA2T2swOGtUTFppSmJJVmxjOFRlZExlc3FqeWE2WFd1SlU3RUxhL2VOY3hhL3lTWk5MVWJWRzF3NVA2ZmJOVzBWR0JHN0p2UFhsVFVFUS9SR09yL1RwVW15VXByak9mQndHMzBYak54NVczZWZzYTE0QzBlUnZHbDRiT3VkS1MzRkd2c0MzR0E4S3h5aDU4VDJpK25tUjU3ZFFYTmU2K01DSlZEaTRaeGd3YVJDUk43UzFPMGVZUE1PQUt5c2VtYVNKa0F1QXF1YkQ5OHNIWkVCcW1IUTVvS1d1QlR5bnlXdnlJeDlLUUF6aE54REw4Vkg5RGtMQWtEST0=", "pin": "111111" } ] diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index c9e73862c..861663054 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -49,22 +49,31 @@ export async function mlBot(t, index1, index2, index3) { botAlias = 'MlBot' //http://ml-bot-sphinx-server:3500/text - const url = 'http://ml-bot-sphinx-server:3500/text' + const host = 'http://localhost:3500' + const url = `${host}/text` + + const model1 = 'gpt' + + //Add Model + const addModel = `/ml add ${model1}` + await sendTribeMessage(t, alice, tribe, addModel) + + await sleep(1000) //Alice Set Text URL - const urlCommand = `/ml url ${url}` + const urlCommand = `/ml url ${model1} ${url}` await sendTribeMessage(t, alice, tribe, urlCommand) await sleep(20) - const botReply2 = await getCheckBotMsg(t, alice, botAlias, tribe, 1) + const botReply2 = await getCheckBotMsg(t, alice, botAlias, tribe, 2) t.truthy(botReply2, 'MlBot should reply') //Alice set API_KEY - const api_key = '/ml api_key qwerty' + const api_key = `/ml api_key ${model1} qwerty` const apiKeyMsg = await sendTribeMessage(t, alice, tribe, api_key) - const botReply3 = await getCheckBotMsg(t, alice, botAlias, tribe, 2) + const botReply3 = await getCheckBotMsg(t, alice, botAlias, tribe, 3) t.truthy(botReply3, 'MlBot should reply') const checkNode1 = await shouldNotGetNewMsgs(t, bob, apiKeyMsg.uuid) @@ -120,24 +129,45 @@ export async function mlBot(t, index1, index2, index3) { t.true(checkNode4, 'BOB SHOULD NOT SEE VIRTUALNODE1 Message') //Alice change Tribe kind to image - const imageKind = '/ml kind image' + const imageKind = `/ml kind ${model1} image` await sendTribeMessage(t, alice, tribe, imageKind) - const botReply6 = await getCheckBotMsg(t, alice, botAlias, tribe, 5) + const botReply6 = await getCheckBotMsg(t, alice, botAlias, tribe, 6) t.truthy(botReply6, 'MlBot should reply') - const imageUrl = 'http://ml-bot-sphinx-server:3500/image' + const model2 = 'image_gpt' - //Alice change Tribe kind to image - const imageUrlMsg = `/ml url ${imageUrl}` + const imageUrl = `${host}/image` + + //Add new Model + const newModel = `/ml add ${model2} ${imageUrl}` + await sendTribeMessage(t, alice, tribe, newModel) + + await sleep(1000) + + //Alice update new model api_key + const imageUrlMsg = `/ml api_key ${model2} twesting` await sendTribeMessage(t, alice, tribe, imageUrlMsg) - const botReply7 = await getCheckBotMsg(t, alice, botAlias, tribe, 6) + const botReply7 = await getCheckBotMsg(t, alice, botAlias, tribe, 8) t.truthy(botReply7, 'MlBot should reply') + await sleep(1000) + + //Alice change new model kind to image + const imageUrlKind = `/ml kind ${model2} image` + await sendTribeMessage(t, alice, tribe, imageUrlKind) + + await sleep(1000) + //Alice sends Message in the tribe const text6 = randomText() - const aliceMsg = await sendTribeMessage(t, alice, tribe, text6) + const aliceMsg = await sendTribeMessage( + t, + alice, + tribe, + `@${model2} ${text6}` + ) await sleep(8000) @@ -146,7 +176,7 @@ export async function mlBot(t, index1, index2, index3) { alice, botAlias, tribe, - 7 + 10 )) as Message const botResponse3 = decryptMessage(alice, botReply8) t.true(botResponse3 === botImageResponse) @@ -165,7 +195,7 @@ export async function mlBot(t, index1, index2, index3) { t, virtualNode1, tribe, - text9 + `@${model2} ${text9}` ) await sleep(8000) From a1c74786c1297f3c646b13c94180ab7f09cc0b4b Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 21:05:13 +0100 Subject: [PATCH 57/93] update: changed url to internal docker url --- dist/src/tests/controllers/mlBot.test.js | 2 +- dist/src/tests/controllers/mlBot.test.js.map | 2 +- src/tests/controllers/mlBot.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index fa7efb728..b9233fbf4 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -49,7 +49,7 @@ function mlBot(t, index1, index2, index3) { t.truthy(botReply, 'MotherBot should reply'); botAlias = 'MlBot'; //http://ml-bot-sphinx-server:3500/text - const host = 'http://localhost:3500'; + const host = 'http://ml-bot-sphinx-server:3500'; const url = `${host}/text`; const model1 = 'gpt'; //Add Model diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index a39919476..e93eecf10 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAsB;AACtB,8CAAoD;AACpD,sCAAsD;AACtD,wCAAsD;AACtD,sCAA+D;AAC/D,oCAA4B;AAC5B,sCAAkE;AAGlE;;EAEE;AAEF,IAAA,aAAI,EAAC,oHAAoH,EAAE,CAAO,CAAC,EAAE,EAAE;IACrI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC,CAAA,CAAC,CAAA;AAEF,SAAsB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;QACnD,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,GAAG,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,YAAY,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QAChC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,gCAAgC,CAAC,CAAA;QAExD,OAAO,CAAC,GAAG,CACT,yCAAyC,KAAK,CAAC,KAAK,QAAQ,GAAG,CAAC,KAAK,QAAQ,YAAY,CAAC,KAAK,EAAE,CAClG,CAAA;QAED,uBAAuB;QACvB,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAW,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACvC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,yCAAyC,CAAC,CAAA;QAE1D,kCAAkC;QAClC,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAA;QAC7D,IAAI,IAAI,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QACzC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;QAErC,2CAA2C;QAC3C,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QACnD,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAA;QAExC,uBAAuB;QACvB,MAAM,OAAO,GAAG,iBAAiB,CAAA;QACjC,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAEhD,IAAI,QAAQ,GAAG,WAAW,CAAA;QAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACnE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QAE5C,QAAQ,GAAG,OAAO,CAAA;QAElB,uCAAuC;QACvC,MAAM,IAAI,GAAG,uBAAuB,CAAA;QACpC,MAAM,GAAG,GAAG,GAAG,IAAI,OAAO,CAAA;QAE1B,MAAM,MAAM,GAAG,KAAK,CAAA;QAEpB,WAAW;QACX,MAAM,QAAQ,GAAG,WAAW,MAAM,EAAE,CAAA;QACpC,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAEjD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,oBAAoB;QACpB,MAAM,UAAU,GAAG,WAAW,MAAM,IAAI,GAAG,EAAE,CAAA;QAC7C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QAEnD,MAAM,IAAA,eAAK,EAAC,EAAE,CAAC,CAAA;QAEf,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,mBAAmB;QACnB,MAAM,OAAO,GAAG,eAAe,MAAM,SAAS,CAAA;QAC9C,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAElE,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACpE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,8CAA8C,CAAC,CAAA;QAElE,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAC7E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,uDAAuD,CAAC,CAAA;QAE3E,4BAA4B;QAC5B,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAE/D,MAAM,eAAe,GACnB,4MAA4M,CAAA;QAC9M,MAAM,gBAAgB,GACpB,mTAAmT,CAAA;QACrT,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QACjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,GAAG,EACH,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,WAAW,GAAG,IAAA,oBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAClD,CAAC,CAAC,IAAI,CAAC,WAAW,KAAK,eAAe,CAAC,CAAA;QAEvC,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAA;QAE7D,4BAA4B;QAC5B,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,mBAAmB,GAAG,MAAM,IAAA,sBAAgB,EAChD,CAAC,EACD,YAAY,EACZ,KAAK,EACL,KAAK,CACN,CAAA;QACD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QACjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,GAAG,EACH,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QACnD,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,eAAe,CAAC,CAAA;QAExC,8CAA8C;QAC9C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAA;QAE7D,kCAAkC;QAClC,MAAM,SAAS,GAAG,YAAY,MAAM,QAAQ,CAAA;QAC5C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QAElD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,MAAM,GAAG,WAAW,CAAA;QAE1B,MAAM,QAAQ,GAAG,GAAG,IAAI,QAAQ,CAAA;QAEhC,eAAe;QACf,MAAM,QAAQ,GAAG,WAAW,MAAM,IAAI,QAAQ,EAAE,CAAA;QAChD,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAEjD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,gCAAgC;QAChC,MAAM,WAAW,GAAG,eAAe,MAAM,WAAW,CAAA;QACpD,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;QAEpD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,sCAAsC;QACtC,MAAM,YAAY,GAAG,YAAY,MAAM,QAAQ,CAAA;QAC/C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAA;QAErD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,kCAAkC;QAClC,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAgB,EACrC,CAAC,EACD,KAAK,EACL,KAAK,EACL,IAAI,MAAM,IAAI,KAAK,EAAE,CACtB,CAAA;QAED,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,KAAK,EACL,QAAQ,EACR,KAAK,EACL,EAAE,CACH,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACrD,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,gBAAgB,CAAC,CAAA;QAEzC,uCAAuC;QACvC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,kCAAkC,CAAC,CAAA;QAEtD,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,2CAA2C,CAAC,CAAA;QAE/D,oCAAoC;QACpC,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,mBAAmB,GAAG,MAAM,IAAA,sBAAgB,EAChD,CAAC,EACD,YAAY,EACZ,KAAK,EACL,IAAI,MAAM,IAAI,KAAK,EAAE,CACtB,CAAA;QACD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAC5D,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,gBAAgB,CAAC,CAAA;QAEzC,6CAA6C;QAC7C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,wCAAwC,CAAC,CAAA;QAE5D,kBAAkB;QAClB,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAA;QAEvC,2BAA2B;QAC3B,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,iCAAiC,CAAC,CAAA;QAEhD,qBAAqB;QACrB,IAAI,SAAS,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAA;IAChD,CAAC;CAAA;AAjND,sBAiNC"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAsB;AACtB,8CAAoD;AACpD,sCAAsD;AACtD,wCAAsD;AACtD,sCAA+D;AAC/D,oCAA4B;AAC5B,sCAAkE;AAGlE;;EAEE;AAEF,IAAA,aAAI,EAAC,oHAAoH,EAAE,CAAO,CAAC,EAAE,EAAE;IACrI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC,CAAA,CAAC,CAAA;AAEF,SAAsB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;QACnD,IAAI,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,GAAG,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,YAAY,GAAG,eAAK,CAAC,MAAM,CAAC,CAAA;QAChC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,gCAAgC,CAAC,CAAA;QAExD,OAAO,CAAC,GAAG,CACT,yCAAyC,KAAK,CAAC,KAAK,QAAQ,GAAG,CAAC,KAAK,QAAQ,YAAY,CAAC,KAAK,EAAE,CAClG,CAAA;QAED,uBAAuB;QACvB,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAW,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACvC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,yCAAyC,CAAC,CAAA;QAE1D,kCAAkC;QAClC,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAA;QAC7D,IAAI,IAAI,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QACzC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;QAErC,2CAA2C;QAC3C,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QACnD,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAA;QAExC,uBAAuB;QACvB,MAAM,OAAO,GAAG,iBAAiB,CAAA;QACjC,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAEhD,IAAI,QAAQ,GAAG,WAAW,CAAA;QAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACnE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QAE5C,QAAQ,GAAG,OAAO,CAAA;QAElB,uCAAuC;QACvC,MAAM,IAAI,GAAG,kCAAkC,CAAA;QAC/C,MAAM,GAAG,GAAG,GAAG,IAAI,OAAO,CAAA;QAE1B,MAAM,MAAM,GAAG,KAAK,CAAA;QAEpB,WAAW;QACX,MAAM,QAAQ,GAAG,WAAW,MAAM,EAAE,CAAA;QACpC,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAEjD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,oBAAoB;QACpB,MAAM,UAAU,GAAG,WAAW,MAAM,IAAI,GAAG,EAAE,CAAA;QAC7C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QAEnD,MAAM,IAAA,eAAK,EAAC,EAAE,CAAC,CAAA;QAEf,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,mBAAmB;QACnB,MAAM,OAAO,GAAG,eAAe,MAAM,SAAS,CAAA;QAC9C,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAElE,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACpE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,8CAA8C,CAAC,CAAA;QAElE,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAC7E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,uDAAuD,CAAC,CAAA;QAE3E,4BAA4B;QAC5B,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAE/D,MAAM,eAAe,GACnB,4MAA4M,CAAA;QAC9M,MAAM,gBAAgB,GACpB,mTAAmT,CAAA;QACrT,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QACjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,GAAG,EACH,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,WAAW,GAAG,IAAA,oBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAClD,CAAC,CAAC,IAAI,CAAC,WAAW,KAAK,eAAe,CAAC,CAAA;QAEvC,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAA;QAE7D,4BAA4B;QAC5B,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,mBAAmB,GAAG,MAAM,IAAA,sBAAgB,EAChD,CAAC,EACD,YAAY,EACZ,KAAK,EACL,KAAK,CACN,CAAA;QACD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QACjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,GAAG,EACH,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QACnD,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,eAAe,CAAC,CAAA;QAExC,8CAA8C;QAC9C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAA;QAE7D,kCAAkC;QAClC,MAAM,SAAS,GAAG,YAAY,MAAM,QAAQ,CAAA;QAC5C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QAElD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,MAAM,GAAG,WAAW,CAAA;QAE1B,MAAM,QAAQ,GAAG,GAAG,IAAI,QAAQ,CAAA;QAEhC,eAAe;QACf,MAAM,QAAQ,GAAG,WAAW,MAAM,IAAI,QAAQ,EAAE,CAAA;QAChD,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAEjD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,gCAAgC;QAChC,MAAM,WAAW,GAAG,eAAe,MAAM,WAAW,CAAA;QACpD,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;QAEpD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;QAEzC,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,sCAAsC;QACtC,MAAM,YAAY,GAAG,YAAY,MAAM,QAAQ,CAAA;QAC/C,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAA;QAErD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,kCAAkC;QAClC,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAgB,EACrC,CAAC,EACD,KAAK,EACL,KAAK,EACL,IAAI,MAAM,IAAI,KAAK,EAAE,CACtB,CAAA;QAED,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,KAAK,EACL,QAAQ,EACR,KAAK,EACL,EAAE,CACH,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACrD,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,gBAAgB,CAAC,CAAA;QAEzC,uCAAuC;QACvC,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,kCAAkC,CAAC,CAAA;QAEtD,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,2CAA2C,CAAC,CAAA;QAE/D,oCAAoC;QACpC,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,mBAAmB,GAAG,MAAM,IAAA,sBAAgB,EAChD,CAAC,EACD,YAAY,EACZ,KAAK,EACL,IAAI,MAAM,IAAI,KAAK,EAAE,CACtB,CAAA;QACD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,oBAAc,EACrC,CAAC,EACD,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,CAAC,CACF,CAAY,CAAA;QACb,MAAM,YAAY,GAAG,IAAA,oBAAc,EAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAC5D,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,gBAAgB,CAAC,CAAA;QAEzC,6CAA6C;QAC7C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,wCAAwC,CAAC,CAAA;QAE5D,kBAAkB;QAClB,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAA;QAEvC,2BAA2B;QAC3B,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,iCAAiC,CAAC,CAAA;QAEhD,qBAAqB;QACrB,IAAI,SAAS,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAA;IAChD,CAAC;CAAA;AAjND,sBAiNC"} \ No newline at end of file diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index 861663054..ed1510642 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -49,7 +49,7 @@ export async function mlBot(t, index1, index2, index3) { botAlias = 'MlBot' //http://ml-bot-sphinx-server:3500/text - const host = 'http://localhost:3500' + const host = 'http://ml-bot-sphinx-server:3500' const url = `${host}/text` const model1 = 'gpt' From e76498f209cbcd8b5ed03ebed2b873de52d7da49 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 17 Aug 2023 22:05:25 +0100 Subject: [PATCH 58/93] update: removed branch pointing to stack --- .github/workflows/cln_proxy_integration_test.yml | 2 +- .github/workflows/integration_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index ba8726ff5..96f0e5de4 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b feat/ml-bot-server https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index bd7ca20a5..f0f668728 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b feat/ml-bot-server https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From 148f1d972f196df943101c534fbe4f2afd85f7f5 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 22 Aug 2023 23:24:27 +0100 Subject: [PATCH 59/93] feat: get message attachment in built-in bot --- dist/src/builtin/index.js | 3 ++- dist/src/builtin/index.js.map | 2 +- dist/src/builtin/ml.js | 10 +++++++++- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/mother.js | 3 ++- dist/src/builtin/mother.js.map | 2 +- dist/src/builtin/utill/ml.js | 30 ++++++++++++++++++++++++++++-- dist/src/builtin/utill/ml.js.map | 2 +- dist/src/controllers/bots.js | 6 +++++- dist/src/controllers/bots.js.map | 2 +- dist/src/utils/msg.js | 13 +++++++++++++ dist/src/utils/msg.js.map | 2 +- src/builtin/ml.ts | 13 +++++++++++++ src/builtin/utill/ml.ts | 31 +++++++++++++++++++++++++++++++ src/controllers/bots.ts | 2 ++ src/utils/msg.ts | 12 ++++++++++++ testing/stack/alice.json | 2 +- testing/stack/bob.json | 2 +- 18 files changed, 125 insertions(+), 14 deletions(-) diff --git a/dist/src/builtin/index.js b/dist/src/builtin/index.js index 997db88dc..b41359cf6 100644 --- a/dist/src/builtin/index.js +++ b/dist/src/builtin/index.js @@ -11,7 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.buildBotPayload = exports.builtinBotEmit = exports.init = void 0; // import * as SphinxBot from '../../../sphinx-bot' -const SphinxBot = require("sphinx-bot"); +// import * as SphinxBot from 'sphinx-bot' +const SphinxBot = require("sphinx-bot-joy"); const MotherBot = require("./mother"); const WelcomeBot = require("./welcome"); const LoopBot = require("./loop"); diff --git a/dist/src/builtin/index.js.map b/dist/src/builtin/index.js.map index 85cbc5f3b..e76fb2277 100644 --- a/dist/src/builtin/index.js.map +++ b/dist/src/builtin/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,0CAA0C;AAC1C,4CAA2C;AAC3C,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 90882fdc0..334d93196 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -10,7 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = exports.CALLBACKS = exports.ML_BOTNAME = exports.ML_PREFIX = void 0; -const Sphinx = require("sphinx-bot"); +// import * as Sphinx from 'sphinx-bot' +const Sphinx = require("sphinx-bot-joy"); const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); const utill_1 = require("./utill"); @@ -18,6 +19,7 @@ const config_1 = require("../utils/config"); const node_fetch_1 = require("node-fetch"); const ml_1 = require("./utill/ml"); const logger_1 = require("../utils/logger"); +const constants_1 = require("../constants"); const config = (0, config_1.loadConfig)(); const msg_types = Sphinx.MSG_TYPE; let initted = false; @@ -60,6 +62,11 @@ function init() { return; } } + if (message.type === constants_1.default.message_types.attachment) { + const blob = yield (0, ml_1.getAttachmentBlob)(message.media_token, message.media_key, message.media_type, tribe); + console.log('Image Blob', blob); + return; + } const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); let metaObj = JSON.parse(bot.meta || `{}`); const modelsArr = Object.keys(metaObj); @@ -143,6 +150,7 @@ function init() { }, 5 * 60 * 1000); } catch (e) { + console.log(e); logger_1.sphinxLogger.error(`ML CALL FAILED: ${e}`, logger_1.logging.Bots); } })); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index cf8e1ed49..c5a215cd1 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAoC;AACpC,kDAAmD;AACnD,sCAA6D;AAC7D,mCAAiC;AACjC,4CAA4C;AAC5C,2CAA8B;AAC9B,mCAQmB;AACnB,4CAAuD;AAEvD,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;AAEjC,IAAI,OAAO,GAAG,KAAK,CAAA;AAEN,QAAA,SAAS,GAAG,KAAK,CAAA;AAEjB,QAAA,UAAU,GAAG,GAAG,iBAAS,CAAC,SAAS,CAC9C,CAAC,EACD,CAAC,CACF,CAAC,WAAW,EAAE,GAAG,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;AAEhC,QAAA,SAAS,GAA2C,EAAE,CAAA;AAEnE,SAAgB,IAAI;IAClB,IAAI,OAAO;QAAE,OAAM;IACnB,OAAO,GAAG,IAAI,CAAA;IAEd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAW,CAAC,CAAA;IAE9B,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAO,OAAuB,EAAE,EAAE;;QAC7D,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,MAAK,iBAAS;YAAE,OAAM;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAC1E,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE;aACpC,CAAC,CAAe,CAAA;YAEjB,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;YAEjE,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,iBAAS,EAAE;gBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,QAAQ,GAAG,EAAE;oBACX,KAAK,KAAK;wBACR,MAAM,IAAA,WAAM,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBACxD,OAAM;oBACR,KAAK,SAAS;wBACZ,MAAM,IAAA,cAAS,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBAC3D,OAAM;oBACR,KAAK,MAAM;wBACT,MAAM,IAAA,YAAO,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBACzD,OAAM;oBACR,KAAK,KAAK;wBACR,MAAM,IAAA,aAAQ,EAAC,kBAAU,EAAE,iBAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;wBAC1D,OAAM;oBACR;wBACE,IAAA,mBAAc,EAAC,kBAAU,EAAE,iBAAS,EAAE,OAAO,CAAC,CAAA;wBAC9C,OAAM;iBACT;aACF;YACD,MAAM,GAAG,GAAkB,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,iBAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAEzE,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACtC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,IAAA,kBAAa,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAA;gBAC7C,OAAM;aACP;YACD,IAAI,IAAY,CAAA;YAChB,IAAI,OAAO,GAAG,EAAE,CAAA;YAChB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC5B,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;oBAClD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;iBAC7D;qBAAM;oBACL,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;iBAC1B;aACF;iBAAM;gBACL,IAAI,SAAS,GAAG,EAAE,CAAA;gBAClB,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBACnC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;oBACtE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;iBAC1D;qBAAM;oBACL,IAAA,kBAAa,EACX,8FAA8F,EAC9F,OAAO,CACR,CAAA;oBACD,OAAM;iBACP;gBACD,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;gBACzB,IAAI,CAAC,IAAI,EAAE;oBACT,IAAA,kBAAa,EAAC,mCAAmC,EAAE,OAAO,CAAC,CAAA;oBAC3D,OAAM;iBACP;aACF;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;YAE3B,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE;gBACpB,IAAA,kBAAa,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;gBACzC,OAAM;aACP;YAED,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,SAAS,GAAG,WAAW,SAAS,EAAE,CAAA;aACnC;YAED,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;oBACvB,OAAO,EAAE,GAAG,SAAS,KAAK;iBAC3B,CAAC;gBACF,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBACX,IAAA,kBAAa,EAAC,qCAAqC,EAAE,OAAO,CAAC,CAAA;gBAC7D,OAAM;aACP;YACD,IAAI,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,IAAA,kBAAa,EAAC,2BAA2B,EAAE,OAAO,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,iBAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAW;gBAC3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;qBACpC,SAAS,CAAC,kBAAU,CAAC;qBACrB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;gBAClD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;iBAC1B;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/B,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,UAAU,CAAC,GAAG,EAAE;gBACd,OAAO,iBAAS,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,qBAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;SACzD;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAlID,oBAkIC"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 0cea32e2d..171a26028 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -12,7 +12,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.init = void 0; // import * as SphinxBot from '../../../sphinx-bot' -const Sphinx = require("sphinx-bot"); +// import * as Sphinx from 'sphinx-bot' +const Sphinx = require("sphinx-bot-joy"); const botapi_1 = require("../controllers/botapi"); const bots_1 = require("../controllers/bots"); const models_1 = require("../models"); diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 5200ebf46..abfe9941a 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index ccbc96054..d6844208a 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -9,11 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.mlBotResponse = exports.addModel = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; +exports.getAttachmentBlob = exports.mlBotResponse = exports.addModel = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); -const Sphinx = require("sphinx-bot"); +// import * as Sphinx from 'sphinx-bot' +const Sphinx = require("sphinx-bot-joy"); const ml_1 = require("../ml"); const logger_1 = require("../../utils/logger"); +const ldat_1 = require("../../utils/ldat"); +const node_fetch_1 = require("node-fetch"); +const meme = require("../../utils/meme"); +const RNCryptor = require("jscryptor-3"); function addUrl(botName, botPrefix, tribe, messageObj, msgArr) { return __awaiter(this, void 0, void 0, function* () { const cmd = msgArr[1]; @@ -169,4 +174,25 @@ function mlBotResponse(msg, message) { message.channel.send({ embed }); } exports.mlBotResponse = mlBotResponse; +function getAttachmentBlob(mediaToken, mediaKey, mediaType, tribe) { + return __awaiter(this, void 0, void 0, function* () { + if (!mediaToken || !mediaKey) + return; + const ownerPubkey = tribe.ownerPubkey; + const terms = (0, ldat_1.parseLDAT)(mediaToken); + if (!terms.host) + return; + const token = yield meme.lazyToken(ownerPubkey, terms.host); + let protocol = 'https'; + if (terms.host.includes('localhost')) + protocol = 'http'; + const r = yield (0, node_fetch_1.default)(`${protocol}://${terms.host}/file/${mediaToken}`, { + headers: { Authorization: `Bearer ${token}` }, + }); + const buf = yield r.buffer(); + const imgBuf = RNCryptor.Decrypt(buf.toString('base64'), mediaKey); + return imgBuf; + }); +} +exports.getAttachmentBlob = getAttachmentBlob; //# sourceMappingURL=ml.js.map \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 33d5bc884..e447e274a 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/bots.js b/dist/src/controllers/bots.js index cbc77f135..13a0a729a 100644 --- a/dist/src/controllers/bots.js +++ b/dist/src/controllers/bots.js @@ -12,7 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getBagdeChatBot = exports.addPatToGitBot = exports.receiveBotRes = exports.buildBotPayload = exports.postToBotServer = exports.receiveBotCmd = exports.receiveBotInstall = exports.botKeysend = exports.keysendBotCmd = exports.keysendBotInstall = exports.installBotAsTribeAdmin = exports.deleteBot = exports.createBot = exports.getBots = void 0; const crypto = require("crypto"); const node_fetch_1 = require("node-fetch"); -const SphinxBot = require("sphinx-bot"); +// import * as SphinxBot from 'sphinx-bot' +const SphinxBot = require("sphinx-bot-joy"); const short = require("short-uuid"); const socket = require("../utils/socket"); const constants_1 = require("../constants"); @@ -478,6 +479,7 @@ exports.postToBotServer = postToBotServer; * @returns {SphinxBot.Message} The created SphinxBot message. */ function buildBotPayload(msg, botPrefix) { + console.log(msg.message); const chat_uuid = msg.chat && msg.chat.uuid; const m = { id: msg.message.uuid, @@ -491,6 +493,8 @@ function buildBotPayload(msg, botPrefix) { amount: msg.message.amount, type: msg.type, media_key: msg.message.mediaKey, + media_token: msg.message.mediaToken, + media_type: msg.message.mediaType, member: { id: msg.sender.id ? msg.sender.id + '' : '0', nickname: msg.sender.alias, diff --git a/dist/src/controllers/bots.js.map b/dist/src/controllers/bots.js.map index 266435cd6..6fec47324 100644 --- a/dist/src/controllers/bots.js.map +++ b/dist/src/controllers/bots.js.map @@ -1 +1 @@ -{"version":3,"file":"bots.js","sourceRoot":"","sources":["../../../src/controllers/bots.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"bots.js","sourceRoot":"","sources":["../../../src/controllers/bots.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/msg.js b/dist/src/utils/msg.js index e4688f093..3073b7573 100644 --- a/dist/src/utils/msg.js +++ b/dist/src/utils/msg.js @@ -119,7 +119,9 @@ function finishTermsAndReceipt(full, destkey, senderPubkey) { // this is only for tribes // DECRYPT EITHER STRING OR FIRST VAL IN OBJ function decryptMessage(full, chat) { + var _a, _b; return __awaiter(this, void 0, void 0, function* () { + console.log('Actuall message in decrypt function', full); if (!chat.groupPrivateKey) return full; const m = full && full.message; @@ -146,6 +148,17 @@ function decryptMessage(full, chat) { const decMediaKey = rsa.decrypt(chat.groupPrivateKey, mediaKey); obj.mediaKey = decMediaKey; } + if (m.mediaTerms) { + let mediaToken = yield (0, ldat_1.tokenFromTerms)({ + host: m.mediaTerms.host, + muid: m.mediaTerms.muid, + ttl: m.mediaTerms.ttl, + meta: m.mediaTerms.meta, + pubkey: (_a = full.sender) === null || _a === void 0 ? void 0 : _a.pub_key, + ownerPubkey: (_b = full.sender) === null || _b === void 0 ? void 0 : _b.pub_key, + }); + obj.mediaToken = mediaToken; + } // console.log("OBJ FILLED",fillmsg(full, obj)) return fillmsg(full, obj); }); diff --git a/dist/src/utils/msg.js.map b/dist/src/utils/msg.js.map index 416acc0c6..916d94c69 100644 --- a/dist/src/utils/msg.js.map +++ b/dist/src/utils/msg.js.map @@ -1 +1 @@ -{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../src/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../src/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 27cb2d6b4..3c0463210 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -12,8 +12,10 @@ import { defaultCommand, mlBotResponse, addModel, + getAttachmentBlob, } from './utill/ml' import { sphinxLogger, logging } from '../utils/logger' +import constants from '../constants' const config = loadConfig() @@ -68,6 +70,16 @@ export function init() { return } } + if (message.type === constants.message_types.attachment) { + const blob = await getAttachmentBlob( + message.media_token!, + message.media_key!, + message.media_type!, + tribe + ) + console.log('Image Blob', blob) + return + } const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) let metaObj: { [key: string]: MlMeta } = JSON.parse(bot.meta || `{}`) @@ -157,6 +169,7 @@ export function init() { delete CALLBACKS[process_id] }, 5 * 60 * 1000) } catch (e) { + console.log(e) sphinxLogger.error(`ML CALL FAILED: ${e}`, logging.Bots) } }) diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index a5f1f6e19..f74a4c88b 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -3,6 +3,10 @@ import { botResponse, findBot } from './index' import * as Sphinx from 'sphinx-bot' import { ML_BOTNAME } from '../ml' import { sphinxLogger, logging } from '../../utils/logger' +import { parseLDAT } from '../../utils/ldat' +import fetch from 'node-fetch' +import * as meme from '../../utils/meme' +import * as RNCryptor from 'jscryptor-3' type ContentKind = 'text' | 'image' export interface MlMeta { @@ -301,3 +305,30 @@ export function mlBotResponse(msg: string, message: Sphinx.Message) { .setOnlyUser(parseInt(message.member.id || '0')) message.channel.send({ embed }) } + +export async function getAttachmentBlob( + mediaToken: string, + mediaKey: string, + mediaType: string, + tribe: ChatRecord +) { + if (!mediaToken || !mediaKey) return + + const ownerPubkey = tribe.ownerPubkey + + const terms = parseLDAT(mediaToken) + if (!terms.host) return + + const token = await meme.lazyToken(ownerPubkey, terms.host) + + let protocol = 'https' + if (terms.host.includes('localhost')) protocol = 'http' + const r = await fetch(`${protocol}://${terms.host}/file/${mediaToken}`, { + headers: { Authorization: `Bearer ${token}` }, + }) + + const buf = await r.buffer() + + const imgBuf = RNCryptor.Decrypt(buf.toString('base64'), mediaKey) + return imgBuf +} diff --git a/src/controllers/bots.ts b/src/controllers/bots.ts index eae75abe7..726b39f46 100644 --- a/src/controllers/bots.ts +++ b/src/controllers/bots.ts @@ -514,6 +514,8 @@ export function buildBotPayload( amount: msg.message.amount, type: msg.type, media_key: msg.message.mediaKey, + media_token: msg.message.mediaToken, + media_type: msg.message.mediaType, member: { id: msg.sender.id ? msg.sender.id + '' : '0', nickname: msg.sender.alias, diff --git a/src/utils/msg.ts b/src/utils/msg.ts index 9df67476c..ba53a8320 100644 --- a/src/utils/msg.ts +++ b/src/utils/msg.ts @@ -129,6 +129,7 @@ async function decryptMessage( full: Partial, chat: Partial ): Promise { + console.log('Actuall message in decrypt function', full) if (!chat.groupPrivateKey) return full as Msg const m = full && full.message if (!m) return full as Msg @@ -154,6 +155,17 @@ async function decryptMessage( const decMediaKey = rsa.decrypt(chat.groupPrivateKey, mediaKey) obj.mediaKey = decMediaKey } + if (m.mediaTerms) { + let mediaToken = await tokenFromTerms({ + host: m.mediaTerms.host, + muid: m.mediaTerms.muid, + ttl: m.mediaTerms.ttl, + meta: m.mediaTerms.meta, + pubkey: full.sender?.pub_key, + ownerPubkey: full.sender?.pub_key, + }) + obj.mediaToken = mediaToken + } // console.log("OBJ FILLED",fillmsg(full, obj)) return fillmsg(full, obj) diff --git a/testing/stack/alice.json b/testing/stack/alice.json index 9f1af4483..7a5487c96 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -7,7 +7,7 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/alice/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3001", - "media_host": "localhost:5555", + "media_host": "memes.sphinx.chat", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, diff --git a/testing/stack/bob.json b/testing/stack/bob.json index fb9ff3253..eeffc5199 100644 --- a/testing/stack/bob.json +++ b/testing/stack/bob.json @@ -7,7 +7,7 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/bob/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3002", - "media_host": "localhost:5555", + "media_host": "memes.sphinx.chat", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, From a9def3b32049f7c3799761904c1d3e313eb20945 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 22 Aug 2023 23:26:01 +0100 Subject: [PATCH 60/93] updated sphinx-bot --- dist/src/builtin/index.js | 3 +-- dist/src/builtin/index.js.map | 2 +- dist/src/builtin/ml.js | 3 +-- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/mother.js | 3 +-- dist/src/builtin/mother.js.map | 2 +- dist/src/builtin/utill/ml.js | 3 +-- dist/src/builtin/utill/ml.js.map | 2 +- dist/src/controllers/bots.js | 4 +--- dist/src/controllers/bots.js.map | 2 +- package-lock.json | 29 ++++++++++++++--------------- package.json | 2 +- 12 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dist/src/builtin/index.js b/dist/src/builtin/index.js index b41359cf6..997db88dc 100644 --- a/dist/src/builtin/index.js +++ b/dist/src/builtin/index.js @@ -11,8 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.buildBotPayload = exports.builtinBotEmit = exports.init = void 0; // import * as SphinxBot from '../../../sphinx-bot' -// import * as SphinxBot from 'sphinx-bot' -const SphinxBot = require("sphinx-bot-joy"); +const SphinxBot = require("sphinx-bot"); const MotherBot = require("./mother"); const WelcomeBot = require("./welcome"); const LoopBot = require("./loop"); diff --git a/dist/src/builtin/index.js.map b/dist/src/builtin/index.js.map index e76fb2277..85cbc5f3b 100644 --- a/dist/src/builtin/index.js.map +++ b/dist/src/builtin/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,0CAA0C;AAC1C,4CAA2C;AAC3C,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AACnD,kCAAiC;AACjC,4CAA2C;AAC3C,sCAAqC;AACrC,0CAAyC;AACzC,8BAA6B;AAE7B,gCAA+B;AAC/B,8CAAqD;AAsBtB,gGAtBtB,sBAAe,OAsBsB;AApB9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,YAAY,CAAC,IAAI,EAAE,CAAA;QACnB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,WAAW,CAAC,IAAI,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW,EAAE,SAAkB;IACrD,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 334d93196..d4e3e4508 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = exports.CALLBACKS = exports.ML_BOTNAME = exports.ML_PREFIX = void 0; -// import * as Sphinx from 'sphinx-bot' -const Sphinx = require("sphinx-bot-joy"); +const Sphinx = require("sphinx-bot"); const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); const utill_1 = require("./utill"); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index c5a215cd1..5ef05c064 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index 171a26028..0cea32e2d 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -12,8 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.init = void 0; // import * as SphinxBot from '../../../sphinx-bot' -// import * as Sphinx from 'sphinx-bot' -const Sphinx = require("sphinx-bot-joy"); +const Sphinx = require("sphinx-bot"); const botapi_1 = require("../controllers/botapi"); const bots_1 = require("../controllers/bots"); const models_1 = require("../models"); diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index abfe9941a..5200ebf46 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index d6844208a..73fe6e76b 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -11,8 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.getAttachmentBlob = exports.mlBotResponse = exports.addModel = exports.defaultCommand = exports.addKind = exports.addApiKey = exports.addUrl = void 0; const index_1 = require("./index"); -// import * as Sphinx from 'sphinx-bot' -const Sphinx = require("sphinx-bot-joy"); +const Sphinx = require("sphinx-bot"); const ml_1 = require("../ml"); const logger_1 = require("../../utils/logger"); const ldat_1 = require("../../utils/ldat"); diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index e447e274a..4eb6d839a 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/bots.js b/dist/src/controllers/bots.js index 13a0a729a..d59dafd8b 100644 --- a/dist/src/controllers/bots.js +++ b/dist/src/controllers/bots.js @@ -12,8 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getBagdeChatBot = exports.addPatToGitBot = exports.receiveBotRes = exports.buildBotPayload = exports.postToBotServer = exports.receiveBotCmd = exports.receiveBotInstall = exports.botKeysend = exports.keysendBotCmd = exports.keysendBotInstall = exports.installBotAsTribeAdmin = exports.deleteBot = exports.createBot = exports.getBots = void 0; const crypto = require("crypto"); const node_fetch_1 = require("node-fetch"); -// import * as SphinxBot from 'sphinx-bot' -const SphinxBot = require("sphinx-bot-joy"); +const SphinxBot = require("sphinx-bot"); const short = require("short-uuid"); const socket = require("../utils/socket"); const constants_1 = require("../constants"); @@ -479,7 +478,6 @@ exports.postToBotServer = postToBotServer; * @returns {SphinxBot.Message} The created SphinxBot message. */ function buildBotPayload(msg, botPrefix) { - console.log(msg.message); const chat_uuid = msg.chat && msg.chat.uuid; const m = { id: msg.message.uuid, diff --git a/dist/src/controllers/bots.js.map b/dist/src/controllers/bots.js.map index 6fec47324..34501b1cb 100644 --- a/dist/src/controllers/bots.js.map +++ b/dist/src/controllers/bots.js.map @@ -1 +1 @@ -{"version":3,"file":"bots.js","sourceRoot":"","sources":["../../../src/controllers/bots.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"bots.js","sourceRoot":"","sources":["../../../src/controllers/bots.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 75b55b7af..81b84d33f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "ISC", "dependencies": { "@boltz/bolt11": "^1.2.7", - "@grpc/grpc-js": "^1.8.7", + "@grpc/grpc-js": "1.8.7", "@grpc/proto-loader": "0.7.4", "@octokit/webhooks-types": "^5.2.0", "@scout_apm/scout-apm": "^0.1.10", @@ -72,7 +72,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.41", + "sphinx-bot": "^0.2.42", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", @@ -822,10 +822,9 @@ "optional": true }, "node_modules/@grpc/grpc-js": { - "version": "1.8.18", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.18.tgz", - "integrity": "sha512-2uWPtxhsXmVgd8WzDhfamSjHpZDXfMjMDciY6VRTq4Sn7rFzazyf0LLDa0oav+61UHIoEZb4KKaAV6S7NuJFbQ==", - "license": "Apache-2.0", + "version": "1.8.7", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.7.tgz", + "integrity": "sha512-dRAWjRFN1Zy9mzPNLkFFIWT8T6C9euwluzCHZUKuhC+Bk3MayNPcpgDRyG+sg+n2sitEUySKxUynirVpu9ItKw==", "dependencies": { "@grpc/proto-loader": "^0.7.0", "@types/node": ">=12.12.47" @@ -15421,9 +15420,9 @@ "license": "CC0-1.0" }, "node_modules/sphinx-bot": { - "version": "0.2.41", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.41.tgz", - "integrity": "sha512-OYDitqmSE4D3gzHjHsctn/eswJ8OnyL68J4hw+qG6Y9Okae+AnBuBYn1frzEtKghjIjxyqyZJLoNqlN0GU0H5w==", + "version": "0.2.42", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.42.tgz", + "integrity": "sha512-EHN5Gj9PfbB6CisHqdAz7rTRzN6oJAjSHR0G5D9gr3IpyWEEC7RYFWJjlJVvS5YvUs+JqP+8O1pZr2Y5tp4wWw==", "dependencies": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", @@ -18054,9 +18053,9 @@ "optional": true }, "@grpc/grpc-js": { - "version": "1.8.18", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.18.tgz", - "integrity": "sha512-2uWPtxhsXmVgd8WzDhfamSjHpZDXfMjMDciY6VRTq4Sn7rFzazyf0LLDa0oav+61UHIoEZb4KKaAV6S7NuJFbQ==", + "version": "1.8.7", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.7.tgz", + "integrity": "sha512-dRAWjRFN1Zy9mzPNLkFFIWT8T6C9euwluzCHZUKuhC+Bk3MayNPcpgDRyG+sg+n2sitEUySKxUynirVpu9ItKw==", "requires": { "@grpc/proto-loader": "^0.7.0", "@types/node": ">=12.12.47" @@ -28764,9 +28763,9 @@ "dev": true }, "sphinx-bot": { - "version": "0.2.41", - "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.41.tgz", - "integrity": "sha512-OYDitqmSE4D3gzHjHsctn/eswJ8OnyL68J4hw+qG6Y9Okae+AnBuBYn1frzEtKghjIjxyqyZJLoNqlN0GU0H5w==", + "version": "0.2.42", + "resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.42.tgz", + "integrity": "sha512-EHN5Gj9PfbB6CisHqdAz7rTRzN6oJAjSHR0G5D9gr3IpyWEEC7RYFWJjlJVvS5YvUs+JqP+8O1pZr2Y5tp4wWw==", "requires": { "@types/cors": "^2.8.7", "@types/express": "^4.17.8", diff --git a/package.json b/package.json index 5b81bc6c3..9f19f0f56 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "short-uuid": "^3.1.1", "sjcl": "^1.0.8", "socket.io": "^4.4.1", - "sphinx-bot": "^0.2.41", + "sphinx-bot": "^0.2.42", "sqlite3": "5.0.11", "tail": "^2.0.3", "ts-jest": "^28.0.8", From 5f3552694777b26873e9e1bad28fd364bf70500a Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 18:23:59 +0100 Subject: [PATCH 61/93] update: finalized image bot --- dist/src/builtin/ml.js | 25 ++++++++++++++++++++----- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 26 +++++++++++++++++++++----- testing/stack/alice.json | 2 +- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index d4e3e4508..c30bd833b 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -61,10 +61,10 @@ function init() { return; } } + let imageBase64 = ''; if (message.type === constants_1.default.message_types.attachment) { const blob = yield (0, ml_1.getAttachmentBlob)(message.media_token, message.media_key, message.media_type, tribe); - console.log('Image Blob', blob); - return; + imageBase64 = blob.toString('base64'); } const bot = yield (0, utill_1.findBot)({ botPrefix: exports.ML_PREFIX, tribe }); let metaObj = JSON.parse(bot.meta || `{}`); @@ -77,7 +77,10 @@ function init() { let content = ''; if (modelsArr.length === 1) { meta = metaObj[modelsArr[0]]; - if (message.content.startsWith(`@${modelsArr[0]}`)) { + if (message.type === constants_1.default.message_types.attachment) { + content = imageBase64; + } + else if (message.content.startsWith(`@${modelsArr[0]}`)) { content = message.content.substring(modelsArr[0].length + 1); } else { @@ -87,13 +90,24 @@ function init() { else { let modelName = ''; if (message.content.startsWith('@')) { - modelName = message.content.substring(1, message.content.indexOf(' ')); - content = message.content.substring(modelName.length + 1); + modelName = message.content.substring(1, message.content.indexOf(' ') > 0 + ? message.content.indexOf(' ') + : 100); + if (message.type === constants_1.default.message_types.attachment) { + content = imageBase64; + } + else { + content = message.content.substring(modelName.length + 1); + } } else { (0, ml_1.mlBotResponse)('Specify model name by typing the @ sysmbol followed by model name immediately, without space', message); return; } + if (!content) { + (0, ml_1.mlBotResponse)('Please provide content', message); + return; + } meta = metaObj[modelName]; if (!meta) { (0, ml_1.mlBotResponse)('Please provide a valid model name', message); @@ -122,6 +136,7 @@ function init() { }, }); const j = yield r.json(); + console.log('Response from image endpoint', j); if (!j.body) { (0, ml_1.mlBotResponse)('failed to process message (no body)', message); return; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 5ef05c064..993f9567e 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 3c0463210..f8de2b8e8 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -70,6 +70,7 @@ export function init() { return } } + let imageBase64 = '' if (message.type === constants.message_types.attachment) { const blob = await getAttachmentBlob( message.media_token!, @@ -77,8 +78,7 @@ export function init() { message.media_type!, tribe ) - console.log('Image Blob', blob) - return + imageBase64 = blob.toString('base64') } const bot: ChatBotRecord = await findBot({ botPrefix: ML_PREFIX, tribe }) @@ -92,7 +92,9 @@ export function init() { let content = '' if (modelsArr.length === 1) { meta = metaObj[modelsArr[0]] - if (message.content.startsWith(`@${modelsArr[0]}`)) { + if (message.type === constants.message_types.attachment) { + content = imageBase64 + } else if (message.content.startsWith(`@${modelsArr[0]}`)) { content = message.content.substring(modelsArr[0].length + 1) } else { content = message.content @@ -100,8 +102,17 @@ export function init() { } else { let modelName = '' if (message.content.startsWith('@')) { - modelName = message.content.substring(1, message.content.indexOf(' ')) - content = message.content.substring(modelName.length + 1) + modelName = message.content.substring( + 1, + message.content.indexOf(' ') > 0 + ? message.content.indexOf(' ') + : 100 + ) + if (message.type === constants.message_types.attachment) { + content = imageBase64 + } else { + content = message.content.substring(modelName.length + 1) + } } else { mlBotResponse( 'Specify model name by typing the @ sysmbol followed by model name immediately, without space', @@ -109,6 +120,10 @@ export function init() { ) return } + if (!content) { + mlBotResponse('Please provide content', message) + return + } meta = metaObj[modelName] if (!meta) { mlBotResponse('Please provide a valid model name', message) @@ -140,6 +155,7 @@ export function init() { }, }) const j = await r.json() + console.log('Response from image endpoint', j) if (!j.body) { mlBotResponse('failed to process message (no body)', message) diff --git a/testing/stack/alice.json b/testing/stack/alice.json index 7a5487c96..c5277d571 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -13,6 +13,6 @@ "tribes_insecure": true, "public_url": "127.0.0.1:3001", "connect_ui": true, - "host_name": "http://localhost:3001" + "host_name": "https://3377-105-112-235-209.ngrok-free.app" } } From 9379415a06c5d72da753d1fd2f421e3395a51a33 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 18:34:06 +0100 Subject: [PATCH 62/93] update: ensured attachments are only viewed by tribe admin and sender for ml-bot --- dist/src/network/send.js | 2 +- dist/src/network/send.js.map | 2 +- src/network/send.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/src/network/send.js b/dist/src/network/send.js index fef6482bc..a1d0c42dd 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -93,7 +93,7 @@ function sendMessage({ type, chat, message, sender, amount, success, failure, sk logger_1.sphinxLogger.info(`[Network] => isBotMsg`, logger_1.logging.Network); // return // DO NOT FORWARD TO TRIBE, forwarded to bot instead? } - if (msg.type === 0) { + if (msg.type === 0 || msg.type === constants_1.default.message_types.attachment) { const hiddenCmd = yield interceptTribeMsgForHiddenCmds(msg, tenant); justMe = hiddenCmd ? hiddenCmd : justMe; } diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 083a30e8a..233b547b5 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/network/send.ts b/src/network/send.ts index 2053d909c..2b18cdcfa 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -149,7 +149,7 @@ export async function sendMessage({ sphinxLogger.info(`[Network] => isBotMsg`, logging.Network) // return // DO NOT FORWARD TO TRIBE, forwarded to bot instead? } - if (msg.type === 0) { + if (msg.type === 0 || msg.type === constants.message_types.attachment) { const hiddenCmd = await interceptTribeMsgForHiddenCmds(msg, tenant) justMe = hiddenCmd ? hiddenCmd : justMe } From 7ab722931bd820b871fef6d466e830c55656e083 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 18:34:56 +0100 Subject: [PATCH 63/93] update: removed logs in decrypt message function for tribe --- dist/src/utils/msg.js | 1 - dist/src/utils/msg.js.map | 2 +- src/utils/msg.ts | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dist/src/utils/msg.js b/dist/src/utils/msg.js index 3073b7573..1f8208cf3 100644 --- a/dist/src/utils/msg.js +++ b/dist/src/utils/msg.js @@ -121,7 +121,6 @@ function finishTermsAndReceipt(full, destkey, senderPubkey) { function decryptMessage(full, chat) { var _a, _b; return __awaiter(this, void 0, void 0, function* () { - console.log('Actuall message in decrypt function', full); if (!chat.groupPrivateKey) return full; const m = full && full.message; diff --git a/dist/src/utils/msg.js.map b/dist/src/utils/msg.js.map index 916d94c69..445a797e2 100644 --- a/dist/src/utils/msg.js.map +++ b/dist/src/utils/msg.js.map @@ -1 +1 @@ -{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../src/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../src/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/msg.ts b/src/utils/msg.ts index ba53a8320..ad2bcd1af 100644 --- a/src/utils/msg.ts +++ b/src/utils/msg.ts @@ -129,7 +129,6 @@ async function decryptMessage( full: Partial, chat: Partial ): Promise { - console.log('Actuall message in decrypt function', full) if (!chat.groupPrivateKey) return full as Msg const m = full && full.message if (!m) return full as Msg From 01c50705a79a2f75ec73fbc1a7939deaf315de2c Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 19:52:17 +0100 Subject: [PATCH 64/93] fix: fixed empty message content for the ml-bot --- dist/src/builtin/ml.js | 2 +- dist/src/builtin/ml.js.map | 2 +- dist/src/network/send.js | 2 +- dist/src/network/send.js.map | 2 +- src/builtin/ml.ts | 2 +- src/network/send.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index c30bd833b..dd6cb62e6 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -89,7 +89,7 @@ function init() { } else { let modelName = ''; - if (message.content.startsWith('@')) { + if (message.content && message.content.startsWith('@')) { modelName = message.content.substring(1, message.content.indexOf(' ') > 0 ? message.content.indexOf(' ') : 100); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 993f9567e..2830c3f4a 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/network/send.js b/dist/src/network/send.js index a1d0c42dd..4cc3c4635 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -433,7 +433,7 @@ function interceptTribeMsgForHiddenCmds(msg, tenant) { where: { tenant, chatId: newChat.id }, })); const content = msg.message.content; - const splitedContent = content.split(' '); + const splitedContent = (content && content.split(' ')) || []; for (let i = 0; i < bots.length; i++) { const bot = bots[i]; const isHidden = bot.botPrefix === splitedContent[0] && diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 233b547b5..dd6811e6b 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index f8de2b8e8..6886f51b4 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -101,7 +101,7 @@ export function init() { } } else { let modelName = '' - if (message.content.startsWith('@')) { + if (message.content && message.content.startsWith('@')) { modelName = message.content.substring( 1, message.content.indexOf(' ') > 0 diff --git a/src/network/send.ts b/src/network/send.ts index 2b18cdcfa..3b54b0abf 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -557,7 +557,7 @@ async function interceptTribeMsgForHiddenCmds( })) as ChatBotRecord[] const content = msg.message.content as string - const splitedContent = content.split(' ') + const splitedContent = (content && content.split(' ')) || [] for (let i = 0; i < bots.length; i++) { const bot = bots[i] From a61be51f2dc20fd08a3adcece44cd0c86c90c1fa Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 21:34:56 +0100 Subject: [PATCH 65/93] update: updated the ml-bot to support base64 images and content --- dist/src/builtin/ml.js | 59 +++++++++++++++++++++----------------- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 58 ++++++++++++++++++++----------------- 3 files changed, 65 insertions(+), 54 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index dd6cb62e6..be4d34dda 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -77,10 +77,7 @@ function init() { let content = ''; if (modelsArr.length === 1) { meta = metaObj[modelsArr[0]]; - if (message.type === constants_1.default.message_types.attachment) { - content = imageBase64; - } - else if (message.content.startsWith(`@${modelsArr[0]}`)) { + if (message.content.startsWith(`@${modelsArr[0]}`)) { content = message.content.substring(modelsArr[0].length + 1); } else { @@ -93,21 +90,12 @@ function init() { modelName = message.content.substring(1, message.content.indexOf(' ') > 0 ? message.content.indexOf(' ') : 100); - if (message.type === constants_1.default.message_types.attachment) { - content = imageBase64; - } - else { - content = message.content.substring(modelName.length + 1); - } + content = message.content.substring(modelName.length + 1); } else { (0, ml_1.mlBotResponse)('Specify model name by typing the @ sysmbol followed by model name immediately, without space', message); return; } - if (!content) { - (0, ml_1.mlBotResponse)('Please provide content', message); - return; - } meta = metaObj[modelName]; if (!meta) { (0, ml_1.mlBotResponse)('Please provide a valid model name', message); @@ -124,19 +112,36 @@ function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } - const r = yield (0, node_fetch_1.default)(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }); - const j = yield r.json(); - console.log('Response from image endpoint', j); + let j; + if (message.type === constants_1.default.message_types.attachment) { + const r = yield (0, node_fetch_1.default)(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + image64: imageBase64, + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }); + j = yield r.json(); + } + else { + const r = yield (0, node_fetch_1.default)(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }); + j = yield r.json(); + } if (!j.body) { (0, ml_1.mlBotResponse)('failed to process message (no body)', message); return; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 2830c3f4a..72727fc02 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 6886f51b4..d7199a55d 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -92,9 +92,7 @@ export function init() { let content = '' if (modelsArr.length === 1) { meta = metaObj[modelsArr[0]] - if (message.type === constants.message_types.attachment) { - content = imageBase64 - } else if (message.content.startsWith(`@${modelsArr[0]}`)) { + if (message.content.startsWith(`@${modelsArr[0]}`)) { content = message.content.substring(modelsArr[0].length + 1) } else { content = message.content @@ -108,11 +106,7 @@ export function init() { ? message.content.indexOf(' ') : 100 ) - if (message.type === constants.message_types.attachment) { - content = imageBase64 - } else { - content = message.content.substring(modelName.length + 1) - } + content = message.content.substring(modelName.length + 1) } else { mlBotResponse( 'Specify model name by typing the @ sysmbol followed by model name immediately, without space', @@ -120,10 +114,7 @@ export function init() { ) return } - if (!content) { - mlBotResponse('Please provide content', message) - return - } + meta = metaObj[modelName] if (!meta) { mlBotResponse('Please provide a valid model name', message) @@ -142,20 +133,35 @@ export function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } - - const r = await fetch(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }) - const j = await r.json() - console.log('Response from image endpoint', j) + let j + if (message.type === constants.message_types.attachment) { + const r = await fetch(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + image64: imageBase64, + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + j = await r.json() + } else { + const r = await fetch(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + j = await r.json() + } if (!j.body) { mlBotResponse('failed to process message (no body)', message) From 6287c34b1ce6ed84998f45ad0d3242beaecf64cd Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 23 Aug 2023 22:46:49 +0100 Subject: [PATCH 66/93] update: changed cln-integration for stack --- .github/workflows/cln_proxy_integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 96f0e5de4..9c05bcee0 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b update/cln-config https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From cba58bb36ff6b9ce1100ae6c5010863f643f555a Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 24 Aug 2023 15:02:21 +0100 Subject: [PATCH 67/93] update: remove cln-config stack branch --- .github/workflows/cln_proxy_integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 9c05bcee0..96f0e5de4 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b update/cln-config https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From 51870277623b9500eae90aeca3f8e0501ad1531c Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 24 Aug 2023 17:24:28 +0100 Subject: [PATCH 68/93] update: added cln update branch --- .github/workflows/cln_proxy_integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 96f0e5de4..9c05bcee0 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b update/cln-config https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From 11bb28a8e368a6370d439811035e9d571fa39b2c Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 24 Aug 2023 22:22:49 +0100 Subject: [PATCH 69/93] update: removed stack branch --- .../workflows/cln_proxy_integration_test.yml | 2 +- src/tests/configs/nodes.json | 70 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 9c05bcee0..96f0e5de4 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b update/cln-config https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index 580fe1ae4..90f854830 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -4,11 +4,11 @@ "pubkey": "03a394d0ebf0d003124ab130c6b12b8b990a50a30a464354800a51981ba745bb07", "ip": "http://alice.sphinx:3001", "external_ip": "http://localhost:3001", - "authToken": "4CowQnkTC3XRbvQqRdCc", - "transportToken": "MIIBCgKCAQEAqhnxh3o4R3lpxrXLUa4iZJAzV0vNPa4fiDgHp+Z43DgfAS239+yv\nP6lhYAt+Wu2NdKAkRBE8EKdCCP3Y+NHPerQf0gaDD5VnvCG1780fOBSIcoAcUzMs\nwanHNjFpXxehNSS2GnE6zhava/sxVIb9v1nqvhq+dbqMyjhjpbeord125L8QoM7E\nKJdlbydezYIIQAd1FXUuY4wPXO2z1680zOgvmA6UEzWFjoDwMPcO55119V1ZgFD5\n2TC4kVsxq7N5jK1TONBuvq+WwjDV85eh1WWyFZZOEZFYVQ7L6hB0pC25V9S1vbp/\nS6fUBoCZeOGskrgsMa1sbF58Qwf/ZqpFMwIDAQAB", - "contact_key": "MIIBCgKCAQEAusfvpMgHfdPHzD633pLhfr3qYckiMSTuXm4NhHtTGx9j82W8DFeQXPUxrrXPwOL9/PAn08WGr6ah1GO1CNv75I2xxPoRvZa0Ebs7vR1VfWTaQCpXyh7Q6D3yXxxJ+t5cPWHzboq9KJHGW0CIOXz4QUwyqx+KXS1y65FzDD2W1BDZxGIO9cqAvGvkhe2K06yx2RVi+3Upf+5kRIVOZFtl3Z7rqN2Zy8h/buW68IKmyyGVGPIBdHmvaSW0tq0q7AFYqbJx0uUJu8QwIoh13Z1TJ45rTif4tpZJsGUEQVbV3wxO67/x8BY76a4WAColSdbrOkCIjcXdRkVMJIuJufBCbQIDAQAB", - "privkey": "MIIEpQIBAAKCAQEAusfvpMgHfdPHzD633pLhfr3qYckiMSTuXm4NhHtTGx9j82W8DFeQXPUxrrXPwOL9/PAn08WGr6ah1GO1CNv75I2xxPoRvZa0Ebs7vR1VfWTaQCpXyh7Q6D3yXxxJ+t5cPWHzboq9KJHGW0CIOXz4QUwyqx+KXS1y65FzDD2W1BDZxGIO9cqAvGvkhe2K06yx2RVi+3Upf+5kRIVOZFtl3Z7rqN2Zy8h/buW68IKmyyGVGPIBdHmvaSW0tq0q7AFYqbJx0uUJu8QwIoh13Z1TJ45rTif4tpZJsGUEQVbV3wxO67/x8BY76a4WAColSdbrOkCIjcXdRkVMJIuJufBCbQIDAQABAoIBADP9ZwUU8JDjnB+L7Z40gDPJJS5mz++h+f+q3nRb53wLNsUPMlK1JOfbECMzVEq6ZDw9lLhrqNvHpA/8WO3IXcr2bd8IRFvjUOgGl9BCFAO9SMrHfnwyK7AZXhd/RlBgCIjFdP71+0UJno7T3Zcy4985GHltZBQfjHdpmv5zPkJ0nGOrcLkgfoqdoGAaQ1JDlWOl03ctGb3doEUAdmToky37HY7YKOP/ISv5z28vehD8tkOwkqsoF4cYX5C6w6gWz6it+2PYP3IOJ4kKR4QXPsUXoKBKeG04it754kK9F6EYuuBwAOB9GLpjun52YYgqYnxYhW7aYfK7oo+Kg8MHzQECgYEA5kTVcbuwFTdsFllGscQp94tTIRYVJUYzYRRhJn3NntEp83h8+cS/P9ZLVs8Gy4Uz1ufxNtSD8yIPaN4VuXBSJQi49X4d+SlqD81pSk1SHV6GFVvMSVa7Fn7Wh8cfzsVl8fTymdzM0c0ZkpaY5thXQldK9N5HCJ+qPstTb9tzAeECgYEAz6cR9JeFgClNOoRommhNYIcjlBcofKXalga7Y837RBub56+jO2edXsNdEqNWZb/s6VMtVDarZ3hnAgrMinNtFEHGp7mvE8uO9E548vJ2OZHRqju8+84z1acXS8WySxN4VV6cJuxGHRMdd+b1eLsl3SpR3Vel44ntTHR1C2SSag0CgYEAv2QnJMkjqf7O0CSUJd0uJJqhFbcNDFY1DlOqDBw0c/TWMY/MEK3/aEfthtG8jBzC4bUXQMOSiNueg0NUOzWokS+WzDVvJFHP3iKViTSLM+4E9GvAeJSmHCSAm4peXbak7V7y5gAoHZmjz7tsizL2FCYKH01BLWHIVzkYuLhl9wECgYEAqCKmBj896HUIxE38CLJVnMgvhbRuoucEI6AV0Q0y24XjaeisKeiO4vEbBoFc7oxFvvMLa/nMNb6m4V9vGNe3RcSwnpRZ75RODwEPK+Ao3Bp3AvjV36mqDN/7m+3anLGKKM2vcFC1wMr+fFx0/CnE0dx3ZtqWRrQigVp2fyAS8W0CgYEAhUzIsge3oN2vFIm72ZAD+Nfls36QX+b8gQBbKGUAaBYW3AUXunuITEGM6KjwHgiLQTTOrMgwMK/hGEb9gZuPOfPJW9bpwYXcCciMDcslLT3vvGlU7f8MiuQQ9I9gDHmv6D39OILUlbI2Z5qfU6bURy6RfHS6szINmpeiR3Hg1RY=", - "exported_keys": "a2V5czo6QXdFcThOck5IaXVyMG83UlU1cVkvYzJGNkJ6amYvR2NwOVYyeGJWa3I4TTBHTWN5M0ticGtIYlhwQlU1c3N5R0pxaTlDdVdHTGwxeTZZL3MzdVFpcGhJOEI2TExUd1J0UU15eGJsaWZyMDh6WEg3UFR1VUhEYzVQVUM2enFsQ0luQzV5UmFYU2tqQ1M1Zk9UVDlHZ0t1ajN2bHhLMTZpdjRMVlpNUDhhcU53UTdFQkRTMDVxQTRwU0RBUmhrL1YydUJRKzh4SDJXMTZ3Q2MzWXJRSG02Q0s2MkNBajNKSklvcHo1bXdUNHBmSDRuUmttVEY3WC9UNmhTbEF3VXdwV0xJSzdlMVhFOWJHcTNOaUl2cFE0YjlZbnRrSFV5bFVQWDJzcjRPQkZSRDVrYThTZk85b2pYcDcvYUhXNk8xSkFFRjJ3NHU0TnViYTdOTXAwNUxNTStUZUdoOHRVQUtVOEk5ZnBmTG9iWTI5NjlPYzlYUlBHUkdFYUt5TjFldXdIbVNpOEhEb2kybCszTWhGRjBMeW1XZE4vY2pzTUZPd2lhMFhYaERvaDNLWWNrZWNVdWZ3YzJZNkh2K2VrSTc1N2t5TWp2TTN0eUw3OVF6M0tZcWsyMVNhSTdoT1o3b2czMnYvVjl2YXY2YWoyZHdRSFRuR1ZLdGVudHFBalluUTl0TjV5anh6cDlZLzd1SG10MURnZ3NkbjRya0Y5NXgzY05tR2YvcjVRZDcydUVsQU9nZVp4d284dFlFZ2U2RDJsUnZody8rcHBRUDhzWjRtTGVQYlk4SXBlMUxmUnBSOExaRDFPU2s2enRBRXpjS0RBQWEvOE1pYmVEVWtTMEN2S3FmV20vaUsxLytZdU5ISTIyeC8vSE5FQVFtNGVYUlV2TXFnTGVKRHF2V0s2R1ZxMDR5RElveER0R09pTUFkNHNiSEY3Wm40Zm1JR3g5TXY1N2N6SmpVUE44TnIzQmJDWmJ5aHF0MythU3hOR3VpRmRBZGRPZGwyOGhieVpGdUhwc3hZRlFXbzFUYmZ2c25xbHVGNUpadTVESmY2N2trcDkrQnBXcyszeXBWNVRESWg4WEk1bUZzK0FrK2h2UkFOTnBxNmlIeFMzRHNTNjlYQmsyRW9LTWNPekE2RW1hS0ZwQmVHSGZkdXZJNmhtT3JDUDhpSVZGa2hNVm9FZjZoMWtDS01veURrcjk0bkIvemJWY29hRTAvbnZweDR2VHYxblBEUWZrd2xOaFlBOWh0MlM0QmRPWHk5Ly9oMndINXVCL1RkN3ZvcVVRNUtLNzVydlZiVWtuTXVwSS84Sm5aRzNzNzdTQXBvT3E0YTZVV1gzVk5vcFpZV0FyeU9uTmhWK1E3SGxuaEJYK1ZybkxRTXNJK3RFc29ud3J0THpGMFRCcEh2NklWSmd1bXp2ZTVrV00yRndMSzJ1WFFKQXE3b1YwRjRhanpsblBXYkFISjgzTDVUdU5BWXlYYWhEYWJ0Ui92bXFJaFhyb216MFd4RUI0cFVmMmNQV0dEdHZKcUNuRVdXRjNodE9haCs1Q2JxOXV1Zm1ockx5dm9kQmppWnAzQ0FydnR4dTIrbGJVaHBNNndjc1FZRXJ5WTdWUG8yZUs1K1RMSW43L0Y2RXl4UjJ3UElrTzByRXNWZ3pCcjNocDBCQXF3Z1BLeW9hdUtCejY3NlhvVG9aWXNDSWNVcU1lM3p6blN6U21LVXhuYlVlNm03ZTJBY3AvSG5vQzFlTEZUWDBjaVc3OHBQUmN5WmF3cEQ3ekFTalQ2VDdiL0hDeFRzTDBrL0xuejd1c21MSDJSaFg5T2ZLTithWHNSTk1FQWNrWElUVmNuWHJuWTBzblBxQWkyLzU0aGZidWNDVmcvUW9VbzNTakxDYkY2RGdrRnBZRGVOUXVKYnFQc3IrQksrMHdKZ3grZjdpbndQUjMvZXpyZTdsRjhxVWFOaUFDZjJmNmdjdGk2N1lTVkxZb2laa2VVbVk4dnNPeWVBYmFzZVY4M0g2UGpVblFjMUlyVmRtYTZBUlJHZDRURnhSSCtPdm5QcllUQVRJenNGYis2TzNUMnM4SDFZNGw5WktQZk95YUp1YlM5VEUxM3R6MTBGNWdvb3pzYnV6QVNyVmFBRndqQS9LbG9ROFM4dlA4UnNEN25lTzJZWkRQUFVnZk1hR2RCTzYrUjVpRXQzbWtuSDZ1NEpjUU9DOUl3TElVMlNwc0RITzJhQTNNQk81VGNOeDdKNjNpL05nMWdLa2JtbWQ0eSs5MVQrZVEyUVUxWHh1VWQ2QUJseU5YbG9OZlF6bE1TWUZlVkQrQXlsQVd2L0RqcFFJOXBvcE9NNzNHSXFIOGtoMzhPWnFnRFdwMWFXTDA0MjNKNEM2Y29UZ3dheHBHTHhCa0tSZWNLaXpjNlF1QzhFNzY0WVJaOTc0MW9vUjNZMnZjL2ZYbEFXdTJMbkZuNTNoZmFNRUJ3eWFkUmRlcm96ZXZpTWk1KzlHK2RmWXp2N3k4WDEwKy84dmQ2Y3l6cWNBNml5SDVMTWZNRHQ5aTB5UnpRekZFZUlJQk5RWk9BaDF5QXl0Qk04NFFwN3hiWUN0Y05PekVBcHFtakxqOUVVbU9PSWg2WlBteXJvSUZ2anRCc2hBaXpQVUhuRWxmWmxzZkZJd09hREU5RHZ5Z0FXeXI0TmdPd1Jvc085dlUrTW5lS2VmditGazRZN2dUSTY4SSt5TVhGc0J2MXJ1dFAxOEQxQjJSZE9yNWFqN1QweUVlb3dQNGE2OFNjYnJMQ3haSWxvUE9OY0tBdlh6Ykp2a3JBS3FZN010aVd0UmY0ZjA4K3Zyd3hMbW1majBPZGtlRDRnN0N6bXZYUUdXSmhvNzAya2N2RFZEcVRFczREVlB3cGkrTVRyMVBzUENiTmhKVlJMMG9uOUJyeERGK3k2cktXK0QwejBMRXpoV3I3cGI0MzNJVHM5WWhxQkkvOE9kWGxFUEw2d1E3a0xEU1lMTnFWUHVuZklGamhUZWcxMG0vWFJxcWQvT1ZSSFB2M2F1TllFWjllK3hVL0N3eURzc3R1NFdkM1E5UkM1bERZSDBjSXVqSWd5UkVOWVpWdERNQmNrbkg5Nm9OVUlsbWVTVC9OaXFBQ0VYTXRzRmpHcjFXSUxRRGdSNEErVURJT2UzZkNWUFpPcld4U3pTNzVYcVVraUM4VEJtMFREVUNmUm9pT2pnRUg3TlB5aHRWUUVUdTFlNnJoRWV5T2M5QmN6ck93TkMwU2F4UlVBTytocHJWRFI4U0ZGRnN2M1Bod3E1U1ZuWGVSUHpSZWxEUTNmaTdENEtucllsaS9vYVJPTGRqTFMrSGZMUGNZaDI4UzR3dkY2ckVzeGV1U3RyZ1pQanEvVCtuRHRTYWNCTUZKUE5JUzBXOTE5M2tqcmw2VkZaQ1BhYTNRbGVmVDJvai8vdDBMeXhBcG0vMmRPZThzdTQ2Y1kvZUs3TUMvV2JLUEhKbVFGc09BbkYyZzJOeGM5WmpJV1Nlb290aWFwd2o5dUVQTlM4NWtuVGZvVndqbS8vRDBnZjcyRm9ZT09ZQ3Y4MkxLR0hRZTFmRzFQUkVRL1VKQnUvUnhEenN6SlVzeDcwSk92R2Y2dkZZQnNLQW5xWVZjeElEZXBDb2JGUjNPNTNtMTJjNHV6Ukp0az0=", + "authToken": "7gZg9fNFZrWfZ0LZdBUQ", + "transportToken": "MIIBCgKCAQEAmA/cRKjb+OqMN/xlP8lM1341PeeT+RAMa78lGdlVCHMBgZ76DSuA\n4l9pfDUjQzbaW353o4gTGIGoE6CCPYOjsE9GSv50zbzHxEo1PZM/XkLw3ak3XKPG\nTUoQPi4KxTq4w9+KyUBTjJYcdTWhlg3K14I2vb6XxdJg7whGhPEayVGOLP2d/r0V\nKLwYPzS0L646+RYzOViraLZe6OZqEayrkaojU5hhJZYk30jv/tPMps56HLyKeJZI\nxCg4uqdDRt3ktfFMRSI+P8J0MFSUi7VTzkVOStfW4jTsIhWz6wGcrbwd20Dd5gV9\nHaLiEdU1QOAsOj3VVNf+KTptlJBNlFKzYwIDAQAB", + "contact_key": "MIIBCgKCAQEAwbYFPfQ4H+b+cTuoBpNx4BGEgHJFkFmXPT4WgXYtDgDlDI/9FgGHbpfsFr0gyhJac7I5kwkSiucTrUKr2mAxXx92KZ5bBGR9DtpSS5OstKyD4Ywgif0sAWWuTySmhVtVSg/qaHQ/y5zeZoU7thWCquf4EEh6BfaHjWtNuEHHI0S59dAmza/MjsrDizoUOn8daX+1ub6AIC3rC75kDiRJDPGZZ5kQiLOH6uBzJU2MgtIfuCPGmvFhcwbp4LvOZ8zohzdMIybOAh0Xkskfkr8o15J2PdmK1tNK6N8G33L4w2BdyH5Gk346Fxg9AjjXWmcJWByM6DlhEvcleMnRQ5I7JwIDAQAB", + "privkey": "MIIEpAIBAAKCAQEAwbYFPfQ4H+b+cTuoBpNx4BGEgHJFkFmXPT4WgXYtDgDlDI/9FgGHbpfsFr0gyhJac7I5kwkSiucTrUKr2mAxXx92KZ5bBGR9DtpSS5OstKyD4Ywgif0sAWWuTySmhVtVSg/qaHQ/y5zeZoU7thWCquf4EEh6BfaHjWtNuEHHI0S59dAmza/MjsrDizoUOn8daX+1ub6AIC3rC75kDiRJDPGZZ5kQiLOH6uBzJU2MgtIfuCPGmvFhcwbp4LvOZ8zohzdMIybOAh0Xkskfkr8o15J2PdmK1tNK6N8G33L4w2BdyH5Gk346Fxg9AjjXWmcJWByM6DlhEvcleMnRQ5I7JwIDAQABAoIBAAzpJNBMRrFZo/vIDhriGOTmRf6JnzlPv1TFnppiVf5o8Ns1fZjJ4Uztsz6QvG67amvrpQq3wBSh8h3KI8oaPzAn2KhNdaOFTxB+XJ3M6eXg2alevYx040n0jPmZZ7/bpoOZK/ZqSRY5Dlmm56PrKxpY+5+aNQfQtpgmXre5KpyfClaooJUVuUMkUhXvr2SjphWrdqgyWnZMI9pDie33ArewUQjo0W/BviUwdnmRYmnNAds8Gl6CSYY4lYV+DubwMBuF2pRXyuZ+PS1nS+096cnG6cnZZcYj6VR0pSI+LAQbwQWu5KUjQ9oJ4bon2szyl9S55wxwYxz+NkOf2pN0NgECgYEA3xqDd0b7laqIoz4iYNzKgchi+qJrEJfL2lNXPuDJf9DdPYYTzHL90wrvibMkl1Sof/1kLeDnnJu9B5V9KQXh1wJvLDKmLv24Cm5Mq2Wl/sADXagz8AVcDfzlK5mkrZW0hPuIMF+4jeLxI8vcNuXcKn+FVUtZKL100QKXHmafOxECgYEA3kYG3ov188sUzw4pNITpbhJ8mC49tksLMwp9Z6r0iJuM0I5sR1VJ/ZyBk4ZUVCxSM2hZDkI0bwJM8lkZ0Sm1NHdN3MNaN/erKneui1p4Zpf8mfJLmthmY9Dmijlr7yW2zIai9hVNHdOzEXlRFWPQ64uYZxC37IgRnI8ofTf64rcCgYEAtmxEgLwerKMTNH9ytsbyIqqKHCu/5YJpIeyxUu2UdRmAPXUrLSn9V5oCgRJk4gRL/tNfHZBfcZN6PgBCpc90eU05P+duMNAuswC7Wg40a5fvaJ5HUYPgYGOfs0Xe/DyDrZTKJ9us2P9ucvmW56CNpIY+rJ5+maxIHzrB/A6nNjECgYAOnv6erwg7xDUXNbBCMygDxJWLkScgEamn7t227wjs34aQxX2b56FZXG0tnh139/5kQU3yYSp/zt/u5SuMlbjEvcBScEtD+Te6MGs74XSgEwlbuxN8GRYLJNe1afeOoKV4qLaZh2cuOhnCYX+S76DzjZg112Sx23WFHemk6wTG2wKBgQDP50ooAYXUQOzFKU/wUoyYzCC80hiuLJGucwbocCc6bI2AakSt+dGXDMWjxSjVqhzBFs50L66dmF1qffaXP2J+I68TLrLR/vAUE9kCDDWOKeVRRlo0mEoRpU3O8TMn6GgMQV/oSxKolDXrQuHZRc0k/vZ5wyEI7zwntOzDNfeMvg==", + "exported_keys": "a2V5czo6QXdIUmZsK0pjbVZOVU1OZUZXczd1ODVzNW9leEc5Ym9QSmkyMnN2V3pGUDF0UmRRblRPVVZpSzNHM0RrNzlQbDMyc2VyY0JOMEk4NGRXZ2hibUIvcUhESzV5b0tRM0FMbUg4RVkwdUZPVDlPQXRnWUtlUXJHbzh0M3N6QUJyeXQ3Z2gxMm5HTTh5enpEVmdYYkRpVy9VeVkzL2E3bG5paFRHdHVPWVFsMGF2eVRMVXVUZXNGRCtPVkRxRWthUjBiY3l4ZTdMQitiU292cVJWM0lMem5mcHNwWlg5R2t2VjhDQmY2RkVES0hFc2Z4VUJjckg3RlhZbnRvVE9xMkVjWGRPNUdvcEljZmYzVkdQbE9oQUdDNHhnWFFSQkVvSmlvN1cwdUdGZjU2c2JoMVU1VlEvTXd3NTVIUWMzbXlkUHpJWXROdThXdWhnd0FPZjEwdmlVT0NjZ3M2eUR4NDV5RisxU2VhODhKam1lSldkYnhweDBCaERreWpmMkwyTVpYb0RUTmp4bHVvaU5HcmJmMTZpdlUxZ1ZhVXhjK3V5S0FZVy9VSkhlU0d1SHZCV3RiTUhXS1J2cmtPVUxWTFpMb01TaU1UamxCbEdRY3lmZUtOeTBCTHNKSlFFcE9pNzUzRmx0SVp6Z2FjRlpUQVVwSlQzWkFRakhLQ1FkaGREdEdpNGNLYjlFMHdTdFpwQnI5ZmkxdjFhQXNKZ21hYk9DSXdKditva0k5SjJYMzRHSHcxRmFxRW04Mk8xb1diWGxwbnFQOW5vWHA5clJHZVdtbkt5eS93L0FuUDRsKzB6ZTZ0akJYQ3NyNlJXbWRYRUVWSmQrNG5VcGdJUUtNdWtwTU5QVlkzNTUveGJBOU1UUUdmUlFlOGwrOGNsSlRLdE03elRHanJZanNSZXlXb2lvcnpvVnpxcEJSK01qREFadm41UnJUdi82OWNQWmJsQ2ZYMVlHZmlZUlNLemQ1SVVRVi91ZE5wTHUzand4K2JKS2NlaStLZWg0WDZndzFtSW51Y1JJWlowWHdzaWEzd1ZTeHoyK3pFZDlSb2hmUXZiRHIvZzFHOXZkNEZsdjdVL1BBRCswZ1N2M0ROOTFDTGVmeG8raFJqWVBxRG5VNzRNWThsNTFET2ZTMVJvcEp0RDVLUHN6YzFCSWJxemI3RFpObHJEa3pvdEJ2a3IwS0J2NjZ0R01vTm9ucFUrMzdCVE5DdGg4bnVVTnIvdTFjTHhDQmxaQnF6T3FNRUxQcEsySktvV0lSc0lzeStaT00wby9KV2puSGI3Q0xhUlVMTzlNK1ZEVGRkdWlvTURUVkV3UkpYZHlLUkZZVSt3Z29QYmM5cVh3eGt0UnZteXFlVVhuSllIVGg2Mm5VbU9QdFlaUkg3TE5xS3liTXFlR3diZE9OUWlPckZiNlp6UmFuUzNhc2pFMlZNU0lvUSs0K2VkL1ZnU0xPbWtiOXE4S0x2QUJjYTlucDExeG9UVmYrZW1oM2J1MXRSVFhSdW5ZN1ErbHRkeFRndGErU3lOb251dlc1K3F4cFNhdng2c05pMVhJbGJyTWxiSjZVSTVML1BzeFJYTlFlU1YybmRvRVRnbkhidHBGa2lHMyt4SDI3UDZnMHRNOWt5c0wzZU56aDBGbUVaL2g0TVNiMEFyblNWdGd4QWsxTHZXYlZ1VTRIWXJnUGJwWmhZTUorNjNvNjdzSFdKUHc5YXJSeDc1NzhqampOSCtwQXRpV1I5bTkvQkIxTytML0krTE5McnFYN2dnTDUxeTlLTmVDYW5OcS90VXovWVRXYWhPTlJsVm40UHpiNHI5Y3dVWGc4a2tsR2dYTnROaUZzU2IwL29hRVY3dC9mSXVLcjVTRlJqdVVWTktWTG43d2hybmtPNE9rMkljSmhtMDRmZkdRbEk3M085eTUvdTl3SG1FemtybitaMGdjdHFvYVRqMW5JRHVEL0gyZ0RVZjRIdDJVdVpTMUgrVjQydXFaWW5OM1BsMndSQmQ2bXpscGQ4MEcvRGZYR1RUY1JCZlF6RFFVdVZaT2QrRnpaNkZpMGcyWUc4NWkxeWRybWpHeEgvR0pHSVZ1b3dHaU5OV0tBb3pDM2kvTmw5MXc4UnVyekR0OURnY1QyemZrSFYweGx0UThZQTNsT1dncDZzT25iSkx4NFZ3RmtuZitlTWpJcHpQcU5LcTk5REdERkR1T0wzVXZmMnV3QzVTb2ZXYVMrL0psbytPWjh5NVJjN2wzb3V1ZjNzNmd2bmlUTHFTLzd4Wnp3aFJQemc0ZmxoMVZCTXkwZFRUSG5NLysvTWZrRkJTblYyY21lTEk4Q0xZbUEya3E2RmQrZXdjSjU4am5VYkdCWE9BUnlwUzNyTis0RXo2QWU5NVFNMDFVeXVyZnRzbjZ3U3pYdG9IRllkamxwalp2NTFtWi9TZFpvNmM0WG5iaDRkaGtVNEdmelpzYjVmL2hHMUxDbTBHSkdWbSs0TTQvdzhaTUJUVnQ0cUtURE9yZTFkVGh0Sk9PK2NxY0xKL0pKckpMMkNCcXZrNE5CQnIxaDlHa2FHMFBrSWRiMkJ3K0M5NzV4ZkpPMERRcVRLSlFyR0EwaGxtb1JTZCsyUTl2a2I0MHBJTUZ3S2FhcVRYVGNDeVc2VUxFcWJYd1MrMVI4SmtaelBrcmtvWUo0c2JSYzJiVEdWWWZrOEFzVVJwQTJac0pXcjhFWmQweFVwWGgvOXpzU2lvT1prOG5SQnNidWNOdDNJVFlLZTJPWUNhSkMrSTdpQ0VHTEJoZ3U2cC9SU1F2NncwTFVjSmVVZlJtTlA4YXhxTUZvZTZ6eHNKR2d3ME1ub1hlZkZwSlpYL1BQT2M3TmhQY3pYbFJud0h0ZGdRMWVUTFZ1dHB6REEvaFh5OTVrOGQwM1VmZmQ0QjloTGx5Qm15aFNCR3NFSDBQTXc5QlZJeTkvenBvbnhqYmtreVl6T1pGRldFY25lczNvMW02b3dHSytXQ29sWGRQanVNZnJSR3RZbEwxUWlZRzE0dXpnajNTRllPTmxLN0dxWWc1RjIwZFgrTnFxM2lyVVpIVTFNcjNaK3RhOEsvUTI0N0hHU01sYUxnRzI5SmtQWWhDNDJQNExsSEZhalBBOHRoaExnQ2pqTFA1NEwzd0NVQlF3dXZnUTh3cngyYXdQbmxHSTE0dkFHUUtuYXJEZk0weklLdlBoY3RqS0IwcDRVMUVCTExGeGdJc3piKzhxVkNoSy9BY1VkSG1Sci9MRkVha1JPS1VYWnJsVk5HMklHTnY1R2NpK291RU9GbkJVZmkvTG9NVGtiQjRVMUNrNHg0QkpWWWw0Y1RyS0NGdUxibGlrSGUzUVpGUTMxVWtGTy9wR0JhSVBERXVvWUtuK2pnUmVZdzlnT2JKQnJ1T3loNTM0U2RHRGx0aW9vVEp5TGc2QllVQ1FSM3FqZHhlZnFtTjh4N0dUQlBFd2k5cmlRWkcwT2tTSG5VdlJpYi9BZlJPa0FMdW9DM2lDQVl0cWExZWNsWFk3MEJ4Sk1mZEhMcXY1RFZpcGVVYmtTcElCV0Z0WkFESkRidmdrcng0U3JvTGNsQ1JTc01lbHJMT245VzVTU1hYTjFWNHJ5MWNLWENNSmE1SmJkaTF0UTh1eFhmc2tEMUw3ZTArSGJGbnRpNDc3OTcxMmdFVT0=", "pin": "111111" }, { @@ -16,11 +16,11 @@ "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", "ip": "http://bob.sphinx:3002", "external_ip": "http://localhost:3002", - "authToken": "juhN/i0W9LbfLDz7/Gf7", - "transportToken": "MIIBCgKCAQEAwd0m8erEjxY1XLldNz9eqHH9Z290FgTYW0vrvykbzE95PZgSjScS\nILSKx+QpacPx+A/zbKvOOjQmBreSzknZeUi6wItekOtMH8buCH6STj+ka58VQ+Le\nlYee9rY2wqwf+9m7jpoRqWSvFZv8n8PvBIMgxPw93Qc6dQK1qvjGDBTmd4bKOLDg\nbUB59bIb7iV0yqfOBwVX5fZ8QO/Uy6hWfhizpncATv4enHnIPk/LtVGcDgWl7tyb\nZQHWsP8E6J3zfIMtvuYdSLrV4I9/x32jYRGAPHnOqpWdoxu2cs34ko/dgIcKQLp5\npM+Dqvbn2vEQsYXvZfTJ2mBm0L168VDHdwIDAQAB", - "contact_key": "MIIBCgKCAQEA0yxNamXLjMfRBcctz1z60l+Hr3PfXPzxl+JwjukNe6RENcPUIUmqlwy2wMYuZNgGka1jdCceik4CuFBGeg8KY/dIEtF0T6cK/KS1mlSd0+FkWkW+kUnEIjekYIhkMEmk4u2eW2b4ukB4mVAjwIvMGtqlaEZ7CsmQ7qCB0z7V1JZHR263ZZ5iuC+VumdwBSDQKhpI2n5DIH97dFLlNp0PkQ76eew5FIyrGYBWGcyrXOvc98YQIMwM15otELTB04D2MD84stZvy0aN9dvNdv4nFp4/w5sjiPbh7AFfvE7GsytsfaYnjS2wtJqdf+iyhIIB9yuTbbZ8lEUz1Hfbo+pGRwIDAQAB", - "privkey": "MIIEpQIBAAKCAQEA0yxNamXLjMfRBcctz1z60l+Hr3PfXPzxl+JwjukNe6RENcPUIUmqlwy2wMYuZNgGka1jdCceik4CuFBGeg8KY/dIEtF0T6cK/KS1mlSd0+FkWkW+kUnEIjekYIhkMEmk4u2eW2b4ukB4mVAjwIvMGtqlaEZ7CsmQ7qCB0z7V1JZHR263ZZ5iuC+VumdwBSDQKhpI2n5DIH97dFLlNp0PkQ76eew5FIyrGYBWGcyrXOvc98YQIMwM15otELTB04D2MD84stZvy0aN9dvNdv4nFp4/w5sjiPbh7AFfvE7GsytsfaYnjS2wtJqdf+iyhIIB9yuTbbZ8lEUz1Hfbo+pGRwIDAQABAoIBAQCUZExeWPwJiJxcaBPL5LWowVKSu2UZbfHDXm7kLea4nL0F3v+hCKgkjt2ZZ2pQmPE8y0/Y3mh6nckRhe+QdCNEDg+Kkb8e/e4djQzET3O84WTofpwkcmat+NW8s/tbZ1TD1mByMFDWaNmWOpd1BYe+0yhqtyRddzkuRoIUVNJkGJNhR4NP/fcW6dV/t6JxyXfBd4csi8Ic7fgt6sc4sGbnAimfmxiBstElKjjG4HSDUm6Evvckabg87bdtnBP5WFiWBncDcu/TSkyoqCzW6SrTI0FXPYIK36yYVrcuwPYG+0h8QHKZoMlaK8pAD/urCu7I15Drl5Nq7G/8rTxcBytxAoGBAOsApaYaGnJ478l1X2Ci4qd8UiVqhmdKxZz6fQsZ0utbv0SHqdJimjS1ML6C4fNC7HLXymOVOcbARMe47pXgwT+XluFPADfW1vh/E3tungHP1MfR0fddZnScZc+ZzM2GzC9G+apyB8JvUbtzzsCJMIgcG1UGykEuNgebs+ShQmppAoGBAOYKlvIt87s2C1N0+E42cgZxRcUD1T7zQnLO0wQoHt2WOS1mo+bwJJN263Yp8Mxexvc3vSB6SjBlpXlhbUy4fDUaCeX37ICYm/GGE2JGbEmbcn+NPpK2IsVwuEQN5RO6ZHTMeRkp6nDAvVUMfqZyy8mai8GfW9BjhQrUTi3TCTUvAoGBAL33AvCXb0OT0ToH4Das1Q1QqNLIHqeGwOGZdtUvZdmNi7qo87U2sbLjuOh3wpCzS5G2MEt5iH/KUo8kRfDwAycVsgilpOZ+i73Kc4Q2shGC4F06lkEgxj6DYqWDjROi4JFjDVUj4nPhKq+d+MaY35tXJR0BZSN1aIWT7sJlPNvpAoGBANG+EgbaEwI8snLzkXpudeSd3slVR1dQIOPg49FEa3AKCjP1A7gKeK7jnKhucRlFyQ+bCJvWJFKgOxHC3Q84njckeKXvOPm/K2A5qO7P2uf6DZlyxPyriGSQ89FJAfbM2c8Mp9VjvFf1xCsJa2iD/n7gpFBz5hjIxIMtM+LgKeMNAoGANst3/1+KxzoQqUobJSrToDKucEiPvKb1fLyVrJjW7A8n5Icob4DePqGvdSa45Z/VjaapIHgmaB9EKy72x9YcSc53R2yyVFobOPfUY/b9E+oYcM/2zF4MdKEd2WZ3phB0Uw4JJgWdJDydSKM6NFCKnsFB3FtryI40alWS9/NtsuI=", - "exported_keys": "a2V5czo6QXdGTkg1ZnBtTmsrRGlRKzR2OTlsNHFKWUM1d3dWcmhlU2RBSWQ3SkRNK2NDWHVwaTZvMFdTSmRZMEQ4NHBqSzJhaUpTbEo2ZzJSWFpta1NrZlp4YzBhdWZKWFd2SnJRRzNVTjRJRWZ4alF6aFI2M0k3V0JydThCNE9wbXVSaEY5aTdZbi9RbkNEVE1WU3NZS2ZJR1hMYlZXZUJYY21UakxsSEJxQWFhYkhueGFwTDVYeGJES1FLSzBWS2RmcmRWcGFhZElIcEtHcFRndmVIRklnR0twZXZhckJMTW1hM24zcytmRXNEazVOT05rWFhNckRjcjdxRVpCbXVBN0ZwbkFDZEJtTTBQSEFRUm00WjJEc0M0eGdKYVVaZmxWZm5CcWluNFpHaEZVRi9TMEVxdnpBNnkvWXViSk1XeVdzc0IwaEJseWN4cUtTME5HL0tUb21NKzZvQ1oxVG1LcE1PSnZWTTM2dURRbWxKWkoycVZLTXhJOVZqbUlKUEk4anJtR3hCN3FTWmg2RzVscUIrWnByTkZNN09VMmh2SFBJRS9NcS9PYVBvYUxRNWFXK0tqb1I5UkVxTXNDTzBhOHljKzRUbXROTHlkR0UxakxQRUM0SzZjUzR3ckhqcE9XOEhwZjQrMmV4Rmh4Qjdpa0ordG9QTDBGcXYycFJkVjVNQlFLSHdaelNoQXh1UlJqY1RqdG4rOTJRMEw2ektsTVZUVng0c1Nlb1huYnJMQTkvbm9EdnB0QnpBcGFKUGxwOEw3YTh4ck1ValBTMjdvdnpNYXl5YTNzN3BtUGJJeW9pT2cza05rQ01Lb1NZb3hxWTRrNzY5LzgyNXRTYjZiT2lvQW8yd3RRUW5KbTJkSkZta28va0YxQUxuV2tyVld3Nk1BdmRFV0tUVjZrZnRnaTg5Z1I2MlZYM0VWbXc5enVmUUhydUg1VG42b2o0K2I4ZEd1c0VFazBXZ2wvM01WdFZYeTJsS0VSVnM0ejBMRTkxVnM5SlRXVEFzNTVGNnJ4YklwTHh1U2dnUHUzWlY1cEZJN1J6cFFzSDl2bzhjdFc2V2MxdWlFdUFZMDVxNEdQTXBXaUp0Wmg1Rnd1QkJzMU1JUjJTRlZQcXJVK05XOHdxR2ExVXN5VVd2clFRNzdDVmcxcVE4WjM1YTB5RGFoeEREQklOQTVNTzVYcXJJUldMcXkwZkxqV0FSTTgyQVM5K1I5dUI2a1pjL1h6VGwrNy9obk9sSEtMY3B6TXdqRHpyOWRoeFI3RjZLZUFjNFMrYTIzcFRXQzBRWWsvdldORlFGSXdUeWhXam9qVCtQUjJjUlI5bElTbUE1MkJjeitzNis2cVdTcXg1VTJBSVBuWjh3a2VaZjdmdnZSK0kwOUV0Y0kxc3g1RksvaXczYm03OEFZT1JSOHNtTnFxemZGL1RwZm1vV1ZiRGMzTjZQckRZS0xCbFA2TTBjcUlxc2JydEtzb3JyTXF6cnJJNUlEM1FJOWRzdm1Hbm9MWjBtM1EyNHhhTitrSHpJZ1ZuRkpTMWFrSnRDdGZudUEyRXV0NEYvTGI3YkY2QjF0Y0pVaktrT1Y2SlV2VTNKY1p2Q1BzWlBkeHN0djBRSCtsN1c0WWdsbzZqQ2lzUFZWK0ZNY08wZjluM2FNdHlNUFB3WGJQeDU1RUtsaFZUNlgrSmhiSjVKYUZ4S0tYNGVVS3lWK3hjRWNqc29HeVlEMU9VNDByUll4L0g0NGNQVXYzWTZFSzNIckFjSmZBL1BwYkZQTW5DVWF4clVjeVB2L3Z0SDdka1BqT25Vb1BXejhoQk1kNHNhZTlPbEhqUjhrNTVMeHdhZTZBNDNsSU9IbjN5VlUzQlJObFVoUFJ6ekJDVEU2cHppMlc1VDlEM0lpd3ZVWXpIcGhOd2xYNzZ3SitrbXI3NzE4S29wYitrN0Z6S21JbHZNSjZER2ZnU1BYK01JOGVXN2hwS1FRYkVDcFdtcDVqdFRuSDZ0Z1FqVi9uQWhZbkRTLzgrL3plZGlsa1FxRG54bUNtSDZZUjErajFpUkhBTnV0ak9GaTB1eDc0eTlYNUNmQXZ2RmNFQzM5cCt4N05yLzhLd1c3OHpRdnRFYzJNK1hSVFZMNTlRVElzMUErTFBCOFd3VXBXMm9zN0xKeE1KTGIvNnNvODd4eWxLV29lRWhKUW5KNDJML1lEcDd3SlQzT1YvT1JDM0x4U1ZhZTIxUTg5WERmNVNPR2JBaVJCMU5lWVo5REozNGFnaWdySGN5TkNvT1VRZzdvbktCTndtbU8yb3FHelFETFFIN0RxMmY3TkEyVWZrN2Y3UGRnaWVJcTVsR2VzTzhUUXhjRWhLSkZrUk82U2k2QmI0TXQ0cE1KN2FLbm0xcTROcU1MWmppKyttcjVMc2pEbkg0MHRUUUZ4L3loMWo0cEJPYlBROUF3WFllQmNVUlNzU2NhOHdHalBHWEpzN2xXVVNZbWRhS0lmREo1a2tDMVlOeGo5R1Mza3Y0bDVxelhIeStGU2dwNVVCNUhIVGVGRDR2M0xWZGdTczBGdGNTVGhNZmNIM0FKZm9Xb0NUYVJnMXl0NlFBc2tMRGVyZlI0VWh0c0VoVi9jK2lnWkV4T21zV1ZOTmtwTTZDZzE5bW83Y2VRUUJpUlRzbDNnNmg1OFYzNDJTN25hd01NMjhKNW02ZVZMUnhjWGZ2N1N1QzE2Zytvc2xUT3FPR0pRK2UvU2NDOWFrVzJhYTdSalJHUjNCTEVjQWFFS1NQU3gzVHRJYWRscmwyL0FCRVlrazZHVkNqRzh6cml3QTE3SmFQOW9WaCtzMDVGRUcrUXk2NmZObTVFR2ZuWEF1QUpXc0RxZVhGN2VUbmozK3dnUUR2dDIwTW0wQ0o0SzFoUmxHWktGZDZndmozVFEyZ3l5V2VPa1JZb3E3NkVNMjM4QTJLWGRJVm5namhLZkN2dDgwTS9QaW5GbTlGZFVhN0tJTUtRL0NWRVZQR3Q3RXBZSTg4NGxENVBOYmt5OUFody9naHUrTGE1TFptaUl1bDY3YjNBZUtwZHZjR1ZyNzhLQVpteTBPc0lKWUtYUUhyVHhBYzY4Z0VMaG1mcWlocm1aaHIxZHdlb1RPVm95bmJCS3JFNXRLc3M4anBMUHcwWWZ4dDlLL1Y3VEJrTFZ1SCs0MjhKNndMbWg1MkRac3UwU01oWUN1OWIwcVFUNXFSeUo3OVgzRHBGMERaM3VmZVJsN3diNWdlWHRNVnpZZ1Q1RWEydjM3dFJlMTJNbGNKWU5IeUNzSWdMNVQvYnVJNzdNajNOSk5lYUlPT2UybFp1QVhuZEJIRW5VajBXTjRxcTdOcHQyL2NsY0Yyd1RUSUpvSnZ4ZXRSMDRHNDV4ZGV2VnZKQmJzaURhOVMrNjRqa2M4RTRQZitDWHRxMUYvOG1uZkNrZW50VjhUSHE1VFl6cGF4M01oMHd4eGFBa0dIMEMyNUV1TWkxVVYwQ2pJWWtsSVBGUzVpa3ZHdnZGazh6WkRkRGNVS3l4alF3K2xjM2U4ZzhBUUJuemlXVWJvSjVRblM1VVVQTGpMb0hZSko2L3dleW1mZmNRdUZvRE11eXpNNWxaLzZROWtxWFV5akpmNWJLZFo4YnVZS3Z0V1JCang5cXk4Z2dNWU1taWVML2ZNNDV0dnRQMmw4QW1KOD0=", + "authToken": "7P4qL2Xxobc1ZN76wyWf", + "transportToken": "MIIBCgKCAQEAwesSS0THuFdF54DizJfb72jtFFdtvmWl/Yzp1OAMkJrHvpPuXH6x\nkvZQ4oobPHJvqmzzagur0fLQgsE6SJGop1KUR7ga0iG0ysNbOt6sYDcNFLVa3PDR\na+biRqS5BPraEnVq/d8oLFc5wM/8n0NQHHAO86nqUUlHkeFnur3OLp1+8Q3fgRfg\nxsaPIsQYYi+ihdK20W20gnGsIHXitr+5wXPBqrp4vM3FnwoeicVMs/eROmkUzXgy\nrJ8qkOHEugzdi5DnocjrTexVRgtrRBTFgyNGgPWQSpYio5i4JkUEHsZQPZFr4ryJ\n9z1C29LAO9T94/U9gbmlr/xzil6LvkxKGwIDAQAB", + "contact_key": "MIIBCgKCAQEAtUwct6Fx6OlkjIih5jeH3wquZS44e+frQJ5Rp3Fd97MbPTA0kDzmhZ8D0heRvv1f2FmwoK+qYsHmgdZRwG/vNiSpb36BkZoF/ZbzXvijR7OUL7YFBeCQEl7iDNmh9iPX9Wuefgu+Vg456DRUS0Ov5GKCsYmNhzainZaWoNXHdIPULadPH1jRmD9uTk6QMiqk26fMajuLarU1yXsFucN9H3Is5Bra4lZ08c6gvOOUm1wmMboW/C9uJ/4Ic950I6ieoZgkwYDpUZTybiI0lwJK1qwd6wcQStq/OIX+LvFG4DtvB0CYo56gLQkhuTq5GgEp+tyJOJLjwr8oPos3nnyGIwIDAQAB", + "privkey": "MIIEowIBAAKCAQEAtUwct6Fx6OlkjIih5jeH3wquZS44e+frQJ5Rp3Fd97MbPTA0kDzmhZ8D0heRvv1f2FmwoK+qYsHmgdZRwG/vNiSpb36BkZoF/ZbzXvijR7OUL7YFBeCQEl7iDNmh9iPX9Wuefgu+Vg456DRUS0Ov5GKCsYmNhzainZaWoNXHdIPULadPH1jRmD9uTk6QMiqk26fMajuLarU1yXsFucN9H3Is5Bra4lZ08c6gvOOUm1wmMboW/C9uJ/4Ic950I6ieoZgkwYDpUZTybiI0lwJK1qwd6wcQStq/OIX+LvFG4DtvB0CYo56gLQkhuTq5GgEp+tyJOJLjwr8oPos3nnyGIwIDAQABAoIBAAXBufO2w6gyqQexWvq1brINY8ZAtnhwv86YeF1Jw0MXQ9koi7K8zFEX4IYuS2l2IDH9fxdLHKzwHUKoLIZgx4a/mUW6DaEy89e+kFHGsWCYei8dp4EtRUXgD2t7CaKINtZLKYg1FUEkSIBwEPEm4BHvctjyVjUh7f31BylqQGAZtcXjMPJWNylHrgAOkjzV43deIdZ4phrYKAj0/Rs98CwjcIf6pBsrUb1wbnUOqtVNcOpnDtNFxQeem2C2Irz2CXstN2XXV0X8O9PKfPPD47QxfB9kVKUOyYJlaAuRYjQzKd7h3uRW6sa8zZM+NgvQc7nB1dOzRhoelT5aP9oLfKECgYEA7jKrQ7KwRXgLnsj77qtnEoNME9ii5N/nBUHoaR6gj4QD6VH9S3yzl+/+oFoJAL++K4I6h82JHj2DAZ7pji+kd5NS70VaN7RHtmd2b8ypP5tHG0YQQxuA4tKK+GMoPbymnTbN9YUQdLLptXbG12C1gRjPHjqcHqPhzKYsiHur0LMCgYEAwtjKPip0cxecV11lDCH/MrqTbDk1rGLqYB+eqOEgyS85CbNunk414XcmfulMA3BP1gukUEeMkHPQJ8Lu0KjByqSiobvIkjRtnHgN9+9Fy58jhqhaUYEazloO5bEJpeo1t9oTNAIpZ23fakkfNb3or96J9o0k7Q2O0+odtKK2TNECgYEAox9d/BmV760bQB1hsnv9NUdnRTwZqeXP3uDY2YxY5o/A4fr9HMIEd6uqU4P1IGcvQ7qGfNP78BKt8eEzDuV/m0fwBt4Wv4kdh0PpbvzYdy/OjVX48wwVwr/u3dWCDG1yKL4MY/RBZbnUpSn3WC3pfsRPquL2YWFX0/+FBd6ztlMCgYBWeNnAnxzRGzBiQWuf59KXE+BrTjR4zelQQZgrQMZJIvEAUiaMkQ8uga+O8UCv4f88ciw5CJfkX9GIY+WSquJeaZRXjLwlzqi6oTkpyIHELVsZ3ss+krpvy94CqAAtJvUyI9ET6sWvRj65r7vvINoMewnlZpx1q+ewOp12ViPrkQKBgB0Lu3TpJyEgzSMId6epnqseBzChfP/AIRP9Vfpl/O1BguLLxxIKQod1mv+9Lee6qjRMj2+TmoYnQQotr6lNkNnJRLxrDAiGqACsQ5hs/7tEsA3BNR3kGAGAv6m4jPl3agc0LOcfBWq/40Ts107o4/Wh6Doyy1a/gmKCHTcxd/we", + "exported_keys": "a2V5czo6QXdGTVE2c0ZJMW5OaVhibWpCcVRoY3JPRHUzblpBUjZjdXdYSWgvd3Awc1lNY0xreHZlcGJnQ0pITDRxYTR6MTlVMVRKZVZLbm9GWk51Yk93cVZHQXVVZ21WWUdLMnR6TzlDcE92Nm41Z09OdTduSjFCOVh5c1N5UFZUZDcxSGxTbzloZDdxVEpkc3o4K29VdEVzWk9TMElUSVRCMno5ZHhUMythbDcvM1lyM3NjZzRaZmJHRnZiNXZIbXhIWVlyblRWeXBmS2VPWkxNMHVuMTNlRDRFeWhPSndQSXNDM1pPK2V5THpGUUQxRG12WnRNYndCOVc0d3AxdWdaQ043Uno0Q0lnTkZnQ085Qjh0ZjczK1Jvc1NMWnFvaTM3WVlMWG1HRDFqNXBla25uekxhZ0FmbXJFOWhUdUZGeWpNYzNRays2LzFuMFlzVDMyWllrNVlYd3BGcnpyVW0xamFrNGNFZk5iRE9wM0sxTHp3THJHalh3UFBKMnJmYnVRam5hUlZtRnA3Ti9Jck4rQ0J1T25yaDQvUHhIcE43bTZTWFVoOXZDZkQrRjBoQXphaUNYTTlmbVF3TFFQZ2hsU1VFTGlEYTlVS3ZTWHFSSWhaenJ4T09wL0E5aE15RkN0d2lFb05WUk1yMjZwU3ZVNXV5Sy9iaUFsMGRMWW1wNjNOQ3ZRbStPWStmZ09ObmFHaXdkL3dMUEhHOTdqdTV6eHZFUXRtSzNVMGhuZUVsbkdQdHF1TFg4U0srZm9TbXhUZmVWb3RoS2tsdHhXaXBORkY3NTl6VlFGMFJ6bHZJT0NRbjFkUlJpcUVYYU9ZZmxNZ3NOL3EzZEN5ZDNscGxidWR5RUgyaWZmL3VkakVpdnlNVVhXbHQ1MjFwcTdWWFNCTVJCY3VrVi8zVHh6KzhQR1hQYUFzWTZ4d1M1MlpCZk91cWJDUlBMT1R6bithUkRsTlF0MlRncTEzZkZPOVhXS0l3bXZ2YWFVYk5rWm1EY0NlaGJxdzlwTithRnhvbCtzSmJUc0VUNFhCbkJDYUl4a2NwUndPTGVFOFBrSXBZVEd0TDdrME1QM213MDNEMk8rNC9SeGV3UEF1bzhueUgrUVpCYVlGRmFTZXRUQ1NsWWV3MjhVL3ZSYWRXTFZHMnRWazJ3YXQvazJSUDFWMzdYZ0hVQndQOEp3aVIxODZsalRESDgrTWRuSEFCL2FPbXlMdVJOLytnS2w1eVBtaUVmWkZwRDJJdml1ZTN0b1hvVDlwMWlCcVQ1SzJzMEo0bWFSQzdiVVRnT0hRQjAxa0lRRmdVR0lTY1lhNXpoUkoweUtyZnd4cnhncXNyUVBrY2NSdHdBUytaZmgwMkR5ZVRibXpZc3JjMU9GdjkxVlU1Q1NveUJKdS9lajNuKzlFakxNTCtKdHAvekJVQ3NKN3RhWmFERGFUOWtNSFcrL0NHeTc0REdzenR5blJjVmpxdHFhU2tYWmkydzg5NUx3Zy9vWUdFb04yR21JVGN6Y045bkZMRWRTRGI0NHh2UzNDRTRteGREVlhtZVlTM2ZhZVF4K0RUVmhBbnZYaDhjZml5ZmVrTXlZSDBCYkRaV01rN2VQdS9VbmxMOHhvWEo2bXJleTAzb1FzdnNXczFYMUMrUS9UcHc4U1h1VkRObHBhaEZaSm5jcmVzZGFsU08weGxSLzlIaTNBb3JrWE9sYlg3MVduZlgwL0FuRWpCWVRsaXFXTCtlcjdhRkNtYWRFYU53Mytrbk8yc2NYeVFFOWtVdERaSVN0Y2JGUFBwUmJaU0NSZ0c1R2phNTEzc0p6SFpBd1VRR2ptQnVzUXRhWWVsVFNMQWVESU1NT2VOeStPTUJhZk83aVlEMlBpbnRNaDFOOXhTSjh1YXhIdHNOeUszL3FpeFplSjh6MUF6M2hlTFhDT3Z3TDVET0gxazBhZ29Ma1lmSCtqcmd0MnR2WmlRTzJyQms1UGFvWGFRMzNXdzdVUnJROUovRVJUTEFLRHFRR3ZLUTRDeUJzTUJiR3QwQVNmMmo0N2xjT0JBUHQ3K2Npa3pLZktpbm5adW9JbFRrNEQ0MU54MXBJZkhGRUlSMit0M0RSc2JlbEFueXg1Q0t3M0ltNFgvRERZWUp1d3lhZ211eE10R2pXZ1h3TmpjZTNXaVlyUSt6ZzltWktqcXpRWVZCanNoLy9UWTV3c2xwNWQ0QW9TNDk0dWYrdUhLeS8rZWRCTEFoTjBhbWJFMTBObXpUWHpmamlDRU9qTVc4aVIyTXc4cHhkWEh0K2crTmtwcXI5ZkFhbStmZ2xXTWgwMXRiTDRDcEQ4dXRhSVdlaS8xcUpHaytWQzdpemFnR1lXVXZMaFlXNk8yT0tVODREaVlQZkdYbmhDYmVIRzlXZ3ZPSTZ3R0ZOZWJITWwrTnNZa2E4L1VhVDVYNGJmMFlnQzdqZy9LZEpKVGdWS2EyWmNBaVNraVd1Uk85MWtwTkpHWmxwUkdNSlV2SE52aExmMUlJRXFCTFduS2RBRmlGTlMwU0JIQ1hSaStBRDJQZXRJZHdkb3BNNHVObmZjc3l3NThqaVhjbXhSa3Y0MFFLOHF0L1VKLzFzQUdIQTVUSmovNkVUd0NBVUlVeDBKRmhGcEJ5SERmTDNUSVhsRjRJS0g5cFBUZlNoZ0dKa21EanFVNUtaNFh4bjZGQzNXaG1zeVdJU3N6TUpZVDJpTGdJcWs2YjZ3bitXM1VnY0hIOHo1UUlsNVR3OFhHRm00bjE3VUJTUGs5bTVPR1RWS3BjY3l4WXBYMjRMUEdmZGdyZFkvZkREMHpSSWFYZjY2c1ZRVWllY054ekc5Znd4dVhNYXhRZ3FxR0ZiVDEwREN5TUYvdUdWK3d6UEFESU0wdXhiaGw0ckhIYUU1L0pUYjU1Tk9ZNkVzM3NXZGZ6dWtGK0U0R2ZzYUpnUXlwNkY3elBGTk9uVUdoZXR2Q2VISThTaE1HbWxVbTh2eWpxM3NIdXA3NllyN2M3c0pjOE8rNVkzQVZQK3RmcG9WM3lCOFdCY0RsU3BiVlkyVGgyM0RBV2tLK0R4dWROM2R3SWJicStSVGZUcFV6STFGbUZaNFhUMTVmRGkvaGpQenVuYWJMNWpKVnhLN2kyYnFYVUN1SWU5MDczaWM5ZlRURTF5Q1pobm85WGw1Wm9BRUFzNi80amZSVlBudnFlTkFmdnZRdXJnV2ZWWTEzVk8rV0g2NUY1blUvN1FMNVdjUlJiRUxRV0w4aWdRL05ycktiOUprcDQ3MTVpZTNaTGlYLzlHem9ZNEZ1dlV5RjV6WHdiSjNuU2YwL0VFM3ZhRisxTWJ5ai9aY21mVUNHYVZtN1ZCUDIvclMvYVMrM1FvaWtvaG9BQ3ViSllIS2FIVW1EcnNKVEZQK3BPSjJHQXpNU3ZKOCtBSExxMDQxeTZQaUZGWTFJVTFGU2JFQzhYQVMweCtLL0N6R3lteU5DbkZhYWVKS1BEZkJxaVI4ZVcyeEFQY1JXd1o5eDhLYlNCbWhtdTkzaHR0ZDkrZEM5Tk9RS2s4OW8wSmVZSEhibExuaDVaVUc4V3RicDNQMzBPTkk3VUFkYUFBUkZVbVZERnVnNGZxNVR3M1o5YlNZUWFBK2IydWRaaS9UVkpQZHBPa2MwNnI2WnFoTDdwa3E2d1I5WDIwWUF6L0dGcG54ST0=", "pin": "111111" }, { @@ -28,51 +28,51 @@ "pubkey": "0364c05cbcbb9612036cc66297445a88bcfc21941fd816e17a56b54b0b52ff02b9", "ip": "http://carol.sphinx:3003", "external_ip": "http://localhost:3003", - "authToken": "UbO77cjm7Peg59oT124s", - "transportToken": "MIIBCgKCAQEA4UP1X3HhARf0CtZ4bBLlPWjHFbI3NDStDFzTLLAXah84Dy82eA9u\n4lRSj238jXbbTFmL5+oUGUMBySd9qK27iNLuCm9YwLDJ4leWDcLrlDZaPQDHTp4v\nqshogUW3BtOIwPTBDcnHmgC3kTWnliPQwhXMeU0oHJwoVORN5s1CLC0Uvosw+SdA\nJPsqdMH+ZtJP+deKG4iIG3w7l5/LWQTqhAUhCMLTUukJlbMcGS67C7MqiUeCFJ/F\niu8+IKpWq0TVV5CXQNPDttSqfdijTsSYjofd0OgpGmH0dDy6yi9QM+Bb03mS1g+J\nTJSXj7jPNsZjISMOyue/Vne3qT6uqnkOTQIDAQAB", - "contact_key": "MIIBCgKCAQEAv7IrzfQgGkE1AQBUKyZFox5WF0yB3Ql28vexXTEUUuAhD/1DG01Q4cd/aBcPmRpOqiELy1tntPRIMON9eCDevGuv3wV8FR502RtsngFI+hhfM8kFD+Q2J42Bd+QLbyANu/Ha2Q3mTvc/OnJ6ejzYLbLonST522LSMF2ls9MLPMQn1zsEPxr4SMMNOXQT6amrZfHEwoXsXVS68bG2tG5E/a9criMlLxOCEZQd+4dvfejDq2RjWZ9iQPs/50HyBwIur4SUm1CoeLGlI878LdMIShqOvEELrHKQqoVS8aPYU+NGCmQtcxT2cZKXZGHl0xcFhSuZXQb38nlVOnxETttnPQIDAQAB", - "privkey": "MIIEpAIBAAKCAQEAv7IrzfQgGkE1AQBUKyZFox5WF0yB3Ql28vexXTEUUuAhD/1DG01Q4cd/aBcPmRpOqiELy1tntPRIMON9eCDevGuv3wV8FR502RtsngFI+hhfM8kFD+Q2J42Bd+QLbyANu/Ha2Q3mTvc/OnJ6ejzYLbLonST522LSMF2ls9MLPMQn1zsEPxr4SMMNOXQT6amrZfHEwoXsXVS68bG2tG5E/a9criMlLxOCEZQd+4dvfejDq2RjWZ9iQPs/50HyBwIur4SUm1CoeLGlI878LdMIShqOvEELrHKQqoVS8aPYU+NGCmQtcxT2cZKXZGHl0xcFhSuZXQb38nlVOnxETttnPQIDAQABAoIBAEeu3biPUK3gsmxkbhUQo7vCrVjbEDjSwDtNKnL51mrDSznKcBy2hcdYLamD7h5HeyEdaGasEJTXQGOfvhx81i3JayPPzj2rfPBu0+gl/N8g3ADma9Esep/Bx6dIjIoKh3g/kaHXE8d1p5w4kNpDBGfaXifdWt2SD51sd3lOMwaOgcmh4ZpYzjujMOBsC119n7BR7ju8FHWbzJyI+I1Di/sV9X6Mhux1d3DRTSthunB26IHhbGzeR4EW5LkgoZ7yMlBprhQ/zZRqJqSjgBkCOaAj4p5lKWOGJs4CRkzjfemiMz6pWAgg0gbEkt7YvuWVH61VB4/bA4T9/dDmEakgaeECgYEA4uDkBqWXHU5q+JD1Z+OJiUwyJf/WGn6/DsIHfpzE9ssRPG0XqpIBQ+tgU//9RSCBdOm8JabbZn8XIj1FRbs8CMkBfEOOmfrMXfUUcnxxwOGXsFxIiyR53YKwvXxyjp+avK/vMSH5V7CYNw6lV3K+75qqwLXypVLgAFPBI+SkyEkCgYEA2E0zo5AxZiqJlt8eJItSkIlGIKDsDKRTG8GhlFFSfHoxu3c/tuXFdI839QNQBmMHwifUh2GdHCgx62smkGjbieobBuYTVAdLaxvHM39nKfJclitTP6ov2etDgbE3ps7eAnHcPK4cMWt9/+dONRSe8CYkfo6hNuOmNqv2hvNjr1UCgYBR286qT0jMvCSAdtz0lPZk4WceqsY3XQ/WZU+K8UlnujEH2ly1oGRwexaQeEaLkITlCAholWGIA8b3BaBe3oV0rgGpMj7bc9AU/n5YKGpqq3qtmT5bZdfKgoL+e05iA1gzSE9HLPjoGMFy7AfgG3ikvutpCLz5xYMo2w9OwgpqcQKBgQC4N8grHbt0z/Wu0QfTB/Whs8hOMb/YZHuDwD3lG/2slkWU69MP6lFpHDEEM3YMens5GMMhKjmsqW8amX+WrjeMFh4+meUMQ8ovxtC5Q2CRkSDZpLyaFE/8wSoVYuGK59SdMGvqIj9Qt8PwFwe8nXtf/JxITSFwpiIBniOwe8oCoQKBgQDL01LN6b8MLj5FW270lY3h+x/THcOVjugyhUjRp8URzcjpLQClFX1QihdC18o6ovVUd5VngVED2EPJYDwKFKf+8YYgNUwlZ4acCRw9wVdk8T1b/Q8GW9B8I3CTC/lVfr/e5JFMGnjstwVLzFscgNKKW0057ukDdNR4RAwQ2e5iIg==", - "exported_keys": "a2V5czo6QXdGYmNWNzJPMjB4cjcwNFR1bXVNZE1pS01LL1grbmRVT2U3ZjlMK29WK1JobmlSRWpDVVRJSEh2SG9zSGlOVExpdEgxQUhudTFGdDZJUHo1RzBNQlEvN2F2NVY5b0RnRGhZc3JzYTkxSnR5eHV3ZU5lN1Rsc0IwN3k1b1hkZ2tJenQzUGl0c2w5OEdTc09tdnZBUnV4Qll4dm1nQ0xVbURqeFRBcXRNS0lFSXE2MG5UNUZYV3FSbUNSUHE4OGZXWHY2UDZwQ285My9rUGhJS1YvR2FYMzNWaXRlZC9OOUViUVRoOXZISXl3NTdZSmN2dk9NWTNjTVp0L3IyZnpJNWNTUUNxMnV2RkRTUFhKcklRSXNTdUcyTDQ2M1hzUDNEQUFqbFRlWkdtQUY1TXp3aDdPcnhKZ0FSN3VNcEE2Wng2QzZ1U2J0Vmo4UjdIdDNHN2ZmSzg1VmpSUXIyR0cxaFVMSHRSbFVLVkEzeDRTQVl1NnRvMFFoYURHdUhhQmgrMUxsVStoeTBSUGp5bFp0Ync3bS9CVzBpd2o0SjhQcFBybWJxa0FJRzVWOWUwR0pZYjlTYUFKUHJEWkhhRnNOVnJRYjJNK05MdTlFOTROYjZKcmJsSW9ybjNreU5Md212TTJoU1h2VzNxdkZWUzBDaTUxRmFWcGNqaVdGNWJnQVYvQWRKTi9Od2dTV3RISHNxWU5CdnJmRlZ6RnJwNWZPeHJwRUZoQjM1ajIyRFJLZmZpK3o5OHhXOFpLa2J1SEJKN2ovMmsyUDVQK1g3N3BxQmlocmxlTktzTGlYR3BTVDh0dFlhdnY1TEVaS09IWHB4OGlUL05LK3FENGdhbk1VZ1RjY1FyVXlLTktycW00MTlyWGJqWDRBK3c4Y09CWU5kQ3ZjYVVQS2JvM2doZmwvaU5nNWFuNERhUG5tSzl4WG1rSG42VUdlS2R4TGRDcExobjlzbFdBODZ4bXlpdFJMZEo3enBWVnVRbHdkcy8yQnhiaHVqQ21xY09ENHNiZmtRSC85R2VqMXFKYWRBTFhYaUZGSElIOVNMTHFBNEZQcEdLL3RPVDRLRC9sU0xWZm5XU2I3dVFVdWNXVWc0UmNWY0JlTHB1ZXVWODdYMjlJM0JqMzdLY0Flc2xaK2FWUmc0WnQyWVBCRDI4SThkTlVmUG5DS21jQW10ek1wOVdsc29WK1VOR3YxYlltQzlrZU43TlovcDNmYm9Ta085WWVZdVptRzErUGZzT1JpQXk2QWFEdjFrVFVYZjFqanZXUGNzUXlJNFhPZXp3TjROYThrL2I2cVBzZ1J4SzBNSmxEaVZ3Uk9CLzNJRm1GeEx3YVNBUXVSczVJTWRwWEVqZS9CZVZKL2tNSlpKaG1jRzMwY053RWlYYTZEUlUrVXdEakdJakI4aHJvTkxyNEVLZ0gzcTk0SmtLeEorUUdMdGxKa0lZMVh2U0U4OWxSNEpaelBkdGxuWlREV3JJNDlFeWhLcFUwK1BBU1hlNUxPMHpBdmJhUVJDanMyM3JUckd0cmswQzFwS2F6b3YvNXl0MUVHQnFQdDB6UXl4RVpVOTFXa0s2OXgwWkpjd2w2VUJqVjltN1Zoa0hFOXhGcGxqMVNrdm83MnRHUitLcXpPekIzKzRpZi9kZExmbWVrTU1LRjE1QWtSWXVYTkMrZDY3dHJKUnFpWTdUQWJ3T2xFekZpb05sanhVNUNpMXNJVzVHZ2gveDZqaWtOdWxlMTJ2SDc5MEcyaGppbkNLU1NTakdFaUxrMWJrdjViOHZMUkZSR2pCODhUUVFYT1BpRWZ2WWJvSTdxVkpDRExPQ0p2OU9nOWswUXR0ZmJvQkQ5OGhRaFdzZFVsRUhPWDF6TlpJV2N6RTBIOEtkMEpjaVgxTnRvdS9lTEk5KzVSV0xlNW9DZmJNN0QrREh1ZzdTa2JPUE5qVkxCVXdxVERnekg1MEZmd0djMkZPcVFzQ2phL3JNaCtOWGF6L3p2cXBFRGlZVVoxeGFXY0FGZ0lKVWtCSS9LcGQxSjRaZ1ByMmNKbHZOT3FjbWhUT09RMWpCQmNIc0tWUVk2Nlk1VXEycUNMRWJ4bG14YXdEV0VENnMyTUhhc1U4OUJ5OFArV2pLcHZvV0FqOHJ6NWI1eitaaXdBdDhrbEpTSjRIYTc5b08yV1NLOURwZnBnVmdzdkVXcitkUzUzallzRnREcXhrSGtiaUhlMHdjeC80MVpzbmkwL1FhWWdseXcrRjNjajNJNmZNRlgzRm1Mc0ZZMmpNRVhKOTg2c2ZJa2NvdGhubTUwUjZScFBoMFFYVFNzU1JXQTBzSDFpaktlMVJqa1RNcVEzYVE5dEp5a3FtcnpoaFBYaSt4TjUyN1o2ckU2KzhaZW83a0dCcnFxbC9VcjhVRGFuTDVVUjhtaWpFQnFnMCt1VXlpdEt4Y2JQYjFIakZwNTEyNTlaRkFvZjdoU2theW5CZUVsK2ZTUENTeEF3RjhDVStEY0JzVGNVby9XNXBCejNYMC84Q1B2SjJOSk8zempEd0NnRzZBbytOK3djQjJPTSsrYjJXbmhIVmZaVVplQUJOVDFxK1ZON1hDc2lkR01Velhlb2xrVm9kbFpvVDg5dGNpdC9kWkhra0puNHZNZGZLT1MxZlcxRnloVnpmRENTRXB5OFpRSStKU2FGeC9PZVFWcVZGRWN0WktxOGUvOGhadXh6aGtwS0hhSEwyZmRoQkhPTU9SaC9PYUtoT2habmVndEFSSHpVL0IzUnEwdHNPdElYa2VvL1lBRmRaZjJwYjN0eDd4TzZjdi81TnZVS2JoU1hHaDdVT21iU3RlUHZGakRrMVJ5WlFWbi9HNVE4dk5UWGc5dWVuM1dGWUR4Y2t1STN2M1Q0ektIWTVEYVZZVUJ2S0Rta2hWODVqWFU0eTlyNGdVdkFERWRPUE93QjdmNlVHblRWeEp0UXV5cVMyODU2Y2lrRlhQbzEzNTNOS3R0V0QveElwdjE4R2p0M2t0aWMrcCt5Uzc1SE9oVzJXbVZuWVJJWTlRaFBNYVhFT3BQcHpQTnI1SzdLOE42YTFiNTh4SldPU2F0aVErWnZLQ0tEb2JLV202RTFwdWdobWZUQVVkUkdDSFZiSlFrNGp5Mkd1cS9aTUs1Qk9NUWp2ZXZSbW1Da1U0RTlBcGZydTJFdVRrSSt1bDZTSDN3S1J6eDl1YUJlWCt6OGVscnJGeDlqeCthMGExb0gxVThCdzhnM1N3dmJjdFBHWm95YmlyWm1IdDdzalJLc0tzRS9SYlRKZ29aNlh2QnZWVHpKWmhmS0RKcnBadlZLaTUvYjc3V2RxdjBSbTQ2aFNWYlpHb09RYk1idVN1VzhTb0xpdUlJWGN0OU0xVG9FMVJlTi91N2N5YTJXSU81Q28vVEhKUitpSXMyaFd2NUp3ZEpNZngzM2hrL2pFT3FrbU54c0FPVFFxSHRSUThaanNaYzZqT3dNaU52THpDM0ZPMTJnQVZQQ2VKTlVXcDBYZ0NRQm9PQXNNMGtUSTNud3oxdkwwMHlKUzNvWVFZQ2xrSWQ0VHRNRU9kRS9tSktkSnZJTnNTMEdFVEhRNkdIWDlPUE8rZnY3YVR0TDNYSGRHUEJ4ekhjZUVxTFllRlhKTHNodUU3MkVmbVYzVWQ3eWRGVyt4MTNrcjltdz0=", + "authToken": "vPhLNeelF8BSdz+J31C9", + "transportToken": "MIIBCgKCAQEAqJi4ThRWxs2ViYeA8XIWt9tGriSCisa/RNzADfvLFsOOCnP4/G4l\nr64Rj5mvuRM1/sSPiJajzMJzoC4U3oEBnRh8M+rRrnzheN7oreFipprSmJ/NkCuy\ndHWdaFrJB6sHBIRMTl4UpeMiWNbPWgiEKZSjbfKHAAnKbIeGSRTCIH2pWDPnwJiV\ng63ibcp9P12gu/5Ahxk/IvX9OZoHn24cyUm9zCZ7lRqPY4uPVT75II+MpX+oJ+sW\nwjYIVzW8Dd5w0xtZJuGzYtLPVu5bPEFaSS42JGzHLfBNu2jSEmlmFK87jjyhHuo+\nlkmL+us7+PYdTqV+BbyfXQYSdI1y6LxLZwIDAQAB", + "contact_key": "MIIBCgKCAQEAuqvyOF3yM6xMdJE6aZOT3cjrwbDWGkS+Mc7n/ZXZA4qilhxq8lwst+76m3h440Fkwf2PvU7Eu3YBpJSEMEvF5pBgfExlQYG9dpZIgm31P3C14WQFR1jCWufgLAs6WsVVNSu1vIrNPshUvAxVvRtcaQ4Nent+Mbes/0ZG3ZDOzY8U0aDCAITi3V0kuaUGXfoYd9Bb+RwCz3IMkCjgS7HURenl3SSntOqhIQqkeLZCU13KmZAASC2n+SSqu1mFQyjLCuLcVzr7O86YEUrWCFKOJfuhfNqUI+EP4N5gN2QgFtHUac+u1EJjlY5xyGW18tnZblI62WummDgGXJP2fAEg7QIDAQAB", + "privkey": "MIIEowIBAAKCAQEAuqvyOF3yM6xMdJE6aZOT3cjrwbDWGkS+Mc7n/ZXZA4qilhxq8lwst+76m3h440Fkwf2PvU7Eu3YBpJSEMEvF5pBgfExlQYG9dpZIgm31P3C14WQFR1jCWufgLAs6WsVVNSu1vIrNPshUvAxVvRtcaQ4Nent+Mbes/0ZG3ZDOzY8U0aDCAITi3V0kuaUGXfoYd9Bb+RwCz3IMkCjgS7HURenl3SSntOqhIQqkeLZCU13KmZAASC2n+SSqu1mFQyjLCuLcVzr7O86YEUrWCFKOJfuhfNqUI+EP4N5gN2QgFtHUac+u1EJjlY5xyGW18tnZblI62WummDgGXJP2fAEg7QIDAQABAoIBAASTyMm3DARWWj2VfhAurTaIAbfrJSTZwKwp/ahLL1oV4Sy7H6g3uGT+OCjtyFESPm0/UXH753kNSLcHaUJh6UVhDuydVvJHQyUQRFDmb1gR5HPVZwe71nAyNV3/HHwzUIaQPtGTubqrYOCHkOalMBvnW09AjfScI2LTD1PJhDioGco7A77Qo3NrgcXS/Qg0vsa9Al7M5+cPhIi0BgRzVvjBP9QgxAoNP8VNEfVeFCAZKN2Uh+NTcn3dkzNrxaBim83UZ28vLys7IdU+4tGQFM9v62Mk03LSDrPCsx1iS+N61Z+nDASliKL3SNZPaDXMOtbt3zVZyhXalEovizblNKECgYEA4BgV08u7799m3jPtcnGk7UrhKhP7g6bZWpGJiDLL18NZvtaWQ19bMOvCnWxLGZdVUxrmpUCM/9H9C/l48OJ+1L/lFmnzW+F56PTZqEUnn/Y5AttwifMH+eBeYD61Jwnp7L84zdoOc6IQWpdUu+nnIE/rsHHQpTf/2xzdwCAQ0zkCgYEA1T/dxZxuGqYxWKFQiBqQ6Pzb5uTDq5wGM3kJpM5JpI9Fqjsw2rm3Stf0guqj86iNfZb4xfHosN1jB5RSJ7U3ZJ7AZkBWYaLszulZwD/q/Y5t5fz6wH1kZJE+EXs/GUPo2CLqZ/Sy21JKWTUrVo6xTq3RuswgRcYRRq+6cySX91UCgYBLMenJGvkiQX18HEKV/2pPMawieXgRMiCHEoTqzdi2utdXgRwE2W95F/NC7b65hJ1d+I3ib6mgge7+YKTjd60FaKrPfZfqgdttfxO2MhZcx7tTqRy3PXS0tUQV2ZTh16LGDVhbQstMo9oG+/az44XpwsecemR/vC2/cY07VccviQKBgQDTvwYEOY8u0QVAv3VKoC5x2tq0C0Wr+lJB/BayWc/QIh+HqBybozs4ivUUpc7EnAJayXUegFWQgVPa69Ej8pIdTHE5VvsvGetQjW78MbuxqCLB8xA94IS2Q25BR4LhIIhtTUY6kUSj+LMwn1X4LdoriPcvJ4+IGOOAr+9Qc+6dvQKBgHwENGpR/fXKbjrKhNqhlx/fcWok8uOOI207WyybJDtdOzgYOwuW0npjKke3xKoOUKqnOK8uJHffvOfkZuBgJEP2qgfyKwFRK+GAmeEnmb8vuvvNPhptd/vugM1cjjCvHpSIQpe9sgUlwKYZMFXXNxv26l7zrgcnfr1p9lTzTXp/", + "exported_keys": "a2V5czo6QXdINlFKbUoxWlF1Tm85MXZtTTNOMDJQcmEvTUZaUGdmUXpZV0owcXMvdDhYZVE5UVZhK3BFcFBtU0tDTVVaSGV6dzJxdVVXWVVFZ3ZCWWRRUWVBZGVSSXFJeUtYRCtac1BYbmxFQksrR2dKcFdOZTVIZUJ3MFZ5Y0Ivb2MvTXQ2SlREdm1qbWlORWd0MVRhZi9xTHpXdnRTbmo5NnBER0JqQ2VIK1JpencwaXJNL3NpdnB5Z3Q0VUcxNnp3eEZNTDhHQ0wwVzV0dTM1L3ZiRllaMjN0bVlsV2c3aTRkeHlHeWNpZ0VDSkhZN0lSVTVUSjJQY3JDTW13Y3d5Q3d5TXVkWU81a0xTbHQzY3dDMnREVGJEWXhKS1A0VklUYjJHdktZOTczR2lNOWxqSG82ekJSS3NWbE91VlJsQnZldklTeG9hMDFiSnBYUVdYS3VBRitRU0RpaTdUelQwTE9jSnBXT3dySDJoZ004VmVneEdFQXd5bFN2SFlrSUdwb09OSll4K2FGV24zSVYxM1cvYVRiOFlFb2NXWGpQWDNCTGJrd09xUk4zVDdPeTlpQU5iMXhDYkNIMWh4STBIYS9RemZLYkM4UlBBYitsUkRCcmc3RE5qUWY0c2lDcVJoSjBuYmVSTFRhNGJYWm5EcFk1anY3eHJoUTJ2SWN1bWNLUll6SnczbEpHUktxYVRUeE5JZXEwK2ppcld6TUV6ZlNrcXdBQlUxWldkODRjWXgxaXJkaHVqUytwRi9EclJvR2xOYTRsSmlyUWNHeWUzemFQRHZHejk2ejJBdkhpeFlDdERneDBsQ3VWMDV1dm5rM3pxanBiaFVBSnh1VXhvMmhLS2RodFhKLzRSR3hHVFpqeEs0Slh6RmpZdGRYckVwQzU3QTRJMTVTTnhYekR3UU9RV0h0aW1XT0tjb3B5bjZ3VWt4SVVDZnJtMGsxR3ZYRk5wSUdGUTJGamU2Tnd4MXl6REZVUFIreXBZQmtYOThDUG9IZ05oRFhXZkVJWXdDdmxKSHA0ZmZLdDIreHlqakNGMmgxNlFlcmRHU2Z4OFBETnBySjZWelBoU2s2MDVINGk5NVJXMTNrTDFBOHlvWms4c2thWXN6Si83UWQxSzlqZVdvOHozYWNSU2c0MFFub0M4Zm9kSTFRbkN4ZlB2TE8zWVYyS3pzczc4aEdSRGVteVoxTjkrbjl4SzQ1WHpnNDEyYnhGMDRiSzVvQzJ5c1pNRytvak9kSlp2RzltNHIvU3o3ZVhuaC9pdXY2UU5KR1lpTGtaNExPeENiMWpPaE9ERngzbTgxMUNWcjJaYWVyckFnSEc3UkcycHFCTzRpdVdxandvYmM2dENubHp4NzZDbUQ5S3BreGdycERqWmVLRm5SKzBrMm8rRUlOWG1HODBXQlFISGpMR1VHakFIRGhaeGlYYjlTQWRSYTdXakJTT3JmOGZ0dndWUkZLN1M4ZUlqN3RDVWhkeDUrdU1RQVFBN2pHSitjdkZ2MnFzSk41b2ZlWVNsSXdmUE1YRUJnS3hBVXRJUlpSUkdGMUZsczh0ZklEU0hhVm4yc2E2cjdEY0pTQVdTQTJOdHB4alBIUTFCVlhYSXZ4Q0VYV3RuekpETDVKbDBVZHE2MU5WR05sc0hqeGluL3BCNmltQUFxS0JHb0xnUWZHNzZISWxseDZrMkhaQ0YwV1pXOGtMc24rNE1EQVFVVGJ0ZVNJdXFiWEpaNXVLZzJrQk0vTUo4WUx3NXdia291aytQeGxLUGNyTFNLdFFSNzl4LzMrTVpveHJ2UnRIejU4amd0OUNlQlMzZWxVSEJERi9YUzU2a2ROcU9raDlReUFyREJCSWpaMml1RGR6RHVCcWswZ3p2eEpMRy9yVVgrLzZRUmNpbzZINUNYRDVUU3haalNlYnNvNlFPRG95S0t1WFg5VEN6ZU5PU0k4K1BTaFhOaUczenlTSHlwMlJJa3V1ODhReE9ZR1VBdVdUV05GdWJTWHp3ZTNtMkFDcnpUWUtGblpJbnc5cEplSW9FMGxXTU5INDMvS1BwSTd4RHc5NlpyVGE3UWpJK3d0Y1JIVW5FWW1Ddnl3NUxtOFhyc0hrYXJnUHNpR21USHhzNHB3K2pHNW51TkxNbFBFOXBhZTdOcjkzbW55V2FMelE5TENSTi9RSm02OTdCS3FKU0p2VmlrUXJNUUluaWVlRUNSWlRaZVJnMjB1NVpVa0ZBRFY2YWFGa281c1c1bWt3UDIyVStZM1dFVkl4aU1CM1dRSmVxMHFmNW1HT2tVWlRVTTYzN3VJbzhWeWdCM2dpSE5UOHpqaEF0SnVtQTVhUXBDcUx5UGs2Z1drbU9WS2hYZWs2cUUvbC94K2ljc3QxdWNrblZ1ajR2TWJ3dzFOUWw5eGRZWTVoT25jWElKZm83U1hUVFlaZXVJSG8rL0M2MjJSSTRWMGoxemVTdzJtbGtxdFI3cmRMc0RnZFc2WWppOGVEZ2hlQzVzbVgwSjBCQmxRMy9MQ01IRWpDY0o0RzltWHBDL0ZOa2V6bVhPQ08xYUxCL0dTZDJVYkcrR2x2bE5nMWZNdkJjUzNrS1hBTXlBaHRRdVBlMlRVQzdHTFVXTHE3WmJlbUI5OG5TUFlDL0VoRVNzTlRvMjZ1MEI0Zld1d0huN29YZnBoWDJPU2RpVjNLRCtPUlRSbDcyd08wNlhkUUFZaWJ1bU1yY005R3Rack02VGt4WkFJT0pZQUlBajE0eVR2TmNGdmJJcTd2NXVYc0FwdlcwdExGTm5LeTZnMzRUSWliUHYzRGR6cnBPOUZCSXFGc2RNVjR4Q3U5V0FrRnJVYWRhbkxPSXdaUGYyTmxSUUJtZkVVeWEyT1hZN09CbVVrdWFmK216N050SGFPMjcrRjdTRjFXQmVzcHd4NjJaYU5YMlhFbFg1cnhiNVhzVEErOGNvL3J2SFQ2QmdMODVjb0p4am1rdUYwQ0RjcTdFUWpwMlA5QnpkL3V4dFdZcWVXRFRwclRHY2NnUmlLanpSSW1XbUVnVjFVa0tWb3lzc2UvOWluLzM1a09TWkhvdGdnR0FISkg1U3pPcTMwVmRUZzVsdG8xbnNLVVZZcHhTQWNQYmZhNGJlNjk2MUIxVlRIK3ZMSEFuYXFGbTZiV2NFT3lXaUJVcEh6ZFRkUGpsem1NcFN5dlRJc0dLRDVkOWdmS2xFQzdOclJlV3VTQTJRU0tITGM1b1lSQ05qcENlelpGWHNUOVp2R09tOC9lK1BjTzZZTHYwNGttWUFSRHN0YWFJTnRwNXRpeHplL1pPVzI0TzFrSVI1NFltcHJCa3lGcnBxTEU0RFlRRmtVb0hZWFN2K2ljZkIvNzBlR2VheGUyMUVoYkZITmRLcW91dDlMWUJnS0tYUkQydzM3aGZtQ0pHczNQN0VOYkp1T3hEVmpTb3RwMTFtc3FZeDI2YXRsM0h1eitEbnp0NGxXdFJ1M2RUNTVCbkFXeWEyZ2tzQjJHTzZoT25YSG5QWWlzUEZvR0Jmc001NlFDR21IVHBaRWFhbWVkeEpQU0pYRDFZQVJOcHhRR0hqRGROMjlWME03WFNjZFR1aGJ3QVE5YnV1MnZRckttbUFhVGtyYjFLclk0UnFMdjRpU0p6QjduK2REZVR4Tmo4RkQyZUREcW5FcUJNZThsMHVLWT0=", "pin": "111111" }, { "alias": "dave", - "pubkey": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f", + "pubkey": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", "admin_token": "r46bnf8ibrhbb424heba", - "authToken": "G6OaAIhl+CHta7ltKmJC", - "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", - "contact_key": "MIIBCgKCAQEA0NMz+pczCYOUmO8N9zwG8R7p2fU/LhSe0kONh5mcRql8zBwCoD18PVDpF8ZXo3OasB79WNJQ/TQD8Rcw0mwDXof9rkVlB+F0R+qamDL1/TwwAw1wiql7uI4NICQy1MmTLfnYDOHe+YAhaCimJcZyNr6ksl2184vIlN4BWINnRe7a7/dndmO6BhtkWkA6uzkBIEMFtRu9yIqCC3kpJj3YMKATe/gqhVKL0FhAdTEBrC/In51COqgax2LF7ADh4LtoIjijQQfYwPv1AVW0XnF1sKPxB2fvZ+5DL5nC9t1WrHKGzPU7FovQ6xPJQgy73eqte1jurgRdTIcJUUt0eTuwxwIDAQAB", - "privkey": "MIIEogIBAAKCAQEA0NMz+pczCYOUmO8N9zwG8R7p2fU/LhSe0kONh5mcRql8zBwCoD18PVDpF8ZXo3OasB79WNJQ/TQD8Rcw0mwDXof9rkVlB+F0R+qamDL1/TwwAw1wiql7uI4NICQy1MmTLfnYDOHe+YAhaCimJcZyNr6ksl2184vIlN4BWINnRe7a7/dndmO6BhtkWkA6uzkBIEMFtRu9yIqCC3kpJj3YMKATe/gqhVKL0FhAdTEBrC/In51COqgax2LF7ADh4LtoIjijQQfYwPv1AVW0XnF1sKPxB2fvZ+5DL5nC9t1WrHKGzPU7FovQ6xPJQgy73eqte1jurgRdTIcJUUt0eTuwxwIDAQABAoIBAE35PuRoBrebuSWtxYI2mMT57QnkiDXVn0QV00f5tJ+x85ZnMxfQPY7Lom2tMtYmeXEf8St0RKd2/63LIgDAMjXfA3tKECJ0La4YzKbeCHoJOkg5gXdVN4w/Bmmk+pH3vowhSWnuAQsaq96vpvJd+hG099xeH22UGU504v3A+xPiIj/g61NAMvvmFEtVSk5Pt0cfJzjMm/HGRahpJ3AZ3lf+qs3IXJdf/ctUGlHeVq0gr8jjCp4RykD8Df6gnqg7E6JD1zlWqwqAsQT/ysEXDRWUu1pzhCQSj+xOTWN2/rUjasIeu3+QvUe4coAGD5FJRRIxp7Jn8pWqGgp4mrTFySkCgYEA9gHTly7iUmH+UeWr0MlwP53+pI+rZ4KY+1TWvUh9F2c3ng0VNId3IzEB+PGn3wJFXIY7PFe69RlW5CrchjNAAFH5gCfI4QFr01WYW0D7XrTFmPNw3YcLv9UeXAjGuFN8JuDv8GgGJq3O02yd3wVIY3eZY9x6MbGB/yAQWN0E5k0CgYEA2U66VwpyjsaoBJRNjWb2MaKsAZJdQhbYGcBNf2JrtT/R8VfhWz1Mk/M09ABFJCz+Jz82h6M2X5NNz0BrQyMKBtVDW765lNhD3Nv37y8/ZV0+rEeSh6rQKfZlVPBda1N4CK3VTIptjZy7btMtkS+fMwQF6BIJqb4EJ1eWATkDpWMCgYBn25WMugpqZVyNDr1ew+xTr0wWBWGDrasQUFzoRHYrLzRX0YYmSxqNDN+cTcllaPwHd9QCQbd4Sl5YrY+0SGa4u+Ltq94uv/7ZlcVgoSp+bSsOy5fWrnDTaBININdkcjpz33rsr74JDk/HCpAL25sYAyIK+sXLvPj40HyWR5kN8QKBgGcI/y16FKtB4jSZpNPg9+a8/NWZ8oH9luVO2vAFWJCN/Bt00bOTMxYLgRYYcrAebTtqq45Qgt16WLBmGPWyTXTD9bYwjonWqQa1fa95NZP4TFkfbojJIv5ih9VoSsMyxn1G/xXVpPA6WlzH4JkwfUmRJMPOmapUIGAPFV7rC6GFAoGAIM8ekINJdgmFp7209HrW5weOGZeU21JK+LusiNV8m1j0RUvUDKmGzB/sZsi5vgvw/UQfwreojGtOpBJdPXBn9/Ndr3EuVC63uK+p4LO1dQRjfx8Xw6CvYph+/kW8F7K+snkPrX5UckCvPD5/LFUrPqm57Og4EHF7FV/lO3hcWzg=", - "exported_keys": "a2V5czo6QXdHS2RIOWZ2WEEzWGVQZ2JWOGEyeCtaR3FBMkN3THY5YnFST1J5WmU2a2JxbUpRZEk0WXhKS05KZ2pRdmpSRE5GaTJPZFBCakY5MlJjZGhDbUxsdHhySXRsZ0NNQko3UFpSY1RkWE1HZHNqRjlZZ0JBK3krTXg3bVFlZThGSFV5ZXIyU3I3YktmT3lzais5V1JqOWdUaUlRQTNiZjl4RE9PQ0VjNTlCd3FtRklJSUZrV3htRjdxNjh6ekFZY3pNbWNtd21mVEZVRURQZThpSmw0QVFqTlE2dHM3dWNvdVpQMVEwVlF2UDNyVElzWVBKbldNMnZyMXlvZFZDWHhEMC84RWtVZnlaMkd3b0Q1bWorQS9GeGhJTDNERElFaUNrc2FaNVJIcWFWVVJKNWJnWDlLZWdYaWZ4VTM2d3ZLdHZnUGZEeC9ucllyT1NRZkdCdER4aXhyVEJQakh0WXgxTVJoRkZTMHJiYUlISnUrSEYrVVh6czhVVUM4djhVZEZaemgxWWlwNmlXMFBnSVU5bjBTbFQ4emVTcE1LRmlJUitRbjdBVTIveVp6RzRsNnY5eU5EWlN5eCtuQUlPbGZ0UFZPa1pDMENjTVdVS0hyVU53WGM4UVU2VGNxaDRMbVlXYlhjYmtwM0hjazY0S1BGcXcvajI1dEthUEYyQjBVZ3VtOUNjY1lRSTVoUEQ4T1ZuNGU4N0tuSm1JeGsyd085U3BoellHV0VxYXlvQnJTY0daOHRNUk1Jdk5KSTBTVVpXZmtzRFQyNjBkb1FFYjZGM0prTWxuRG9paXFweXhJS1ZiNzZYVFZtLzRmN09SS016VXkxNWMyQStxcnliU2dsaVVLQzNRSUVJREdKNnlUbmgzQ0hHeU5ZVktaUUtzNWhSOFdHdUJseHFGSFdMbzdwVldzbFZUVVRtd1p2Z1IwdkJLSkh2VVcyOXJkK2pSOUJ1YlVBeW84VnhGa2ROK3BhOHZWQ0xWVE1FTk5wVkh2eTVLam00NW9FQzIxdG5UN3lISmpGR3hpRUc5YzVCU1lWRWYwSUtRaGdVMlI4dGg3TUlUTGxveW00WkRwSnlKTmhaTUR3VjBNR1Zac3p6NkVST3lBZHQwLys3Zzd5K1k4VXhyUnViMm42WFdBNFpBRWpqdlpFRnpwVXhFUHZlSXcvdTR2N3FGdWRPV3FpRkU3SklRaFBHZzZabUYwek1IRkw4TldqVjNKL2k0dWdXT3JZbzZNOFhSSU1obWp4QmE5MGxtU2gzVklKVS9Pdm91ejh2K0dPV3BwdEJmL243U0pneElyOHNaWjlCdGVvckltT2c3YjM3NEJLZlVhbmNCUjVwZjhVOVFqWWxlcytPVlA2MFh4NS9qWS9LVHBCUjR4OVFkczFVbC85dklRbFhrcmswSXRtWUhWa2ppNVphMERUYzIybjBNWEtLZks0eUhwdzJzc0t0NURXWmhqSzNENmZETkVEbmFMUGkwMHh0ZnFieTdzWGJ0WHYvVG9kcENkQWExQjB3YTFFWlZMMHBIRjd6b29heUZGRE9MaklDTUJlQkg1MTJuWFdmZXZKSW1rNXlNSDdxTXd6T0J0Kzg0QWVKQmh3R2E1d3UxaDhMUVBUd1p0dFk2eEFYS3Viczd5T3QvMXluMnprWGZxN0RubGVoakpDRk5yUGZMYTYvRTU0TGJ0TEtFSVhjU01uRlhTdWNmbi9iaWFka2VzYXRlZ3RKdmtSRm8yRG40THlsNG5NcnVObUFOLzFrUnBCc0Jsc1M1eWQ2UlFKaGN2eWdkV2VITGFUS08xNUJDQlRxZFZIMjZYNHlsZ2gyTTBxellYL2JiZWR5MXd5R2VEOUhXUC8rY2oySVoxZW5JYU45czJyRkNQWlRrYlBnOFRjZ0FiQXN6UzhTOVRqUXNkR2Y5Y3YzbVA3anVOelVVbDkySVdaeGdVYnpoRlpKTHdzcGtPZEJCUVZkUWRXNndkcUFCUDNZZDhlckJsL2NqcVphMVVKNi9wRzFzdVczQlE0NzRsTkFGdEZpL0NRMUtVRHZ0SWFWdzBpLytEY3JmZjVZTklGNjRIRC9LL3lwYVBUMHl3bmUzUW1uZUp5OXg2Vm9ENG9BazFlNHRpSFF3bWRlYUFEV0wyQ2w0UlZCU0FJK3NwdVFtdFBSSjlXdWlwamw3Z2w4YXJaamJCZW1JUGN2NjM4bWxnZ0I0bk83bktoelpKMGlqUHNEb1RyVVNxU0tHd01mRUYzL3ZJV1NQV2xaY1N0K2taWkNPNVV2RHFhMkRGSEFybHQwMkZTQU1IbmlQS2d6RDZXSXhTSjFSbjFMOGVONmtyMCs4RUZLOUJUU2Y5NXJPd3o1QS8wcU1vcURTaDFWaHNlR1ZGajhydlM1S0lSMGhzTDNmbEJjcVYwTmxLSytLN09DMVg0dWJxTndCYlJHQnhZSDZ1bEg1cHRycE8zbmQzVGpjdFRRMi9XREc5OGt2ZGFscDZoUWplckp2UCtCa05sM016YnM1Yy9YUWFQMGNEUkIxRHhybmpkZFhqSEhDNjRZdll2WWowVkhvNkVxLzVtL3hldEYycTFGYVd4bjg3Y3AyY0ZWaVlVVG9BVlJIZmVxUXVHZW8zS1d6cVB1b2V0dnBHVkE3WDArV2NTYlZGNzRPemJ4SndLN3BadzI5ek5LSXpTNy9FWGlCTEhtNXMwdGEyeTdIRUg2TFhMWU9pd2ZpM2VtN0pCKzcrTXdGU2VwR093QkhENVg2RGFmZXphaXIvR2F0Q05MNGR3RHlmOExwMVFpSDkzeEdEbjJ1QkFuVXQ0YktyTndETlcvT2oxdllPMlg1NnB5djFzWCtmOVkrMWlMUVpKYkVWcHlFbmRUNkVsOHl6V28vU0VRYmxGaXJwMjVlTTVnTERtWC9OQlpBVzUyQWZNTVBPRGYvZ2NtZnA2QlBvUFJ6aXNBZm91dzBsTVQvanJKZHlaVmdJVFZzRS9WQ09YbTJzcjJLcVNRS0xlWWhkNGFyS3dIbXBBNWpma01RWjVQVkMrTy8ydDN3dnpoWHZQbTdPYzVOemtaaTZKNWRSc2p6dGJXclFyLzlLYWhNUVBMRXFsVXJJOWFwall3dXptck9KaHp6dUswd3JhT0FCeW1MbjRlTEprVWQvVEJVR3p2K1pISjZEeEFVVkYzU2dqQ3RxaEJDOWNlZVV4a204SFpOcnRyamZpWUg1dkxESWlOcldMKzVMUXBPRUQ4a3EvU09ldTlWRWhiU2UzTzdMbEQwNXhleExTcTZESW5rd0tFVXgvYUVqRVRDUjZ1cFlGVTdBMVNsclQyNFBMVjljajA4YklQV0g2amVYb050Z3pJa0owMlhlS3FLbXoxRnNlZ3lTVFlCVkRaVk4zWmc4ZE5NT3dVcVBNK2huQlNycHNNb3E2WEs2TEd0b1oveW5qc1R3TElyZ1dadnk5ZFZZaVpOYW1zQmU1UVdybFdSYmZ5OG1tNEpmMjJSVk9tN2N0Tmc0Y0hxUjN6OVU3QzNRNk00Q2hGMGtpdUYzK2tYUUIvV3NPTVF4Y0RvWTVIcUcxUUVSdjc0Q0RHeEFsTGIzNnUveVBGVEFTL3RpOTJUOW5WNHFBN3pOSU9HVVFJYmVOT3ZGNlZLbTZ0Z2NPTHVyQ1RyTThyYjQxcGJYT2JaekhDMy9hdzI0UT0=", + "authToken": "ZZ2piBreX+KULxOoe+Fl", + "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", + "contact_key": "MIIBCgKCAQEA12PEKhRH1EUoO/rMzxfYhRX026JJNuJl1SgOj8+ZaP4Wx+EKEVWF08RFTot8fc9JaK+sG4duGJhzukUCVzNabgdlkKi7uSdfek2fzfZHdpS5kjpCRHq4YLgk0DTm9KDp3YxkNGlFeQzkDCl4gcgSv00kksIplJrwlhkI4cstRfbTkb9q1Iy3gavxGOHbB8fAj17CzEgcb5qZg7T/9k79zVcgS4Zi9py0PApLmMdJzfYcWv0Otd8+zEh4wQ1TSU50TzSxG39s0aEh4LJjJ7PVJQNezgyOkhVu2ErGVNpR6sz08eQ8xQBbAmzv8JQHI9hYoH/PAre6lwXjT9bytAbowwIDAQAB", + "privkey": "MIIEowIBAAKCAQEA12PEKhRH1EUoO/rMzxfYhRX026JJNuJl1SgOj8+ZaP4Wx+EKEVWF08RFTot8fc9JaK+sG4duGJhzukUCVzNabgdlkKi7uSdfek2fzfZHdpS5kjpCRHq4YLgk0DTm9KDp3YxkNGlFeQzkDCl4gcgSv00kksIplJrwlhkI4cstRfbTkb9q1Iy3gavxGOHbB8fAj17CzEgcb5qZg7T/9k79zVcgS4Zi9py0PApLmMdJzfYcWv0Otd8+zEh4wQ1TSU50TzSxG39s0aEh4LJjJ7PVJQNezgyOkhVu2ErGVNpR6sz08eQ8xQBbAmzv8JQHI9hYoH/PAre6lwXjT9bytAbowwIDAQABAoIBAQDRBhCohWXvqe2Rx6Jal1mYTeaB/svuZ2dLpMP87AqEyZByCQIsMELfb+mSf+sgbLlgzprHXHaLh+dHLRFIbp2jiaoW6KjE1mDh39LlnctcWJh+P+tvaWjk889F/xDi9gX+6u+TrVWuU8Q7yUMZL4CCBesoQST5AiPYhhMIjJQy/7z/2Ydkb/uxRl5G6Mq27fVvgG2rlRyHCOXv1TjrzUEBzqJ3l3tjWPLD8gcPUVU4biMHADzIpMf2N/R7p5/qfPSa3e+V2hm+HjFXDJAREI/gqbDfbZ7skNdJx/UfK2m6E89afKtknw6cL9Lc0gBrHgmcUMYSvunbtIjM5Uoyy38BAoGBAPxaW3Lepm8qar1OBaNXtLpXf6F5yMNR8Jm0gx36NlCA/YalGHlLSPE7CkG6coO0QvjqCtjrVDDn1C6yyx3hKVv90A6vjFP1iU9KufSx1YhwFALwGfqN0i0iQeF6llxBWbA2U/94XlrdX7e748E6pPFGCrdz3ltP6KkC/1XprfGpAoGBANqAp39oP6w5XRck7k7fsn/ig8Ee9ti2eCn1NjoVUTw2EXPBoa4uoGBJj/+PBJMN5ozIdL0hKIQXVSPJPBuzoyJlzGjEJF3dvE8OBnFNvjkwGTbc/NMnjmYewZrTTs7OGu9HAsmxDwVhZzGV+y8wPjRODOEPLumSV8BhZPKKwmKLAoGAcqJtRmpEOt2O7X3i68eszrVuwiC7hZbUcE5i/ZwrTji6co7O5lK/yO2kBCW5XYDmp4JR+SY18Z1ucuQ/hsxA6IwNFo7CdWVlwcJVZQXf1YHsZUVC1+HS5zPXr6Drau842eZkE/pPCoHjuGg+1wlX4k6KEbot+Vb8fsJg0Vs87DkCgYBLswDUmhhdIW6H4yqQtt1PgvlkgcbBY84Tszl7PAFt28mGEhJilxLG6RVzU2ghTlKOebBACenQgYjkogYqDr044I3FyhZTUsu3k8NVo7qAc5J4uGz69pxV8tfePNDzwuH//dkQaUAr/AfVXQGt4ofadSPvIOR+1U2Df/qKMNqRawKBgE/mkFj4jp4Lhsdw/3dNfG7yBKjiSZzPho4klSvqurAhCq/lOq6VFfSf+55loEVdJ6m9kwu80QsDUX8Iz8c2PI7LCZUil6yMK41musTchUTJ56Qob32MAWCzEnnjfw6gcI8BZ60Tbu8x2WIPzRVkzL+yIQplPxgkoX1EdU98u09Z", + "exported_keys": "a2V5czo6QXdFZlgyNXVHcXF5ZkNxa0Y2ZUpaMWZ4cVlRSEg4aVZJUi93c1Q4K1hGRnkvWnU2Z25rWlFjMGVvT3kxUzA4U0tvNzVyaTMwbE9XOFVPVGpWNDlNeU1mT0xNOVR6Z3BRYy9iWVNFUlhieENJNFQ3QXQrUFJqaGZuMEgwN0lhbWVwSXBWcXVFcHlmd0VWSkdWK2tzUzZyV2xVQ2VoTXI4c0NjTDI3ZFNDS1VibVNCaEtaVzJKb3czYWdrZll4VUhrdlY3QkhDVkNlWUhKK1FzTFJvVDBiK0lCV0UwM3FoT0tKdlpOcWllUGxZMklsZHVqcldlWllTcFFCM1QvTkJkWjEweWtqN0JCVFYzemkyM0R5UG1JeVVvU3VvcWNvWnUrdHI4aFNZV3lnSDlhMjZvWVAwTWczRGg1K0pnYU9Ha28yRGh1NXJRUktyRlU0SWZ1OEJvN011RWd2K1IzejUyb1hQOUpJbEFySE5UeURSQmxzMXpORS82ZVY2Q1NxbUlwN1pZTytJeWtNMTlxbkY1R2toUllvSEJmZC95VUpEQXF5NjM2WVZRaVQ4czU0VmhxQ2JmOVcxRU5qc1RFTzJDYTZ3NCtOVW96V3N1dWp0NDhhQjBwNzkvaFhGMHlHNnRUd2RaOUFyK0U5bmNUamJiYS8yQ0RmVWNaS2wvakJvajBTTTQ0R0Y1SzJkNzlpaTdOaFVyZzMvN0pzVGdkOUR4SVJFUzdDN3Z6VFpidk1KcXBwUmRlTVNjVFdscHFoUTFreEZoTEJPRFNVNTl4T2JScWw5NDg4dEFBS2ZhQ3QvSGh2S09jQ1I3OUJMY3JBMlZiTHhPVVF3cDcxdkd3U3AyeVgyNSs4NWlCYllSOWR0TVRCMXlaOC9vcWU0aGE0QmVkWCs5YUxkWXZhVU9kMTViVFVXM3F6SU11TXM1ZkhUcXl3clBNWkVRUU1jU2xSSUE3YW43c1Z0MGNJMlpyYjNqaTRXbWZ5cjhPL3lWRGxzTjBiaGwzbmlzN2RlUDFET2ZDM0ZZRm9uNFB1QzI1dTJLK1JkWm5XSERGUHdhNkhlVndpRW1hdWx6ZWVKZ3RLbGtGRE5haXJaQXFtZWczZG1Lc25FTkN3UGRiYlQycjBiMEtRakRiM3ppanNjU0ppZFVYa1FuWnJ2SnpnMFBGRWl4R3ZIMmxFZ0NSMExtekluSWJyVFE5UU1qdkY5NUZScU50U0I4Y1l0dXM0UVR0MGdRM1F2amhJQVVDNzc2ZWZBRWk2RlQ0VnlnZU5iQVJvaStDUDNtSHVyL1dzQlVEbXV2UWkzSzllekNyUG01ZmxQNTdubkRDaUxlYzVjVEVzNS8zVEtZaUQ3U2pPbzNUOVRQQmVrRkdiQ1l4Y3FhSEpkZThyWld3TDByRlRaYWkzT2hTVDdCN0lRbXZ1ZUExVE01dG51UGFnRWs5ZHdBR0tIK0Z4OEFibjFpNWo2NXMrSjJzc2RPRUgzMkVMa2UxWGRvQ3JsbUZrdS9LcTFHR3J1d0s5THlXczRFTkFGekJ2Q3ZDQ3YrRkVyMGtaTFRsU1VYUjNiWHVnVWxBSUJaVDdubjNVUFNiT1lQZHBGYkl1NVU0MEJiMjNzVXVuV0cxaXc3UXI2dzZiSDQzaG1NVkZURkJSeWx3aWNZeDR1cWp2c2RxZm56ZW1TWVpzRWdiNFJEc09EcVJnOUFHVTVmU0c0K0hrWlAvYm1INlB6dTNsMFF5d0ExMkttNncwemV4d2lNMXB2aTRmY0dRZDdUa2F3RkJ4a3p5M2QwbmRLV0Y1NExwa1JiOFVORXk2RlBEdFFSbyt4Ym9CbUtEalNCMTdiWVg5Y2tBMWFPZVBveHN2eDgvTnBwWDFhVERDZFA5d3hHT2NLTVNpc0lneEkrV0dSVSsxUXQvQ1ZQc0c0VndjejR4UWdBd1FIUHArUGFDZVpxN3hjMTR6RURjTWJ6azV4MmdtbFZnTkV4WE5XbXZoc2tacE80dnFsV01xWWJmNTMvR1ZHMlRGTWpmdjZrb2hqcGdmMzVldXlGYmxTTFRpMW52NU82Z1dJVHJaMGNFNFZoM1l3ajhUVVBQYlBMWHlseVlsTkp0VXpZLytRcmI2ZDcvV1ppN0lWVWU1RGFyMEhMN1VITHlMZ1hYTGNqaEF2QXc3b3RXVTAzVGw5TGl3anF4RGpVZEFDcU80Yzd1WGJVeHdmYlo1SVRRYmRydHRxVzVVdVkyYVBnMUNzT0xuU3RhSDJxcW1LYlYxZlk1OUE3d3lOV2VkNTBNSyticFlmczhuZFFRREpUb0pjY0hGSGlsY3hDQ2ZEMnNjamc3U3VkTkRhNVFybmNBTWlrckxwWktxRGxmNkdrb0J1QlIzMXBKNHRyWVplT2U4Q2pUTUpMT1lkS2FpR2wxb2lhclhub3lmdmpFT28zRUZoTW1TSzZ6T2ZqeExLS3NObFFsdWZ0dUI3dnpaYjBlalNtZzN6T1dBRDhQSFljaythQzIzTG9jdXh3ZUFadGdnU21qU3Noc3luZEsxcUdFWFg0NmRpTGhKTS9RNjl4WnVOaWxQa0xuK053THZPOGdsR05ZUHQxbit6UWY0WWE1RTEvWUNuN0Rwa1FDRVBUSXVCb2F2eGFGMHNCdmIyR3hyYU9GZDVOLzRlNU5Jeno0UEs3dE9iZ0t6akIyNjRPeENtQVI4VG5jL0JkcUVMaG9ZVFI5WGFCWXRXVlZIOTRZbXZteDJpcWdqcG9iNUlxM1JhMmhuOHNCN2NZbHRySEVoNHpRaUg3eDF4NFNBVDBMYkRwOUxITENEcmpScHpXdU9JUEgydDUwSDU5bE50RHZWclduUkZoYXFMTWgyUHAzamZDdkNDWmwxMVZESFp0d0h5VVNDcGVoWW5HNm1UaGpxd25VTzdVdnBYSDE1elp1ekprQktUSmE1MXFYbzZ2TzZWem1wY0Z3N1BiQS9ybURzei9yU2doRGs5ZmdvSllQby9Ia3FYQ29vakRnWnlDOHNZdlhSK2JlQllFZDJSNzJ3QnRPdUxVb0crNGg5eXhLTk5NeUdsdGNLRkM0QkxRRC9WcTE5Q1FoSFlaMlRaRmFIeTFPaDBtNHBoSUIyMk1iTlE4MnZ5RDh6Q04veGlicmhzZUpsV3d5RDYxTGdLRG5XTlVmWEEyazJ0T25DWmRJbU5rbjJndk55Z21qSnZCcGtHN2I0V00wbGdtMW5PUlpWUWVGMFA0YTJpOXNBWVVpMDdOZTZjeDNGU2hHTmJzWkVCNm03VzR2YkI1RllyNGpCRER0TTVpU0FhRStzMS9rdGRZNmRMbVFPbStVQWdJUHlwWThNTmo0MEJMa3NFRUVFYjc5SmVocloxbm5VQ21JcndkMzhkTDNCTC90TllMdWMzNm54eGg3ZnFkV1hyOC8wc3l1UUE3cHpxVkg0amFTZW9OV1F1ZkRoSXR1cFJ0N0p2WExnSTR5Mm01ZU1YbDUzSVArRGViNHRJWmx1MjM4SWJlbjlQaW14aG42a3pha3dhQUgxTUM5VHZwWHZpK0JjSEJwUTM5dlRjSzVNdm10RGZoR2xDVzMyWlNaTE5DMWVWVm9RaDBqL3kxbFNPd1hpQVlHeWxUOFFvcEhnNkV5WDB5Z1NDdGQyL1pwMktxNGdRSUlCa1RzK2YwaWtOOHh5OXpVL1ppSFBRZz0=", "pin": "111111" }, { - "pubkey": "02c770adb674dd5fb22c913e6c80d441b73e3f5266f10e46e31440d3dc6e0fea67", - "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023452161", + "pubkey": "02132660a55668156cf1c2be27f8fb2a4a9b388d3fa2fdf3ba4677545c41c323a3", + "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023386625", "alias": "virtualNode0", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "HelxYyNTtDVN7cQHso7u", - "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", - "contact_key": "MIIBCgKCAQEAyUbJQqGZQ5+eapGlCv8NCt04PpQ2QJjHelHLivtcLKI8dXtKjf2uVDaCLMrsdQKtH7t//kN0V/P+EUpIwcGNcYLnFVPMxAaE68CeESmuaK6goyeBAx1qO2k7qg1CMYt3+69vx6pX2oD2Gq3d8rCxWm0NrwUEAmLHwHa2aUKIgu+GHiudS+8fzIcI7ryrr+tnHe4LUJfwl+NueyEyw+O8UH/md0IoxyUYIiHzHjBgd8q+NljUxFlTzZgDAECo2/XL3lfD+U0Yu1jQSLbjFdby0uMiTh8OA1WcyfOf2C3368xs17ufn5WNckDTcwjdpi7bZlToImSIuprhFVhE/L1mwwIDAQAB", - "privkey": "MIIEpAIBAAKCAQEAyUbJQqGZQ5+eapGlCv8NCt04PpQ2QJjHelHLivtcLKI8dXtKjf2uVDaCLMrsdQKtH7t//kN0V/P+EUpIwcGNcYLnFVPMxAaE68CeESmuaK6goyeBAx1qO2k7qg1CMYt3+69vx6pX2oD2Gq3d8rCxWm0NrwUEAmLHwHa2aUKIgu+GHiudS+8fzIcI7ryrr+tnHe4LUJfwl+NueyEyw+O8UH/md0IoxyUYIiHzHjBgd8q+NljUxFlTzZgDAECo2/XL3lfD+U0Yu1jQSLbjFdby0uMiTh8OA1WcyfOf2C3368xs17ufn5WNckDTcwjdpi7bZlToImSIuprhFVhE/L1mwwIDAQABAoIBAEVuLJjWg7cHBa9/RC5x4r7fpro3iCtqSE1Sj+MGaDphUHe6KvKmEo+sKeVnrn+Ch9PNaw57mFOKsBaoyEZGDROd8zaxLI5mLU3hqOUEuswTiQge5Wr8p5uM5m73meDbWm0wjF+UzC9skviLB2fjOZqWycSY91QXXQ5wJOZUdCCt//1l2xHoQFoPc34/isZctYtdugt2jcz52H4GqC3LwO33gLUTgX2ALa7A5W2NyalrppB7djwS0jtMLQ0yFnPqqduvWUnW2Ij2IMD+/EywaDrBo3/5Hzy2eeIO7Xob0r502EKKpcD3JKqBsU14TDASVNGklOPQh6WVCTR3ZXppxtECgYEA+jRQzxepqgc7WYE6kgdDrUgKEM/toXOOP4BkFbSEqFH6YPsvyjcmT+w88KL+No6s8HeMVhbIANHtRc0jN/6W5JGb/rk8dBmz6y7IQvjS+NLOabA4+2YDCUAzvbbxeAP2CFD2JViaiNs+Y3RYMFd91WOd2DTWt0XSOt8D/+I1NnkCgYEAzfBVcDT7KSwQAHzivQTTkr6VNGNrjIjExods7S1nOR4CLcwEKasY3s1yi57F9g5Vqi/J5L7tNuAww92BKdGAfioaQfVh170NRVG9SKPDIv23OlkcMt3wrJprpl+A0YxG4F8yALgkRnFGLer9tMnPiAg/ebv2NU8uPRYmrjEb6BsCgYB7vrYcxoo+Mpdy3Aw4vukE4bVAvWW8zScUVw6pAX/+s5TOtEzdiUskiiVVqndqSkRUJfw9c8T1St48AIojnoHIiA+L+tdgYHnwnlGjdeb582DtOp/kDn7/60Xr1Xg1sFfVox0qOVksyKphi+A2AH+Ws08U6IUtXZXtUfFrc9h3mQKBgQC2GROTWmXULDAiHkvn08K5eWg5oMfSxoUo/0rkFke2C8DlegccSTx+lq/4oXZucpJxIDyn1eOvqGG2b8Dsl2HFLbl2JWJU/8giSXrUJmpAIJTKNU1n9TQBi7IwtTYVFLL/Z22xkSISX8ssgyO/nsuxf4mRPREiZld+kH23fZktjQKBgQCi0Idq0babTTIEPWZdBZiqr+XaBb01i+/ZXseUlqKr+RysNugpAJgf43p17+uNkiwlIcTiBkThw5fh07noLgwQAEPbwPc2jEL4ccAdZa55VXrzGA+tlndJE/+9Cc9LHZG5/NGMMT9RHIRhXK/7IiPCEP7rIwtebcPOoUXUjdLAJQ==", - "exported_keys": "a2V5czo6QXdGbUNXS29VN2tLNlNQdHdSQXJzN2VtK3B5RHNsL29CNm1wVVFSaUVKTy9GTEhqbWdJSllueS9rQi9xWVJiRXhzQ1BNbjBMSndpUHNXRWRyZ21IOE4xbFE2ckVuNkdJckdBS0tTOUFMUWhYYUlMMDZjQ1B3d3QxYkluNlN4aCtKb1NEWG13eUtpMWVDSFpsU3J2T24rS2hFcG91MEZPejVFc1daVnBCQ0JRUGp0WWQ2Z0NkcDB4RTlQL0FVMk9NRlRZTURRRDAwWTlVYld4VG5tYzBKVlRNcUhOdTRQTmI4MGl3bjF1TmUyR2pTY0hYSm5rbHMvMEcrUkVnM01QUWw0b0xDWFdRTjNMZmNxTnoyd1hwWldkeWU5aXN1SHdkbmRrRlZTa05RS3k3dWxReld6b2hPTkJ3MU4rZWtSdFFFN2FDb2g4TUVxMkVaWWI0c0ttMzBLcVFtZUVUeXlyeUtwZUgvbjQybjQ1aFpFcVZXZnk1ZkFVTU83VHlXd2FidXFMU3hTemg5eUZYRk43djVRZmxxSll5U1pIZXhPbVhwUVgxenIweXRKSmh1dWJydnZkL0hEcEVJbkw3V0tKcDFCNVgzS3p2Ym1aN0tCcnVTTE9QZWFLZFRwK1NGZE1HWWd6bUQxTFczUzIrNUVla3NxK1dNSVdVTldTQlNYNDZCYW1UOERMaHRLMkF5SVVEMWE3K3dONEc1eElDbkpEblpHUGt5ZTM0YnptQ1hOMVpXL1IrYkdraVFhbGpZRll2bW5oZHZIY3ZBcnlvNjNHcXNuelE3T291RGtuODFIMjRYQjJpcUloOG5MZHVDc1ZsU0V4VStmTHNYNU9rV1JBU3M1TERSTkxrd1ErQ2hhdWVCM0xvM2ZDWk8vUHJSNTJ6cjBvaXdYNW5RUitDRnFGZmtlWUVEQnBtTnQzUHhKNGI4dm1tUS9LamlmbkpTVXhpbEwxWEo3NlRMWkFuaHFQbWRMRllqWDhFanpZdVdRamZuNE1yV0FzUGRMeDZKczZCTE9xMGFubUJZOVhySnNyVmxaQkxXamdhSi9OVWRid1c4M3MvM3lzNlhpYUNHRkRUWTRPWTBFaVZzMkRmYVFsQk95WXVjRTZXdXY4U01uR1BHYXJad3VtRXRzZnArbHAwRzM5eTR1Sm9VaGVsb1EyU1FIM0ZoRVlPVVVxRVg0endmT1VvSkF4Sm9PbzBDOTdTOUVvTUJPS3QxdGZOVFVjb1VRb2tnSncyOXZHZlNzUWwwQ2RlZVA3enY0azEvelZGZi9ueHRzSTJqR2NBVzdEQnMvQTBVWFA5aDQxLzdpQXgybDE1SVdEU1YwSEl4ZWxjM01pTWJGUWxlbUQ5RTZ4cE1zd0VxU0JtNFdZT0ZMTnNlazNuYkJyTU1SWTd0NlduNWEzMWtwOWxDeXNrSW9WdHZTdjdGRjBaekRaVmRUZ3ZQOTFXaE1ET2dmekRkZ0RlUVFRUzREb01zMTNhRGUwZldoa2YvaWQ3Z2VnaVRBc0pETWVzRUJWRWdSU0NFejFwMTIxZmlpSlpqMHRnR3dSb1FkbE50TTZ3SUxsSFBqbEs2RGoyY0E1VmxwTWVpb1dCbjJYZHlTYXQyY0NHblRKcngxdmp0R0RhVDZnVldHNW9NdHdtV3Azdzk5ajFDdlRmeTR5TXhycTdrTWlSZW16SXFIME5lL0FqMXovRzVkZ1FPRE9NUjBncERKbmlRUDRIUUdLemkwb1E0cVVWeVRKaEVMSk9welFYV2ZsRlFWSUFCcnZOTFZGUDVFWk1Yc0JubjlUcndyRjdCZXZvQTFlakRnamR1MStsNU5NL1BkNkthQllpTXJqRlJ3RmJLZDdrNW1XdU1KODNKVUF3ZkcvTjkvcWF2T0xzeXlxSDROOGZhZGhDMkdtYWhtbjcvRWZ0SUdNTTMvNHppb1NFMzM5Z3J0YytuWUVTV0RHWTcxTDk4NitGVTdLOVRoZjltMTJLQ1hseGdQcC83SG5jUGxwbEErK3pGRXgxVU5oWUJMd2s5QVhtNjNnQXlQT2dkLy9qbFhVZGovZUdQWmw2ZjIvckdPYmpuakVGK3BsUnFuOHFTd1hxY0NPT1FWV3loWjZtcVhxNWJGMjZZMzM0N3RFUzIzMENlallGZUdJenFsUGV0aUszeTJ2elFnbmZwd2xGclFweWFHRnlPZndzZjNEUlluTjcySmh4WUtYRU1NaDNEZHJHWVMvb1FsSXJCdTFTNGk2YnpOYXRTNU1qZlpWTFB5ZkxDSjBJN0xRSlZwWHo2TVR3dVlCU2tnVGxYVlpQeHFqRW5EdXQ3K3V0MHF3K1ZoNGpmcXZwZytRZWlObWJMUlZnbW5kbHdUdk9QOTM2Y2lFbnptcnFoZGpDUTJNL3BNYm5iSW94b2pmYUgrb05qenI5cTd6VENhS1NJODN2bmlPTDlHVkZHWHBVSVlCbjA0TnFCY3RWZVBoa2dNR0o3RkI3MmYxSXR5N0hkOG5XODQycm1LbjcwNUVpS2tSQk5pTVNBdmRQdVprZkpoUG9zQkM5b0kvUmNycTVTbG1wRE16bkJCM0RyUjdVMzNTdEZVMUhQYy9KazZwMUZHeDQyZWlzd0NXUnNZTUwxeUN0cDh6QlA3WENFLzVDb1k1bG1ldlRodjJaU2NZTVZ2VGhWRHFFYkxZUE5MVFJVcDk5S29wRm5iTkFuZm4wWUJXYm8yVGdvSE9hVU9EdmcwNkFDRDJiY3JSd0VZUVdYOHJSWnJleXYydkhzNFRBSWt4SnNOanVXRjg5RnJQUVlIVUpqaXV3Ulp6VlZjRXF3OE5aaklieE1Fd3NKOG5ORndQajErZy9aRGJSdEZyWEtISlVqbWNMbkxPMmhTRWVSQ1Q4MEx2T2RUZFRrT0VjdDJ0ZnNYN0Z3NmRxUDRXUnFNalQ4L2dMQkhPdDl0cUdDYW9xMzFtVFR3bVBrT1lKdWd1aEFJSHZWZ25jSUxKaWp6cjR4NmpEUlB3N3JhZitrQkJtb2dwSWdvazFFeE9nalFxaSsvOWJIcDkyZkt1SkJ0RnZWRVFzU0pQWHJNWUU1Uno2UVMyQWlyQ3Y1QTVqb2tsTFRGcWZGUzY3WDZQL1VzVVN0NDB6K2gxWmt1dlVWRncwYmNyTFJOQ29OKzA0WWRSbkxteVNucHhUcnhLUUQzRmtSMHNJTlJCZHVOMzMrZmtUQ2pkTCsyZVFSY0xvRzEyRWQxcWd5K0Rjd2V6NjFhck5hNERORStOUHRHVW90RWZYVnFTVkFrTTMzRlM5TkxWY0hNMkpZdUU3dmFZS2JGQTZweVFKRVV1M0NYajFWcXJJQ2FyS2JvSjJhT3J2UVhmTm5xMkFzM2NLeGtZVFJjQUErRzhtUXE1RXJTNE0zeDBWam44WE5pUndoUSt6WHlETlFwWFRyMDBZZWx2dU5aK25MMFhtZzZKSS9lQWNNN25Ma0tkbUUxK1VGOTRQVkN4RmdwRERVYy9vVkFudVJESG95aWtpZm1RcTBlSDM1MStNQURsS0FzOENyaG9Bc2Vjamx1NVBsdUZvVXJIOE9vR2lybEsybENQL3lwZWE3VFQ2aEI5d2NXZDZZYldSclkra0haZERpYTNqdVVJdEMwY3NqMlBRRkI4bTlsSVRlcHdNUE10K1RuZ1pPbG5iei96L2I0cz0=", + "authToken": "gp+ishyWIxHWzKFPRdBn", + "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", + "contact_key": "MIIBCgKCAQEAyIeBzOPjcG6+G54qJDe4v3fS3H0UrsN13wNZxeJbNkT37uiqbvcHA8bfnks4ga+2WXUm4ut9gGk33yzS8TTjfH+F5BKHYJWyF6A3hOi8Ywh5e5o+OXE7uAjYCxBhQbvLvJ1CF3wwSJ9TzbVS/z5ABlnhUv+Pee2ILu7ZkAPwSkgM6TYTAKXC6ybHvwrtFE7lTvnavPg2Oi6LRQC/uFnrN0ANYW+PTSxWS+VZ3EVFXj5cvxl1JHeHrxS8eKgaltzhw15gIh3WQPxwCSVRcyEl9SII2PhRMjyq2r+bc10xBvX63D/KnDFBWxRcju1IC+/gn/vWh14RVBQ+/U/0BRYahwIDAQAB", + "privkey": "MIIEowIBAAKCAQEAyIeBzOPjcG6+G54qJDe4v3fS3H0UrsN13wNZxeJbNkT37uiqbvcHA8bfnks4ga+2WXUm4ut9gGk33yzS8TTjfH+F5BKHYJWyF6A3hOi8Ywh5e5o+OXE7uAjYCxBhQbvLvJ1CF3wwSJ9TzbVS/z5ABlnhUv+Pee2ILu7ZkAPwSkgM6TYTAKXC6ybHvwrtFE7lTvnavPg2Oi6LRQC/uFnrN0ANYW+PTSxWS+VZ3EVFXj5cvxl1JHeHrxS8eKgaltzhw15gIh3WQPxwCSVRcyEl9SII2PhRMjyq2r+bc10xBvX63D/KnDFBWxRcju1IC+/gn/vWh14RVBQ+/U/0BRYahwIDAQABAoIBAQDGgPVpyHE9vDJujmwy/AHjb48Jerw9n/mPsPZuH/ugxjcUhbcpL1n/UB/Ox7GBF1qQRZsf6HOM6RtIzktmQK+sb2Qv+HOQlb79CjnLVMQf2KTBSVetbzzpmb+bfDR6aJdu99EUBHibezTvHj6xsoKYhuK5UYhK72ru4rv1hyCXtehNot8MiYSLL+VACe94oAFc+SpU+SCnGhMFe1AJsEBiAfJCB/OmEecxdhqh4TfU77N4Tth6VT6l8pRP3GlwFON0EZSWIwWoxeAOr9GdRkLFzsitW1Uk5793pCh4HO/j9bYZFpspYTBkCEJ02s4KOWc68g7VHQY9CUqFDs63zd2ZAoGBAOrJDKhb5rG3VRyZrmdQBlqyWCiwfMW6jmCh9RrDulfqcld/WCkxgjyBB0Q980yXzUQ2KiIhzhRImJFoXSYioavxWCxC2fOGOZQh0a8ti1OEiJk3g4GE7BxFG5v6PyyXWrln1J5QZfWDbU2Dxw0n6rud/kc5/bEvUI+cnDZouodrAoGBANqmD/pGMl7WknaChN9xRLfANAOKwwm+E7DM52PTdKViPLlB02DL7ar9aEhbWDAdLIIIUu5pvN+RljsZQV9p6TygpKpfhXAxOjU8bHsgavrFq4jggJaVqZgb1+NYN6mmS91oSylkTz7ErGdbD0zKNQ1ATSkOM2Wn79jZbyW5kmxVAoGAVitl1uCr4avMtAt/Y/GN83mjO4PSt2tJ2BN49tLBMIUeZBibzbqa9wPQG+60vfa04oUSn6ZSkUU3oZ5xGY76UTXpy4zZmzQ3K7Ph1m5bxVJOJBWo0T9svM9sW6nTx9Tg+k0uTtBpK1uKITntM1nkH+nTqmaRQpd/9MVg2+NCGnMCgYBAH3uIFpYnIh6KCvUU4o8YpJGciFFyxf/YVf92U0leR1Uvr5JiTOxCvVacAc33LlcjO3W23eO6XWQFqP53EQSJ90LThHgJ0yYS/smBwpwdN2N7HPwZLYMzTNcfoXuRkWemYzPHy9dBvUQie54dEyBD5pu6cqO4KGw62Gm0UpwSkQKBgGAL17KhSNU5Ot2AeUfMdMxL+zGem68aOQkmMJBU4gmknavBwWUpepB24I/Zp1/EpGobOYsoJmtEPgtuvngZ+f4c2q+R83OOAjy5ji4lwM+FAcjreVBk3H56+m8/XGYpkB59CqyMfBLNZk8JYiyZlsy3K5Fz3WH2cvdTNIbxwh/n", + "exported_keys": "a2V5czo6QXdIcVRuOGhJZ3J1OVVjRFlaSWdkZkxqKzNpcGNvb3Q3aVNBZlkrVDVWUmtPVXJtdjZzZmJQOTQ1YWFwTENwS2xzQzVYVGpFMTRQZVlUTkZyT0dsakdZMjVvT1IxVGUyZ0RJaW5RUEdnZldVT2xjVnFQMDhRYTdyU2F1eFVQdEJCakwwYWlZVTV3QStxME5EZTRFa1BLdlV3d3krQXJkQmdiRnVUSFNHalY0cGZFenFCRjJ4bUFvYk9SLzhFK2htc1FXc1R0UmdsbFE5bmJSYXN3TkYvWjA0cDNZeUV2NzJtYWlGMDArelhLaUNZYTVaV0RUYkJjWVJHN2N5SWJQWW9pdTlCaERCOXN4eTNYK2RwbFRZbmdJcjA3R3VGQW1HWkViSW40bHFGWTlSdFZDMm1xKzJXZHNPdFFFOGtSczFPdDVTRElwV0s1a3Q0VGdYVE9HTDBiZWVSZTZKSEpabmVWRzJhZDk4U1k3SWFjTGI1L0lHMXlmbVo1UjZFcU1wOUgvSHd5T0NsSnE2VVMyYlUzNEJySVRpNFY3cWxLTHB3Uisrei96WXcwd3MrTHRqaERSRzRtUDBTRERSbGtVQnZ2b0Q3VjlSQlkyb3p4d3l0ZW81MjI2YnZzWWFHeXZUYzRmQldmNHlwYWNQVzI4TkpyTFBaeVJ5VFlqMUFBK0gzMXlKWGRWOVhPNG9qMTQySFd0aXBNN1hvaUhHUmJQQnlWTFlkdnFaZjlJRFl4VUJoSWhyR2E1OU5yRFd3WFNTM0lXaTZZckdWcnp4UGFkbGl0YXd6NGZ3RkNIUTF0QVVjQ2Rlb25Da3oyUjRMRndlTHB6aW4raldPdHdDYy9PSzRlbnlCZ2N0SjNERXUvRkZla3gyR0xCWlErUlZaS2J1VDZ5dm5HOXlaZXhPVmxreHVXdWRCa3BYMnUreU1VcDRSUkxJSFV5SWpPMGZXQ0luVDhwOGNMN2tmMytaa2d5c1RZOTJsNzZPdGVVM2poamx5a01aRkZkSUFvN2RGZVN2cjBvVjVOQVk1QmlDc0xuME5zOHFFenhmM2djUC9pWWFHQzQ5UzN6K1g4OG5OaVc0QVFjWmdheC9EdVhnT0lPOTMrUHBvZS9hWGE0eVU4dWxVSjU3NFFQcFlONEd2aVhNTFNlQitWWHRhRytOYk05bFhQcjZFZmRvZHlQVzZhSi9QWEZFK1RESmh6S1RQeDE5STRJTHRJVGc3MUlqKzJYcnRWMGxNT3lzU0Rvc285RWlCUm1mL1FhUlVZYlR2QnFDaWZ5aU9UVjRBTWowQloyeGMwL3Z1S3FzQ3QyMnYxQlFVR01ONWRUejR3TS84N3dvL044aGx4SjNqTC9LemVOVTdKSmplY1VSYWJOeFhQdnM1SVU5Um41SE1reWIxcHAwT25qR283b1NJa1NuT1VBRTZuR25TNVRLUHpYNnhSRDV0a0ZVck1Rd3VIVXc5cXU0Sk5KUkFST0ZNb0RveDJVYSt6eThRRVhVMTM1N0lvZUpVb0xjOHlTUHdxdGp3emdMR0ErWHdRdGFLWTZRZEdDZk5wS2ljSTR5U21yUE9seExTNGwrcHhWRXljK1MrNTBkdVB0UWtWUXMwUEljdFNpM252MnRwRkNRMy9qVmdhWEhlVEFkdHVoVzhocXFDMzlURmdUVWN0KzA0TkptWVdlT0JCVUsxbTRudDhuVFVKYUNOU3NyS01UWXk1OThpanl3TXgrMStsSU1rVWlGOHdieWV3SmZoaDB6MFBJQ2JzYnRpbFVxYkkvenpJNlBqNWRJSGNWQlV3OUcwOGtQRldhUGErQWdha0pTSW91TXBIVXBvWG5uZE03MnNwYnNqZ1ZpV2R0SjVYV2d4b0FKd0gyVFllVjlIVE1qU1pGUjBYdFVpVTNVZDJLOXJ2Y0k4KzBxazR3VFIrVE9UQmRiejlCR2dXMGFsczhLVXVwaFpXSTFLY0xmZ3JVWmtNb2gwUlgxSDdkb0Z2NVlkZ1RFK2FQZjRoMTZ3VzBmK1V6WExCaEtja09UN0prVjdUYitzUWYwRGVVc2lHeGFDdWJ1QTlyTXRnWG9WNVJHL3RDeEhON2lRWVZlaTJhYmZmUDBxWExCd3k1Sk90NllhOWlEc3V5U3UxUkoyZEJ0TkZIWTBBQnBsbVhCZW9oUXovRzJNb1Qvc2tGbkVkVXprUWsrdkRvL2JBVDF6SENZMGRBd3Z0ZEFYTWZRVENlUmF6eTRYdnZ1Q2UzcXRDMFF6b282VW1PUTJZUFV6S2N5WC9SZkNtVUhxYnpuUmNrZHI0QjVKV1dubHVVUmNwYlBaU3dGMFR6ZU8vTGdId0s3Si9JQlBOV0wwZytBVk5BcUxmWkwrQWdSUVVRWHYwQlptUlZseEZGUHRLY1owNmpOdll0MzZFanFNOWZwV01HdDdwUkEveGJ4Zk96MjVSK093dG9QeFppQmg5VWRLaC9VREhLSVpjZ3NBeGhrT0xCL1l6MmY0UEtlZENZbUhadytLVzhMWDg1eEZEQWd6b0ZZdEJWS2F4b2VOMWVydWxsOGNBdUlVMDRPQmU2WDArVjZwdTJ1aFY4bXlRb2RINnVheXJFbWF0NDExb3Z2MXdkWXFOelVIaFhoUE5RNFIvY2xVbmNPYURUazdSR3RZR0lQb3VNZ2srQUF1eVJjMmRVZTJXd0tIbUdKamllVHQ0bnZEbzg1OVEzWWhnRTZaQ1ZnZVVxMzlmWUd1M3M2V2I1d3I5aXl4TG9RYi95RTdlMFdTOElhc2U2MGJaOWw3L2JGK3U3alJ4SUptNGhsdE1wTDUyc0x4cTVSUXFPcmE0ZDZUeE1PZi9qeUNrQ1phNXBDRFdNQ0lLWXZGZklxYWFkTXhKV040ZU1RWmUvY3BhYTA2OG1qbm9mVnFObEw1dGhkMjVHcDFYazRRTEN6VVZBR3hnZUE3clN5OUQxTENQQmJxQkloS2h1cGpTc2tMLzV4dmlaNmJHL0xqZGZ4NnNybTN1czVEcm9PdlJTdUNydUxZNUxJNVhyZmlGQ0RWZzNuTXJMeHowZ3FVUmZ6QWVQQ1czaGE5NnJVWFlIcTVBTkY2eS9KTHV5UHJUcTI2dFJGK2RKZlQzOTNoUDE5aGRDaVhyTlRBNWpOak9Lb0FoenlFWlVWOVhtZXM0Vk5zRDRnc0lLaHRTSnV1MkFoMGV6bkR5bFpMZ2JFRmJxMjYzQ1NLajMyeVlkck5FOHdVbDRWa3BDTHo2aHluYndVT1ZXdXR1M09UZ3dSenpvRWVxVXhyYWZsWUQrRTlMSC9yQkpJbiszU0VHMUlPaHk2aUs1LzRLVFNlaHNPTlFRU1E3WTJpOWMranBuQThBWHVId1JrZ0FLNHFtbmNZRjZTU2E3WVNvd1MyRnBEUGg5aXFIYjNkZDZWUEZCU0pQVUVicmMrZWhxQktmbkpUaXc5ZU1lT3hjZlN6b1JrQnhBanZIZFRFWk53NHZVMmlMWUtuQWFwUlZQUUtGNFdoNjVoN25ySEI2QnNPc2NhQWlyY2YwRUlwUy94dEJEV3phY0Y2TW1xR3cvN1ZJMXQ1T1g2L2VCMW5xelBRTkcveE44NVVlUjc2T3c1OTU4RnoycnVWRW9mQkx4Q3ppYXhaRkVId3FvbFUydzNhdjFvekxZN3dKOHJLNGJ5d3pjQm1YWT0=", "pin": "111111" }, { - "pubkey": "032a8584180847b52aca8b9fb54b2b80b07f22e58cef812f82780242eefbe83cab", - "routeHint": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f:2199023386625", + "pubkey": "0382314dab08270ee1afbfa60f8aafc31c17e4cfa56b67e34d936788a1004db8a5", + "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023452161", "alias": "virtualNode1", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "SLeaO/kn0h+L8Yvs6Shl", - "transportToken": "MIIBCgKCAQEAooPAuBkokTQjkCuje595SahO/mNOHFcXyognRO6L2dasKED11X6D\nERnqRWXlOATbmHoWbVn+8ZoHHFWhzD4eTBs6XkywIGcnYB1iEU/UL4g+rAOQE+Pt\nmcv0d1qd8hcBpE8RQZomgZ0tFrj5+14MerUqhxSQBWAdWLyWa9LolZfRu924L45u\nopBwM+TdxlmCqi0OySl/Q1TM9Z8UnyQTKIf/7EJ9F4ETvWJ9YiksIgDejMKPVPJt\n5OLrmvhGs8kIsyvjwjkdlLfOl2gAklR9FdA6nygjHo0SzaRqfEa8JSv7eMuMROjA\nCZPy48fdy7ms9ZSHdSsFEeFsL69+bnVICwIDAQAB", - "contact_key": "MIIBCgKCAQEApRoSC8CE+/3Uc+IsTCK/5BjMRHqsGIBZBwBfFOqRUT7Jtqvn1Yr1s35W6e2ovnQS97zXZlxdUGQSKY6Ge8PUunJQ1g+8HLxaORxMdEinq1rheApQCobOtxvf+baZzwy2C52z1wqzu9WG0Bzf3LeDQOM0Glw/Q5yFdu0lDiR+wabDFqpBn0VWSlIUqtg3B4yBGSz9FUBj8JyEC5KPTa319Y8OjFH17ICn1Yq1mAn79ECpLAdodMRsjQRk4U6o/DfGdcl45zTKbYfQJQ/UxyUziK4FgKqLSa6sa/W6i7/X6OBIZRZIKdGVOIrvg7xG6mV/TxMPaWvL0MkUOA/7GL49sQIDAQAB", - "privkey": "MIIEogIBAAKCAQEApRoSC8CE+/3Uc+IsTCK/5BjMRHqsGIBZBwBfFOqRUT7Jtqvn1Yr1s35W6e2ovnQS97zXZlxdUGQSKY6Ge8PUunJQ1g+8HLxaORxMdEinq1rheApQCobOtxvf+baZzwy2C52z1wqzu9WG0Bzf3LeDQOM0Glw/Q5yFdu0lDiR+wabDFqpBn0VWSlIUqtg3B4yBGSz9FUBj8JyEC5KPTa319Y8OjFH17ICn1Yq1mAn79ECpLAdodMRsjQRk4U6o/DfGdcl45zTKbYfQJQ/UxyUziK4FgKqLSa6sa/W6i7/X6OBIZRZIKdGVOIrvg7xG6mV/TxMPaWvL0MkUOA/7GL49sQIDAQABAoIBAGFEVLFbwHz887c53kMUjdyBx4Xoh47/vnNjgqC9+NLWnNvjtveVoF8Y5Xd3rlxV4f7V4EjLzaXY7uJQt2Ye3yrgwkL6jiaXyMewplIzo6ROLFseKD2rYgl6gJ+LNl5G7NE3HYZpJa5Zg80D1dcgvlDyCfYltpfMlMyVtaj5UzweYpTf07gm+f662pl1M7xUB0Q8mnjyl1YQvJxplq1aCzFKMpU5sN+Gp29VuiU76fyzdUMqgJmxa0hVeo4ZHyCWYot62c8FDvnU/JM8VhbxKpkS0yAte24eE6oWUURvOlx1yMUlwP6qugm/SAU4Y7t6xJ6X4Y9HIYu6kzoH0jBb4AECgYEA1VogGYMMglotq1MZDavHwqa8rYxWwwc18u9WkLWwhMGn0oeJP0Rl2Hht820T9Mzdb+NMTD2X3dCBShiAHzGtrZ/pkveiByISXqUKLqEcZh2z3sNyMF6SwaOB+Ru8JPQBxZVNlX3L89QLZNknOg80C5liarg/OpWAgTNS91sDzQECgYEAxhrVqOmkADRgcpjEDACMiLZjUtpd4lzcsI6sgVoz/lryd5p0/1FebwzuBH31x/mrATn8hwDpIhQzah0HQoeMjlclH9VZ1Y/wFwUkLgzYAXOj6jkxAuHsLfzb6QrpJUex/HyYbXloReBmBCHOtxYN+olh34JmDCdTPi9gz4udgLECgYAj0dTP07O28uL1/6aWKAAKyymkTYqHhd9l4Q78jrSLJWRCsWS2jYo31MhI9UhDcl2/Gj9GEZU8tXPvd7uTASkynEV/2jmGzw6ce0MBXyVAc74uKUwzmL0063m31BM7dQgTHyT+czdZwYEENn0if0jypZbjafmboVwI1RAZ3Vr/AQKBgB6rVNybnzow4aWcJO2+wAMCSYowKEy9F6V10RsNffMo3VTK4sYMMNR8afTkE0LsUh8UfRXhfDY8bmFFMTSJi6cVsrek7g10BTVrJFjEwEQpRP0j8YSCuW+9L8Z6W/HbkaCHIYoBO7VlsiV9nmUV0wAweKiDpYzIIckEyLYY5T9hAoGAL3Fk6kMasyMkaRbErDICySFHNhvugd0WvyjtDZLCB0uhOQpnNN8MnLe+K+MT5+Vp44gttzsrgxZFvhgXCRgeKkQQL9C8PIq5ophDQ/UcCqN+A1fPpkwkCN/Qd/BsE8Ah9vHh8WcdFF/q6hV7/X8nKm63krfV8YzUIiGcdIw4z3I=", - "exported_keys": "a2V5czo6QXdGMFRFbGVENjdXclBxV1RUWk1tODFTY0R2M3laZWlGTVVCb1RsYXcvV084M2FSVTlEZVVqRUtpWGpMMi93QlBHL2NRd3BjNUJhZXpoQXE4ZUhKUzBYYUZuUzhXVnJXNmwxb29ScFk4VU1KZWhvUzUwMkZ6Qi9JcjlWRGUrSm5oUGxuV1psbE05Ui9RcWVqU01Wand4VVd0dkhDQ3RQYWFVVFFlTGx4UHJIdXM1QkZUUTJ2ZElPYnA1WUhOdUJkYXBvZ2RPcnowMkI5bnRqKy96R1lwMFhFdWk4b0pib3FZU24vVGpYcFUyVUhSZTdOSW1CNUxPVHRsaGMycEdtTlBVa1hpMjF5RWdSMlpoNmVjWGZIbDFrSzY5SDd4ZWh4RlF5Zk5uYStIa3RIYzMzYWk1SFNybEplR0cweERBRnBBY3B6YW9NT1Vsa0hjdnRXTzNlclo1VnpaYXNMY2hSM3RTd05ERWdqWEN1Mk9FRzNWMHorQytHWlllM3BxNmZ5L3I2Z1oreXRhQjBSNjV0c05yMFRsMm16dUlEbmJsY1o4ZnZBVHY4SFdEcFhPaTFKVDEyTHZXcVFwc0FUMzhUblNUcFRaWGg3UmZKbGNzQXFOejRKcGhDbUk0MnNwQ1ZDWkYzQ20wZzUvNlg4bTY1clJiYTVRdXBhRTZMQUlUWll0VXJaSEV6ajk4OEg3R0hpbDBxRDFqSjBqd0RhVWRkRWQ3V29ic21rRHM3UEhPeENYd0oxMDZNSkRnaW50eUNXNitzTnNKWUhRZHNLSUVHelN2TTJCZ0MrYXJwN05iUEtXNlpCbS9KdVJWenZ1NEtvREd2bTRZcDlwdDNPaFMrbHdMK0tiS1lnZEw4UEpTa1cyaUxPOE5UbFZDODkxQTcyZTRhWjRhYTBCTTJXTDNFT2QzV1AyNDFmdVpIQ0dvY1FrUS9jVmxEQ2NGTnpTd2I5dVpveFRITUw3NDhGenNNMDc0ZmNUWWZBdERFTEUvUXUveXpsYWkySEViZWZKcWY1cWI2alI1V2Y3NUYvUlgvWFF4M3d4SU5WMmM5aU9Yd250U25RYk1TUDB0dDJyd0tNTFNrdU9La2ttWUw5a2U1UE93MDBHUTV2U2NTWkxtM2RpUStMQXc5cG8wVXNTVXZUVnNpR3J5YmZsMXlMSzA5TnRVbDdrdXdjN3NtVHcxN1ZzZnZjRzQzcENHWUdvQ1ZEVkVYYXhzK2NSaWcvMTRkRVlDa3ZNRElLSGYrbzBPcUE5dnVhT3FmNjVIR3B0OGhrb3dBUzF6WGtxYjBkakhYZUc0WGljTTE1a25GNzJYNDNpN3AxK0RIbkZJQ3NMUVBQc3pOVWhFaUpYdGRwdEpIMGJaNlByd2JQRHlNVklRcTZ6K1UzQ29hNTQ5M0M4eG9tTlJ4L1JUL3FDTThTbXFkTGVLRDVqaUZCTXM4Q3hueUVKUWJEK2xSb1FwVldQSldhOE5Qdy85dDhjRXhNemxHczFvcHJYSEhrYWQxYUt3TGQyeVRLbXhOR2FlSUtuTTRHYmFHaTdIK0VrbkRpbm1jRis5RkF4UEc1L1R1VjdlOG1PZEphekZSbGhoSG9hZzdRTzQ5ZnBUSDZrQ085WHhMKysvS2lCNGFVdWxDNFovTG9iSHVHZE4xcDltLzlTQTlSNXY2ZlRZVms3YkJtZFJTZlRmTnVNdkxnVEdhalhmS05QZzBxdXJMZUs2T2JZd2QvWDZBdE9SbmtDQ0RYVjlTYk4wTHZydzBvNVlQaC8vY0w2VGl2OXJacmdXZEdYOFVXczlQMk1Tb1IzMDZ6cjJNNEphYTNsSStIVm5ITWR5QUpldlpPNW5VZnMzc3hWdG5OUktYRDhLZzFBNUNleGlsQ2hLNzZ3d1hBa0tZaS8xOXhRWFNOaHlSVVBiQ0pmeVlLRFlHWWNnNkpQeFNLaEEzTTBlY09qSFJvYUhHTTgycjZtNWs4amhvZThoQUMzVmFPalo4T2l5bTdtNTBtb2Jmdm95dmV5dFFRZVZLcDlyeFRTQTBpbVh4TjFRNVRzcUl4Q3kyTjlGNVNWQ1gwOGtvYnptMnVqTUlsTkZsU3ZnbkVkLzI2QmRPWCtQTndBVzEzZDY2Wm5UdSszdUJoVytYWm5PSk1YZTdjYk8xQ3N2MXNsbDhiQk5lNkF2NDVFV0xvUCtySU10Z2liQkVSbU52QVpSRHc5WVN6c1pCQlEzK2ZNaEd0ZTdmclp3ZG5TMkE5WFRmdWxmWDFrMCsxRGlUemkvK0xvTEJUdFFqS0FMK1l3YXVWL0FtZjlnMk9kUkd4U2dLUk5pQ3M2dEFvZzE4ajRVdGJBdWV0cWwvTWZjL3hFY2hCbnpFR1RzcFR3TDJFOGc2eTduUTg5V3BaLytVRUhZU2dLWkwzVXFDRGk5UHpxV2pWZ0JtUWsxWmljbDVYWC9vQmtHYmtKSU5YTERxaEw1cjlTcWhjMlRLYnErZWt4U24xckdxc2pEVDJSbll1eTcxQXFkTkNHRDRNd00zaEcxNXUySUxJYnFpZGk0aUFXUUNxZ0p4ajFwdWgyYUhCWjk2Rm5qQ0dPVzBjQzJLWjg3bGJsR2FCempGSEhBKzEzbWFnaSt2bEcramMrbFAxSjQ0OCszYVpraGtJbVVmZFc2bWV5RHVSWVFTSkpmc3R5Tmd0NWVZZFNPT0FkQmU3V0dvekY0dlBQRTdBQnNyRmNyVkE5T0xLQTJYQTVjLzNVNUFQeVJIYTJZZlUzQ21HSlVjNnViTFNOMnQzWXVxOE9yTHYvTzdqdDMvWXZHT2lINURoL1NHbDJHbWJOQ3BFL2toKzg1cnpPVWZURUZpdDVIaTlMOEdxNSs0MW1KaStSSy91alRHZlhSR0pWbmNxRytEVXZxajV5N2RpeWkxMzU1L2xNUC95Ujh1SW5GS2xkZU56YjFIVEtNV0lzQkEyUlVHeWcvMWZ4c2M4SnJ6cEtrZGNvZ3d3NmxQZzVCTStkZm9FUW1rVlZWSjNxYk5pVk9FWnJLMFQxUHZWSjRJY3BMK2pXNDE1V1d6UmdDOXRtcURlS1g3ZXJXQW9UcFZEMUx6OFZxcE50aWNmdkFRZ1VZM3FKbXlRV1lSV2RsNFNrTERKaW84cFBZdXNSRXNPUDZCczU2S3AvZDhpY0N4eXo5czhKYXFJT3ZJdkZIdTFpR2had0VVeWVhellXNGI0Q3VuMHM2TWdjMGgvRlVBeDBXaHg3a0IvM1ZXQXJJbTFEU3FvYzFFM2xQblBOaFdvMWFlOU93TEcyM1NOT2xpWTNPcVdQRUVBQjF6WHNVTk5nWEl0QndaUEVFcm9zRHF6WWdRMDQ3NnhIaHA2T2swOGtUTFppSmJJVmxjOFRlZExlc3FqeWE2WFd1SlU3RUxhL2VOY3hhL3lTWk5MVWJWRzF3NVA2ZmJOVzBWR0JHN0p2UFhsVFVFUS9SR09yL1RwVW15VXByak9mQndHMzBYak54NVczZWZzYTE0QzBlUnZHbDRiT3VkS1MzRkd2c0MzR0E4S3h5aDU4VDJpK25tUjU3ZFFYTmU2K01DSlZEaTRaeGd3YVJDUk43UzFPMGVZUE1PQUt5c2VtYVNKa0F1QXF1YkQ5OHNIWkVCcW1IUTVvS1d1QlR5bnlXdnlJeDlLUUF6aE54REw4Vkg5RGtMQWtEST0=", + "authToken": "eARizF6dDJ6RFf6lf1Yb", + "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", + "contact_key": "MIIBCgKCAQEAyCA/IhZp+GZc65lecegloTYaB181r/Fza2wIcZsdEt8dP6wgzbWvjXC/IAZCHKemU3B3CszP5vPLZ+eN9u+crJS63LfOodCj+aA29dRjYGaU1GmOqdbGeGwrw6TCGpeJjG6IDo1m8RI59Gt5bVWaqiyHw8mBryOQMgbNas6TqwhQRxLtBpF03vN/SeODZmKrWaj/qwlTL9Jbp4qP/lZOJeARbMUYBMuN//jP8LMPW/7uqP8u4Fsqb7ddLnh1uCWMRq8+gVcAEFWh2gMpGV23NMrYPucuuMfE3Ma81+vnJ799UUmgOUXJuWST3Oh5saJ83u+SWsLCMYMeRSR83Y0GhQIDAQAB", + "privkey": "MIIEowIBAAKCAQEAyCA/IhZp+GZc65lecegloTYaB181r/Fza2wIcZsdEt8dP6wgzbWvjXC/IAZCHKemU3B3CszP5vPLZ+eN9u+crJS63LfOodCj+aA29dRjYGaU1GmOqdbGeGwrw6TCGpeJjG6IDo1m8RI59Gt5bVWaqiyHw8mBryOQMgbNas6TqwhQRxLtBpF03vN/SeODZmKrWaj/qwlTL9Jbp4qP/lZOJeARbMUYBMuN//jP8LMPW/7uqP8u4Fsqb7ddLnh1uCWMRq8+gVcAEFWh2gMpGV23NMrYPucuuMfE3Ma81+vnJ799UUmgOUXJuWST3Oh5saJ83u+SWsLCMYMeRSR83Y0GhQIDAQABAoIBAG8YH5Pvt2ISiRCsshYvlfwZSXfALdB/C+CdN07BmfEo9FatWgR4EH1HEoJXlwnLM3TsYNkY+2ys98S1cUScnW/cnKL8UnPXm79uZjQvc/9G0uXbtzunI8Qj4GOaKbqTVuMjVNonOvcmdA+wPdcpB1PipndUfG5aIqjyx8O765OsbU8510pxVR6RRepO2ZHracrykbN85vdUKXlvAROVtmcPmm7dLELtvqbeUVPX2+IKzdgaTeFdfKgZisAoY85cqRhl7Rb53QqAEF91mFRE4DnyQMhbX8Ro4SsZhhGqhX7y+Pkg5c0jKGnCO4pD3Lo6WQ59+kpwdfrw2dLSkUoMad0CgYEA6zXwuuB54wQqWVFZGkRtf2rIiAeHUSfRsDaWXLekiQ0Cwi1qCcTaSyMLRu0qKbIMMuLjRgvyIJRxmcihEG9HgyaXoH9zsI10QG7+sGNjiEq5IraE3fALzm6KAoWUCnFqXSzpfEtFOcEC9BbzidnOdnIAARYRbRkUw9wy9ATLql8CgYEA2dBzpDCLTCLk+1wjkGJ4QI4SO6E84HU0DXi0dXVpgsAP4q0GRTK8D2K60+ru7/dYrJF+uaMmt8/tlMZwfCtm0VMLXrpBWR7o/PAsCkApT6oC4oOBrU93nmNo9X3N6/itfgKZv/PvMvl+4V9TFlGcXszA5Rth4PW8Dauu6vt9gZsCgYAZFGtSwdS9TBhn5bCmiF1UlMJFHuhi0ugc7fUidcJpiqWcptMDr6XHFTmCmo9AWufKFT8+nM94gduLFkV2RydM6LSKPIzNaofWxv8JN8/JHI6ZEPUh5RKdNFQq6KtcYbOBs+RBiJUdD2ONO1VEgaDuKEGv2/aHt4DrUXNtaYV96QKBgHryiCQY5rgeRkSAOO7qNliyGSahl9xXK/+ir7JRiTItuYnJAu4SekbxAuZWCXNYmiwmoHKm3lcJPmEpNhtQ4GOtzZA18Gce5ILKCwHqP6dhHum/M3ahkbLNCFTyI0dcgonLbAAG8HFEldMfXKYPgQWd7BAmybQS4YiR7VVkie6bAoGBALFrCqOUqG3A0y9/I3MEaFXYdY1AiJ+XLsVzrqpP31GBLR/WSNdWlSH/Zjg+rBhqrEX3QFSl8mRRu0dncOqhkILjLF6hNKWxHEF+eNpTPxkm5NaDihqhdjCmpdDqb4aDEkQmrGS0SYvjNL0v0F1BhsS/lasoM0o4B/jPcYiRsHsF", + "exported_keys": "a2V5czo6QXdGOXZBNEhYanNNZkhQV0N1YlNJaFZRc3RBazIyeWI3eEIyTU5Kcll5cHUyY3E5RXV5RklqOXB5YnhhVXh4dzZSSUd2S1hrdkdVR1FmTUpjb3QrdW9nSllkUkpwNEVoRmNYcGRRVk5hMG55dkk3ZWxoU0RST0dMTFJUa3orbkpsM1NUOGJsTW5wcWRjYVdQZUJzODBTbGgyNlkxeE9zSWdFZ0dXQ3RzSGpaQTVWQWJ5SHB4bUhCVndFVkJhVmV2UW94SFFTbmZmeHpTemJqakZWdlhoY0FOVGZOYXNaM2tKTzF6NlViVW5NenFjUjBmMCt3RStiVmlCT0pjM2k4ZnZOS3Y3RXpoSmxVVm9oT1d4WnJ0SkhCUkk3bEFBbWE5T3plMGtoNEQwNEhVWWMxVWRxS0Q2UlBnVzc4SEhvOUo5MFY1elNEZ2ZBRHdkUy85NWJ2STVGS0lKQ3V5ekdkNlNFRXlsNG1wMk5aNTNXNDFwRjZTWm9iakRYWDlhaXFJalFXakhYNi9YeUZuTHNoMVU1ZkFVRWh6Q04wZzJuSmdtRExCM1lZcXRNSWgybmFyRHZ4WnVWN25KaXU5cXBWaUpxRDZDalZSa0U5WHZrRHZNRTBOWHgvOW4wSzdYekFlK000MmMweUduaHExR2VDajRqM1VwS3h1eWJwd3drVUdlcVVWdWVQc3RTaWxNdGRCMWJjK2tNa25QeWRGU3VvTnpUcEhTMGFCL3NkQXJyUFlTK1BDRzMxZFhWeVBmOVd4TXpRdmxleWV4VEEvTjllSkZRVU8vOC95K09hRDcveEpaakgxK3Byc2tCd0hlWExaYWR2MUxrYk92NHFMalB4dmljL3RhTFRtV0dubkc2Q0ZkRmlCRVlnWjE1dzAvUzRPK1Q1OEZQUlo3NGhXcldGSXN6VTdvb1lNU05QdHV0b2RjOFhkNDhSR09BYmFFYjFuYVB4VlRCOWpZaXg5UlpuYXdOOTBhaUFuZVR0Vll2YSs2Q1IwUGhXVzdCV04rb2QyaFZ0VVlxMU1tWnJUV29qVnRaTFZEWWJvZVZiY0ZTbTlzWXFsK0JIbDdxSUw4NUQ3OVdKNlpMczR6cGs0UkJ6aHJFeDRKQklhZXVoWHZmVXFvb0Vucnp4b3NtWlQ2d0gwNFhvL0Z5aG1nSEhraHVKTkh0TFNBdTZ6QkdQMEJ3UkJwSmI4NHdWcXIwc1lHY0lpbWZGajc0a3hLMis5VVdnM3dlTEI2THptUVNEdlRzMGR6Z3ZLN1NnaU5TeVVTbGgrVXBpaFAySXp6blhkRWRBTmpXWjNGMFlyQi9vNzg5a1o1VWFBNXBuTEFDZElWc0IvRTNpWTVEbEM2OVJIZDk2R2cyRUszM3haK1NBR0ZYU3ZYbEVOc2psOS9rN3FZeGZXdVk1TGhYYk1aRWU5Qkk0WVpsQXNtb3ZFMGtIVzMwdFA5YlI5T0NNcE54ZTR4cFhGaU1NZXBvM1ZOVHVubHRCZlNBMXV5eGoyTUtrQXBXQXZRNWVjSVptVXdWYm1HV0NzMXA2N1g3YTVSeG9sdk0xOW9iQUttckxWUGhjWTYyYWg3ZFFkZjB2UGVHcjhOS25xeXZKUnFaQ2NMdUlsMnQ4MTJGSWN6OGh6OGZncEVFOVhCWWtpc0Q4TUZSbHkweXdkd2w1bU1uNHFOdmZhN3FvK1pHVGlERHhQMlNjTThJcGJtOVpkdXkyekV1RHQ0OXo3RGk2RzYyVVhJMkhSMEQxNFpzNE1kYTNFYmVFbXAzRURjTHVRc3RoVVBOeG5uQW4yQit1RUgyMm1IdERDL3R0UXJ6TEh3VFB3OGk1MDB6NlZIZCtCUUNKR09HNzAwZHNqN0Q3WldZUng5VUxvSkpXL2NicnhGQjI0NXJ2VThvZHErQmNqcUxHdWVacWZGT1JabFIwMnpHL3RCWXpveDVrT2FueWhvUUNwV200aCtUSlEwNU1uT0tKVkNxdUNzUnV3WElxVWtzbUF6VWdFMytKN2xmOTUrKytVc1ZPTzJzODFGdDNFQjcvOVh0SzNSS1JSQ0pWMEZJZXc2M0k0V1BBeXBDczNEdlUwbEtZOXE1MHNIT2paVzlTeHp1NzhwNG5tSTA3RlFlYUwydm9sNzBtT0hBK3BORXZXMVM5bmUwd1owUmpGYXNVelQyS1kvb1JndlZVd3NtaEVKUWlMUUpjckxXRXFzMjhQZ2YyZ21VbGJpVG1uTk5OTElrSDFydDNua1lzS1RwRUZRZ3lxcjkyazlZTWk3Z25wL1cvRGNUWlBNcFBXSjlvQS9oK05TZUluZTVYUzFxVGRUdjdUM3JCejYvczdvbmJOdG9UUDlzUndmWTd5dkw2aEZWN3Y2M2tOeG53U29obGpBVmZxRVpvTzlTS0JEYU91Ny9PT3RuM2FzK0pMMjBsa3VkTDRHMktubDQrY29Gekt5dTZ4Wit1dTZUSWkzNmx6RVlhb1VhNSthNTNlNHdRU3J3Q2puMTJndlhVRlowUC9zVldqdGJBZWlCUjNQZTYwN2kzNENZZ0V1ZWgzM2MzUnJqb2F4MFdxZFVKc29qZlRoLzN0WHlpNDQ3dHJheFdaVnhyWlRDOUFGVzhrRjdCTkFrWDl5VmdUbll5TnI4bWJLekRPUXJHWTBJTlNubEdqTkQ2TWpucjFoVWxUbjEvUlZCRW5RSWluc0FsNXpYMytBeFB2RUtLNHphNGRlZktJNVNHM3RveWc4TWkxcXhYWEsxVzBUWXhsUHYvM2tHRGRueHdQcFZFTFdTajAyUEE4RXIxRFQ5OVFaQ3NodEs5dFBvanpsSnByYU9INVNuMHdsLzhoNEd2clo2ZjNsb0hzbXpxS1I4dXpYMVQxck9QK05ud05sT29YbkU2S1pMRnBJVWtXQmN6WG5vaVErb3hxYWJTNnNHaHdXcWo1emMwZEJvbUFJMHNWdEYwbEM3ZmM0QjFtbWV4UzNBbmtqSFZYNHNQblptK2MrcE5SclFjZ0ZUdDdidCtzNHBGRGlKeE5IYW5NK0w2MUg2WGJYMlY4cjc1ZnREc2FJZS9RN2hKOUExZHFVcXV5ek1sOEZwcm1FYjhhQ0ZPSVFNUlJ4bUJVSlBuNmdsc2dqbG5uWXExV3FPaEFEUStXWUNEV2xqeGFBZnNpMUFWVDFUc3dWbzlkNUpCbFpFWDNLanByRllKd252c3Z1RlFwVHJTd2tveWR6RnRMRlA1ZmxqTnlhTWcxdW9OL0dPbXdOTDY4ZlRrc1Q2ckduSTRVN3piaFJTam9HRUtzZ0VCdHphMjRVUnZYMjMvN1k3WENXUG5NSnZrdEY0OGE5MG1nZk9hRTg3bmk1UzJ1ZE9iTTBkVEFQT3N5LzhNTXU3dk03QlovYmJENC9oSUM1SnpaTVRnUG4rcENOY01aS05PV1BzbUNNZ3BBRXd5bGEweVAzQXNYak04QUtsZXNmamp6S05lZ0tQeGNNWFRjeEVDTWpIUFIyU0s2M0FGK095bENrY2NVdlJHdDRPNDBIOEgzTjdJUVhyeGRqK1JxZ0NvTm9UVGJnSWFOYVhyWmdsWXZGdk1sUmNVZDEyVm13bTFSbjZDemJDYUZBU2ZwcG5ZMWphbnJKVVcvMDc0NTZHUG9aOXVZWUpoalhUa1FqMk4xd1pUSVVOWStKR0NZcVRiYnFFcz0=", "pin": "111111" } ] From 070da4a1717e21e20ce909c6961f8b5fb265b909 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 24 Aug 2023 23:53:02 +0100 Subject: [PATCH 70/93] updated: updated bot response --- dist/src/tests/controllers/mlBot.test.js | 2 +- dist/src/tests/controllers/mlBot.test.js.map | 2 +- src/tests/controllers/mlBot.test.ts | 2 +- testing/stack/alice.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index b9233fbf4..52fd123c9 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -75,7 +75,7 @@ function mlBot(t, index1, index2, index3) { const text4 = (0, helpers_1.randomText)(); const bobMessage = yield (0, msg_1.sendTribeMessage)(t, bob, tribe, text4); const botTextResponse = '
This is a response from test ml-bot server built in sphinx-stack
'; - const botImageResponse = '
'; + const botImageResponse = '
'; yield (0, helpers_1.sleep)(8000); const botReply4 = (yield (0, get_1.getCheckBotMsg)(t, bob, botAlias, tribe, 1)); const botResponse = (0, msg_1.decryptMessage)(bob, botReply4); diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index e93eecf10..bb1a4b3da 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index ed1510642..b4b34459c 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -89,7 +89,7 @@ export async function mlBot(t, index1, index2, index3) { const botTextResponse = '
This is a response from test ml-bot server built in sphinx-stack
' const botImageResponse = - '
' + '
' await sleep(8000) const botReply4 = (await getCheckBotMsg( t, diff --git a/testing/stack/alice.json b/testing/stack/alice.json index c5277d571..7a5487c96 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -13,6 +13,6 @@ "tribes_insecure": true, "public_url": "127.0.0.1:3001", "connect_ui": true, - "host_name": "https://3377-105-112-235-209.ngrok-free.app" + "host_name": "http://localhost:3001" } } From 94216d2ef5f78b5f3100ae2ba01199522588ed16 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Sat, 26 Aug 2023 00:25:37 +0100 Subject: [PATCH 71/93] update: send attachemmnt in test --- dist/src/builtin/ml.js | 6 ++++++ dist/src/builtin/ml.js.map | 2 +- dist/src/tests/controllers/mlBot.test.js | 6 ++++-- dist/src/tests/controllers/mlBot.test.js.map | 2 +- dist/src/tests/utils/msg/sendImage.js | 14 ++++++++++++-- dist/src/tests/utils/msg/sendImage.js.map | 2 +- src/builtin/ml.ts | 6 ++++++ src/tests/controllers/mlBot.test.ts | 12 +++++++++--- src/tests/utils/msg/sendImage.ts | 15 +++++++++++++-- testing/stack/dave-cln.json | 2 +- 10 files changed, 54 insertions(+), 13 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index be4d34dda..d850d374f 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -62,6 +62,12 @@ function init() { } } let imageBase64 = ''; + // let imageUrl = '' + if (message.reply_id) { + //Look for original message + //Decrypt message + //Check if message has img tag + } if (message.type === constants_1.default.message_types.attachment) { const blob = yield (0, ml_1.getAttachmentBlob)(message.media_token, message.media_key, message.media_type, tribe); imageBase64 = blob.toString('base64'); diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 72727fc02..3d10e4aba 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index 52fd123c9..b075ccdd7 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -17,6 +17,7 @@ const save_1 = require("../utils/save"); const msg_1 = require("../utils/msg"); const nodes_1 = require("../nodes"); const get_1 = require("../utils/get"); +const base64images_1 = require("../utils/base64images"); /* npx ava src/tests/controllers/mlBot.test.ts --verbose --serial --timeout=2m */ @@ -129,13 +130,14 @@ function mlBot(t, index1, index2, index3) { t.true(checkNode6, 'VIRTUALNODE1 SHOULD NOT SEE ALICE Message'); //VirtualNode1 send message in tribe const text9 = (0, helpers_1.randomText)(); - const virtualNodeImageMsg = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, `@${model2} ${text9}`); + const imageSent = yield (0, msg_1.sendImage)(t, virtualNode1, alice, base64images_1.greenSquare, tribe, 0, '', `@${model2} ${text9}`); + t.true(!!imageSent, 'message should have been sent'); yield (0, helpers_1.sleep)(8000); const botReply9 = (yield (0, get_1.getCheckBotMsg)(t, virtualNode1, botAlias, tribe, 2)); const botResponse4 = (0, msg_1.decryptMessage)(virtualNode1, botReply9); t.true(botResponse4 === botImageResponse); //Bob Node Should not See VirtualNode Message - const checkNode7 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, virtualNodeImageMsg.uuid); + const checkNode7 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, imageSent.uuid); t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message'); //BOB LEAVES TRIBE let left2 = yield (0, del_1.leaveTribe)(t, bob, tribe); diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index bb1a4b3da..9dce8bad8 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/sendImage.js b/dist/src/tests/utils/msg/sendImage.js index f4a77e0df..6eabca528 100644 --- a/dist/src/tests/utils/msg/sendImage.js +++ b/dist/src/tests/utils/msg/sendImage.js @@ -19,7 +19,8 @@ const helpers_1 = require("../helpers"); const get_1 = require("../get"); const helpers_2 = require("../helpers"); const config_1 = require("../../config"); -function sendImage(t, node1, node2, image, tribe, price, thread_uuid) { +const rsa = require("../../../crypto/rsa"); +function sendImage(t, node1, node2, image, tribe, price, thread_uuid, text) { return __awaiter(this, void 0, void 0, function* () { //NODE1 SENDS AN IMAGE TO NODE2 var token = yield (0, helpers_2.getToken)(t, node1); @@ -28,6 +29,14 @@ function sendImage(t, node1, node2, image, tribe, price, thread_uuid) { let typ = 'image/jpg'; let filename = 'Image.jpg'; let isPublic = false; + let encryptedText = ''; + let remoteText = ''; + if (text) { + encryptedText = rsa.encrypt(node1.contact_key, text); + } + if (tribe && text) { + remoteText = rsa.encrypt(tribe.group_key, text); + } const upload = yield (0, meme_1.uploadMeme)(fileBase64, typ, host, token, filename, isPublic); t.true(typeof upload === 'object', 'meme should have been uploaded'); t.true(typeof upload.media_key === 'string', 'upload should have media key'); @@ -75,10 +84,11 @@ function sendImage(t, node1, node2, image, tribe, price, thread_uuid) { muid: upload.muid, media_key_map: mediaKeyMap, media_type: 'image/jpg', - text: '', + text: encryptedText || '', amount: 0, price: 0 || price, thread_uuid, + remote_text_map: { chat: remoteText } || '', }; //send message from node1 to node2 const img = yield http.post(node1.external_ip + '/attachment', (0, helpers_2.makeArgs)(node1, i)); diff --git a/dist/src/tests/utils/msg/sendImage.js.map b/dist/src/tests/utils/msg/sendImage.js.map index 091669748..50d2169d1 100644 --- a/dist/src/tests/utils/msg/sendImage.js.map +++ b/dist/src/tests/utils/msg/sendImage.js.map @@ -1 +1 @@ -{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA8B;AAC9B,iCAAgC;AAChC,yCAAwC;AACxC,gDAAkD;AAClD,8CAAuD;AACvD,wCAAkC;AAClC,gCAOe;AACf,wCAA0E;AAG1E,yCAAqC;AAIrC,SAAsB,SAAS,CAC7B,CAA4B,EAC5B,KAAiB,EACjB,KAAiB,EACjB,KAAa,EACb,KAAmB,EACnB,KAAc,EACd,WAAoB;;QAEpB,+BAA+B;QAE/B,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACpC,IAAI,IAAI,GAAG,eAAM,CAAC,QAAQ,CAAA;QAC1B,IAAI,UAAU,GAAG,wBAAwB,GAAG,KAAK,CAAA;QACjD,IAAI,GAAG,GAAG,WAAW,CAAA;QACrB,IAAI,QAAQ,GAAG,WAAW,CAAA;QAC1B,IAAI,QAAQ,GAAG,KAAK,CAAA;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAU,EAC7B,UAAU,EACV,GAAG,EACH,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,KAAK,QAAQ,EAAE,gCAAgC,CAAC,CAAA;QACpE,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE,8BAA8B,CAAC,CAAA;QAC5E,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,yBAAyB,CAAC,CAAA;QAElE,IAAI,WAAW,GAAY,EAAa,CAAA;QACxC,IAAI,WAAW,GAAY,EAAa,CAAA;QACxC,IAAI,KAAK,EAAE;YACT,WAAW,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;SACtC;aAAM;YACL,CAAC;YAAA,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;SACjE;QAED,6DAA6D;QAC7D,IAAI,mBAAmB,GAAG,IAAA,aAAO,EAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAC5E,IAAI,oBAAoB,CAAA;QACxB,IAAI,WAAW,GAAkB,IAAI,CAAA;QACrC,IAAI,SAAS,GAAkB,IAAI,CAAA;QACnC,IAAI,WAAW,GAA+C,IAAI,CAAA;QAClE,IAAI,KAAK,EAAE;YACT,wCAAwC;YACxC,oBAAoB,GAAG,IAAA,aAAO,EAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;YACjE,SAAS,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YACrD,WAAW,GAAG;gBACZ,CAAC,MAAM,CAAC,EAAE,oBAAoB;gBAC9B,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB;aACtC,CAAA;SACF;aAAM;YACL,6DAA6D;YAC7D,oBAAoB,GAAG,IAAA,aAAO,EAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;YACzE,WAAW,GAAG,WAAW,CAAC,EAAE,CAAA;YAC5B,WAAW,GAAG;gBACZ,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,oBAAoB;gBACtC,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB;aACtC,CAAA;SACF;QAED,kBAAkB;QAClB,mDAAmD;QACnD,4CAA4C;QAE5C,QAAQ;QACR,IAAI,CAAC,GAAG;YACN,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,aAAa,EAAE,WAAW;YAC1B,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,IAAI,KAAK;YACjB,WAAW;SACZ,CAAA;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CACzB,KAAK,CAAC,WAAW,GAAG,aAAa,EACjC,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;QACD,sBAAsB;QACtB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;QAC9C,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC3B,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAA;QACzB,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,IAAI,eAAe,GAAG,EAAE,CAAA;QAExB,IAAI,KAAK,EAAE;YACT,2BAA2B;YAC3B,MAAM,eAAe,GAAG,MAAM,IAAA,qBAAe,EAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YAEhE,wCAAwC;YACxC,IAAI,WAAW,GAAY,EAAa,CACvC;YAAA,CAAC,EAAE,WAAW,CAAC,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YACrD,IAAI,YAAY,GAAG,WAAW,CAAC,EAAE,CAAA;YAEjC,kEAAkE;YAClE,IAAI,SAAS,GAA8B,IAAI,CAAA;YAE/C,IAAI,KAAK,EAAE;gBACT,SAAS,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;aACtD;iBAAM;gBACL,MAAM,KAAK,GAAG,MAAM,IAAA,cAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACtC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;gBACxB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACrC,IAAA,qBAAW,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CACxD,CAAA;gBACD,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,6CAA6C,CAAC,CAAA;gBACnE,SAAS,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAE,CAAA;aAC3B;YAED,yCAAyC;YACzC,MAAM,UAAU,GAAG,eAAe,CAAC,WAAW,CAAA;YAE9C,gCAAgC;YAChC,IAAI,CAAC,GAAG;gBACN,UAAU,EAAE,YAAY;gBACxB,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,UAAU;aACxB,CAAA;YAED,yDAAyD;YACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAC/B,KAAK,CAAC,WAAW,GAAG,WAAW,EAC/B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;YACD,CAAC,CAAC,IAAI,CACJ,SAAS,CAAC,OAAO,EACjB,oCAAoC,GAAG,SAAS,CAAC,KAAK,CACvD,CAAA;YACD,8BAA8B;YAC9B,IAAI,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YAE5D,6CAA6C;YAC7C,6DAA6D;YAC7D,aAAa,GAAG,UAAU,CAAC,SAAS,CAAA;YACpC,CAAC,CAAC,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,4BAA4B,CAAC,CAAA;YAEvE,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,eAAM,CAAC,QAAQ,CAAC,CAAA;YAC9C,GAAG,GAAG,GAAG,QAAQ,MAAM,eAAM,CAAC,QAAQ,SAAS,UAAU,CAAC,WAAW,EAAE,CAAA;SACxE;aAAM;YACL,2BAA2B;YAE3B,uCAAuC;YACvC,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAA;YAClB,MAAM,YAAY,GAAG,MAAM,IAAA,qBAAe,EAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YAE7D,2CAA2C;YAC3C,aAAa,GAAG,YAAY,CAAC,SAAS,CAAA;YACtC,CAAC,CAAC,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,4BAA4B,CAAC,CAAA;YAEvE,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,eAAM,CAAC,QAAQ,CAAC,CAAA;YAC9C,GAAG,GAAG,GAAG,QAAQ,MAAM,eAAM,CAAC,QAAQ,SAAS,YAAY,CAAC,WAAW,EAAE,CAAA;SAC1E;QAED,eAAe;QACf,eAAe,GAAG,IAAA,aAAO,EAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QACvD,CAAC,CAAC,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,EAAE,8BAA8B,CAAC,CAAA;QAE3E,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACpC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QAE3D,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;YAC5B,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;YAC7C,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;QAEF,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAChC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,mBAAmB,CAAC,CAAA;QAE5C,uDAAuD;QACvD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAA;QAEvE,qCAAqC;QACrC,8BAA8B;QAC9B,8BAA8B;QAC9B,4DAA4D;QAC5D,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE,qBAAqB,CAAC,CAAA;QAE/D,OAAO,MAAM,CAAA;IACf,CAAC;CAAA;AA9LD,8BA8LC"} \ No newline at end of file +{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA8B;AAC9B,iCAAgC;AAChC,yCAAwC;AACxC,gDAAkD;AAClD,8CAAuD;AACvD,wCAAkC;AAClC,gCAOe;AACf,wCAA0E;AAG1E,yCAAqC;AACrC,2CAA0C;AAI1C,SAAsB,SAAS,CAC7B,CAA4B,EAC5B,KAAiB,EACjB,KAAiB,EACjB,KAAa,EACb,KAAmB,EACnB,KAAc,EACd,WAAoB,EACpB,IAAa;;QAEb,+BAA+B;QAE/B,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACpC,IAAI,IAAI,GAAG,eAAM,CAAC,QAAQ,CAAA;QAC1B,IAAI,UAAU,GAAG,wBAAwB,GAAG,KAAK,CAAA;QACjD,IAAI,GAAG,GAAG,WAAW,CAAA;QACrB,IAAI,QAAQ,GAAG,WAAW,CAAA;QAC1B,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,IAAI,UAAU,GAAG,EAAE,CAAA;QACnB,IAAI,IAAI,EAAE;YACR,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;SACrD;QACD,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SAChD;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAU,EAC7B,UAAU,EACV,GAAG,EACH,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,KAAK,QAAQ,EAAE,gCAAgC,CAAC,CAAA;QACpE,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE,8BAA8B,CAAC,CAAA;QAC5E,CAAC,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,yBAAyB,CAAC,CAAA;QAElE,IAAI,WAAW,GAAY,EAAa,CAAA;QACxC,IAAI,WAAW,GAAY,EAAa,CAAA;QACxC,IAAI,KAAK,EAAE;YACT,WAAW,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;SACtC;aAAM;YACL,CAAC;YAAA,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;SACjE;QAED,6DAA6D;QAC7D,IAAI,mBAAmB,GAAG,IAAA,aAAO,EAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAC5E,IAAI,oBAAoB,CAAA;QACxB,IAAI,WAAW,GAAkB,IAAI,CAAA;QACrC,IAAI,SAAS,GAAkB,IAAI,CAAA;QACnC,IAAI,WAAW,GAA+C,IAAI,CAAA;QAClE,IAAI,KAAK,EAAE;YACT,wCAAwC;YACxC,oBAAoB,GAAG,IAAA,aAAO,EAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;YACjE,SAAS,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YACrD,WAAW,GAAG;gBACZ,CAAC,MAAM,CAAC,EAAE,oBAAoB;gBAC9B,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB;aACtC,CAAA;SACF;aAAM;YACL,6DAA6D;YAC7D,oBAAoB,GAAG,IAAA,aAAO,EAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;YACzE,WAAW,GAAG,WAAW,CAAC,EAAE,CAAA;YAC5B,WAAW,GAAG;gBACZ,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,oBAAoB;gBACtC,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB;aACtC,CAAA;SACF;QAED,kBAAkB;QAClB,mDAAmD;QACnD,4CAA4C;QAE5C,QAAQ;QACR,IAAI,CAAC,GAAG;YACN,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,aAAa,EAAE,WAAW;YAC1B,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,aAAa,IAAI,EAAE;YACzB,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,IAAI,KAAK;YACjB,WAAW;YACX,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;SAC5C,CAAA;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CACzB,KAAK,CAAC,WAAW,GAAG,aAAa,EACjC,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;QACD,sBAAsB;QACtB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;QAC9C,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC3B,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAA;QACzB,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,IAAI,eAAe,GAAG,EAAE,CAAA;QAExB,IAAI,KAAK,EAAE;YACT,2BAA2B;YAC3B,MAAM,eAAe,GAAG,MAAM,IAAA,qBAAe,EAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YAEhE,wCAAwC;YACxC,IAAI,WAAW,GAAY,EAAa,CACvC;YAAA,CAAC,EAAE,WAAW,CAAC,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YACrD,IAAI,YAAY,GAAG,WAAW,CAAC,EAAE,CAAA;YAEjC,kEAAkE;YAClE,IAAI,SAAS,GAA8B,IAAI,CAAA;YAE/C,IAAI,KAAK,EAAE;gBACT,SAAS,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;aACtD;iBAAM;gBACL,MAAM,KAAK,GAAG,MAAM,IAAA,cAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACtC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;gBACxB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACrC,IAAA,qBAAW,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CACxD,CAAA;gBACD,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,6CAA6C,CAAC,CAAA;gBACnE,SAAS,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAE,CAAA;aAC3B;YAED,yCAAyC;YACzC,MAAM,UAAU,GAAG,eAAe,CAAC,WAAW,CAAA;YAE9C,gCAAgC;YAChC,IAAI,CAAC,GAAG;gBACN,UAAU,EAAE,YAAY;gBACxB,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,UAAU;aACxB,CAAA;YAED,yDAAyD;YACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAC/B,KAAK,CAAC,WAAW,GAAG,WAAW,EAC/B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;YACD,CAAC,CAAC,IAAI,CACJ,SAAS,CAAC,OAAO,EACjB,oCAAoC,GAAG,SAAS,CAAC,KAAK,CACvD,CAAA;YACD,8BAA8B;YAC9B,IAAI,UAAU,GAAG,MAAM,IAAA,yBAAmB,EAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YAE5D,6CAA6C;YAC7C,6DAA6D;YAC7D,aAAa,GAAG,UAAU,CAAC,SAAS,CAAA;YACpC,CAAC,CAAC,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,4BAA4B,CAAC,CAAA;YAEvE,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,eAAM,CAAC,QAAQ,CAAC,CAAA;YAC9C,GAAG,GAAG,GAAG,QAAQ,MAAM,eAAM,CAAC,QAAQ,SAAS,UAAU,CAAC,WAAW,EAAE,CAAA;SACxE;aAAM;YACL,2BAA2B;YAE3B,uCAAuC;YACvC,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAA;YAClB,MAAM,YAAY,GAAG,MAAM,IAAA,qBAAe,EAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YAE7D,2CAA2C;YAC3C,aAAa,GAAG,YAAY,CAAC,SAAS,CAAA;YACtC,CAAC,CAAC,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,4BAA4B,CAAC,CAAA;YAEvE,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,eAAM,CAAC,QAAQ,CAAC,CAAA;YAC9C,GAAG,GAAG,GAAG,QAAQ,MAAM,eAAM,CAAC,QAAQ,SAAS,YAAY,CAAC,WAAW,EAAE,CAAA;SAC1E;QAED,eAAe;QACf,eAAe,GAAG,IAAA,aAAO,EAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QACvD,CAAC,CAAC,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,EAAE,8BAA8B,CAAC,CAAA;QAE3E,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACpC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QAE3D,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;YAC5B,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;YAC7C,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;QAEF,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAChC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,mBAAmB,CAAC,CAAA;QAE5C,uDAAuD;QACvD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAA;QAEvE,qCAAqC;QACrC,8BAA8B;QAC9B,8BAA8B;QAC9B,4DAA4D;QAC5D,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE,qBAAqB,CAAC,CAAA;QAE/D,OAAO,MAAM,CAAA;IACf,CAAC;CAAA;AAxMD,8BAwMC"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index d7199a55d..725b45d1e 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -71,6 +71,12 @@ export function init() { } } let imageBase64 = '' + // let imageUrl = '' + if (message.reply_id) { + //Look for original message + //Decrypt message + //Check if message has img tag + } if (message.type === constants.message_types.attachment) { const blob = await getAttachmentBlob( message.media_token!, diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index b4b34459c..45b629f1b 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -2,10 +2,11 @@ import test from 'ava' import { randomText, sleep } from '../utils/helpers' import { deleteTribe, leaveTribe } from '../utils/del' import { createTribe, joinTribe } from '../utils/save' -import { sendTribeMessage, decryptMessage } from '../utils/msg' +import { sendTribeMessage, decryptMessage, sendImage } from '../utils/msg' import nodes from '../nodes' import { getCheckBotMsg, shouldNotGetNewMsgs } from '../utils/get' import { Message } from '../types' +import { greenSquare } from '../utils/base64images' /* npx ava src/tests/controllers/mlBot.test.ts --verbose --serial --timeout=2m @@ -191,12 +192,17 @@ export async function mlBot(t, index1, index2, index3) { //VirtualNode1 send message in tribe const text9 = randomText() - const virtualNodeImageMsg = await sendTribeMessage( + const imageSent = await sendImage( t, virtualNode1, + alice, + greenSquare, tribe, + 0, + '', `@${model2} ${text9}` ) + t.true(!!imageSent, 'message should have been sent') await sleep(8000) const botReply9 = (await getCheckBotMsg( @@ -210,7 +216,7 @@ export async function mlBot(t, index1, index2, index3) { t.true(botResponse4 === botImageResponse) //Bob Node Should not See VirtualNode Message - const checkNode7 = await shouldNotGetNewMsgs(t, bob, virtualNodeImageMsg.uuid) + const checkNode7 = await shouldNotGetNewMsgs(t, bob, imageSent.uuid) t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message') //BOB LEAVES TRIBE diff --git a/src/tests/utils/msg/sendImage.ts b/src/tests/utils/msg/sendImage.ts index 5eb9ba713..3e3651e77 100644 --- a/src/tests/utils/msg/sendImage.ts +++ b/src/tests/utils/msg/sendImage.ts @@ -17,6 +17,7 @@ import { arraysEqual, getToken, makeArgs, memeProtocol } from '../helpers' import { NodeConfig } from '../../types' import { Contact, Chat } from '../../types' import { config } from '../../config' +import * as rsa from '../../../crypto/rsa' interface Context {} @@ -27,7 +28,8 @@ export async function sendImage( image: string, tribe?: Chat | null, price?: Number, - thread_uuid?: string + thread_uuid?: string, + text?: string ) { //NODE1 SENDS AN IMAGE TO NODE2 @@ -37,6 +39,14 @@ export async function sendImage( let typ = 'image/jpg' let filename = 'Image.jpg' let isPublic = false + let encryptedText = '' + let remoteText = '' + if (text) { + encryptedText = rsa.encrypt(node1.contact_key, text) + } + if (tribe && text) { + remoteText = rsa.encrypt(tribe.group_key, text) + } const upload = await uploadMeme( fileBase64, @@ -93,10 +103,11 @@ export async function sendImage( muid: upload.muid, media_key_map: mediaKeyMap, media_type: 'image/jpg', - text: '', + text: encryptedText || '', amount: 0, price: 0 || price, thread_uuid, + remote_text_map: { chat: remoteText } || '', } //send message from node1 to node2 diff --git a/testing/stack/dave-cln.json b/testing/stack/dave-cln.json index aaa6e8888..6b430aaa8 100644 --- a/testing/stack/dave-cln.json +++ b/testing/stack/dave-cln.json @@ -22,7 +22,7 @@ "tribes_mqtt_port": "1883", "tribes_insecure": true, "public_url": "127.0.0.1:3004", - "media_host": "localhost:5555", + "media_host": "memes.sphinx.chat", "connect_ui": true, "logging_level": "debug", "mqtt_host": "127.0.0.1", From edc38408ef1a0b46b98865ecb103c3fae3288de8 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 13:49:29 +0100 Subject: [PATCH 72/93] added display logs --- .github/workflows/cln_proxy_integration_test.yml | 6 ++++++ .github/workflows/integration_test.yml | 6 ++++++ testing/stack/alice.json | 2 +- testing/stack/bob.json | 2 +- testing/stack/dave-cln.json | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 96f0e5de4..912a73488 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -107,3 +107,9 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m + continue-on-error: true + - name: Display Logs + run: | + docker logs alice.sphinx + docker logs bob.sphinx + docker logs dave.sphinx diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index f0f668728..8737bbcfc 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -107,3 +107,9 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m + continue-on-error: true + - name: Display Logs + run: | + docker logs alice.sphinx + docker logs bob.sphinx + docker logs dave.sphinx diff --git a/testing/stack/alice.json b/testing/stack/alice.json index 7a5487c96..9f1af4483 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -7,7 +7,7 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/alice/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3001", - "media_host": "memes.sphinx.chat", + "media_host": "localhost:5555", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, diff --git a/testing/stack/bob.json b/testing/stack/bob.json index eeffc5199..fb9ff3253 100644 --- a/testing/stack/bob.json +++ b/testing/stack/bob.json @@ -7,7 +7,7 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/bob/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3002", - "media_host": "memes.sphinx.chat", + "media_host": "localhost:5555", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, diff --git a/testing/stack/dave-cln.json b/testing/stack/dave-cln.json index 6b430aaa8..aaa6e8888 100644 --- a/testing/stack/dave-cln.json +++ b/testing/stack/dave-cln.json @@ -22,7 +22,7 @@ "tribes_mqtt_port": "1883", "tribes_insecure": true, "public_url": "127.0.0.1:3004", - "media_host": "memes.sphinx.chat", + "media_host": "localhost:5555", "connect_ui": true, "logging_level": "debug", "mqtt_host": "127.0.0.1", From 3cce9db7783095c8e248ea5f84e624e69090b232 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 14:57:55 +0100 Subject: [PATCH 73/93] update: changed meme host to internal server --- dist/src/tests/config.js | 2 +- dist/src/tests/config.js.map | 2 +- dist/src/tests/utils/msg/sendImage.js | 2 +- dist/src/tests/utils/msg/sendImage.js.map | 2 +- src/tests/config.ts | 2 +- src/tests/utils/msg/sendImage.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/src/tests/config.js b/dist/src/tests/config.js index c9c406185..aef653310 100644 --- a/dist/src/tests/config.js +++ b/dist/src/tests/config.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.config = void 0; exports.config = { iterate: true, - memeHost: 'localhost:5555', + memeHost: 'meme.sphinx:5555', tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', allowedFee: 4, diff --git a/dist/src/tests/config.js.map b/dist/src/tests/config.js.map index 3cee18f94..e5ebde253 100644 --- a/dist/src/tests/config.js.map +++ b/dist/src/tests/config.js.map @@ -1 +1 @@ -{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/tests/config.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,gBAAgB;IAC1B,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,qBAAqB;IACxC,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,gBAAgB;IAC1B,gBAAgB,EAAE,kBAAkB;CACrC,CAAA"} \ No newline at end of file +{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/tests/config.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,kBAAkB;IAC5B,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,qBAAqB;IACxC,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,gBAAgB;IAC1B,gBAAgB,EAAE,kBAAkB;CACrC,CAAA"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/sendImage.js b/dist/src/tests/utils/msg/sendImage.js index 6eabca528..e33d16620 100644 --- a/dist/src/tests/utils/msg/sendImage.js +++ b/dist/src/tests/utils/msg/sendImage.js @@ -24,7 +24,7 @@ function sendImage(t, node1, node2, image, tribe, price, thread_uuid, text) { return __awaiter(this, void 0, void 0, function* () { //NODE1 SENDS AN IMAGE TO NODE2 var token = yield (0, helpers_2.getToken)(t, node1); - let host = config_1.config.memeHost; + let host = config_1.config.memeHost; // Change this in config to localhost:5555 when running on local let fileBase64 = 'data:image/jpg;base64,' + image; let typ = 'image/jpg'; let filename = 'Image.jpg'; diff --git a/dist/src/tests/utils/msg/sendImage.js.map b/dist/src/tests/utils/msg/sendImage.js.map index 50d2169d1..f02363cd4 100644 --- a/dist/src/tests/utils/msg/sendImage.js.map +++ b/dist/src/tests/utils/msg/sendImage.js.map @@ -1 +1 @@ -{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/config.ts b/src/tests/config.ts index dcc5e7888..7c2ac4184 100644 --- a/src/tests/config.ts +++ b/src/tests/config.ts @@ -2,7 +2,7 @@ export const config = { iterate: true, - memeHost: 'localhost:5555', + memeHost: 'meme.sphinx:5555', // Change this to localhost:5555 when running on local tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', allowedFee: 4, diff --git a/src/tests/utils/msg/sendImage.ts b/src/tests/utils/msg/sendImage.ts index 3e3651e77..4032fad8f 100644 --- a/src/tests/utils/msg/sendImage.ts +++ b/src/tests/utils/msg/sendImage.ts @@ -34,7 +34,7 @@ export async function sendImage( //NODE1 SENDS AN IMAGE TO NODE2 var token = await getToken(t, node1) - let host = config.memeHost + let host = config.memeHost // Change this in config to localhost:5555 when running on local let fileBase64 = 'data:image/jpg;base64,' + image let typ = 'image/jpg' let filename = 'Image.jpg' From 94563e7648225c6e930aa206f342f285f02875da Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 15:24:08 +0100 Subject: [PATCH 74/93] update: update meme protol for http --- dist/src/tests/electronjs/meme.js | 2 +- dist/src/tests/electronjs/meme.js.map | 2 +- dist/src/tests/utils/helpers.js | 2 +- dist/src/tests/utils/helpers.js.map | 2 +- src/tests/electronjs/meme.ts | 3 ++- src/tests/utils/helpers.ts | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dist/src/tests/electronjs/meme.js b/dist/src/tests/electronjs/meme.js index 2b28ef399..e53a13db3 100644 --- a/dist/src/tests/electronjs/meme.js +++ b/dist/src/tests/electronjs/meme.js @@ -37,7 +37,7 @@ function uploadMeme(fileBase64, typ, host, token, filename, isPublic) { }); const formHeaders = form.getHeaders(); let protocol = 'https'; - if (host.includes('localhost')) + if (host.includes('localhost') || host.includes('meme.sphinx')) protocol = 'http'; const resp = yield (0, node_fetch_1.default)(`${protocol}://${host}/${isPublic ? 'public' : 'file'}`, { method: 'POST', diff --git a/dist/src/tests/electronjs/meme.js.map b/dist/src/tests/electronjs/meme.js.map index 2fc1bb3d9..725aef21d 100644 --- a/dist/src/tests/electronjs/meme.js.map +++ b/dist/src/tests/electronjs/meme.js.map @@ -1 +1 @@ -{"version":3,"file":"meme.js","sourceRoot":"","sources":["../../../../src/tests/electronjs/meme.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgC;AAChC,mCAAoC;AACpC,6CAAqC;AACrC,2CAA8B;AAC9B,sCAAqC;AAErC,SAAe,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ;;QACxE,IAAI;YACF,IAAI,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;YAErC,IAAI,cAAc,CAAA;YAClB,IAAI,MAAM,GAAG,EAAE,CAAA;YACf,IAAI,QAAQ,EAAE;gBACZ,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aACrC;iBAAM;gBACL,MAAM,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACxC,MAAM,YAAY,GAAG,IAAA,qBAAO,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBAC5C,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;aACrD;YAED,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;YAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE;gBAClC,WAAW,EAAE,GAAG,IAAI,WAAW;gBAC/B,QAAQ,EAAE,QAAQ,IAAI,WAAW;gBACjC,WAAW,EAAE,cAAc,CAAC,MAAM;aACnC,CAAC,CAAA;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YACrC,IAAI,QAAQ,GAAG,OAAO,CAAA;YACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAE,QAAQ,GAAG,MAAM,CAAA;YACjD,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAK,EACtB,GAAG,QAAQ,MAAM,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,EACvD;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,kCACF,WAAW,KACd,aAAa,EAAE,UAAU,KAAK,EAAE,GACjC;gBACD,IAAI,EAAE,IAAI;aACX,CACF,CAAA;YAED,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAC5B,IAAI,CAAC,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;YAE1C,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,SAAS,EAAE,MAAM;aAClB,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACR;IACH,CAAC;CAAA;AAEQ,gCAAU;AAEnB,SAAS,YAAY,CAAC,OAAe;IACnC,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;IAC1B,oCAAoC;IACpC,IAAI,GAAG,IAAA,gBAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACrB,CAAC,GAAG,IAAI,CAAC,MAAM,EACf,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;IAC3B,OAAO,CAAC,EAAE,EAAE;QACV,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;KAC9B;IACD,OAAO,KAAK,CAAA;AACd,CAAC"} \ No newline at end of file +{"version":3,"file":"meme.js","sourceRoot":"","sources":["../../../../src/tests/electronjs/meme.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgC;AAChC,mCAAoC;AACpC,6CAAqC;AACrC,2CAA8B;AAC9B,sCAAqC;AAErC,SAAe,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ;;QACxE,IAAI;YACF,IAAI,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;YAErC,IAAI,cAAc,CAAA;YAClB,IAAI,MAAM,GAAG,EAAE,CAAA;YACf,IAAI,QAAQ,EAAE;gBACZ,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aACrC;iBAAM;gBACL,MAAM,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACxC,MAAM,YAAY,GAAG,IAAA,qBAAO,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBAC5C,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;aACrD;YAED,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;YAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE;gBAClC,WAAW,EAAE,GAAG,IAAI,WAAW;gBAC/B,QAAQ,EAAE,QAAQ,IAAI,WAAW;gBACjC,WAAW,EAAE,cAAc,CAAC,MAAM;aACnC,CAAC,CAAA;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YACrC,IAAI,QAAQ,GAAG,OAAO,CAAA;YACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC5D,QAAQ,GAAG,MAAM,CAAA;YACnB,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAK,EACtB,GAAG,QAAQ,MAAM,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,EACvD;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,kCACF,WAAW,KACd,aAAa,EAAE,UAAU,KAAK,EAAE,GACjC;gBACD,IAAI,EAAE,IAAI;aACX,CACF,CAAA;YAED,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAC5B,IAAI,CAAC,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;YAE1C,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,SAAS,EAAE,MAAM;aAClB,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACR;IACH,CAAC;CAAA;AAEQ,gCAAU;AAEnB,SAAS,YAAY,CAAC,OAAe;IACnC,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;IAC1B,oCAAoC;IACpC,IAAI,GAAG,IAAA,gBAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACrB,CAAC,GAAG,IAAI,CAAC,MAAM,EACf,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;IAC3B,OAAO,CAAC,EAAE,EAAE;QACV,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;KAC9B;IACD,OAAO,KAAK,CAAA;AACd,CAAC"} \ No newline at end of file diff --git a/dist/src/tests/utils/helpers.js b/dist/src/tests/utils/helpers.js index 6b5c65366..5abb86794 100644 --- a/dist/src/tests/utils/helpers.js +++ b/dist/src/tests/utils/helpers.js @@ -120,7 +120,7 @@ function getToken(t, node) { exports.getToken = getToken; function memeProtocol(host) { let p = 'https'; - if (host.includes('localhost')) + if (host.includes('localhost') || host.includes('meme.sphinx')) p = 'http'; return p; } diff --git a/dist/src/tests/utils/helpers.js.map b/dist/src/tests/utils/helpers.js.map index 83338b296..b0de5930e 100644 --- a/dist/src/tests/utils/helpers.js.map +++ b/dist/src/tests/utils/helpers.js.map @@ -1 +1 @@ -{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/tests/utils/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/tests/utils/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/electronjs/meme.ts b/src/tests/electronjs/meme.ts index d9088b11b..757d800c9 100644 --- a/src/tests/electronjs/meme.ts +++ b/src/tests/electronjs/meme.ts @@ -26,7 +26,8 @@ async function uploadMeme(fileBase64, typ, host, token, filename, isPublic) { }) const formHeaders = form.getHeaders() let protocol = 'https' - if (host.includes('localhost')) protocol = 'http' + if (host.includes('localhost') || host.includes('meme.sphinx')) + protocol = 'http' const resp = await fetch( `${protocol}://${host}/${isPublic ? 'public' : 'file'}`, { diff --git a/src/tests/utils/helpers.ts b/src/tests/utils/helpers.ts index 1ba6412ca..9c53ef051 100644 --- a/src/tests/utils/helpers.ts +++ b/src/tests/utils/helpers.ts @@ -124,7 +124,7 @@ export async function getToken(t, node) { export function memeProtocol(host) { let p = 'https' - if (host.includes('localhost')) p = 'http' + if (host.includes('localhost') || host.includes('meme.sphinx')) p = 'http' return p } From 6b2a7d2f454ddd4db8a64f00a66299b0b642a662 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 15:53:49 +0100 Subject: [PATCH 75/93] update: added meme to the log --- .github/workflows/cln_proxy_integration_test.yml | 1 + .github/workflows/integration_test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 912a73488..779b8d414 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -113,3 +113,4 @@ jobs: docker logs alice.sphinx docker logs bob.sphinx docker logs dave.sphinx + docker logs meme.sphinx diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 8737bbcfc..4c72544a3 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -113,3 +113,4 @@ jobs: docker logs alice.sphinx docker logs bob.sphinx docker logs dave.sphinx + docker logs meme.sphinx From c6741772393a47cc0d9f8189f506265a0b6eeb03 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 16:16:54 +0100 Subject: [PATCH 76/93] update: add docker list --- .github/workflows/cln_proxy_integration_test.yml | 1 + .github/workflows/integration_test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 779b8d414..a4876929f 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -114,3 +114,4 @@ jobs: docker logs bob.sphinx docker logs dave.sphinx docker logs meme.sphinx + docker ps diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 4c72544a3..29afc2225 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -114,3 +114,4 @@ jobs: docker logs bob.sphinx docker logs dave.sphinx docker logs meme.sphinx + docker ps From a07a14b3d81145ea5b899ba2a9ba5801996ab8bc Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 17:11:00 +0100 Subject: [PATCH 77/93] update: changed media_host to localhost and posited stack to a new branch --- .github/workflows/cln_proxy_integration_test.yml | 2 +- .github/workflows/integration_test.yml | 2 +- dist/src/tests/config.js | 2 +- dist/src/tests/config.js.map | 2 +- dist/src/tests/utils/msg/sendImage.js | 2 +- dist/src/tests/utils/msg/sendImage.js.map | 2 +- src/tests/config.ts | 2 +- src/tests/utils/msg/sendImage.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index a4876929f..a5253618d 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git -b update/add_media clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 29afc2225..18e9c055c 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b update/add_media https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/dist/src/tests/config.js b/dist/src/tests/config.js index aef653310..c9c406185 100644 --- a/dist/src/tests/config.js +++ b/dist/src/tests/config.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.config = void 0; exports.config = { iterate: true, - memeHost: 'meme.sphinx:5555', + memeHost: 'localhost:5555', tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', allowedFee: 4, diff --git a/dist/src/tests/config.js.map b/dist/src/tests/config.js.map index e5ebde253..3cee18f94 100644 --- a/dist/src/tests/config.js.map +++ b/dist/src/tests/config.js.map @@ -1 +1 @@ -{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/tests/config.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,kBAAkB;IAC5B,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,qBAAqB;IACxC,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,gBAAgB;IAC1B,gBAAgB,EAAE,kBAAkB;CACrC,CAAA"} \ No newline at end of file +{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/tests/config.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,gBAAgB;IAC1B,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,qBAAqB;IACxC,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,gBAAgB;IAC1B,gBAAgB,EAAE,kBAAkB;CACrC,CAAA"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/sendImage.js b/dist/src/tests/utils/msg/sendImage.js index e33d16620..6eabca528 100644 --- a/dist/src/tests/utils/msg/sendImage.js +++ b/dist/src/tests/utils/msg/sendImage.js @@ -24,7 +24,7 @@ function sendImage(t, node1, node2, image, tribe, price, thread_uuid, text) { return __awaiter(this, void 0, void 0, function* () { //NODE1 SENDS AN IMAGE TO NODE2 var token = yield (0, helpers_2.getToken)(t, node1); - let host = config_1.config.memeHost; // Change this in config to localhost:5555 when running on local + let host = config_1.config.memeHost; let fileBase64 = 'data:image/jpg;base64,' + image; let typ = 'image/jpg'; let filename = 'Image.jpg'; diff --git a/dist/src/tests/utils/msg/sendImage.js.map b/dist/src/tests/utils/msg/sendImage.js.map index f02363cd4..50d2169d1 100644 --- a/dist/src/tests/utils/msg/sendImage.js.map +++ b/dist/src/tests/utils/msg/sendImage.js.map @@ -1 +1 @@ -{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"sendImage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendImage.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/config.ts b/src/tests/config.ts index 7c2ac4184..dcc5e7888 100644 --- a/src/tests/config.ts +++ b/src/tests/config.ts @@ -2,7 +2,7 @@ export const config = { iterate: true, - memeHost: 'meme.sphinx:5555', // Change this to localhost:5555 when running on local + memeHost: 'localhost:5555', tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', allowedFee: 4, diff --git a/src/tests/utils/msg/sendImage.ts b/src/tests/utils/msg/sendImage.ts index 4032fad8f..3e3651e77 100644 --- a/src/tests/utils/msg/sendImage.ts +++ b/src/tests/utils/msg/sendImage.ts @@ -34,7 +34,7 @@ export async function sendImage( //NODE1 SENDS AN IMAGE TO NODE2 var token = await getToken(t, node1) - let host = config.memeHost // Change this in config to localhost:5555 when running on local + let host = config.memeHost let fileBase64 = 'data:image/jpg;base64,' + image let typ = 'image/jpg' let filename = 'Image.jpg' From fac5a10a2552acd0c81689eb804a903c7692b45f Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 17:23:01 +0100 Subject: [PATCH 78/93] fix: error --- .github/workflows/cln_proxy_integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index a5253618d..c1e289cfc 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git -b update/add_media clone https://github.com/stakwork/sphinx-stack.git stack + git clone -b update/add_media https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From 038fad72688303a9baec69099523ad40bc8b78be Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 18:54:55 +0100 Subject: [PATCH 79/93] update: added check for meme.sphinx to change protocol to http --- dist/src/network/modify.js | 2 +- dist/src/network/modify.js.map | 2 +- src/network/modify.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dist/src/network/modify.js b/dist/src/network/modify.js index 00992510f..a6e4e3939 100644 --- a/dist/src/network/modify.js +++ b/dist/src/network/modify.js @@ -191,7 +191,7 @@ function downloadAndUploadAndSaveReturningTermsAndKey(payload, chat, sender, own // console.log('[modify] terms.host', terms.host) // console.log('[modify] mt', mt) let protocol = 'https'; - if (terms.host.includes('localhost')) + if (terms.host.includes('localhost') || terms.host.includes('meme.sphinx')) protocol = 'http'; const r = yield (0, node_fetch_1.default)(`${protocol}://${terms.host}/file/${mt}`, { headers: { Authorization: `Bearer ${token}` }, diff --git a/dist/src/network/modify.js.map b/dist/src/network/modify.js.map index da6ab6959..2363a0c90 100644 --- a/dist/src/network/modify.js.map +++ b/dist/src/network/modify.js.map @@ -1 +1 @@ -{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../../src/network/modify.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../../src/network/modify.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/network/modify.ts b/src/network/modify.ts index 1b7e8f601..3bb417519 100644 --- a/src/network/modify.ts +++ b/src/network/modify.ts @@ -248,7 +248,8 @@ export async function downloadAndUploadAndSaveReturningTermsAndKey( // console.log('[modify] terms.host', terms.host) // console.log('[modify] mt', mt) let protocol = 'https' - if (terms.host.includes('localhost')) protocol = 'http' + if (terms.host.includes('localhost') || terms.host.includes('meme.sphinx')) + protocol = 'http' const r = await fetch(`${protocol}://${terms.host}/file/${mt}`, { headers: { Authorization: `Bearer ${token}` }, }) From 5b3c73b8c7182c4025877ee25fb7579f2cbc5f8d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 19:15:06 +0100 Subject: [PATCH 80/93] update: and meme.sphinx to ml utill --- dist/src/builtin/utill/ml.js | 2 +- dist/src/builtin/utill/ml.js.map | 2 +- src/builtin/utill/ml.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dist/src/builtin/utill/ml.js b/dist/src/builtin/utill/ml.js index 73fe6e76b..0facaa318 100644 --- a/dist/src/builtin/utill/ml.js +++ b/dist/src/builtin/utill/ml.js @@ -183,7 +183,7 @@ function getAttachmentBlob(mediaToken, mediaKey, mediaType, tribe) { return; const token = yield meme.lazyToken(ownerPubkey, terms.host); let protocol = 'https'; - if (terms.host.includes('localhost')) + if (terms.host.includes('localhost') || terms.host.includes('meme.sphinx')) protocol = 'http'; const r = yield (0, node_fetch_1.default)(`${protocol}://${terms.host}/file/${mediaToken}`, { headers: { Authorization: `Bearer ${token}` }, diff --git a/dist/src/builtin/utill/ml.js.map b/dist/src/builtin/utill/ml.js.map index 4eb6d839a..f14e769bf 100644 --- a/dist/src/builtin/utill/ml.js.map +++ b/dist/src/builtin/utill/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../../src/builtin/utill/ml.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAA8C;AAC9C,qCAAoC;AACpC,8BAAkC;AAClC,+CAA0D;AAC1D,2CAA4C;AAC5C,2CAA8B;AAC9B,yCAAwC;AACxC,yCAAwC;AAUxC,SAAsB,MAAM,CAC1B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;gBACjB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EACvD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,OAAO,CAAC,IAAI,CAAC,mCAAQ,IAAI,KAAE,GAAG,GAAE,CAAA;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,GAAG,IAAI,CAAC,WAAW,EAAE,2BAA2B,EAChD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,+BAA+B,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACxE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,4BAA4B,EAC7C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA3DD,wBA2DC;AAED,SAAsB,SAAS,CAC7B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACxB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACpB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,EAC3D,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,OAAO,CAAC,IAAI,CAAC,mCAAQ,IAAI,KAAE,MAAM,GAAE,CAAA;YACnC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,GAAG,IAAI,CAAC,WAAW,EAAE,+BAA+B,EACpD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,mCAAmC,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YAC5E,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,0BAA0B,IAAI,CAAC,WAAW,EAAE,UAAU,EACvE,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA3DD,8BA2DC;AAED,SAAsB,OAAO,CAC3B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,UAA0B,EAC1B,QAAkB;;QAElB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QACxB,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QACxB,IAAI;YACF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;gBAClB,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,gCAAgC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EACxD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,OAAO,EAAE;gBACvC,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,0CAA0C,EAC1C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,OAAO,CAAC,IAAI,CAAC,mCAAQ,IAAI,KAAE,IAAI,GAAE,CAAA;YACjC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,GAAG,IAAI,CAAC,WAAW,EAAE,oBAAoB,IAAI,EAAE,EAC/C,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,gCAAgC,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACzE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,0BAA0B,IAAI,CAAC,WAAW,EAAE,OAAO,EACpE,SAAS,EACT,KAAK,CAAC,EAAE,EACR,UAAU,EACV,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AAtED,0BAsEC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,SAAiB,EACjB,OAAuB;IAEvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,OAAO,CAAC;SAClB,QAAQ,CAAC,eAAe,CAAC;SACzB,SAAS,CAAC;QACT;YACE,IAAI,EAAE,cAAc,OAAO,EAAE;YAC7B,KAAK,EAAE,GAAG,SAAS,yBAAyB;SAC7C;QACD;YACE,IAAI,EAAE,kBAAkB,OAAO,EAAE;YACjC,KAAK,EAAE,GAAG,SAAS,iCAAiC;SACrD;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,GAAG,SAAS,iCAAiC;SACrD;KACF,CAAC;SACD,YAAY,CAAC,IAAI,CAAC,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAxBD,wCAwBC;AAED,SAAsB,QAAQ,CAC5B,OAAe,EACf,SAAiB,EACjB,KAAiB,EACjB,aAA6B,EAC7B,MAAgB;;QAEhB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,mCAAmC,EACnC,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/C,IAAI,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;YACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,IAAI,EAAE;gBACR,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,qBAAqB,EACrB,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;gBACD,OAAM;aACP;YACD,MAAM,QAAQ,GAAW,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;YAC3E,OAAO,CAAC,IAAI,CAAC,qBAAQ,QAAQ,CAAE,CAAA;YAC/B,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACnD,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,8BAA8B,EAC9B,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,6BAA6B,KAAK,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAA;YACtE,MAAM,IAAA,mBAAW,EACf,OAAO,EACP,KAAK,CAAC,OAAO,IAAI,oCAAoC,EACrD,SAAS,EACT,KAAK,CAAC,EAAE,EACR,aAAa,EACb,GAAG,CACJ,CAAA;YACD,OAAM;SACP;IACH,CAAC;CAAA;AA5DD,4BA4DC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,OAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE;SACpC,SAAS,CAAC,eAAU,CAAC;SACrB,cAAc,CAAC,GAAG,CAAC;SACnB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACjC,CAAC;AAND,sCAMC;AAED,SAAsB,iBAAiB,CACrC,UAAkB,EAClB,QAAgB,EAChB,SAAiB,EACjB,KAAiB;;QAEjB,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ;YAAE,OAAM;QAEpC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;QAErC,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,UAAU,CAAC,CAAA;QACnC,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,OAAM;QAEvB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAE3D,IAAI,QAAQ,GAAG,OAAO,CAAA;QACtB,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YACxE,QAAQ,GAAG,MAAM,CAAA;QACnB,MAAM,CAAC,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,QAAQ,MAAM,KAAK,CAAC,IAAI,SAAS,UAAU,EAAE,EAAE;YACtE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC9C,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,MAAM,EAAE,CAAA;QAE5B,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;QAClE,OAAO,MAAM,CAAA;IACf,CAAC;CAAA;AA1BD,8CA0BC"} \ No newline at end of file diff --git a/src/builtin/utill/ml.ts b/src/builtin/utill/ml.ts index f74a4c88b..fd5e5fe6e 100644 --- a/src/builtin/utill/ml.ts +++ b/src/builtin/utill/ml.ts @@ -322,7 +322,8 @@ export async function getAttachmentBlob( const token = await meme.lazyToken(ownerPubkey, terms.host) let protocol = 'https' - if (terms.host.includes('localhost')) protocol = 'http' + if (terms.host.includes('localhost') || terms.host.includes('meme.sphinx')) + protocol = 'http' const r = await fetch(`${protocol}://${terms.host}/file/${mediaToken}`, { headers: { Authorization: `Bearer ${token}` }, }) From 41d9a51e442a742bf605548ae7c26d5f44bad603 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 28 Aug 2023 20:48:56 +0100 Subject: [PATCH 81/93] update: removed logs used for debugging on github pipeline --- .github/workflows/cln_proxy_integration_test.yml | 8 -------- .github/workflows/integration_test.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index c1e289cfc..8df7c41ea 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -107,11 +107,3 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m - continue-on-error: true - - name: Display Logs - run: | - docker logs alice.sphinx - docker logs bob.sphinx - docker logs dave.sphinx - docker logs meme.sphinx - docker ps diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 18e9c055c..35cb51b2d 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -107,11 +107,3 @@ jobs: - name: Run tests working-directory: ./relay run: npx ava src/tests/controllers/${{matrix.test-name}}.test.ts --verbose --serial --timeout=2m - continue-on-error: true - - name: Display Logs - run: | - docker logs alice.sphinx - docker logs bob.sphinx - docker logs dave.sphinx - docker logs meme.sphinx - docker ps From dcbdd6a33edcdeb3a10eb4acc1aba9e4b903e1d9 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 00:13:08 +0100 Subject: [PATCH 82/93] update: added a special condition for the ML Bot for reply_uuid --- dist/src/network/intercept.js | 4 ++++ dist/src/network/intercept.js.map | 2 +- src/network/intercept.ts | 4 ++++ testing/stack/alice.json | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/src/network/intercept.js b/dist/src/network/intercept.js index eb801e25c..2c93e8309 100644 --- a/dist/src/network/intercept.js +++ b/dist/src/network/intercept.js @@ -16,6 +16,7 @@ const builtin_1 = require("../builtin"); const bots_1 = require("../controllers/bots"); const constants_1 = require("../constants"); const logger_1 = require("../utils/logger"); +const ml_1 = require("../builtin/ml"); /* default show or not restrictions (be able to toggle, or dont show chat) @@ -63,6 +64,9 @@ function isBotMsg(m, sentByMe, sender, forwardedFromContactId) { }, })); if (ogBotMsg && ogBotMsg.senderAlias) { + if (ogBotMsg.senderAlias === ml_1.ML_BOTNAME) { + ogBotMsg.senderAlias = ml_1.ML_PREFIX.substring(1); + } const ogSenderBot = (yield models_1.models.ChatBot.findOne({ where: { chatId: chat.id, diff --git a/dist/src/network/intercept.js.map b/dist/src/network/intercept.js.map index 1df680f9a..ae0dd5429 100644 --- a/dist/src/network/intercept.js.map +++ b/dist/src/network/intercept.js.map @@ -1 +1 @@ -{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../src/network/intercept.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../src/network/intercept.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/network/intercept.ts b/src/network/intercept.ts index f998d00c4..d76f3a40c 100644 --- a/src/network/intercept.ts +++ b/src/network/intercept.ts @@ -6,6 +6,7 @@ import { keysendBotCmd, postToBotServer } from '../controllers/bots' import constants from '../constants' import { logging, sphinxLogger } from '../utils/logger' import { BotMsg } from './interfaces' +import { ML_PREFIX, ML_BOTNAME } from '../builtin/ml' /* default show or not @@ -63,6 +64,9 @@ export async function isBotMsg( }, })) as Message if (ogBotMsg && ogBotMsg.senderAlias) { + if (ogBotMsg.senderAlias === ML_BOTNAME) { + ogBotMsg.senderAlias = ML_PREFIX.substring(1) + } const ogSenderBot: ChatRecord = (await models.ChatBot.findOne({ where: { chatId: chat.id, diff --git a/testing/stack/alice.json b/testing/stack/alice.json index 9f1af4483..58fc63542 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -13,6 +13,6 @@ "tribes_insecure": true, "public_url": "127.0.0.1:3001", "connect_ui": true, - "host_name": "http://localhost:3001" + "host_name": "https://19cd-105-112-233-141.ngrok-free.app" } } From 30ff87d7783bfcd98d2aef745729818909b7beb4 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 19:05:49 +0100 Subject: [PATCH 83/93] update: parsed replied message to get image url --- dist/src/builtin/ml.js | 14 ++++++++++++-- dist/src/builtin/ml.js.map | 2 +- dist/src/builtin/utill/ml.js | 11 ++++++++++- dist/src/builtin/utill/ml.js.map | 2 +- .../tests/controllers/boostPayment.test.js | 18 +++++++++--------- .../controllers/boostPayment.test.js.map | 2 +- src/builtin/ml.ts | 19 ++++++++++++++++++- src/builtin/utill/ml.ts | 11 ++++++++++- src/tests/controllers/boostPayment.test.ts | 18 +++++++++--------- 9 files changed, 71 insertions(+), 26 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index d850d374f..d2580bcb2 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -19,6 +19,7 @@ const node_fetch_1 = require("node-fetch"); const ml_1 = require("./utill/ml"); const logger_1 = require("../utils/logger"); const constants_1 = require("../constants"); +const rsa = require("../crypto/rsa"); const config = (0, config_1.loadConfig)(); const msg_types = Sphinx.MSG_TYPE; let initted = false; @@ -32,7 +33,7 @@ function init() { const client = new Sphinx.Client(); client.login('_', botapi_1.finalAction); client.on(msg_types.MESSAGE, (message) => __awaiter(this, void 0, void 0, function* () { - var _a; + var _a, _b; if (((_a = message.author) === null || _a === void 0 ? void 0 : _a.bot) !== exports.ML_PREFIX) return; const isAdmin = message.member.roles.find((role) => role.name === 'Admin'); @@ -62,12 +63,21 @@ function init() { } } let imageBase64 = ''; - // let imageUrl = '' + let imageUrl = ''; if (message.reply_id) { //Look for original message + const ogMessage = yield (0, ml_1.getOgMessage)(message.reply_id, tribe.tenant); + const parsedRemoteMessage = JSON.parse(ogMessage.remoteMessageContent); //Decrypt message + const decryptedMessage = rsa.decrypt(tribe.groupPrivateKey, parsedRemoteMessage.chat); //Check if message has img tag + const splittedMessage = decryptedMessage.split(' { + return (await models.Message.findOne({ + where: { uuid, tenant }, + })) as MessageRecord +} diff --git a/src/tests/controllers/boostPayment.test.ts b/src/tests/controllers/boostPayment.test.ts index 40025e60e..6a7c4f692 100644 --- a/src/tests/controllers/boostPayment.test.ts +++ b/src/tests/controllers/boostPayment.test.ts @@ -1,6 +1,6 @@ import test from 'ava' import { randomText } from '../utils/helpers' -import { deleteTribe, leaveTribe } from '../utils/del' +// import { deleteTribe, leaveTribe } from '../utils/del' import { createTribe, joinTribe } from '../utils/save' import { sendTribeMessageAndCheckDecryption, sendBoost } from '../utils/msg' import nodes from '../nodes' @@ -84,14 +84,14 @@ export async function boostPayment(t, index1, index2, index3) { t.true(boost3.success) //NODE2 LEAVES TRIBE - let left2 = await leaveTribe(t, node2, tribe) - t.true(left2, 'node2 should leave tribe') + // let left2 = await leaveTribe(t, node2, tribe) + // t.true(left2, 'node2 should leave tribe') - //NODE3 LEAVES TRIBE - let left3 = await leaveTribe(t, node3, tribe) - t.true(left3, 'node3 should leave tribe') + // //NODE3 LEAVES TRIBE + // let left3 = await leaveTribe(t, node3, tribe) + // t.true(left3, 'node3 should leave tribe') - //NODE1 DELETES TRIBE - let delTribe2 = await deleteTribe(t, node1, tribe) - t.true(delTribe2, 'node1 should delete tribe') + // //NODE1 DELETES TRIBE + // let delTribe2 = await deleteTribe(t, node1, tribe) + // t.true(delTribe2, 'node1 should delete tribe') } From d866a9893512147682efcc299f5c04ff7bef6cb4 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 21:20:26 +0100 Subject: [PATCH 84/93] update: added image url to command --- dist/src/builtin/ml.js | 45 ++++++++++++------------------------- dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 46 +++++++++++++------------------------- testing/stack/alice.json | 4 ++-- 4 files changed, 33 insertions(+), 64 deletions(-) diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index d2580bcb2..76ca80ed5 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -77,7 +77,6 @@ function init() { imageUrl = secondSplitting[1]; } } - console.log(imageUrl); if (message.type === constants_1.default.message_types.attachment) { const blob = yield (0, ml_1.getAttachmentBlob)(message.media_token, message.media_key, message.media_type, tribe); imageBase64 = blob.toString('base64'); @@ -128,36 +127,20 @@ function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } - let j; - if (message.type === constants_1.default.message_types.attachment) { - const r = yield (0, node_fetch_1.default)(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - image64: imageBase64, - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }); - j = yield r.json(); - } - else { - const r = yield (0, node_fetch_1.default)(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }); - j = yield r.json(); - } + const r = yield (0, node_fetch_1.default)(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + image64: imageBase64 || '', + image_url: imageUrl || '', + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }); + let j = yield r.json(); if (!j.body) { (0, ml_1.mlBotResponse)('failed to process message (no body)', message); return; diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 7185f657f..2bf73cee2 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index bedea5174..777ed1f35 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -93,7 +93,7 @@ export function init() { imageUrl = secondSplitting[1] } } - console.log(imageUrl) + if (message.type === constants.message_types.attachment) { const blob = await getAttachmentBlob( message.media_token!, @@ -156,35 +156,21 @@ export function init() { if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } - let j - if (message.type === constants.message_types.attachment) { - const r = await fetch(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - image64: imageBase64, - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }) - j = await r.json() - } else { - const r = await fetch(url, { - method: 'POST', - body: JSON.stringify({ - message: content.trim(), - webhook: `${host_name}/ml`, - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - }) - j = await r.json() - } + + const r = await fetch(url, { + method: 'POST', + body: JSON.stringify({ + message: content.trim(), + image64: imageBase64 || '', + image_url: imageUrl || '', + webhook: `${host_name}/ml`, + }), + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + let j = await r.json() if (!j.body) { mlBotResponse('failed to process message (no body)', message) diff --git a/testing/stack/alice.json b/testing/stack/alice.json index 58fc63542..f24f53a40 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -7,12 +7,12 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/alice/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3001", - "media_host": "localhost:5555", + "media_host": "memes.sphinx.chat", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, "public_url": "127.0.0.1:3001", "connect_ui": true, - "host_name": "https://19cd-105-112-233-141.ngrok-free.app" + "host_name": "https://7bb5-105-112-235-249.ngrok-free.app" } } From 520db197818b08035419ffda45e065e372aa88df Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 21:54:11 +0100 Subject: [PATCH 85/93] update: changed configs to default --- testing/stack/alice.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/stack/alice.json b/testing/stack/alice.json index f24f53a40..9f1af4483 100644 --- a/testing/stack/alice.json +++ b/testing/stack/alice.json @@ -7,12 +7,12 @@ "macaroon_location": "/Users/oluwatobibamidele/Desktop/work/sphinx/sphinx-stack/lnd/alice/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3001", - "media_host": "memes.sphinx.chat", + "media_host": "localhost:5555", "tribes_host": "localhost:13000", "tribes_mqtt_port": "1883", "tribes_insecure": true, "public_url": "127.0.0.1:3001", "connect_ui": true, - "host_name": "https://7bb5-105-112-235-249.ngrok-free.app" + "host_name": "http://localhost:3001" } } From 759501e041eaaa855ba56d41102c0c588207be18 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 23:09:02 +0100 Subject: [PATCH 86/93] update: added reply to bot to get image url to test --- dist/src/tests/controllers/mlBot.test.js | 17 +++++++++--- dist/src/tests/controllers/mlBot.test.js.map | 2 +- dist/src/tests/utils/msg/sendTribeMessage.js | 2 +- .../tests/utils/msg/sendTribeMessage.js.map | 2 +- src/tests/controllers/mlBot.test.ts | 26 ++++++++++++++++--- src/tests/utils/msg/sendTribeMessage.ts | 3 ++- 6 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dist/src/tests/controllers/mlBot.test.js b/dist/src/tests/controllers/mlBot.test.js index b075ccdd7..f79131c5d 100644 --- a/dist/src/tests/controllers/mlBot.test.js +++ b/dist/src/tests/controllers/mlBot.test.js @@ -77,7 +77,7 @@ function mlBot(t, index1, index2, index3) { const bobMessage = yield (0, msg_1.sendTribeMessage)(t, bob, tribe, text4); const botTextResponse = '
This is a response from test ml-bot server built in sphinx-stack
'; const botImageResponse = '
'; - yield (0, helpers_1.sleep)(8000); + yield (0, helpers_1.sleep)(6000); const botReply4 = (yield (0, get_1.getCheckBotMsg)(t, bob, botAlias, tribe, 1)); const botResponse = (0, msg_1.decryptMessage)(bob, botReply4); t.true(botResponse === botTextResponse); @@ -87,7 +87,7 @@ function mlBot(t, index1, index2, index3) { //Bot sends Message in tribe const text5 = (0, helpers_1.randomText)(); const virtualNode1Message = yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, text5); - yield (0, helpers_1.sleep)(8000); + yield (0, helpers_1.sleep)(6000); const botReply5 = (yield (0, get_1.getCheckBotMsg)(t, bob, botAlias, tribe, 1)); const botResponse2 = (0, msg_1.decryptMessage)(bob, botReply5); t.true(botResponse2 === botTextResponse); @@ -118,7 +118,7 @@ function mlBot(t, index1, index2, index3) { //Alice sends Message in the tribe const text6 = (0, helpers_1.randomText)(); const aliceMsg = yield (0, msg_1.sendTribeMessage)(t, alice, tribe, `@${model2} ${text6}`); - yield (0, helpers_1.sleep)(8000); + yield (0, helpers_1.sleep)(6000); const botReply8 = (yield (0, get_1.getCheckBotMsg)(t, alice, botAlias, tribe, 10)); const botResponse3 = (0, msg_1.decryptMessage)(alice, botReply8); t.true(botResponse3 === botImageResponse); @@ -132,13 +132,22 @@ function mlBot(t, index1, index2, index3) { const text9 = (0, helpers_1.randomText)(); const imageSent = yield (0, msg_1.sendImage)(t, virtualNode1, alice, base64images_1.greenSquare, tribe, 0, '', `@${model2} ${text9}`); t.true(!!imageSent, 'message should have been sent'); - yield (0, helpers_1.sleep)(8000); + yield (0, helpers_1.sleep)(6000); const botReply9 = (yield (0, get_1.getCheckBotMsg)(t, virtualNode1, botAlias, tribe, 2)); const botResponse4 = (0, msg_1.decryptMessage)(virtualNode1, botReply9); t.true(botResponse4 === botImageResponse); //Bob Node Should not See VirtualNode Message const checkNode7 = yield (0, get_1.shouldNotGetNewMsgs)(t, bob, imageSent.uuid); t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message'); + //VirtualNode sends reply bot response to get image URL + const text10 = (0, helpers_1.randomText)(); + yield (0, msg_1.sendTribeMessage)(t, virtualNode1, tribe, `@${model2} ${text10}`, { + reply_uuid: botReply9.uuid, + }); + yield (0, helpers_1.sleep)(6000); + const botReply10 = (yield (0, get_1.getCheckBotMsg)(t, virtualNode1, botAlias, tribe, 3)); + const botResponse8 = (0, msg_1.decryptMessage)(virtualNode1, botReply10); + t.true(botResponse8 === botImageResponse); //BOB LEAVES TRIBE let left2 = yield (0, del_1.leaveTribe)(t, bob, tribe); t.true(left2, 'bob should leave tribe'); diff --git a/dist/src/tests/controllers/mlBot.test.js.map b/dist/src/tests/controllers/mlBot.test.js.map index 9dce8bad8..f26af0c37 100644 --- a/dist/src/tests/controllers/mlBot.test.js.map +++ b/dist/src/tests/controllers/mlBot.test.js.map @@ -1 +1 @@ -{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mlBot.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/mlBot.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/sendTribeMessage.js b/dist/src/tests/utils/msg/sendTribeMessage.js index 90ea74c14..73e3a50e7 100644 --- a/dist/src/tests/utils/msg/sendTribeMessage.js +++ b/dist/src/tests/utils/msg/sendTribeMessage.js @@ -34,7 +34,7 @@ function sendTribeMessage(t, node1, tribe, text, options) { amount: (options && options.amount) || 0, parent_id: (options && options.parent_id) || 0, thread_uuid: (options && options.thread_uuid) || '', - reply_uuid: '', + reply_uuid: (options && options.reply_uuid) || '', boost: false, }; //send message from node1 to node2 diff --git a/dist/src/tests/utils/msg/sendTribeMessage.js.map b/dist/src/tests/utils/msg/sendTribeMessage.js.map index 24a81fdb2..938abf2ef 100644 --- a/dist/src/tests/utils/msg/sendTribeMessage.js.map +++ b/dist/src/tests/utils/msg/sendTribeMessage.js.map @@ -1 +1 @@ -{"version":3,"file":"sendTribeMessage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendTribeMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAgC;AAIhC,gCAAgC;AAEhC,wCAAqC;AAErC,2CAA0C;AAC1C,gCAA2C;AAQ3C,SAAsB,gBAAgB,CACpC,CAAa,EACb,KAAiB,EACjB,KAAW,EACX,IAAY,EACZ,OAA4B;;QAE5B,mCAAmC;QACnC,MAAM,YAAY,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAE5C,8CAA8C;QAC9C,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QAEjE,8CAA8C;QAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAErD,4CAA4C;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACzD,CAAC,CAAC,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,EAAE,0BAA0B,CAAC,CAAA;QAE/D,MAAM,CAAC,GAAG;YACR,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,aAAa;YACnB,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;YACrC,MAAM,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACxC,SAAS,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YAC9C,WAAW,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;YACnD,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,KAAK;SACb,CAAA;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CACzB,KAAK,CAAC,WAAW,GAAG,WAAW,EAC/B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAA;QAExD,OAAO,GAAG,CAAC,QAAQ,CAAA;IACrB,CAAC;CAAA;AAxCD,4CAwCC"} \ No newline at end of file +{"version":3,"file":"sendTribeMessage.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendTribeMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAgC;AAIhC,gCAAgC;AAEhC,wCAAqC;AAErC,2CAA0C;AAC1C,gCAA2C;AAS3C,SAAsB,gBAAgB,CACpC,CAAa,EACb,KAAiB,EACjB,KAAW,EACX,IAAY,EACZ,OAA4B;;QAE5B,mCAAmC;QACnC,MAAM,YAAY,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAE5C,8CAA8C;QAC9C,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QAEjE,8CAA8C;QAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAErD,4CAA4C;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACzD,CAAC,CAAC,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,EAAE,0BAA0B,CAAC,CAAA;QAE/D,MAAM,CAAC,GAAG;YACR,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,aAAa;YACnB,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;YACrC,MAAM,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACxC,SAAS,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YAC9C,WAAW,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;YACnD,UAAU,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE;YACjD,KAAK,EAAE,KAAK;SACb,CAAA;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CACzB,KAAK,CAAC,WAAW,GAAG,WAAW,EAC/B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAA;QAExD,OAAO,GAAG,CAAC,QAAQ,CAAA;IACrB,CAAC;CAAA;AAxCD,4CAwCC"} \ No newline at end of file diff --git a/src/tests/controllers/mlBot.test.ts b/src/tests/controllers/mlBot.test.ts index 45b629f1b..15ea756d8 100644 --- a/src/tests/controllers/mlBot.test.ts +++ b/src/tests/controllers/mlBot.test.ts @@ -91,7 +91,7 @@ export async function mlBot(t, index1, index2, index3) { '
This is a response from test ml-bot server built in sphinx-stack
' const botImageResponse = '
' - await sleep(8000) + await sleep(6000) const botReply4 = (await getCheckBotMsg( t, bob, @@ -114,7 +114,7 @@ export async function mlBot(t, index1, index2, index3) { tribe, text5 ) - await sleep(8000) + await sleep(6000) const botReply5 = (await getCheckBotMsg( t, bob, @@ -170,7 +170,7 @@ export async function mlBot(t, index1, index2, index3) { `@${model2} ${text6}` ) - await sleep(8000) + await sleep(6000) const botReply8 = (await getCheckBotMsg( t, @@ -203,7 +203,7 @@ export async function mlBot(t, index1, index2, index3) { `@${model2} ${text9}` ) t.true(!!imageSent, 'message should have been sent') - await sleep(8000) + await sleep(6000) const botReply9 = (await getCheckBotMsg( t, @@ -219,6 +219,24 @@ export async function mlBot(t, index1, index2, index3) { const checkNode7 = await shouldNotGetNewMsgs(t, bob, imageSent.uuid) t.true(checkNode7, 'BOB SHOULD NOT SEE VirtualNode Message') + //VirtualNode sends reply bot response to get image URL + const text10 = randomText() + await sendTribeMessage(t, virtualNode1, tribe, `@${model2} ${text10}`, { + reply_uuid: botReply9.uuid, + }) + + await sleep(6000) + + const botReply10 = (await getCheckBotMsg( + t, + virtualNode1, + botAlias, + tribe, + 3 + )) as Message + const botResponse8 = decryptMessage(virtualNode1, botReply10) + t.true(botResponse8 === botImageResponse) + //BOB LEAVES TRIBE let left2 = await leaveTribe(t, bob, tribe) t.true(left2, 'bob should leave tribe') diff --git a/src/tests/utils/msg/sendTribeMessage.ts b/src/tests/utils/msg/sendTribeMessage.ts index 8c6721448..24c4eb3e0 100644 --- a/src/tests/utils/msg/sendTribeMessage.ts +++ b/src/tests/utils/msg/sendTribeMessage.ts @@ -13,6 +13,7 @@ interface SendMessageOptions { amount?: number parent_id?: number thread_uuid?: string + reply_uuid?: string } export async function sendTribeMessage( @@ -43,7 +44,7 @@ export async function sendTribeMessage( amount: (options && options.amount) || 0, parent_id: (options && options.parent_id) || 0, thread_uuid: (options && options.thread_uuid) || '', - reply_uuid: '', + reply_uuid: (options && options.reply_uuid) || '', boost: false, } From 97cd8a01ab09b57dd3634f720d8e9b1fefb59270 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Tue, 29 Aug 2023 23:09:57 +0100 Subject: [PATCH 87/93] update: removed stack branch --- .github/workflows/cln_proxy_integration_test.yml | 2 +- .github/workflows/integration_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cln_proxy_integration_test.yml b/.github/workflows/cln_proxy_integration_test.yml index 8df7c41ea..96f0e5de4 100644 --- a/.github/workflows/cln_proxy_integration_test.yml +++ b/.github/workflows/cln_proxy_integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b update/add_media https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 35cb51b2d..f0f668728 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -71,7 +71,7 @@ jobs: npm install && npm run build && docker build -t sphinxlightning/sphinx-relay . - name: Checkout stack run: | - git clone -b update/add_media https://github.com/stakwork/sphinx-stack.git stack + git clone https://github.com/stakwork/sphinx-stack.git stack - name: give permissions working-directory: ./stack run: | From f02184f39a094db12c282de4cad730dca1c1ae8d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 30 Aug 2023 18:13:56 +0100 Subject: [PATCH 88/93] update: ensured message is sent through lightning before returning a response to client --- dist/src/controllers/invoices.js | 4 +- dist/src/controllers/invoices.js.map | 2 +- dist/src/tests/utils/msg/payInvoice.js | 6 +- dist/src/tests/utils/msg/payInvoice.js.map | 2 +- src/controllers/invoices.ts | 6 +- src/tests/configs/nodes.json | 64 +++++++++++----------- src/tests/utils/msg/payInvoice.ts | 10 +--- 7 files changed, 41 insertions(+), 53 deletions(-) diff --git a/dist/src/controllers/invoices.js b/dist/src/controllers/invoices.js index c81ffeadf..3768b0bb6 100644 --- a/dist/src/controllers/invoices.js +++ b/dist/src/controllers/invoices.js @@ -194,8 +194,7 @@ const createInvoice = (req, res) => __awaiter(void 0, void 0, void 0, function* msg.expirationDate = new Date(expiry); } const message = (yield models_1.models.Message.create(msg)); - (0, res_1.success)(res, jsonUtils.messageToJson(message, chat)); - network.sendMessage({ + yield network.sendMessage({ chat: chat, sender: owner, type: constants_1.default.message_types.invoice, @@ -204,6 +203,7 @@ const createInvoice = (req, res) => __awaiter(void 0, void 0, void 0, function* invoice: message.paymentRequest, }, }); + (0, res_1.success)(res, jsonUtils.messageToJson(message, chat)); } } catch (err) { diff --git a/dist/src/controllers/invoices.js.map b/dist/src/controllers/invoices.js.map index 578e3d2de..dcf50d5e0 100644 --- a/dist/src/controllers/invoices.js.map +++ b/dist/src/controllers/invoices.js.map @@ -1 +1 @@ -{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../src/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../src/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/utils/msg/payInvoice.js b/dist/src/tests/utils/msg/payInvoice.js index f84a13618..e984c032b 100644 --- a/dist/src/tests/utils/msg/payInvoice.js +++ b/dist/src/tests/utils/msg/payInvoice.js @@ -21,10 +21,9 @@ const payInvoice = (t, sendingNode, receivingNode, amount, payment_request) => _ const receivingNodebeforeBalance = yield (0, get_1.getBalance)(t, receivingNode); const v = { payment_request }; const r = yield http.put(sendingNode.external_ip + '/invoices', (0, helpers_1.makeArgs)(sendingNode, v)); - console.log('-> payInvoice res', sendingNode.alias, r); t.true(r.success, 'Put method should have succeeded'); const paymentHash = r.response.payment_hash; - t.truthy(paymentHash, 'paymentHash should exist'); + t.truthy(paymentHash, `paymentHash should exist for ${sendingNode.alias}`); //wait for PUT method const paid = yield (0, get_1.getCheckNewPaidInvoice)(t, receivingNode, paymentHash); t.truthy(paid, 'receivingNode should see payment'); @@ -32,9 +31,6 @@ const payInvoice = (t, sendingNode, receivingNode, amount, payment_request) => _ const sendingNodeafterBalance = yield (0, get_1.getBalance)(t, sendingNode); //get receivingNode balance after payment const receivingNodeafterBalance = yield (0, get_1.getBalance)(t, receivingNode); - console.log('amount', amount); - console.log('NODE1 === ', sendingNodebeforeBalance - sendingNodeafterBalance); - console.log('NODE2 === ', receivingNodeafterBalance - receivingNodebeforeBalance); //check that sendingNode sent payment and receivingNode received payment based on balances //3 SAT ARE ADDED AS A MESSAGE FEE t.true(sendingNodebeforeBalance - sendingNodeafterBalance >= amount, 'sendingNode should have paid amount'); diff --git a/dist/src/tests/utils/msg/payInvoice.js.map b/dist/src/tests/utils/msg/payInvoice.js.map index 8a3e24483..996903b78 100644 --- a/dist/src/tests/utils/msg/payInvoice.js.map +++ b/dist/src/tests/utils/msg/payInvoice.js.map @@ -1 +1 @@ -{"version":3,"file":"payInvoice.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/payInvoice.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iCAAiC;AAEjC,gCAA2D;AAC3D,wCAAqC;AAE9B,MAAM,UAAU,GAAG,CACxB,CAAa,EACb,WAAuB,EACvB,aAAyB,EACzB,MAAc,EACd,eAAuB,EACL,EAAE;IACpB,sCAAsC;IAEtC,wCAAwC;IACxC,MAAM,wBAAwB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IACjE,0CAA0C;IAC1C,MAAM,0BAA0B,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IAErE,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,CAAA;IAC7B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CACtB,WAAW,CAAC,WAAW,GAAG,WAAW,EACrC,IAAA,kBAAQ,EAAC,WAAW,EAAE,CAAC,CAAC,CACzB,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAA;IAC3C,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAA;IAEjD,qBAAqB;IACrB,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAsB,EAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,CAAA;IACxE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAA;IAElD,uCAAuC;IACvC,MAAM,uBAAuB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IAChE,yCAAyC;IACzC,MAAM,yBAAyB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IAEpE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC7B,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,CAAA;IAC7E,OAAO,CAAC,GAAG,CACT,YAAY,EACZ,yBAAyB,GAAG,0BAA0B,CACvD,CAAA;IAED,0FAA0F;IAC1F,kCAAkC;IAClC,CAAC,CAAC,IAAI,CACJ,wBAAwB,GAAG,uBAAuB,IAAI,MAAM,EAC5D,qCAAqC,CACtC,CAAA;IACD,CAAC,CAAC,IAAI,CACJ,0BAA0B,GAAG,yBAAyB,IAAI,MAAM,GAAG,CAAC,EACpE,2CAA2C,CAC5C,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AArDY,QAAA,UAAU,cAqDtB"} \ No newline at end of file +{"version":3,"file":"payInvoice.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/payInvoice.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iCAAiC;AAEjC,gCAA2D;AAC3D,wCAAqC;AAE9B,MAAM,UAAU,GAAG,CACxB,CAAa,EACb,WAAuB,EACvB,aAAyB,EACzB,MAAc,EACd,eAAuB,EACL,EAAE;IACpB,sCAAsC;IAEtC,wCAAwC;IACxC,MAAM,wBAAwB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IACjE,0CAA0C;IAC1C,MAAM,0BAA0B,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IAErE,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,CAAA;IAC7B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CACtB,WAAW,CAAC,WAAW,GAAG,WAAW,EACrC,IAAA,kBAAQ,EAAC,WAAW,EAAE,CAAC,CAAC,CACzB,CAAA;IAED,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAA;IAC3C,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,gCAAgC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAA;IAE1E,qBAAqB;IACrB,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAsB,EAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,CAAA;IACxE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAA;IAElD,uCAAuC;IACvC,MAAM,uBAAuB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IAChE,yCAAyC;IACzC,MAAM,yBAAyB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IAEpE,0FAA0F;IAC1F,kCAAkC;IAClC,CAAC,CAAC,IAAI,CACJ,wBAAwB,GAAG,uBAAuB,IAAI,MAAM,EAC5D,qCAAqC,CACtC,CAAA;IACD,CAAC,CAAC,IAAI,CACJ,0BAA0B,GAAG,yBAAyB,IAAI,MAAM,GAAG,CAAC,EACpE,2CAA2C,CAC5C,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AA7CY,QAAA,UAAU,cA6CtB"} \ No newline at end of file diff --git a/src/controllers/invoices.ts b/src/controllers/invoices.ts index f897d55f9..fd9d7b9c5 100644 --- a/src/controllers/invoices.ts +++ b/src/controllers/invoices.ts @@ -211,9 +211,7 @@ export const createInvoice = async (req: Req, res: Response): Promise => { msg )) as MessageRecord - success(res, jsonUtils.messageToJson(message, chat)) - - network.sendMessage({ + await network.sendMessage({ chat: chat as Partial, sender: owner, type: constants.message_types.invoice, @@ -222,6 +220,8 @@ export const createInvoice = async (req: Req, res: Response): Promise => { invoice: message.paymentRequest, }, }) + + success(res, jsonUtils.messageToJson(message, chat)) } } catch (err) { sphinxLogger.error(`addInvoice error: ${err}`) diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index 90f854830..6be00a488 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -4,11 +4,11 @@ "pubkey": "03a394d0ebf0d003124ab130c6b12b8b990a50a30a464354800a51981ba745bb07", "ip": "http://alice.sphinx:3001", "external_ip": "http://localhost:3001", - "authToken": "7gZg9fNFZrWfZ0LZdBUQ", - "transportToken": "MIIBCgKCAQEAmA/cRKjb+OqMN/xlP8lM1341PeeT+RAMa78lGdlVCHMBgZ76DSuA\n4l9pfDUjQzbaW353o4gTGIGoE6CCPYOjsE9GSv50zbzHxEo1PZM/XkLw3ak3XKPG\nTUoQPi4KxTq4w9+KyUBTjJYcdTWhlg3K14I2vb6XxdJg7whGhPEayVGOLP2d/r0V\nKLwYPzS0L646+RYzOViraLZe6OZqEayrkaojU5hhJZYk30jv/tPMps56HLyKeJZI\nxCg4uqdDRt3ktfFMRSI+P8J0MFSUi7VTzkVOStfW4jTsIhWz6wGcrbwd20Dd5gV9\nHaLiEdU1QOAsOj3VVNf+KTptlJBNlFKzYwIDAQAB", - "contact_key": "MIIBCgKCAQEAwbYFPfQ4H+b+cTuoBpNx4BGEgHJFkFmXPT4WgXYtDgDlDI/9FgGHbpfsFr0gyhJac7I5kwkSiucTrUKr2mAxXx92KZ5bBGR9DtpSS5OstKyD4Ywgif0sAWWuTySmhVtVSg/qaHQ/y5zeZoU7thWCquf4EEh6BfaHjWtNuEHHI0S59dAmza/MjsrDizoUOn8daX+1ub6AIC3rC75kDiRJDPGZZ5kQiLOH6uBzJU2MgtIfuCPGmvFhcwbp4LvOZ8zohzdMIybOAh0Xkskfkr8o15J2PdmK1tNK6N8G33L4w2BdyH5Gk346Fxg9AjjXWmcJWByM6DlhEvcleMnRQ5I7JwIDAQAB", - "privkey": "MIIEpAIBAAKCAQEAwbYFPfQ4H+b+cTuoBpNx4BGEgHJFkFmXPT4WgXYtDgDlDI/9FgGHbpfsFr0gyhJac7I5kwkSiucTrUKr2mAxXx92KZ5bBGR9DtpSS5OstKyD4Ywgif0sAWWuTySmhVtVSg/qaHQ/y5zeZoU7thWCquf4EEh6BfaHjWtNuEHHI0S59dAmza/MjsrDizoUOn8daX+1ub6AIC3rC75kDiRJDPGZZ5kQiLOH6uBzJU2MgtIfuCPGmvFhcwbp4LvOZ8zohzdMIybOAh0Xkskfkr8o15J2PdmK1tNK6N8G33L4w2BdyH5Gk346Fxg9AjjXWmcJWByM6DlhEvcleMnRQ5I7JwIDAQABAoIBAAzpJNBMRrFZo/vIDhriGOTmRf6JnzlPv1TFnppiVf5o8Ns1fZjJ4Uztsz6QvG67amvrpQq3wBSh8h3KI8oaPzAn2KhNdaOFTxB+XJ3M6eXg2alevYx040n0jPmZZ7/bpoOZK/ZqSRY5Dlmm56PrKxpY+5+aNQfQtpgmXre5KpyfClaooJUVuUMkUhXvr2SjphWrdqgyWnZMI9pDie33ArewUQjo0W/BviUwdnmRYmnNAds8Gl6CSYY4lYV+DubwMBuF2pRXyuZ+PS1nS+096cnG6cnZZcYj6VR0pSI+LAQbwQWu5KUjQ9oJ4bon2szyl9S55wxwYxz+NkOf2pN0NgECgYEA3xqDd0b7laqIoz4iYNzKgchi+qJrEJfL2lNXPuDJf9DdPYYTzHL90wrvibMkl1Sof/1kLeDnnJu9B5V9KQXh1wJvLDKmLv24Cm5Mq2Wl/sADXagz8AVcDfzlK5mkrZW0hPuIMF+4jeLxI8vcNuXcKn+FVUtZKL100QKXHmafOxECgYEA3kYG3ov188sUzw4pNITpbhJ8mC49tksLMwp9Z6r0iJuM0I5sR1VJ/ZyBk4ZUVCxSM2hZDkI0bwJM8lkZ0Sm1NHdN3MNaN/erKneui1p4Zpf8mfJLmthmY9Dmijlr7yW2zIai9hVNHdOzEXlRFWPQ64uYZxC37IgRnI8ofTf64rcCgYEAtmxEgLwerKMTNH9ytsbyIqqKHCu/5YJpIeyxUu2UdRmAPXUrLSn9V5oCgRJk4gRL/tNfHZBfcZN6PgBCpc90eU05P+duMNAuswC7Wg40a5fvaJ5HUYPgYGOfs0Xe/DyDrZTKJ9us2P9ucvmW56CNpIY+rJ5+maxIHzrB/A6nNjECgYAOnv6erwg7xDUXNbBCMygDxJWLkScgEamn7t227wjs34aQxX2b56FZXG0tnh139/5kQU3yYSp/zt/u5SuMlbjEvcBScEtD+Te6MGs74XSgEwlbuxN8GRYLJNe1afeOoKV4qLaZh2cuOhnCYX+S76DzjZg112Sx23WFHemk6wTG2wKBgQDP50ooAYXUQOzFKU/wUoyYzCC80hiuLJGucwbocCc6bI2AakSt+dGXDMWjxSjVqhzBFs50L66dmF1qffaXP2J+I68TLrLR/vAUE9kCDDWOKeVRRlo0mEoRpU3O8TMn6GgMQV/oSxKolDXrQuHZRc0k/vZ5wyEI7zwntOzDNfeMvg==", - "exported_keys": "a2V5czo6QXdIUmZsK0pjbVZOVU1OZUZXczd1ODVzNW9leEc5Ym9QSmkyMnN2V3pGUDF0UmRRblRPVVZpSzNHM0RrNzlQbDMyc2VyY0JOMEk4NGRXZ2hibUIvcUhESzV5b0tRM0FMbUg4RVkwdUZPVDlPQXRnWUtlUXJHbzh0M3N6QUJyeXQ3Z2gxMm5HTTh5enpEVmdYYkRpVy9VeVkzL2E3bG5paFRHdHVPWVFsMGF2eVRMVXVUZXNGRCtPVkRxRWthUjBiY3l4ZTdMQitiU292cVJWM0lMem5mcHNwWlg5R2t2VjhDQmY2RkVES0hFc2Z4VUJjckg3RlhZbnRvVE9xMkVjWGRPNUdvcEljZmYzVkdQbE9oQUdDNHhnWFFSQkVvSmlvN1cwdUdGZjU2c2JoMVU1VlEvTXd3NTVIUWMzbXlkUHpJWXROdThXdWhnd0FPZjEwdmlVT0NjZ3M2eUR4NDV5RisxU2VhODhKam1lSldkYnhweDBCaERreWpmMkwyTVpYb0RUTmp4bHVvaU5HcmJmMTZpdlUxZ1ZhVXhjK3V5S0FZVy9VSkhlU0d1SHZCV3RiTUhXS1J2cmtPVUxWTFpMb01TaU1UamxCbEdRY3lmZUtOeTBCTHNKSlFFcE9pNzUzRmx0SVp6Z2FjRlpUQVVwSlQzWkFRakhLQ1FkaGREdEdpNGNLYjlFMHdTdFpwQnI5ZmkxdjFhQXNKZ21hYk9DSXdKditva0k5SjJYMzRHSHcxRmFxRW04Mk8xb1diWGxwbnFQOW5vWHA5clJHZVdtbkt5eS93L0FuUDRsKzB6ZTZ0akJYQ3NyNlJXbWRYRUVWSmQrNG5VcGdJUUtNdWtwTU5QVlkzNTUveGJBOU1UUUdmUlFlOGwrOGNsSlRLdE03elRHanJZanNSZXlXb2lvcnpvVnpxcEJSK01qREFadm41UnJUdi82OWNQWmJsQ2ZYMVlHZmlZUlNLemQ1SVVRVi91ZE5wTHUzand4K2JKS2NlaStLZWg0WDZndzFtSW51Y1JJWlowWHdzaWEzd1ZTeHoyK3pFZDlSb2hmUXZiRHIvZzFHOXZkNEZsdjdVL1BBRCswZ1N2M0ROOTFDTGVmeG8raFJqWVBxRG5VNzRNWThsNTFET2ZTMVJvcEp0RDVLUHN6YzFCSWJxemI3RFpObHJEa3pvdEJ2a3IwS0J2NjZ0R01vTm9ucFUrMzdCVE5DdGg4bnVVTnIvdTFjTHhDQmxaQnF6T3FNRUxQcEsySktvV0lSc0lzeStaT00wby9KV2puSGI3Q0xhUlVMTzlNK1ZEVGRkdWlvTURUVkV3UkpYZHlLUkZZVSt3Z29QYmM5cVh3eGt0UnZteXFlVVhuSllIVGg2Mm5VbU9QdFlaUkg3TE5xS3liTXFlR3diZE9OUWlPckZiNlp6UmFuUzNhc2pFMlZNU0lvUSs0K2VkL1ZnU0xPbWtiOXE4S0x2QUJjYTlucDExeG9UVmYrZW1oM2J1MXRSVFhSdW5ZN1ErbHRkeFRndGErU3lOb251dlc1K3F4cFNhdng2c05pMVhJbGJyTWxiSjZVSTVML1BzeFJYTlFlU1YybmRvRVRnbkhidHBGa2lHMyt4SDI3UDZnMHRNOWt5c0wzZU56aDBGbUVaL2g0TVNiMEFyblNWdGd4QWsxTHZXYlZ1VTRIWXJnUGJwWmhZTUorNjNvNjdzSFdKUHc5YXJSeDc1NzhqampOSCtwQXRpV1I5bTkvQkIxTytML0krTE5McnFYN2dnTDUxeTlLTmVDYW5OcS90VXovWVRXYWhPTlJsVm40UHpiNHI5Y3dVWGc4a2tsR2dYTnROaUZzU2IwL29hRVY3dC9mSXVLcjVTRlJqdVVWTktWTG43d2hybmtPNE9rMkljSmhtMDRmZkdRbEk3M085eTUvdTl3SG1FemtybitaMGdjdHFvYVRqMW5JRHVEL0gyZ0RVZjRIdDJVdVpTMUgrVjQydXFaWW5OM1BsMndSQmQ2bXpscGQ4MEcvRGZYR1RUY1JCZlF6RFFVdVZaT2QrRnpaNkZpMGcyWUc4NWkxeWRybWpHeEgvR0pHSVZ1b3dHaU5OV0tBb3pDM2kvTmw5MXc4UnVyekR0OURnY1QyemZrSFYweGx0UThZQTNsT1dncDZzT25iSkx4NFZ3RmtuZitlTWpJcHpQcU5LcTk5REdERkR1T0wzVXZmMnV3QzVTb2ZXYVMrL0psbytPWjh5NVJjN2wzb3V1ZjNzNmd2bmlUTHFTLzd4Wnp3aFJQemc0ZmxoMVZCTXkwZFRUSG5NLysvTWZrRkJTblYyY21lTEk4Q0xZbUEya3E2RmQrZXdjSjU4am5VYkdCWE9BUnlwUzNyTis0RXo2QWU5NVFNMDFVeXVyZnRzbjZ3U3pYdG9IRllkamxwalp2NTFtWi9TZFpvNmM0WG5iaDRkaGtVNEdmelpzYjVmL2hHMUxDbTBHSkdWbSs0TTQvdzhaTUJUVnQ0cUtURE9yZTFkVGh0Sk9PK2NxY0xKL0pKckpMMkNCcXZrNE5CQnIxaDlHa2FHMFBrSWRiMkJ3K0M5NzV4ZkpPMERRcVRLSlFyR0EwaGxtb1JTZCsyUTl2a2I0MHBJTUZ3S2FhcVRYVGNDeVc2VUxFcWJYd1MrMVI4SmtaelBrcmtvWUo0c2JSYzJiVEdWWWZrOEFzVVJwQTJac0pXcjhFWmQweFVwWGgvOXpzU2lvT1prOG5SQnNidWNOdDNJVFlLZTJPWUNhSkMrSTdpQ0VHTEJoZ3U2cC9SU1F2NncwTFVjSmVVZlJtTlA4YXhxTUZvZTZ6eHNKR2d3ME1ub1hlZkZwSlpYL1BQT2M3TmhQY3pYbFJud0h0ZGdRMWVUTFZ1dHB6REEvaFh5OTVrOGQwM1VmZmQ0QjloTGx5Qm15aFNCR3NFSDBQTXc5QlZJeTkvenBvbnhqYmtreVl6T1pGRldFY25lczNvMW02b3dHSytXQ29sWGRQanVNZnJSR3RZbEwxUWlZRzE0dXpnajNTRllPTmxLN0dxWWc1RjIwZFgrTnFxM2lyVVpIVTFNcjNaK3RhOEsvUTI0N0hHU01sYUxnRzI5SmtQWWhDNDJQNExsSEZhalBBOHRoaExnQ2pqTFA1NEwzd0NVQlF3dXZnUTh3cngyYXdQbmxHSTE0dkFHUUtuYXJEZk0weklLdlBoY3RqS0IwcDRVMUVCTExGeGdJc3piKzhxVkNoSy9BY1VkSG1Sci9MRkVha1JPS1VYWnJsVk5HMklHTnY1R2NpK291RU9GbkJVZmkvTG9NVGtiQjRVMUNrNHg0QkpWWWw0Y1RyS0NGdUxibGlrSGUzUVpGUTMxVWtGTy9wR0JhSVBERXVvWUtuK2pnUmVZdzlnT2JKQnJ1T3loNTM0U2RHRGx0aW9vVEp5TGc2QllVQ1FSM3FqZHhlZnFtTjh4N0dUQlBFd2k5cmlRWkcwT2tTSG5VdlJpYi9BZlJPa0FMdW9DM2lDQVl0cWExZWNsWFk3MEJ4Sk1mZEhMcXY1RFZpcGVVYmtTcElCV0Z0WkFESkRidmdrcng0U3JvTGNsQ1JTc01lbHJMT245VzVTU1hYTjFWNHJ5MWNLWENNSmE1SmJkaTF0UTh1eFhmc2tEMUw3ZTArSGJGbnRpNDc3OTcxMmdFVT0=", + "authToken": "maPk0GOsAXRDwPYseJ5K", + "transportToken": "MIIBCgKCAQEAsVjAAHNblgh0ZvetxqtFvh9IGq97ifk9ljzxYqbpMui6uSE+2Mjn\n8PYDWynJyOMXUtYlVSncqARtP+GfzolLK5S/61T0xdsEHaLrFQuFFgmUVjmQ3Edp\nM7+u4KwZlAPYIGkVdQciPCpw6mePvAjheE0QAlxdnbzxqdIFJ0LJ4q/T8t/dT4PG\nnKXhp+OU5CquyUkNIu6BnS3EyuQF8pTrBRRX02hjTOYlRw+xxYsRfko99C0xFVTu\nVK6PZlcIcO0ycvHSm3p73xq9mY8bGqqiEhEoV2j3yl2XrqScedH63zwnVB75iizH\n+VFWigkRrcUI+EfJkgeOWTx5sKc1Hc73OwIDAQAB", + "contact_key": "MIIBCgKCAQEAvOY5hPIS1MI3VFu8cy7jqUBA/oNu/KhrfISlDEMT35y754SvT9WLoQJ4R/EYFdaoWxYFgD8WhSsKmKqEJdpQXhsDt78LmGz9Gfda0fIvorsHQLp14wRiBziCCoobm1z8qEkjn3LBOsSmkcAOqyuB1HqGdbI8bqyA+/MwnmbFEoi7ZNRvL32ERDvrJaSrlb9kROo6Wk4MkWOVmDS3K54NP1MF4LSWSyeEJocV/4oqy7iuDo1m8cJ3FnQpCO0k+dWaNpb5A6Os2s++nr/dqQdjHNc91nWnND69E2zQ1P2d8r2JvIfYj848kEpqmz8fYV0wSmFaIDEWfemGzTacqsyk0QIDAQAB", + "privkey": "MIIEpAIBAAKCAQEAvOY5hPIS1MI3VFu8cy7jqUBA/oNu/KhrfISlDEMT35y754SvT9WLoQJ4R/EYFdaoWxYFgD8WhSsKmKqEJdpQXhsDt78LmGz9Gfda0fIvorsHQLp14wRiBziCCoobm1z8qEkjn3LBOsSmkcAOqyuB1HqGdbI8bqyA+/MwnmbFEoi7ZNRvL32ERDvrJaSrlb9kROo6Wk4MkWOVmDS3K54NP1MF4LSWSyeEJocV/4oqy7iuDo1m8cJ3FnQpCO0k+dWaNpb5A6Os2s++nr/dqQdjHNc91nWnND69E2zQ1P2d8r2JvIfYj848kEpqmz8fYV0wSmFaIDEWfemGzTacqsyk0QIDAQABAoIBAFO5Gq9Q94WzGwDZs/m9Q4xFfUkRCgUTxKgoxlpb9Jf8iNABYA5bUIqpZJRGSG2NeYr9hKylyZ52SDkIApAgZdR/1rL/Cu2hCMEUf/1jgTd3+6v1uMBItgYLRp/TPI8stJMF77MBEqGwfT9GR3oYS2/YanYJ7H0FGhoRXHAojpo6ml24hOSXGHHi2UOSWH60FVH2//EWmB/e+IHfeb1raBXCuuN/lrsebsNy9W0bjvZ0jXkGi08anuBfHhjzCU8TF2yF5gduPfFq0Q5qrLoBUpN1thXG26bA6tCIq4amSMNHeAmrGH7ezWeGQEv2gWFQuK8ROJrhO0YLUM+W6ho26q0CgYEA8AWpXX4xzE5HFifK0/viez1Tno0G9gKQJiZVbWz8ER7w/OFHzSwo//QetcHpTlwqyvitKIy7Nd0GsV19LLrLfY8qe00By79QIxkYudgc+A9ZhtjNC8Ze0ngr4c94Tq2dhgVv8EYliBgLOOyAB/Yqp9A4oacj93e4Xt7QJ5Ai/GsCgYEAyXlag7fV2WPJAIsR5yx3lWHVbj7Ax8NMqvQfyYeXprceVZ5cHh5/zL2Ab/aMmUK5qdIBKtLKMkbru0Rh23qI2gUfvW5BTwVn17lEFf/oZRIEwZkHYbJZWZRgAALDi6mhQkDRVDl75U0k3szoReSSw/yI+30ChrgVVWrj+q1r8rMCgYEA2WN3UxtBxRY8oh9mP/sJ1K7ltltqq5QEtNjRVKt53ZPVlmP/4R8W/0M+MUawpW0qwOzcADb+NDm8nxXakpGYTl9FjalgcAYVccSANYo8KpvUbSKdDAYdyahXrkx3XWM3obP4/3i483s7ZtIk35Egbx9Su26jT7ZaAWrywnJ0jYMCgYBZonDfqxksJ1XUtQqZA9KMFkOjUa3o8f2ZDRVbTsTsegm348Vt7PnEuAZ9SX5R7Tq2z+SPDcrBRYY5AXpb8A8UmDT/zR6nLmt9sUIWW40j8jlFfHSpRXS1AusW9iPTbft9g2LeCtkRMhoWOamY9tFI+oBjCsHl994d63lUHHWrOwKBgQCAhZYCoX6SEtx1wpuEkSYA1ajwHJNocIKyTpDBLoQuTZe4esAYh26OBf2hvGi3gtW7yWf7r+RObyEQdhvaGhRkblptaJrP/aZj0UdSpKeAQERcSFpSRudO+FW24p4tRuitMU+AMh32LDWaYvB4EuZt6wGSPGrXj8GoHXnL71aQnQ==", + "exported_keys": "a2V5czo6QXdGMFhuZEJzNWdOdkkyak4rRE1wZ3FZOW9Cbks5V3RsaXltbFUyZ0RYUWxUbmllQTBHT3Bqd3M1a0N3TDdMK1JIWXc3MVBTRkh2YTkyYURrM2ZaNGxDRzd4L2FWWmNQcmd0SmxEN0JORHdublQ3eEoyQVA4SjM5S2ZpdzhlMlMxRDIzNC9aTXh3QW50dzdtUWtxdnNtbWpmQWhjNHV1OXBoYkY0dVF2cXc3TThZcGU0VGlVTG1Xellyd0NPdTlwWkhDTFZ0eVdXK2ZRbWN0OWkyMDhvbnBjNm1CTFRkSWhFekZuR1hEZEVnWVdVdUJDSHZHWmptUkFBN3VVbVpVOTBOQkxoQ1EyS2M3UlpuOXltTGk1dlRIZVdTSFpoNnp2VzhUR1ROOFRDUnllNzR0aEFCSXQ5NDVaQ3pJUG5oNWMyRGhZSnluNmljWlQyNEhKVW5xUFM1WmRnTVFjVTR3eCt3UU5LYW5pMi9HeFBSUmZNZDE4TjJTckczak9ZNlp4c2ZIa0NPSXZIK1A0M3ErVGpzUndOY0djcXQ3ZlQzbkxyNE1adms0VVFRbEYrQndGSk5lTlplcTVuVVUyTW4rVksxYmFYQ3VVYW44Vmh1c0w5ajBXeWNlVUZvaDZ6TmRBam5uNnFadGJOd1N4NzVWNWNQMEtPOHMxYnBmdGVOYUtJTkhCcEVUeWVyUnZZRTRWeHZSeE9PanFxWS9IOTd6ZE1BS0JnbzNQY08xYUx6NmZ1NDhMMVF3TkFwZ2pSQklaMzBRTm05aGV2L214Rk9YQ1ZqYnQ3cDB2NGVzTHZqRDJJVUVkbjVRS0VNTUFTenIxbVo0ZTBuWDROSHVXT1oyVUEwakpscmU4bnBrR3pucDZHM1B2TGVqeUY1b3VEek9VdHVsT2FZaytFZ3Z6bzljbnBSZmg4cFpORkhPczR6L09aRkVONjhDZmZBTklnQUdaZkFZNW5JTk80OWFlT29maWVBMDVUZVgrL2FTdTNFWHNnWXp3UEJQUm5uWU8zd2lCNzFyYm5iSWc1aTgzTm9ibFI1eDdieVBTSDl3N2J3eDhnL05NMjJlNkJQSUhudFU5WEVPaUVGUVBqamtydE15SWZXSlcwMmMrL0szRXJaTjdUSEZFZXViNEhYVDRxRWJaczdkMGZNbWlWNFNuRG8vUiszQUhxVTB0aGNaYUxqTkJVVlNucVQzUzB1TzgxM01kVWxLcVlmUlN0NWtSUWczR1JkdFdRR1lKRHdReHZNTEdrcU5qWXZMeWlaTTRrVE56Z2x4Qmg2bXdud2tqcDdoeHFPOWE5QVJWSTlYc2xCY21NdU96QkZ1djljNmtoelRXQ2d0eTJvSFpMN3hRVmx0WkJmSUR0OXFrWEhiZFRLM2ZCcmVMUGpvRVhOMmYyVGx3RkJyMHUzS3hIQUs1SndKb2lsV0JBbFpySnl5dGRDWnpFYkFwM0RNS044eXpTQmR4Mktsak9MM3NhbXJhSzZPckZCOTFYLytTYTlhcEE4aUtOMXpnRnU5amI1c1JHdzVaYkI5Qkt1QUZXMUlERFlBZzBlSXlqYWx2ZXFUTUFCbWg3ODJGbVFTY05LeDV3Ty9Oby9Xb2U1OU4wbnlKQ2JSK0xQNDFrWTZ5bUdKZ0ZZMlpVVTQ2aHZJcVVQVWdRUW9QMnNNTU1pY0llb1lwUW9kZ250TGxJK3pyRm1DMms3eEYxNWdmYlVzaUVrc2ZmZ0FPdmtDZnFqeDd6QmVMQy9lS1FxMm43MExkdTd6a3ZoWXFDaTRnemFjT3hBSGYyRVNnT0NQbW0xbEpTN0hGR2ViT2swTjJXMHZaQ0U0eXB4SUxtQk5qL1pDejYyU09yMjAvN3BKV1dYSkdiUkw1OWdRZjdZYXZTMktTL3Fybi9abi9yQW5ldTdpVjhDaXIxbXJncWswbDV2REFvTjlEZlZQRUxROUVlZHF6eHJNUTRheVJudmRiU1E1Ulo2T2ZLUytFVDJkSnBKQXF6c1ZOblpWMFhGbWQ2RjZhbG5ldStmQXFtczlQOG5zdmFYNlU5Q3BGS0pEejM3OFh6RWZPZDRKcHF1ZStENGtJb2piUkZINlVRWEpTWVZESEJZMTlzZUtLSWZkOTRGMm84U29vaEZhbHBxUXJvbjJ5VGdFSkZmYmlTOURPTnhabXFyd2s5YXVuaWFGeG5KWVFpRXlDVWdXLzZRLzNHak1SRW0vZTNxY2c1MER1cGdHTHYwMXVCZGRHcGV4M25JcjdSZ3g3NlFlN2NVemJIaW9hZklHWExZZWI5RGNGbU9ta3RyN0ppZEoyMWluQU5wZUY5aWdrNTM1NFFmQXZWTTZwWGR1UFNteCtxam84OElWVy9yZmFCdGxqMTZGbi9HUTJod0RwQUZiamxxSkZZcFM4bnJsTDNmNFFQbmc1NnFHOXNSRnFSNGYrbnpVT2I2d0FMZ0xUWDh0c3ltSG5KcG1NUGEwRDVrc2s1NTlNMi9uK0xwOGxidzhMOFNQbUFId3ZkY2pmTEQ1L083RE80TTNZa1ZXNDZEK0ZZSnBZSFdpem9wdFZYaVFWaEk4cm1QMkJ2VGJ1d3Y2OTk5Uk9UUWhCRlhqT2lzUURNUWtMYUsxcVEyak9wVXlxeW1LajM4MVp0WnZDRDVjalpjcy9Jc1c5bXRwUFgvUnV6ejZjSmo5UWdVTDJmUzNHcU45S1RieTJMekpuU1ZaUnF5ajFmTHhRS2g2N2tDdExEbW8yQ1JxbTJQSE5JbGVmVncyR3g4WThJK09uRWZYc09QeWhOTTVRVHRuOEFDb0gveVM3NkQvN2dsOGVSVExhQ0pqSXBoeDlaTGhwRkJaV1hUYkREdXNIS1JNZUg1RHRxUVYwT2o3RUZMeWZIamRZc1ZMN0pFUzRSeE90QmF0c0JuellVY0dEM1B0ZDY0MCszRDJjb1hwODJYYk9haG44bXlsOURCQmJ1ejJEQ1JoanRsMjBIZE1Sc3hwaUJ1V3hkcTZkbGZ2R1piU2llNURmSStmcHpINm02QmxnTTZ2eUhxWFIvMm81Q0QyTzJ0dVd0d25zYXArdVVVNjFxeEdQbW1nK1d5ckprYmVwYjdWMDJzemVOR3pvdGhOdGpiZ3Z2aG0vTEh5QWtrOEpGUk1tUzJxa1NwZ0pvVXhTM3h4Mk11YlZHbXEyOVBQcU1IWWhoMWxNZm9LSXZkR2MreHAzLzRJSHV6OEk1Q3dTcldiZkZQL3lMb2J1OEZmaXAxZ0tFbW9jbXNpUitxMjQ0Q1RHNHQ4bkhhMEVnUC8zTklTK0hPYlRDOWpDM1NKM0ZnbjRNTG0vbjZjUlVzMUl1aHpLY3NNUVl2T1NidUhzT1JFeW4wT3g1Yi9wcXVJYjk3dktJTjdrTVhyaklaSTlRZkVBT294bGErWmQyTE12WENVUDJ1MFhYS0NsMVVXTHRWcVJXdFNaTEE3YkREWEhtNytkOUlXTDVnd3MrUkk1c1lNZ2o0czBjY04vc0JjdE52TnJYWlAwdVNnVjVIMUMyaVRuRVkwSGJqTzdvb1JTSWU5VHdYMGgyOGpkU2VXckNGb2tUUXVqQzVPd21Wa0QvOGM5aWxsQjFYQnNIZXJpNzZZUnVGVjRqLzNRZzEzS0VtOHplaG1DWFJVUVFiSFpMLzZucFovY2hXdm1MYlZMZ3ZZd1Evcz0=", "pin": "111111" }, { @@ -16,11 +16,11 @@ "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", "ip": "http://bob.sphinx:3002", "external_ip": "http://localhost:3002", - "authToken": "7P4qL2Xxobc1ZN76wyWf", - "transportToken": "MIIBCgKCAQEAwesSS0THuFdF54DizJfb72jtFFdtvmWl/Yzp1OAMkJrHvpPuXH6x\nkvZQ4oobPHJvqmzzagur0fLQgsE6SJGop1KUR7ga0iG0ysNbOt6sYDcNFLVa3PDR\na+biRqS5BPraEnVq/d8oLFc5wM/8n0NQHHAO86nqUUlHkeFnur3OLp1+8Q3fgRfg\nxsaPIsQYYi+ihdK20W20gnGsIHXitr+5wXPBqrp4vM3FnwoeicVMs/eROmkUzXgy\nrJ8qkOHEugzdi5DnocjrTexVRgtrRBTFgyNGgPWQSpYio5i4JkUEHsZQPZFr4ryJ\n9z1C29LAO9T94/U9gbmlr/xzil6LvkxKGwIDAQAB", - "contact_key": "MIIBCgKCAQEAtUwct6Fx6OlkjIih5jeH3wquZS44e+frQJ5Rp3Fd97MbPTA0kDzmhZ8D0heRvv1f2FmwoK+qYsHmgdZRwG/vNiSpb36BkZoF/ZbzXvijR7OUL7YFBeCQEl7iDNmh9iPX9Wuefgu+Vg456DRUS0Ov5GKCsYmNhzainZaWoNXHdIPULadPH1jRmD9uTk6QMiqk26fMajuLarU1yXsFucN9H3Is5Bra4lZ08c6gvOOUm1wmMboW/C9uJ/4Ic950I6ieoZgkwYDpUZTybiI0lwJK1qwd6wcQStq/OIX+LvFG4DtvB0CYo56gLQkhuTq5GgEp+tyJOJLjwr8oPos3nnyGIwIDAQAB", - "privkey": "MIIEowIBAAKCAQEAtUwct6Fx6OlkjIih5jeH3wquZS44e+frQJ5Rp3Fd97MbPTA0kDzmhZ8D0heRvv1f2FmwoK+qYsHmgdZRwG/vNiSpb36BkZoF/ZbzXvijR7OUL7YFBeCQEl7iDNmh9iPX9Wuefgu+Vg456DRUS0Ov5GKCsYmNhzainZaWoNXHdIPULadPH1jRmD9uTk6QMiqk26fMajuLarU1yXsFucN9H3Is5Bra4lZ08c6gvOOUm1wmMboW/C9uJ/4Ic950I6ieoZgkwYDpUZTybiI0lwJK1qwd6wcQStq/OIX+LvFG4DtvB0CYo56gLQkhuTq5GgEp+tyJOJLjwr8oPos3nnyGIwIDAQABAoIBAAXBufO2w6gyqQexWvq1brINY8ZAtnhwv86YeF1Jw0MXQ9koi7K8zFEX4IYuS2l2IDH9fxdLHKzwHUKoLIZgx4a/mUW6DaEy89e+kFHGsWCYei8dp4EtRUXgD2t7CaKINtZLKYg1FUEkSIBwEPEm4BHvctjyVjUh7f31BylqQGAZtcXjMPJWNylHrgAOkjzV43deIdZ4phrYKAj0/Rs98CwjcIf6pBsrUb1wbnUOqtVNcOpnDtNFxQeem2C2Irz2CXstN2XXV0X8O9PKfPPD47QxfB9kVKUOyYJlaAuRYjQzKd7h3uRW6sa8zZM+NgvQc7nB1dOzRhoelT5aP9oLfKECgYEA7jKrQ7KwRXgLnsj77qtnEoNME9ii5N/nBUHoaR6gj4QD6VH9S3yzl+/+oFoJAL++K4I6h82JHj2DAZ7pji+kd5NS70VaN7RHtmd2b8ypP5tHG0YQQxuA4tKK+GMoPbymnTbN9YUQdLLptXbG12C1gRjPHjqcHqPhzKYsiHur0LMCgYEAwtjKPip0cxecV11lDCH/MrqTbDk1rGLqYB+eqOEgyS85CbNunk414XcmfulMA3BP1gukUEeMkHPQJ8Lu0KjByqSiobvIkjRtnHgN9+9Fy58jhqhaUYEazloO5bEJpeo1t9oTNAIpZ23fakkfNb3or96J9o0k7Q2O0+odtKK2TNECgYEAox9d/BmV760bQB1hsnv9NUdnRTwZqeXP3uDY2YxY5o/A4fr9HMIEd6uqU4P1IGcvQ7qGfNP78BKt8eEzDuV/m0fwBt4Wv4kdh0PpbvzYdy/OjVX48wwVwr/u3dWCDG1yKL4MY/RBZbnUpSn3WC3pfsRPquL2YWFX0/+FBd6ztlMCgYBWeNnAnxzRGzBiQWuf59KXE+BrTjR4zelQQZgrQMZJIvEAUiaMkQ8uga+O8UCv4f88ciw5CJfkX9GIY+WSquJeaZRXjLwlzqi6oTkpyIHELVsZ3ss+krpvy94CqAAtJvUyI9ET6sWvRj65r7vvINoMewnlZpx1q+ewOp12ViPrkQKBgB0Lu3TpJyEgzSMId6epnqseBzChfP/AIRP9Vfpl/O1BguLLxxIKQod1mv+9Lee6qjRMj2+TmoYnQQotr6lNkNnJRLxrDAiGqACsQ5hs/7tEsA3BNR3kGAGAv6m4jPl3agc0LOcfBWq/40Ts107o4/Wh6Doyy1a/gmKCHTcxd/we", - "exported_keys": "a2V5czo6QXdGTVE2c0ZJMW5OaVhibWpCcVRoY3JPRHUzblpBUjZjdXdYSWgvd3Awc1lNY0xreHZlcGJnQ0pITDRxYTR6MTlVMVRKZVZLbm9GWk51Yk93cVZHQXVVZ21WWUdLMnR6TzlDcE92Nm41Z09OdTduSjFCOVh5c1N5UFZUZDcxSGxTbzloZDdxVEpkc3o4K29VdEVzWk9TMElUSVRCMno5ZHhUMythbDcvM1lyM3NjZzRaZmJHRnZiNXZIbXhIWVlyblRWeXBmS2VPWkxNMHVuMTNlRDRFeWhPSndQSXNDM1pPK2V5THpGUUQxRG12WnRNYndCOVc0d3AxdWdaQ043Uno0Q0lnTkZnQ085Qjh0ZjczK1Jvc1NMWnFvaTM3WVlMWG1HRDFqNXBla25uekxhZ0FmbXJFOWhUdUZGeWpNYzNRays2LzFuMFlzVDMyWllrNVlYd3BGcnpyVW0xamFrNGNFZk5iRE9wM0sxTHp3THJHalh3UFBKMnJmYnVRam5hUlZtRnA3Ti9Jck4rQ0J1T25yaDQvUHhIcE43bTZTWFVoOXZDZkQrRjBoQXphaUNYTTlmbVF3TFFQZ2hsU1VFTGlEYTlVS3ZTWHFSSWhaenJ4T09wL0E5aE15RkN0d2lFb05WUk1yMjZwU3ZVNXV5Sy9iaUFsMGRMWW1wNjNOQ3ZRbStPWStmZ09ObmFHaXdkL3dMUEhHOTdqdTV6eHZFUXRtSzNVMGhuZUVsbkdQdHF1TFg4U0srZm9TbXhUZmVWb3RoS2tsdHhXaXBORkY3NTl6VlFGMFJ6bHZJT0NRbjFkUlJpcUVYYU9ZZmxNZ3NOL3EzZEN5ZDNscGxidWR5RUgyaWZmL3VkakVpdnlNVVhXbHQ1MjFwcTdWWFNCTVJCY3VrVi8zVHh6KzhQR1hQYUFzWTZ4d1M1MlpCZk91cWJDUlBMT1R6bithUkRsTlF0MlRncTEzZkZPOVhXS0l3bXZ2YWFVYk5rWm1EY0NlaGJxdzlwTithRnhvbCtzSmJUc0VUNFhCbkJDYUl4a2NwUndPTGVFOFBrSXBZVEd0TDdrME1QM213MDNEMk8rNC9SeGV3UEF1bzhueUgrUVpCYVlGRmFTZXRUQ1NsWWV3MjhVL3ZSYWRXTFZHMnRWazJ3YXQvazJSUDFWMzdYZ0hVQndQOEp3aVIxODZsalRESDgrTWRuSEFCL2FPbXlMdVJOLytnS2w1eVBtaUVmWkZwRDJJdml1ZTN0b1hvVDlwMWlCcVQ1SzJzMEo0bWFSQzdiVVRnT0hRQjAxa0lRRmdVR0lTY1lhNXpoUkoweUtyZnd4cnhncXNyUVBrY2NSdHdBUytaZmgwMkR5ZVRibXpZc3JjMU9GdjkxVlU1Q1NveUJKdS9lajNuKzlFakxNTCtKdHAvekJVQ3NKN3RhWmFERGFUOWtNSFcrL0NHeTc0REdzenR5blJjVmpxdHFhU2tYWmkydzg5NUx3Zy9vWUdFb04yR21JVGN6Y045bkZMRWRTRGI0NHh2UzNDRTRteGREVlhtZVlTM2ZhZVF4K0RUVmhBbnZYaDhjZml5ZmVrTXlZSDBCYkRaV01rN2VQdS9VbmxMOHhvWEo2bXJleTAzb1FzdnNXczFYMUMrUS9UcHc4U1h1VkRObHBhaEZaSm5jcmVzZGFsU08weGxSLzlIaTNBb3JrWE9sYlg3MVduZlgwL0FuRWpCWVRsaXFXTCtlcjdhRkNtYWRFYU53Mytrbk8yc2NYeVFFOWtVdERaSVN0Y2JGUFBwUmJaU0NSZ0c1R2phNTEzc0p6SFpBd1VRR2ptQnVzUXRhWWVsVFNMQWVESU1NT2VOeStPTUJhZk83aVlEMlBpbnRNaDFOOXhTSjh1YXhIdHNOeUszL3FpeFplSjh6MUF6M2hlTFhDT3Z3TDVET0gxazBhZ29Ma1lmSCtqcmd0MnR2WmlRTzJyQms1UGFvWGFRMzNXdzdVUnJROUovRVJUTEFLRHFRR3ZLUTRDeUJzTUJiR3QwQVNmMmo0N2xjT0JBUHQ3K2Npa3pLZktpbm5adW9JbFRrNEQ0MU54MXBJZkhGRUlSMit0M0RSc2JlbEFueXg1Q0t3M0ltNFgvRERZWUp1d3lhZ211eE10R2pXZ1h3TmpjZTNXaVlyUSt6ZzltWktqcXpRWVZCanNoLy9UWTV3c2xwNWQ0QW9TNDk0dWYrdUhLeS8rZWRCTEFoTjBhbWJFMTBObXpUWHpmamlDRU9qTVc4aVIyTXc4cHhkWEh0K2crTmtwcXI5ZkFhbStmZ2xXTWgwMXRiTDRDcEQ4dXRhSVdlaS8xcUpHaytWQzdpemFnR1lXVXZMaFlXNk8yT0tVODREaVlQZkdYbmhDYmVIRzlXZ3ZPSTZ3R0ZOZWJITWwrTnNZa2E4L1VhVDVYNGJmMFlnQzdqZy9LZEpKVGdWS2EyWmNBaVNraVd1Uk85MWtwTkpHWmxwUkdNSlV2SE52aExmMUlJRXFCTFduS2RBRmlGTlMwU0JIQ1hSaStBRDJQZXRJZHdkb3BNNHVObmZjc3l3NThqaVhjbXhSa3Y0MFFLOHF0L1VKLzFzQUdIQTVUSmovNkVUd0NBVUlVeDBKRmhGcEJ5SERmTDNUSVhsRjRJS0g5cFBUZlNoZ0dKa21EanFVNUtaNFh4bjZGQzNXaG1zeVdJU3N6TUpZVDJpTGdJcWs2YjZ3bitXM1VnY0hIOHo1UUlsNVR3OFhHRm00bjE3VUJTUGs5bTVPR1RWS3BjY3l4WXBYMjRMUEdmZGdyZFkvZkREMHpSSWFYZjY2c1ZRVWllY054ekc5Znd4dVhNYXhRZ3FxR0ZiVDEwREN5TUYvdUdWK3d6UEFESU0wdXhiaGw0ckhIYUU1L0pUYjU1Tk9ZNkVzM3NXZGZ6dWtGK0U0R2ZzYUpnUXlwNkY3elBGTk9uVUdoZXR2Q2VISThTaE1HbWxVbTh2eWpxM3NIdXA3NllyN2M3c0pjOE8rNVkzQVZQK3RmcG9WM3lCOFdCY0RsU3BiVlkyVGgyM0RBV2tLK0R4dWROM2R3SWJicStSVGZUcFV6STFGbUZaNFhUMTVmRGkvaGpQenVuYWJMNWpKVnhLN2kyYnFYVUN1SWU5MDczaWM5ZlRURTF5Q1pobm85WGw1Wm9BRUFzNi80amZSVlBudnFlTkFmdnZRdXJnV2ZWWTEzVk8rV0g2NUY1blUvN1FMNVdjUlJiRUxRV0w4aWdRL05ycktiOUprcDQ3MTVpZTNaTGlYLzlHem9ZNEZ1dlV5RjV6WHdiSjNuU2YwL0VFM3ZhRisxTWJ5ai9aY21mVUNHYVZtN1ZCUDIvclMvYVMrM1FvaWtvaG9BQ3ViSllIS2FIVW1EcnNKVEZQK3BPSjJHQXpNU3ZKOCtBSExxMDQxeTZQaUZGWTFJVTFGU2JFQzhYQVMweCtLL0N6R3lteU5DbkZhYWVKS1BEZkJxaVI4ZVcyeEFQY1JXd1o5eDhLYlNCbWhtdTkzaHR0ZDkrZEM5Tk9RS2s4OW8wSmVZSEhibExuaDVaVUc4V3RicDNQMzBPTkk3VUFkYUFBUkZVbVZERnVnNGZxNVR3M1o5YlNZUWFBK2IydWRaaS9UVkpQZHBPa2MwNnI2WnFoTDdwa3E2d1I5WDIwWUF6L0dGcG54ST0=", + "authToken": "l+7am3E9nW8jUPxrnB3Z", + "transportToken": "MIIBCgKCAQEAtYiWC/NDPUABjWjvYFlUg3oDzd10aebHIHT/VlqvWubCEvrcSF32\nJmqRm6kMuGjckKx5xqUGmlwNbXB0tj3tsIGpcqI8FJpElq4aJO4d0IyaglXsB8N3\nS35kGWQ76qNwKeRd/vJptjo6CE6KFHfhO9xGbSmaFpYSG2ErPAOHOQ8dDjk6/TxJ\nk0j5veAKXkeND4qv/rv9wbGjjhfUn4z2s1UAEtZQHTc9FrET9Z3QdDSgVXozu4wD\nCTF4TfF89EVnP2l2uLEq40VzZtXkNgovk6K1IdeLlJqO1qvQ9Qj3iRhajgE6JBBC\nWBvSTEzDFOPEaKMxI6Du3b45X1nTexHxlQIDAQAB", + "contact_key": "MIIBCgKCAQEAz0J3x5+AncS3xohw16DlHxjUj6Sy3H3L44JG5jqQylPY1nPC2SurB77cfsBdMLcBzriE0hC8wmQX19c7zexAK1FZ6qDQ9r/ZvQedPtzgkL8+3r3eSmbd1G89EV+UCsQ6DF0U1xsQS9MjccDhzK/UADLkN6wEkSFBlZS+1e6vZtzdpT0bfpV/Trgu3wxqnDl4BJezYVwrE5j2LP+DGKYymRoSfb3Ho3K1julJK7Jbq5vS0SSjGKpXJIhLzs10xPimNgc+dRJEq+Xe/lnah9u/wNqvWJ7cvMz509ys1F+/XCMkUe7RbRCjJ/1g8mZxy8i//2xKfiUD9pULzu8RZ66+wQIDAQAB", + "privkey": "MIIEowIBAAKCAQEAz0J3x5+AncS3xohw16DlHxjUj6Sy3H3L44JG5jqQylPY1nPC2SurB77cfsBdMLcBzriE0hC8wmQX19c7zexAK1FZ6qDQ9r/ZvQedPtzgkL8+3r3eSmbd1G89EV+UCsQ6DF0U1xsQS9MjccDhzK/UADLkN6wEkSFBlZS+1e6vZtzdpT0bfpV/Trgu3wxqnDl4BJezYVwrE5j2LP+DGKYymRoSfb3Ho3K1julJK7Jbq5vS0SSjGKpXJIhLzs10xPimNgc+dRJEq+Xe/lnah9u/wNqvWJ7cvMz509ys1F+/XCMkUe7RbRCjJ/1g8mZxy8i//2xKfiUD9pULzu8RZ66+wQIDAQABAoIBAFb3EeFuOP56K46fc5HWziz1M0OunOpN0n59DJjQHC75bbPWUPzlCNewKz74ImIteBGwdPLb2QhMDYEgq9Rk/Cvw76S2o9fVelyJ1F4rOgMibBP0YVCgxxW7M0mV7D10RtMnP3ZewcC/MFEr2NMVOAR5Vi9R+3yWErnb9xM3GtwysP5RCaavD+xz5fBTbiwEXdBlyO4Xm8ldHIPN8IIu9UyHN/IHovYmEBg6JYZVmORY6sa0+0sLym47ey1WkXe8UYflN2hRKPrX5Gnj5UF0FNe9p+/qLV4zK2SONCRxdHAUOeazMvT7/AemMdgzPSmf2qatE91MwYaCOnBa7er+Hx0CgYEA9sW2Ut5IdFqMXUzVRaCu6shcU1/UPnUcwvKb4J64YF/COoyVq6Vzp0HxxogdoMKTzWcsSSZAcJSHxs97F3dp8KmvGn+ibSyV0Sgyh0PS5fQMPOKS7uhO2IjwIEIfQTbjrqCI0ziCKCz+Xm02vdGZDpXg7I3EeTpSd6yFjyXpmpsCgYEA1wKC09Zaqof/TBvtJgMC/UbGIQdhrqpDNXtT2i7JyglWwlxGXXVEvBO676hA0BSXiL7ddNdz6cPFyFMn0Bg+jXDy8bOToj9SJXKAqp9IT3arw1+U9hC9An2GR02ZP/2jr2viS7H+C2HmhX2uojwbMOspgE5NsSTFIBF+VNsFg9MCgYEAwDRMhwz0+BNSwpTGhH3b36iBKLs6EA+dgEYAnRpi10WefYXkSZYLl5moXA7GrOEAx/p1JuBxTn6RposR/7wVusofRY9mDoysgAVEHdD44fyMz5tWAFjWmJdIGIgH2f6LpgcJqyKXVf19fkSoX35yLUcVsonVHusLMoUgXdeUtMMCgYBzkTv01TCinLrSk+giGFhQ/uub8TXGBmpdos5tZdy8pcxmZ+bCcTfix9Ag5RUBQzA4Ji8ukGgTbFEw3dF2frGQoPdUhyuBd/uVeThDfZ4GaEjmmMeeg1y0q/ey97i5toF21swp16AvSg34DpgBR8Ftx9jkyDHmV1dFZ2G6BoeuVQKBgGhn17hI+8VSq6TTM0LH7L/YGCGEp3nzLX/Dgdk/Kb87J21001WAe5TS8K7uWyU8OyXODqprnwFGICI1lNKGDEplOwsGaY/8p7LXv3+kwvOYIElAsIOwZtFduuTFKDbqHmFnEhlpX7GTZaAPbe/fTGkyAOIQ6OOPyZY42HlpRtRR", + "exported_keys": "a2V5czo6QXdIQU1Fc0VjZko2dVpMNXhkdUhWVFlBQmRoczE1S0ZOQTVVTit0ekNMQXdPQlNHWUNNV2dPMzcvUFJmcWxaRlY3enV3djNUdkhSTitkSGR0dVFvZEJpSVFjdU1uVGpINFFlUW5YcmNtY0pZTkRVcDZ5cEdlMkVZQStJMkZoZ0ZMMGlMRXBHNHBGbkN1Y2NJTjFoNnl1Z0xzeEJnaTZWbU9RQUNnUmdFc0xJUXRVKzJJbEMvZ243Z0dIdUp0U1lMVW5sQ0RhTUtjYWNCVTcvNWYxay9IY21sM1Irbi9Pb2gxbGlBeS9KeGJTY3cxakJ4VkJSWTNmVnB3TU1jbXBZeVppUmZkWTFTMFJuVGFib0h5TEYrdUdGTG9tMFN0Y1pNeVpSMloyV3BYNWVBSmhjcVdYN0xVdVBrQmdURzU1TENsc2dEZlY2bDcvMkZXWk5rTGI1NisxUkptM3h3WVluVzcyNFUzRnpjNUpNVUwxeXdieVdhUFduV3NIb09mRWdIK2hFRERmSExTZWVya0c3RHQyZ2hIdllrVEpkRkc0RnBITjRtRFF0Tkl0MFZYVSttbGJFK0dFZElhcnd2cDVUdmxiT2Z2RXdodUMxczM1Y1RCeDdkak5qeHJ1eThMSUo2U3VzSXVqZnp5VUJyQ3NGMUs0YXF6WmliRytKa0UzUnVad1RJdjg0Y0wxRTBzT2dKSDhJa2Q1ODQ0azBDdE1uV0c1VGtjdEwzZVVVMlhnazZkeGlCYUlnb1ppNWFZclAvT09WV1hFczBJcDJSUS9zZXFuOVExdnlXY0oxYzhtRUV5cEFHSEV6TFVFNWJuOFJCR3ZQTnRkRWdDL1g0VHJMN1ZHeDN1cmZWY296UGNkMGZwVitNaXFEK282c3l3eGF1YWtWVjgwbHpIMzlINy9GOVF6Q2IzUnlIUitsem42cksxN2kzdU5Zd2RyN1k3TTU2NzBhaEFSMHlHWk5STklDQyt5S1ZLVi9KMTRvUnBzdW9mT2xzQjhnTmZuemlvZVJNa2NlR2dZRWVrbjJCU1MxQ0o5VlR4N2s1MlRqWnBlcFNzQk5Ic0hTWUVoVm9ua0ZyZjcveFJwTW1ESUl2NzJiNk1VaFRpb2d0b05ITXMvRkYwRUNCaXg2WVNJd1Y1Yjh2bWtvUlVqL0YwZ0pCUVdCS0pYb1QwU2lTS0FLdkdaOWVQekZsMGRSeTFhN3RZcGRrbXU2eTBGRFBNNEhoR0ZFdEk5WDJMNTRtQU1pMGpiakdZcmhkMUFhOVJVNUxJMDF1Y2NvYW9pWStLaWpyd0RrVGRvQTVjY2E5YVFqMUR3cVVVTnBCZFJDWXBDUzhaRy82YTIrTUZlOXVOS1l1QXc5UTBLQW9XTmlTZkJxVWIreHlCTDZER1crRzdjVFlkMmFlSmdoek56dEUwaDNMLzNrRk8zR2gxWDZjRmoyN3daVGtQMGFXcU1mVWUyMXNLS2lONkpMQ2pBbmRtcjJqbTI3WGFMa2VRK3RkYTNlNEhpMDdnOVdDZDk1M295RlFINVloMG5jMzRPdGYwL2pBSkFTL2tQeUF2bDBlaXFQYytqWmhvWHFMcDZNUGZsRm9nbS9jZXQ4RDhoYkQ1aTg1NDR2aDZBYkJQT05XNVNOL3MyUkJzVFJXVEk4TStjdXR6UzFjSHdGZ2ZrbFMxcWU1dlc5dUhQdnFtN0VuVUgyU2dwKzRza3pNaS9LNGMzWU0yeEduaXZzNHBVRDhvWUhZclVxcStXcW1RVk5GZnkxV2NhNm5kYUpYN0sya3NONXhuYkVLT2laSUE1YzU1MDhQNnAvSVFyZjRLbkoxTkJQK055S0RnaWlDZXZUak9QVTZPVU1TQXo0Vk5SV1VyUUgxRVYrdjhEOUlPbnVJU2NNU3I0T21Wc2MwNlc2aGtTZXZobHYyQUNTZ1BtUmJoQVNYSGRLNmV2N2VpeG01bFRIbEYwVDBZQnc0TEVIZG1GNUZ6VnV6dnBHOWZmNllTUTlyb1pnTVJXVTRiTU9vSjlhZjl5cm9PKzJrd3VtVWJlTUVJUEhmeXMrOUhyNjJZeHI3b3IyRlozVE5iaDRnbzd6akZKVmlJQzJuRHlhYy9iZkRZczQyTTkwcXZKbENYcUoxT2lQN3A5a3hhMVJpZW9mN21QVU9OZWJVYm1tTy9oTUFmQ1dUWHNyYnhBVUppcy9jc0tPT2VQQTNmbThvREV4b3AxSnVlSzlkeUU2UUlZL2Z5VmFUcHc3U0FpbFA5NUhGR09YcjhCaVdENDI3QWIvNjFaVGFtWTdWTVAzVU56YUlMTUpJaHk3YWtmbkZIbkptK2cxQ2RoV3RLOU9FT20wdjRpTlVDdXdhZVBDWnZWUDBSdEtHK2gxa3EwYTk2b2J5N3cxRGtUV2tabmJ2YVhDUGtsYW5FWXJlTVpuallZWk51Q1dNMkU4UnJFWWdCL3daTUdqZVhHZDdZMGw3OWpFVEM0Nnh0TTdWNGV2Ri9YN2xwQktXamVoekNMWXNDbWVJbGY2SnpDTGw1WmdrdVltN0lnY0ZlRzk5SUdqTFk0cFhRNk9SRUo5bTNEbDdWZ0tDaVdsQjhwakxrbnROcEkxSDE1QXlMZG44U0lsQzlSeUNVMVlhc2wxQkduQUZheUZPNnNXVzFFV2hoeXEvWDN5VVljdTJzOXlLNVRra3A4ZDlTWmcrVmxDbktPeWg0ZW5pVVl5RDNHR2hNa3FDUVRRNWtwRWhaQU5qY0tVVXdJMFpPMHlqWTNTbTRTZUUvUkxyNitsUnpXMGt3a1ZwRVJpRHkyTk9vVmxBLzZqS3VWTURHT0R0YUlVM0hzdGh5eHBlb3IrQWlKaGlZMVpnQk01Q3A1aTNIOEdrMHF1NklhQ3R5d1BwYmZVYVN5azlaVUF2SU04VW9LTFhFREhCSGc2Z0YxYjFpZ2J0OHFpT3ZObHFINDllYWFVbmowTU5laXp2cGRwb09XSDc1UWNYRFNnaXJ1SjFPd0FDdytMZHh6WkpYek1FbVp6akdjajBpQjFGQ2I0d0N3Y0VaOUtRSytzNDBldW5BZThPU0ZveFFuSXk3eTRSSlRwRC9NVW5sOEErQTRWL2lFNWNGNVZUN1FjK2V1R3FkTzI2cUxCQ3MyN1dGWU51Wm01QzFKZFNDRXpCTHk1dkZnS1VkOUJVeGgwanorTDdCdWczcjRJdTBtbUdVdXJpcWdPdlJndTZQaEZrZU5XWUx3V3FQNmJaZHlraysxZkRwYzZ5M1RqY1BuR3FISFR5ZVRrc2QxRTVTdUdIM2VXbGR2dW95R0ZML1JwdTFIOWxZQm54aEwxVkQyd0J6d0tRMVJXVmZKclhFQi91dFNlbm5TSTR4eG9ESUNaemhPTnBWOUprblA2VGdGSHg4S0p5RU1wVHZXbm5SYURXZmhHenBaYU93MFFGbW54Um90QVA4VGJBcVNJdWFiOElCcFhsa2Q1aGFPdU9GYlJkckt6TjAwRmZxL0kxa0hBeTcrL0xFdnNhMDkzME5xSjZPR081Z0hIQm1OMUE3cHQ5UVBVczJmZnNZU1pGUTBKMlpIWHlMUFJFdUpxRG5iODlEcDZ0T0hhRDFoVmg0dG9nNEJ4UkhXNzNzUll1bzRxM1NJcG5UTENiTU1TbFp5bFFEbzBTb3VINm1qdmR0SVg4anRxMmdJcz0=", "pin": "111111" }, { @@ -28,11 +28,11 @@ "pubkey": "0364c05cbcbb9612036cc66297445a88bcfc21941fd816e17a56b54b0b52ff02b9", "ip": "http://carol.sphinx:3003", "external_ip": "http://localhost:3003", - "authToken": "vPhLNeelF8BSdz+J31C9", - "transportToken": "MIIBCgKCAQEAqJi4ThRWxs2ViYeA8XIWt9tGriSCisa/RNzADfvLFsOOCnP4/G4l\nr64Rj5mvuRM1/sSPiJajzMJzoC4U3oEBnRh8M+rRrnzheN7oreFipprSmJ/NkCuy\ndHWdaFrJB6sHBIRMTl4UpeMiWNbPWgiEKZSjbfKHAAnKbIeGSRTCIH2pWDPnwJiV\ng63ibcp9P12gu/5Ahxk/IvX9OZoHn24cyUm9zCZ7lRqPY4uPVT75II+MpX+oJ+sW\nwjYIVzW8Dd5w0xtZJuGzYtLPVu5bPEFaSS42JGzHLfBNu2jSEmlmFK87jjyhHuo+\nlkmL+us7+PYdTqV+BbyfXQYSdI1y6LxLZwIDAQAB", - "contact_key": "MIIBCgKCAQEAuqvyOF3yM6xMdJE6aZOT3cjrwbDWGkS+Mc7n/ZXZA4qilhxq8lwst+76m3h440Fkwf2PvU7Eu3YBpJSEMEvF5pBgfExlQYG9dpZIgm31P3C14WQFR1jCWufgLAs6WsVVNSu1vIrNPshUvAxVvRtcaQ4Nent+Mbes/0ZG3ZDOzY8U0aDCAITi3V0kuaUGXfoYd9Bb+RwCz3IMkCjgS7HURenl3SSntOqhIQqkeLZCU13KmZAASC2n+SSqu1mFQyjLCuLcVzr7O86YEUrWCFKOJfuhfNqUI+EP4N5gN2QgFtHUac+u1EJjlY5xyGW18tnZblI62WummDgGXJP2fAEg7QIDAQAB", - "privkey": "MIIEowIBAAKCAQEAuqvyOF3yM6xMdJE6aZOT3cjrwbDWGkS+Mc7n/ZXZA4qilhxq8lwst+76m3h440Fkwf2PvU7Eu3YBpJSEMEvF5pBgfExlQYG9dpZIgm31P3C14WQFR1jCWufgLAs6WsVVNSu1vIrNPshUvAxVvRtcaQ4Nent+Mbes/0ZG3ZDOzY8U0aDCAITi3V0kuaUGXfoYd9Bb+RwCz3IMkCjgS7HURenl3SSntOqhIQqkeLZCU13KmZAASC2n+SSqu1mFQyjLCuLcVzr7O86YEUrWCFKOJfuhfNqUI+EP4N5gN2QgFtHUac+u1EJjlY5xyGW18tnZblI62WummDgGXJP2fAEg7QIDAQABAoIBAASTyMm3DARWWj2VfhAurTaIAbfrJSTZwKwp/ahLL1oV4Sy7H6g3uGT+OCjtyFESPm0/UXH753kNSLcHaUJh6UVhDuydVvJHQyUQRFDmb1gR5HPVZwe71nAyNV3/HHwzUIaQPtGTubqrYOCHkOalMBvnW09AjfScI2LTD1PJhDioGco7A77Qo3NrgcXS/Qg0vsa9Al7M5+cPhIi0BgRzVvjBP9QgxAoNP8VNEfVeFCAZKN2Uh+NTcn3dkzNrxaBim83UZ28vLys7IdU+4tGQFM9v62Mk03LSDrPCsx1iS+N61Z+nDASliKL3SNZPaDXMOtbt3zVZyhXalEovizblNKECgYEA4BgV08u7799m3jPtcnGk7UrhKhP7g6bZWpGJiDLL18NZvtaWQ19bMOvCnWxLGZdVUxrmpUCM/9H9C/l48OJ+1L/lFmnzW+F56PTZqEUnn/Y5AttwifMH+eBeYD61Jwnp7L84zdoOc6IQWpdUu+nnIE/rsHHQpTf/2xzdwCAQ0zkCgYEA1T/dxZxuGqYxWKFQiBqQ6Pzb5uTDq5wGM3kJpM5JpI9Fqjsw2rm3Stf0guqj86iNfZb4xfHosN1jB5RSJ7U3ZJ7AZkBWYaLszulZwD/q/Y5t5fz6wH1kZJE+EXs/GUPo2CLqZ/Sy21JKWTUrVo6xTq3RuswgRcYRRq+6cySX91UCgYBLMenJGvkiQX18HEKV/2pPMawieXgRMiCHEoTqzdi2utdXgRwE2W95F/NC7b65hJ1d+I3ib6mgge7+YKTjd60FaKrPfZfqgdttfxO2MhZcx7tTqRy3PXS0tUQV2ZTh16LGDVhbQstMo9oG+/az44XpwsecemR/vC2/cY07VccviQKBgQDTvwYEOY8u0QVAv3VKoC5x2tq0C0Wr+lJB/BayWc/QIh+HqBybozs4ivUUpc7EnAJayXUegFWQgVPa69Ej8pIdTHE5VvsvGetQjW78MbuxqCLB8xA94IS2Q25BR4LhIIhtTUY6kUSj+LMwn1X4LdoriPcvJ4+IGOOAr+9Qc+6dvQKBgHwENGpR/fXKbjrKhNqhlx/fcWok8uOOI207WyybJDtdOzgYOwuW0npjKke3xKoOUKqnOK8uJHffvOfkZuBgJEP2qgfyKwFRK+GAmeEnmb8vuvvNPhptd/vugM1cjjCvHpSIQpe9sgUlwKYZMFXXNxv26l7zrgcnfr1p9lTzTXp/", - "exported_keys": "a2V5czo6QXdINlFKbUoxWlF1Tm85MXZtTTNOMDJQcmEvTUZaUGdmUXpZV0owcXMvdDhYZVE5UVZhK3BFcFBtU0tDTVVaSGV6dzJxdVVXWVVFZ3ZCWWRRUWVBZGVSSXFJeUtYRCtac1BYbmxFQksrR2dKcFdOZTVIZUJ3MFZ5Y0Ivb2MvTXQ2SlREdm1qbWlORWd0MVRhZi9xTHpXdnRTbmo5NnBER0JqQ2VIK1JpencwaXJNL3NpdnB5Z3Q0VUcxNnp3eEZNTDhHQ0wwVzV0dTM1L3ZiRllaMjN0bVlsV2c3aTRkeHlHeWNpZ0VDSkhZN0lSVTVUSjJQY3JDTW13Y3d5Q3d5TXVkWU81a0xTbHQzY3dDMnREVGJEWXhKS1A0VklUYjJHdktZOTczR2lNOWxqSG82ekJSS3NWbE91VlJsQnZldklTeG9hMDFiSnBYUVdYS3VBRitRU0RpaTdUelQwTE9jSnBXT3dySDJoZ004VmVneEdFQXd5bFN2SFlrSUdwb09OSll4K2FGV24zSVYxM1cvYVRiOFlFb2NXWGpQWDNCTGJrd09xUk4zVDdPeTlpQU5iMXhDYkNIMWh4STBIYS9RemZLYkM4UlBBYitsUkRCcmc3RE5qUWY0c2lDcVJoSjBuYmVSTFRhNGJYWm5EcFk1anY3eHJoUTJ2SWN1bWNLUll6SnczbEpHUktxYVRUeE5JZXEwK2ppcld6TUV6ZlNrcXdBQlUxWldkODRjWXgxaXJkaHVqUytwRi9EclJvR2xOYTRsSmlyUWNHeWUzemFQRHZHejk2ejJBdkhpeFlDdERneDBsQ3VWMDV1dm5rM3pxanBiaFVBSnh1VXhvMmhLS2RodFhKLzRSR3hHVFpqeEs0Slh6RmpZdGRYckVwQzU3QTRJMTVTTnhYekR3UU9RV0h0aW1XT0tjb3B5bjZ3VWt4SVVDZnJtMGsxR3ZYRk5wSUdGUTJGamU2Tnd4MXl6REZVUFIreXBZQmtYOThDUG9IZ05oRFhXZkVJWXdDdmxKSHA0ZmZLdDIreHlqakNGMmgxNlFlcmRHU2Z4OFBETnBySjZWelBoU2s2MDVINGk5NVJXMTNrTDFBOHlvWms4c2thWXN6Si83UWQxSzlqZVdvOHozYWNSU2c0MFFub0M4Zm9kSTFRbkN4ZlB2TE8zWVYyS3pzczc4aEdSRGVteVoxTjkrbjl4SzQ1WHpnNDEyYnhGMDRiSzVvQzJ5c1pNRytvak9kSlp2RzltNHIvU3o3ZVhuaC9pdXY2UU5KR1lpTGtaNExPeENiMWpPaE9ERngzbTgxMUNWcjJaYWVyckFnSEc3UkcycHFCTzRpdVdxandvYmM2dENubHp4NzZDbUQ5S3BreGdycERqWmVLRm5SKzBrMm8rRUlOWG1HODBXQlFISGpMR1VHakFIRGhaeGlYYjlTQWRSYTdXakJTT3JmOGZ0dndWUkZLN1M4ZUlqN3RDVWhkeDUrdU1RQVFBN2pHSitjdkZ2MnFzSk41b2ZlWVNsSXdmUE1YRUJnS3hBVXRJUlpSUkdGMUZsczh0ZklEU0hhVm4yc2E2cjdEY0pTQVdTQTJOdHB4alBIUTFCVlhYSXZ4Q0VYV3RuekpETDVKbDBVZHE2MU5WR05sc0hqeGluL3BCNmltQUFxS0JHb0xnUWZHNzZISWxseDZrMkhaQ0YwV1pXOGtMc24rNE1EQVFVVGJ0ZVNJdXFiWEpaNXVLZzJrQk0vTUo4WUx3NXdia291aytQeGxLUGNyTFNLdFFSNzl4LzMrTVpveHJ2UnRIejU4amd0OUNlQlMzZWxVSEJERi9YUzU2a2ROcU9raDlReUFyREJCSWpaMml1RGR6RHVCcWswZ3p2eEpMRy9yVVgrLzZRUmNpbzZINUNYRDVUU3haalNlYnNvNlFPRG95S0t1WFg5VEN6ZU5PU0k4K1BTaFhOaUczenlTSHlwMlJJa3V1ODhReE9ZR1VBdVdUV05GdWJTWHp3ZTNtMkFDcnpUWUtGblpJbnc5cEplSW9FMGxXTU5INDMvS1BwSTd4RHc5NlpyVGE3UWpJK3d0Y1JIVW5FWW1Ddnl3NUxtOFhyc0hrYXJnUHNpR21USHhzNHB3K2pHNW51TkxNbFBFOXBhZTdOcjkzbW55V2FMelE5TENSTi9RSm02OTdCS3FKU0p2VmlrUXJNUUluaWVlRUNSWlRaZVJnMjB1NVpVa0ZBRFY2YWFGa281c1c1bWt3UDIyVStZM1dFVkl4aU1CM1dRSmVxMHFmNW1HT2tVWlRVTTYzN3VJbzhWeWdCM2dpSE5UOHpqaEF0SnVtQTVhUXBDcUx5UGs2Z1drbU9WS2hYZWs2cUUvbC94K2ljc3QxdWNrblZ1ajR2TWJ3dzFOUWw5eGRZWTVoT25jWElKZm83U1hUVFlaZXVJSG8rL0M2MjJSSTRWMGoxemVTdzJtbGtxdFI3cmRMc0RnZFc2WWppOGVEZ2hlQzVzbVgwSjBCQmxRMy9MQ01IRWpDY0o0RzltWHBDL0ZOa2V6bVhPQ08xYUxCL0dTZDJVYkcrR2x2bE5nMWZNdkJjUzNrS1hBTXlBaHRRdVBlMlRVQzdHTFVXTHE3WmJlbUI5OG5TUFlDL0VoRVNzTlRvMjZ1MEI0Zld1d0huN29YZnBoWDJPU2RpVjNLRCtPUlRSbDcyd08wNlhkUUFZaWJ1bU1yY005R3Rack02VGt4WkFJT0pZQUlBajE0eVR2TmNGdmJJcTd2NXVYc0FwdlcwdExGTm5LeTZnMzRUSWliUHYzRGR6cnBPOUZCSXFGc2RNVjR4Q3U5V0FrRnJVYWRhbkxPSXdaUGYyTmxSUUJtZkVVeWEyT1hZN09CbVVrdWFmK216N050SGFPMjcrRjdTRjFXQmVzcHd4NjJaYU5YMlhFbFg1cnhiNVhzVEErOGNvL3J2SFQ2QmdMODVjb0p4am1rdUYwQ0RjcTdFUWpwMlA5QnpkL3V4dFdZcWVXRFRwclRHY2NnUmlLanpSSW1XbUVnVjFVa0tWb3lzc2UvOWluLzM1a09TWkhvdGdnR0FISkg1U3pPcTMwVmRUZzVsdG8xbnNLVVZZcHhTQWNQYmZhNGJlNjk2MUIxVlRIK3ZMSEFuYXFGbTZiV2NFT3lXaUJVcEh6ZFRkUGpsem1NcFN5dlRJc0dLRDVkOWdmS2xFQzdOclJlV3VTQTJRU0tITGM1b1lSQ05qcENlelpGWHNUOVp2R09tOC9lK1BjTzZZTHYwNGttWUFSRHN0YWFJTnRwNXRpeHplL1pPVzI0TzFrSVI1NFltcHJCa3lGcnBxTEU0RFlRRmtVb0hZWFN2K2ljZkIvNzBlR2VheGUyMUVoYkZITmRLcW91dDlMWUJnS0tYUkQydzM3aGZtQ0pHczNQN0VOYkp1T3hEVmpTb3RwMTFtc3FZeDI2YXRsM0h1eitEbnp0NGxXdFJ1M2RUNTVCbkFXeWEyZ2tzQjJHTzZoT25YSG5QWWlzUEZvR0Jmc001NlFDR21IVHBaRWFhbWVkeEpQU0pYRDFZQVJOcHhRR0hqRGROMjlWME03WFNjZFR1aGJ3QVE5YnV1MnZRckttbUFhVGtyYjFLclk0UnFMdjRpU0p6QjduK2REZVR4Tmo4RkQyZUREcW5FcUJNZThsMHVLWT0=", + "authToken": "fPp0XqXb8AKktav55I3o", + "transportToken": "MIIBCgKCAQEAqpp6mQIwmyHD0Cy3clfU3M3KxyP8tKLCWyirSpqEPukO5m/43liG\nXjpMW5IQq2i6Sog6ftaHQeRBJPfujrFWU/IlC86SE6ke8rieGm4sP0mmap9TioxC\npE9u22Ip9aKJbrCueDqn8npnTG1kAovcmOCJ96glk11M1qWb7FXRICYqxT3rcRhf\nRq6zSPxVwzl5e42nlOyejcPsYEe0O1mvo0wRfc70B87BtgbVho274g2PishHiBvI\n3Q79OYMFabw/cDHdpfErN294wpy9re0Juv8QbEBw+Nl/+ErxAMpNx9CJYNkuaOXt\nJ0wx1xUNE573waKHWXXmAncYENte1eulvwIDAQAB", + "contact_key": "MIIBCgKCAQEA1gukg8VKp787t/sLwFKb0JK1eygoHIpd1zgxIHXOnq+ThuboAwghWeXzq2wMvP8w39ewm9ti2goaA1L4C7Is7+nodnuledpyaNZOlD5oXjgblWc5OSqtDZ5amzEsJyVYQMnngfv3O0x3Y+fb/oGymluZVlzuG+d5M7VgWwZNvKQoi+zL2oF1UVhNkW5wbj85DrYmrwZP7+M3U4grwq6uTEZh7/LjrYry7ZQfPpFy6GeQ8YlHUOuXf3QlJa6UB+hhpeUzkIXYB6OJPpvwCbZUm9EXCPgdaLPCmud1eQ7q0I9w8ulq2upW63pynHQGOIqAw98QezoA9hYqFCVzGAkNHwIDAQAB", + "privkey": "MIIEpAIBAAKCAQEA1gukg8VKp787t/sLwFKb0JK1eygoHIpd1zgxIHXOnq+ThuboAwghWeXzq2wMvP8w39ewm9ti2goaA1L4C7Is7+nodnuledpyaNZOlD5oXjgblWc5OSqtDZ5amzEsJyVYQMnngfv3O0x3Y+fb/oGymluZVlzuG+d5M7VgWwZNvKQoi+zL2oF1UVhNkW5wbj85DrYmrwZP7+M3U4grwq6uTEZh7/LjrYry7ZQfPpFy6GeQ8YlHUOuXf3QlJa6UB+hhpeUzkIXYB6OJPpvwCbZUm9EXCPgdaLPCmud1eQ7q0I9w8ulq2upW63pynHQGOIqAw98QezoA9hYqFCVzGAkNHwIDAQABAoIBAQC2RTPTAi6QqkgwY5eeLrqA4m2ocom1xB4lJ7St76QDfYAjYH4yFrpP04GseFZgmu8Drqi2EBwdkHyWWBDh5NhfdNCAFMrU+TB0FgrUMlCt6xmSIFSaWb0D29VMUpNGwoZkpYp/JhFibbs9WDP+hnOQ/m+VG42oNXUAk3N6D+QivhjpZXCMwOOVaHha/P7FFeoq5x2UAnRXwXUoem15q3BuBxSvV5ZAzSa5WOhCOUFkcIzUT+XSkkExPiBUXqm55M5uwm/BuElncV1AZAnDqXz0oFiiwGtFh3PyeSD85uunu5rr6WVHpY+Nrt/W0vef7+J/TfElP5+KyvawjaCou8ABAoGBAPGVPv/fk8DwIsmlALDzsWwTb+FqZMkitHZlAwpr6VHJSibiQw5zHVg7MG2CtpnjeIh7PhZDcJ7lpm0Vd/wx1geenTZyQsgZYSMCNxpBkmfmUd101hlmC4TYssCAr5JJ1lzx2IYPMK1AxYrgoDnKhgVUXH2p3mYxQXUIkl/VtxORAoGBAOLRshTZ0i4cwAVgJbQFByAPc7x7rTs7UjejcHqkKUdB2ZN24NW0GcDVCIfr2RHWUb4qIBADiPjg2kMia3IlRWVjYybJhx8NG+tKxfZ6/OA9lS6zuXAFERQZMRg+y31zKq4+spOLFp7c6mvRUa1e3SGthsFDCtlA0cO+oySf112vAoGADCdG+RZlV4J9LYnIhB5uYZKEwWFZ2qiNTZt9UKvnG/81ZMljODngUwz/PbMivpEsAim5EOOpqcTB36EB3UUgkFeRbyjGZUypj1pQLVj5JZL3sV1sW/C/SZqhO3/91S0zxI9CJlRjTYQBrB/qz515qpD46jV+g8OcmGeq/XlB8ZECgYB3TUK00ulJVdfuO+c469gWleoTPp4cZJRXLYFREJ2hnFI7zTBvVz6gfazyCSxwxGDUfEXHBoT6GxLScv0+2bnJnWAem6uVuohv1zGO9puhuuKH4QJtmEymXKXFEepofrX5VoMJNgRc5Ofsc/nZDeeT+jjB2GiRYxWyNsiK0AQwgwKBgQCz8DbWjZUYUeDFLjTTeTulvDUTueU8F3hyIZzQGUuqJ8Jx+RlnzXvW8/rH5hjl2Lp1xoZHvmG4ihj3vqr+Fb3bEaaV+OBaxSEo9xyUebem1oPPnP/7Bybog/esT10OR8vP/kmvdQJEL5bjFOUUmd/zZJuBjAQgSmxjSXkjYecyng==", + "exported_keys": "a2V5czo6QXdFb2E1UEd4MGpZK0wyOENmaVJkMC9sbjJoSTJHV015R1U4YU5zRVNEZnVaR0EzMHAxOUZTc3NXN0RuTTBEUXMxMEhPSkZmcFVxaURTYldEK21FbGF2UlBCRisyRHlVSTIzUmhURFZFZ1RNQUVIZEs0eVM1TDFPblVwMDhvOVFta0xiKy9lQ0xmbVQ4ZisvQXh4VC9kQ04xdmFSaWxNVnNqb0pHMW1QQ2FLTjFIOTlkUHpzWjlKcXFrUytPSVdhUkIzMXhtRm5MaFducmlJZnpEWFZqWGZ3TVBQbmd3NlNjVE5jbzlBUHhNSm1OMXZ3dkdQQVRma0JOb085aktnZGkvMVRuZTdrcWJVQWhiYXJxV29TWFZTam0rL04rdnZSUDNvZ0trb3hDUE9IaUdwMnY0ZUNIUG1sZGpPWHg5M0dJSjBIN2VtblZmYjA1dmJlVGNPYkxaNjBmTkY2b2tORFREd3QvTXVINm9vZVEwMUhuMkhRamwwa3hRazRXY0xtLy9nd1NzZ2JGT2JBQm5vaTUvUHBYSjRHUWZMTUFjV3ZhV1hIbmVaeFhXNjBNR1FpZE40UXBLQmdVUS8xcnZVZlo2cUdRSGJEMG5Ib0ZhalJ0Uzg5WFR4WUFyRkJuSS9icUcvcHdoMUQ4ci96S2NaSUV6cnJaSklwSHVLUWprSkFGMGFRTlMwcXVpeGNNc0l2S0VUU0lJL3hTOHlORkpCN0FLOTBmb1dneldiOUd3cTd5V01wS3BNNzFzSDZtSzZ6V20ydE5ObThGZDNVR2FsaW1HbWs5VFk2WmdhM0d5N3N1OHVDRFRIOS92SDdhYXFrRG9oL0daZzd3ZGU4dUtUMWQ0ZE5MY20zUGQ5MEJhcWo0YW9wNlpXdnMxV2dIUmJTenRIelZEeWNXS2VTS1ZxaWVhVXlld0hiR1VHM0diVmxvd25TbGhJeHJNNWt6dCtaaWxoWHloQklEOU9DbTlha2dDQSttRzEzcWNrMzZsNzRJYy9rOFJSZnk3eTZ0ZExyeUNTWmlPcmNkT1pBdldlaWt6YmZLSHBHdWFpUlpZaDZ1cUQ3a1E2NWpWMFhJd0p4TERvTzRaMWxGUTJsOWFkQ3hkZUkwOUI3TmVFa2RwZ0J4VzJJbHF3Z2RDSVl3aWI5aTNwRjdCcE51SnBTYnIzUVMxb01LelgxdWUxQWpYemxiM0dpYVNmSkVOSC9VbnVGb1I3NElGM0hZZTZtWDF5RllhSU5jOUtsdFFMYy82eUJxV2gya2krQ0pKdmNNQWNobE5mb0UxMFMybzZINHNtb05scEllbG8rRzVvdm9IbWhLUmRsOEhHdVc4cjY1NVdrT2hCRG5BYmJjRG5xbzhZYmFtZFRCRURXeTVYaEpCVDRxbUtvTnpwd3JINFk4OVpycDROei9iUzMzUTRrem9VY0V1YWtLdmc3dVkwUjcyYUlKa0ZKUzNIWmJVckFRbVBrY0JDemtkQlJ6Y0V1NFpyaTdvcjZqeUM0MXI5SWFidDFKN1R5aDYyemNmOXRMMHNtTlgrNWZHNmhIQ2xGQXRNRTljOU9VQjJUV2VrYmViZ0t0bFFkNlNZMWx5eTdvRFRPcEpKM3oxTU44ZTBuV2xrQW1vc0ZOTTVqTW9nTS9iNmZ1V3oyRmpHOFdnRVZKTjhkd0VPd3FyRGIxdUd5ZTZYYXM3MWJBUGdWaHFBbld1dWJ2K0ZYNUNyQ1k1d0xnRGJzUUhLT1ZPcThvL2lZUEdwczVMSjlBSlZkT1dYRk5ibCtWVVdqZlVJWktKL2k0NTU4NStBNFhaK04vajJ1TjR6YStsZWVqRGM0ci9pS3hIN1p3VlduRU5RVTdvamg3am1UOUNqN0VLU1Vwd1UrVlB5NUZtU1pFYWxpVVNFN2kreXRvbHRYS1hSd0lXWUFhcGd1eDJxeWRwNmpCeXh4bTJqaFp6MDJWVWc1WHdMT0tVdVQzaHVLajIwQmVNdytEQSs5ZzZYK3pWRjRVN0MrKy9ZbmZxMVpUcklrVVpBNTBFWHJwREdwb1ZpR2dZR3NtNVpZL3NLQXVkLzhYS1lWdHdkMUdXdzcvYmhPM1B4OVhuVkFsSzk5bHBzTW1jNDd5andlT0NvdzRjV2ZMdjJiVEZtajh1RThueGxROFI1dDh1eHA4YXBlaUNQVWN3M01jRHowUkVWMjB4QlFQTVIrMjQvY3Z1ODBpd0ZzVnZiTUR4QUhtcjg0dC9QR0RKeVdRVU83LzV5clUyWkFkWWVJSlRJU2tMTm5PUHFwZFQ2ZTZPVURudzdZc01wd1ZMZHVUMEVCbGx2TE5qc1Vtc0wxRXhkcC83WEZUcWtGY3lCN096eit4cUVjSGlFTjh1eVovTnBtQ3hCSW5wcHdlRXA1cnJSZGtlMkVsVUg2eGNlR0NUd1E2YTB6QlA1Z3pLNmhYaHBXTWF1bVVON0w4UWlLajhnUkNvZ0p2c3daQUJVcThsaWVlVU5NN05KSXJ1ZlNMSm45UnA3WXlWaE5ISG42bWVNYUl1UEwzbVhHVTY3emxZMXI1VU5PTXhYOGNCMEJsQkVzalA3aStaNEI2QkpwMzNmQlNpUEVzdG5ZQ1JnMGhiMWMrQXpvL3RoZnZwK1BXNGQxT1g4cjd3bU5SRHQrQ1hYZGZuT1M1OVBoUWpPbEdBNlkydjh4eml4Rk1GSGdoaXlrYjZUVEVWTGpCbTdoVFlyWkZESXpYUSt4YW5UZEVhREdvais3RHdldk0rNUx6S2djM01rT2daTFByYVZWc3MrSXE1S0tvcmEwZWxNMTBSK0FMcW1uMzNvb0U1a25XUGhzUit0Wno1VmhaTFBoRWRFZWVlcGQzRFFWZ0Q3Q0UxT1c4TDFOZkFoNjNZRGlnVGwwbkJqbWx4M2dFZWlrVWRHNjJvTmhIOU5KMDNDR1dCVkVrVHFOR0p6dTlySWJCUU53cVhpcFFKR1NsR1lEU01ES1lwU1pSUEZhUG1rdkJxOGVLVHp0NjFTNkhod3puR0ZRU2hWMEpjanNNR1pmbFhiV0lEQjUxcUozTE1YTGM1TUZUWElqY3g2Qm9Rc3Q1ZVlLQ3Y4Z2Q4TVozSWI2OU45cUk1TTdTSEtzbmVJSnVsaXRkcjIxU3VhVzNiaTRUT1p1cXIzV2RvQ1EwMUFDVFJkZ2gxcU1RbFloYzg0ZEJaVVNQVk5wRmNUWEJXZnNhMkhUcndjVDE3Y2hKbFFMem1ZNkdnRGo1NktnemdmMzFuUkE3UUV1ODB3ZmQ0dElPa3llZVlWbjFydDl4SEJDS0ljS0FtcDZxSjVVSkl1KzNVMWRtSjBmWVM2dHRkejZhMndQbUhWUzNBVmlTTHppOTJSRVpmaGd0V3RaT015V3BtOFgyZks2REE1bk9WcGZzYWVUdFJEdGc1Z2VSVmZhTVU4aGEzYWI4a3pzaG5nR04zU05KZU4zdnkyZ1EyMGFUeXV2QStXb3hEbXZacDJrZ0RNY09nRERQVEE3bW5RSit0em0rbkhUR253aUdnekVBaTRWZ1Z0R1JVK09SQ3NYSFhKREVNd21qTHp1NElWbVJJd3NoU0F5WEpuRkZLam1UUFhla1k5bFFLOW9YQmFFbTNpaUVwZ3h4QVdEUUc3VGZSVVhlR0V6cHJjK3lCSUpmZzRYcVhlSkQvTHJ2WnBKeC9EK0twcz0=", "pin": "111111" }, { @@ -42,37 +42,37 @@ "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", "admin_token": "r46bnf8ibrhbb424heba", - "authToken": "ZZ2piBreX+KULxOoe+Fl", - "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", - "contact_key": "MIIBCgKCAQEA12PEKhRH1EUoO/rMzxfYhRX026JJNuJl1SgOj8+ZaP4Wx+EKEVWF08RFTot8fc9JaK+sG4duGJhzukUCVzNabgdlkKi7uSdfek2fzfZHdpS5kjpCRHq4YLgk0DTm9KDp3YxkNGlFeQzkDCl4gcgSv00kksIplJrwlhkI4cstRfbTkb9q1Iy3gavxGOHbB8fAj17CzEgcb5qZg7T/9k79zVcgS4Zi9py0PApLmMdJzfYcWv0Otd8+zEh4wQ1TSU50TzSxG39s0aEh4LJjJ7PVJQNezgyOkhVu2ErGVNpR6sz08eQ8xQBbAmzv8JQHI9hYoH/PAre6lwXjT9bytAbowwIDAQAB", - "privkey": "MIIEowIBAAKCAQEA12PEKhRH1EUoO/rMzxfYhRX026JJNuJl1SgOj8+ZaP4Wx+EKEVWF08RFTot8fc9JaK+sG4duGJhzukUCVzNabgdlkKi7uSdfek2fzfZHdpS5kjpCRHq4YLgk0DTm9KDp3YxkNGlFeQzkDCl4gcgSv00kksIplJrwlhkI4cstRfbTkb9q1Iy3gavxGOHbB8fAj17CzEgcb5qZg7T/9k79zVcgS4Zi9py0PApLmMdJzfYcWv0Otd8+zEh4wQ1TSU50TzSxG39s0aEh4LJjJ7PVJQNezgyOkhVu2ErGVNpR6sz08eQ8xQBbAmzv8JQHI9hYoH/PAre6lwXjT9bytAbowwIDAQABAoIBAQDRBhCohWXvqe2Rx6Jal1mYTeaB/svuZ2dLpMP87AqEyZByCQIsMELfb+mSf+sgbLlgzprHXHaLh+dHLRFIbp2jiaoW6KjE1mDh39LlnctcWJh+P+tvaWjk889F/xDi9gX+6u+TrVWuU8Q7yUMZL4CCBesoQST5AiPYhhMIjJQy/7z/2Ydkb/uxRl5G6Mq27fVvgG2rlRyHCOXv1TjrzUEBzqJ3l3tjWPLD8gcPUVU4biMHADzIpMf2N/R7p5/qfPSa3e+V2hm+HjFXDJAREI/gqbDfbZ7skNdJx/UfK2m6E89afKtknw6cL9Lc0gBrHgmcUMYSvunbtIjM5Uoyy38BAoGBAPxaW3Lepm8qar1OBaNXtLpXf6F5yMNR8Jm0gx36NlCA/YalGHlLSPE7CkG6coO0QvjqCtjrVDDn1C6yyx3hKVv90A6vjFP1iU9KufSx1YhwFALwGfqN0i0iQeF6llxBWbA2U/94XlrdX7e748E6pPFGCrdz3ltP6KkC/1XprfGpAoGBANqAp39oP6w5XRck7k7fsn/ig8Ee9ti2eCn1NjoVUTw2EXPBoa4uoGBJj/+PBJMN5ozIdL0hKIQXVSPJPBuzoyJlzGjEJF3dvE8OBnFNvjkwGTbc/NMnjmYewZrTTs7OGu9HAsmxDwVhZzGV+y8wPjRODOEPLumSV8BhZPKKwmKLAoGAcqJtRmpEOt2O7X3i68eszrVuwiC7hZbUcE5i/ZwrTji6co7O5lK/yO2kBCW5XYDmp4JR+SY18Z1ucuQ/hsxA6IwNFo7CdWVlwcJVZQXf1YHsZUVC1+HS5zPXr6Drau842eZkE/pPCoHjuGg+1wlX4k6KEbot+Vb8fsJg0Vs87DkCgYBLswDUmhhdIW6H4yqQtt1PgvlkgcbBY84Tszl7PAFt28mGEhJilxLG6RVzU2ghTlKOebBACenQgYjkogYqDr044I3FyhZTUsu3k8NVo7qAc5J4uGz69pxV8tfePNDzwuH//dkQaUAr/AfVXQGt4ofadSPvIOR+1U2Df/qKMNqRawKBgE/mkFj4jp4Lhsdw/3dNfG7yBKjiSZzPho4klSvqurAhCq/lOq6VFfSf+55loEVdJ6m9kwu80QsDUX8Iz8c2PI7LCZUil6yMK41musTchUTJ56Qob32MAWCzEnnjfw6gcI8BZ60Tbu8x2WIPzRVkzL+yIQplPxgkoX1EdU98u09Z", - "exported_keys": "a2V5czo6QXdFZlgyNXVHcXF5ZkNxa0Y2ZUpaMWZ4cVlRSEg4aVZJUi93c1Q4K1hGRnkvWnU2Z25rWlFjMGVvT3kxUzA4U0tvNzVyaTMwbE9XOFVPVGpWNDlNeU1mT0xNOVR6Z3BRYy9iWVNFUlhieENJNFQ3QXQrUFJqaGZuMEgwN0lhbWVwSXBWcXVFcHlmd0VWSkdWK2tzUzZyV2xVQ2VoTXI4c0NjTDI3ZFNDS1VibVNCaEtaVzJKb3czYWdrZll4VUhrdlY3QkhDVkNlWUhKK1FzTFJvVDBiK0lCV0UwM3FoT0tKdlpOcWllUGxZMklsZHVqcldlWllTcFFCM1QvTkJkWjEweWtqN0JCVFYzemkyM0R5UG1JeVVvU3VvcWNvWnUrdHI4aFNZV3lnSDlhMjZvWVAwTWczRGg1K0pnYU9Ha28yRGh1NXJRUktyRlU0SWZ1OEJvN011RWd2K1IzejUyb1hQOUpJbEFySE5UeURSQmxzMXpORS82ZVY2Q1NxbUlwN1pZTytJeWtNMTlxbkY1R2toUllvSEJmZC95VUpEQXF5NjM2WVZRaVQ4czU0VmhxQ2JmOVcxRU5qc1RFTzJDYTZ3NCtOVW96V3N1dWp0NDhhQjBwNzkvaFhGMHlHNnRUd2RaOUFyK0U5bmNUamJiYS8yQ0RmVWNaS2wvakJvajBTTTQ0R0Y1SzJkNzlpaTdOaFVyZzMvN0pzVGdkOUR4SVJFUzdDN3Z6VFpidk1KcXBwUmRlTVNjVFdscHFoUTFreEZoTEJPRFNVNTl4T2JScWw5NDg4dEFBS2ZhQ3QvSGh2S09jQ1I3OUJMY3JBMlZiTHhPVVF3cDcxdkd3U3AyeVgyNSs4NWlCYllSOWR0TVRCMXlaOC9vcWU0aGE0QmVkWCs5YUxkWXZhVU9kMTViVFVXM3F6SU11TXM1ZkhUcXl3clBNWkVRUU1jU2xSSUE3YW43c1Z0MGNJMlpyYjNqaTRXbWZ5cjhPL3lWRGxzTjBiaGwzbmlzN2RlUDFET2ZDM0ZZRm9uNFB1QzI1dTJLK1JkWm5XSERGUHdhNkhlVndpRW1hdWx6ZWVKZ3RLbGtGRE5haXJaQXFtZWczZG1Lc25FTkN3UGRiYlQycjBiMEtRakRiM3ppanNjU0ppZFVYa1FuWnJ2SnpnMFBGRWl4R3ZIMmxFZ0NSMExtekluSWJyVFE5UU1qdkY5NUZScU50U0I4Y1l0dXM0UVR0MGdRM1F2amhJQVVDNzc2ZWZBRWk2RlQ0VnlnZU5iQVJvaStDUDNtSHVyL1dzQlVEbXV2UWkzSzllekNyUG01ZmxQNTdubkRDaUxlYzVjVEVzNS8zVEtZaUQ3U2pPbzNUOVRQQmVrRkdiQ1l4Y3FhSEpkZThyWld3TDByRlRaYWkzT2hTVDdCN0lRbXZ1ZUExVE01dG51UGFnRWs5ZHdBR0tIK0Z4OEFibjFpNWo2NXMrSjJzc2RPRUgzMkVMa2UxWGRvQ3JsbUZrdS9LcTFHR3J1d0s5THlXczRFTkFGekJ2Q3ZDQ3YrRkVyMGtaTFRsU1VYUjNiWHVnVWxBSUJaVDdubjNVUFNiT1lQZHBGYkl1NVU0MEJiMjNzVXVuV0cxaXc3UXI2dzZiSDQzaG1NVkZURkJSeWx3aWNZeDR1cWp2c2RxZm56ZW1TWVpzRWdiNFJEc09EcVJnOUFHVTVmU0c0K0hrWlAvYm1INlB6dTNsMFF5d0ExMkttNncwemV4d2lNMXB2aTRmY0dRZDdUa2F3RkJ4a3p5M2QwbmRLV0Y1NExwa1JiOFVORXk2RlBEdFFSbyt4Ym9CbUtEalNCMTdiWVg5Y2tBMWFPZVBveHN2eDgvTnBwWDFhVERDZFA5d3hHT2NLTVNpc0lneEkrV0dSVSsxUXQvQ1ZQc0c0VndjejR4UWdBd1FIUHArUGFDZVpxN3hjMTR6RURjTWJ6azV4MmdtbFZnTkV4WE5XbXZoc2tacE80dnFsV01xWWJmNTMvR1ZHMlRGTWpmdjZrb2hqcGdmMzVldXlGYmxTTFRpMW52NU82Z1dJVHJaMGNFNFZoM1l3ajhUVVBQYlBMWHlseVlsTkp0VXpZLytRcmI2ZDcvV1ppN0lWVWU1RGFyMEhMN1VITHlMZ1hYTGNqaEF2QXc3b3RXVTAzVGw5TGl3anF4RGpVZEFDcU80Yzd1WGJVeHdmYlo1SVRRYmRydHRxVzVVdVkyYVBnMUNzT0xuU3RhSDJxcW1LYlYxZlk1OUE3d3lOV2VkNTBNSyticFlmczhuZFFRREpUb0pjY0hGSGlsY3hDQ2ZEMnNjamc3U3VkTkRhNVFybmNBTWlrckxwWktxRGxmNkdrb0J1QlIzMXBKNHRyWVplT2U4Q2pUTUpMT1lkS2FpR2wxb2lhclhub3lmdmpFT28zRUZoTW1TSzZ6T2ZqeExLS3NObFFsdWZ0dUI3dnpaYjBlalNtZzN6T1dBRDhQSFljaythQzIzTG9jdXh3ZUFadGdnU21qU3Noc3luZEsxcUdFWFg0NmRpTGhKTS9RNjl4WnVOaWxQa0xuK053THZPOGdsR05ZUHQxbit6UWY0WWE1RTEvWUNuN0Rwa1FDRVBUSXVCb2F2eGFGMHNCdmIyR3hyYU9GZDVOLzRlNU5Jeno0UEs3dE9iZ0t6akIyNjRPeENtQVI4VG5jL0JkcUVMaG9ZVFI5WGFCWXRXVlZIOTRZbXZteDJpcWdqcG9iNUlxM1JhMmhuOHNCN2NZbHRySEVoNHpRaUg3eDF4NFNBVDBMYkRwOUxITENEcmpScHpXdU9JUEgydDUwSDU5bE50RHZWclduUkZoYXFMTWgyUHAzamZDdkNDWmwxMVZESFp0d0h5VVNDcGVoWW5HNm1UaGpxd25VTzdVdnBYSDE1elp1ekprQktUSmE1MXFYbzZ2TzZWem1wY0Z3N1BiQS9ybURzei9yU2doRGs5ZmdvSllQby9Ia3FYQ29vakRnWnlDOHNZdlhSK2JlQllFZDJSNzJ3QnRPdUxVb0crNGg5eXhLTk5NeUdsdGNLRkM0QkxRRC9WcTE5Q1FoSFlaMlRaRmFIeTFPaDBtNHBoSUIyMk1iTlE4MnZ5RDh6Q04veGlicmhzZUpsV3d5RDYxTGdLRG5XTlVmWEEyazJ0T25DWmRJbU5rbjJndk55Z21qSnZCcGtHN2I0V00wbGdtMW5PUlpWUWVGMFA0YTJpOXNBWVVpMDdOZTZjeDNGU2hHTmJzWkVCNm03VzR2YkI1RllyNGpCRER0TTVpU0FhRStzMS9rdGRZNmRMbVFPbStVQWdJUHlwWThNTmo0MEJMa3NFRUVFYjc5SmVocloxbm5VQ21JcndkMzhkTDNCTC90TllMdWMzNm54eGg3ZnFkV1hyOC8wc3l1UUE3cHpxVkg0amFTZW9OV1F1ZkRoSXR1cFJ0N0p2WExnSTR5Mm01ZU1YbDUzSVArRGViNHRJWmx1MjM4SWJlbjlQaW14aG42a3pha3dhQUgxTUM5VHZwWHZpK0JjSEJwUTM5dlRjSzVNdm10RGZoR2xDVzMyWlNaTE5DMWVWVm9RaDBqL3kxbFNPd1hpQVlHeWxUOFFvcEhnNkV5WDB5Z1NDdGQyL1pwMktxNGdRSUlCa1RzK2YwaWtOOHh5OXpVL1ppSFBRZz0=", + "authToken": "nRJR4rdOz4P98bJfGpFx", + "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", + "contact_key": "MIIBCgKCAQEAthq6JTCalizrR7F8nQyucUej8FIooQVlDYrxYJ+8N6QhJrGpu4lKDgaTzvIOuJkj/7/5yf/w9wpOJmrneDyPlCKOVr/bvbyX345TzoOapW3XUr+tLCSMSEEICjVqpvmubzcw3pxkhIBDoX38AVyj8JVeydPkQcFBDkNmnYH9rWtkDEiK/ULPrII+HgGLtJklJVy32ZG3Ymf9D2ZkKgoBDD5z/ZLkc9xcbvNs0nSTJP8vMO3HjhjLRNBi75SErtq5REHM8Jgk/el3ei3puxH9qWFcS2f3SDfwfykSf2jnqCH0RjAZ3jMnP4B6Q3wrmAD0Saf+YuYlcG51Mg7SqRe5+wIDAQAB", + "privkey": "MIIEowIBAAKCAQEAthq6JTCalizrR7F8nQyucUej8FIooQVlDYrxYJ+8N6QhJrGpu4lKDgaTzvIOuJkj/7/5yf/w9wpOJmrneDyPlCKOVr/bvbyX345TzoOapW3XUr+tLCSMSEEICjVqpvmubzcw3pxkhIBDoX38AVyj8JVeydPkQcFBDkNmnYH9rWtkDEiK/ULPrII+HgGLtJklJVy32ZG3Ymf9D2ZkKgoBDD5z/ZLkc9xcbvNs0nSTJP8vMO3HjhjLRNBi75SErtq5REHM8Jgk/el3ei3puxH9qWFcS2f3SDfwfykSf2jnqCH0RjAZ3jMnP4B6Q3wrmAD0Saf+YuYlcG51Mg7SqRe5+wIDAQABAoIBAQCRYE7gZ6fRYbTGvENuIPSWDIoszXoP6f2dTSGbcInSpZ2thUGqLFTJU6jmGcl0xxS9FCY2g7N7lGeFNezpyPcaXGfjizDCjO91kesHv3pSvJicP9bgmaDAAeKIO9KT0FnYAWhrHtEEEl1ra+clsy5RXv2YBCeB8uSbnWUrMt4wdWP3uIVp/5F2fP4r1QL7PhNwX2ATrERxGYp0mvHVqFMpfBFbf5kW7Ccf28gnkEdeGP5Os6DVWw9BTLPzVtYKZj3JhXnlkz7w5PMDTKqkJC4F9V+gT2jWrAbXITQLzEEJoQQjzYT5sCeYsZbH1wgug+NHFYv9cyNZyrF4g9fAb5QBAoGBAOxeYB4XjAIGyZJdIJ7d546avTfAvesQJGJJEuJsSadF2LY63gu9kXk7KKlezrwvMdXGMYIJcaKi3TSqx0V1syPDjD08W+zJLT0cfqEDjqFgrjuu1wqdTq5RWr29io+YjsixlJs7zU0efPRm6KxbMi68fYI0OkMs73nqfTUZ+R/7AoGBAMU6mH3fqpVE7LSTk+jH81y0DbHdMuYqKSAiZF268SUpLWnCNmMtoNB2OwAb/IzI0Ec7HdJmNDe+2nq2e7ZI8XI+mkpPd4QaAAgVanBhhLrP9OWkWI0CBeFiNx/4kQtS1GkY0I0bZc/AY7zaRb8GkpuN713k7/FAXoAJe/Aahq4BAoGAVWFNxPDqgPzkqPr8woYTk55vhQkZUSSWj+4nZSSKgmKngkPHW2RRfQISkQOPF8jQbpDV50v0ATRlRRX/Pybh26RSLvhzmBefQLjfQNghGEftB+ADC3GBL1Rxu6IQwAfyY6pJrL0wTpAZwMq/dyrF+L3bdEHbXdKIenhqW9kS9SsCgYBuZp9njmUBS2SorBdWbV6nnM4xqt1MA3uj1jySTwufPo6CLcmd+LOVHSlnpULYV6xmwwutc7J1JetMV4umfOxShAJ/6D3Bf4BXBg3fvGa83515UmaS//fkssKirdQbH5FxBwfuhNCX21y5IQF7raUxV+EOkRFS3TJIv4ZV37NWAQKBgBo08Z5Pws1xMstW4K5DUw1rZJC4LDe3+JdgIwiZeFwOBWpB4FX+s1btqazGHUdHuIT1+6y+Pgt5/pIbsg9ema8IC6lZx2qR/ufUDKxGodRt5WDhUZ0vOOpmAgCReVO8RbrHuR5yi/0sRD8YRb4tYCi4v3Lncvgv8Wqwt1GTw4cH", + "exported_keys": "a2V5czo6QXdGTlNzb0xTYnpvOXFaU2Q0cG45K1ZxR3VGUml5UlRVQ2xWYUFIV3ZtKzlGSWtQb0oybCtkZlQ2elZzMktwUDdUQlFMSllSMjlhQWhCZ1hZZHpFM0s4K21JY0tHTDF0cXhuODI5N25VcWw5TmxXQU9kaXFpNnExV1RLaHVTUjZibmswakoyNnNCS3V1M1NtMDdKU1RGZUdTOEYxVEg5VWFOYnhHalJJeXJWWGFwWVo1MjhQemFXUS93OFpDczRzRStydDdBNnVJdklLMGxSWmVFR2xwRGRGbnhYdHJKaXJaRUlyV2xwRCtVMHptQVJLQ1ptcmxGTUxBc3I3bTljclZ5TWo1VVpOQjg3K0tPV0w4NHdxb1VWVklzSENuNjFKaTF2MlZBNXp4T1huakRnQ0ZNNHNtdzVETDV0QjdPN0wwWG1zUjdMK0xOYUZCTDd3dU1GZWwrcm12czRzcG53dDB6Yi9KcE9ERDJ1QzBRMTlLY2JrWFFXbUY0UEhONXJQRStSWTFMOHNWTE16WUYxemM2cE9UVVVRRnR6SnB6cUx2ZnAwTGhYTWhEbmxvc1J2Zk5Bd3FPdkd0a2V3eEhiNzRPd2lXNXZDZVBiNS9JMHFJcUMvRTJpQ0hOMFROQmovWk94Z1B5ckZoUU5sNEJQeVdMRUR2amNtTTd1aG1jVG9zemYreXBGUW9EME1XVm14Tjlja2RmVDg4bTZ0OWZmb1RBQS9DOXozUmRUTzhlaG5lNWF1YVZMMW8ycm96UDRlNndxUVRGb0hPZHd3ekpSdVdSZWdvU0dCNzhtdjR4WmFOeGUrL3B2a29PalhCQk5hamlndHNUTS82Rjhjb3pxVTJ4Mmw5ZTIwbS8rbXo4MHdYOVUxazFhQ1JiWkZ2cDZFN0tXSlpoVisyMHRHRFE0WTYrWHptNi82a2Z0bUxIaS80WjA1SHJtYnVTSzJydzI0QjlQUjA2Smk2K3lONDg3L243NDcwekZNWWJEa0NGOEJKUThKQWx0dS95dmdKeW04aVorUTgrQkxEK3dTUHByWkdzR21nUTRQMlVKL3VIcm8xNUFNaVNXOVV2Rk1LWTRiZ2UvZkNRdTZMTCt3cjZzNkFER2E5Uk85YWVkQ1hwUkdCdmZOVjNFK0FkQlhWUGJEYzd5dVVISkRtQ08wUG14L1kzOVU1cmo1QmU2bkhaU2N6MjU2MFJKZGpqMUg5OUdBK0R0NXZDSEJwblltVG5FcDdyb2M4YjdtSFFqSGZZeDErL2xqT1Z0NEJFdVYwY1M5Y3ZDQU1BdGFDMjIxd0l6UkdUazd4Mm5pbEZORzliV0lYSENlb2hoZmVZVEtYY1B1TGxxVU5TNjVKUjVDN25qeW9CK21Wc2prNDROMG1udW0vSUV2MC85QU1yNjMvWFFtMDdvb1ZnT3QwMEFEM0g4ajRlUFRmL0p5eHBzcWhQUUROR1YrM2s0WkRTeisyRmxldTlrcGd6UkNMVkpUaS9Ud3hmeFBjS2l3YlZGblB6QkxOOUxKbnZUSFI3OWZoVVpEWXB1RzJETmx1alY2T01jTmxGeVRMSGFZazRNUmRvZk84TE1XaG1NWGwzNkk1T1FYd2VpNllURUxuckh1UG93T0p4UnMwRm1sSVhnNkVtczFCUkNZSkNweVVJR0NqTXZXS3VCVy95Nk10S2RXNFVXTDhQRUlnbVhtNHEveXozRjZvdTg3UW80Rmc4YXIycitndXFmcHhmdVR5clNuSndQR2ZpSmV3Rm5OdE9mZXludzJxaG5HUUI4cnA0aXRPOE1wV0NVR3RoVTdVVnFiODV4a1lMYUFTSnFIQ0lsWE1wbnBPZ0NRdnBWTUh0ajl4aVVaSVhuSExNcUFxYm1HTnRkS3ZIc0g1OXc5Ui94UEp3OFNpMWpvb01SR3phdEszak5Rb2pZV2J0ZzlBdDZoR1FjcTdqM1JkWlZqUHY0OVZzT295TTc1ZVJqUEJjSnE2aDlQcXhrQ2VEMHZyVlpRWjI2eWkyQ3R3cklKY0x3MTRWekhPR1ZJajVHNjF2dzFEMXB0WXdaek5Wd2lEVDlWYzFhY0xMcHRJK2ZuZnkxQUxYNmdDK1ZHdHlyV3JGc3hwcDFvOEh5TUR5QXFkZ2hEZUJqWTlyYmcwd2VqaFFQVy9FYmxQNlNLcGpXYWNwRjJGRmtlS1NQQkg2Mm8rMm55M3lNSmozcFkwUEJXT2RCNzJ1WFp5RFNlN2JUYURzbExkR0VUVHo0TjFFQUhBWXVieFBiditVdjRHZGl4S1BHMGhmak5Sa2UwdW9GL3NTRFl4SllOc1MxaVg1ZGNUR0NCY1dYTzZxZGkvaW1XYjVkcU5EMmZxK09XYTBiMUNwZlI0UUpiQU5kT0szRnoza01PUC9WcG1iS1gwTjRERzhrd2pROFhFdWk1Rjd1bUp0ekZtUG9GaGd1L2VsT2lqWThvdWdQZUNoS001WDJITEV0MDBEWllKUURJVEtEenIyMjExeDIyU0czZEVyT0ZqZzVnNUhiQlR2SVY5aXN0R2o5RGhrWGZlbkhmTGZVSW1ueGZoOU8wUmhGd2t5dzdqblROYTFWMVp5akRwZFJ3L3pRUS9nbHp1eDFuQktIVE9sTkYxT2NnaW03U3NBeGp6eHppVzFkYm15YS94YThZc1g4SUZ4V1E2YXdPVlRzQkdqb3ppRWVyUm9xWTRBajhrb04vTGVVb2RKek5ZMVVhdWpySTVaOVhNb3RFQTA0cnoxRHU1WkJaNWZLbkJkc2h3MG4rekNwZ1Zib3pmYTVQSlNsOVc2QlBSNnpqRUlobktsU3VxbjFVVTJFMXg3WkVCYk1OdjI1clpsc1lacWxaeXRQL0g2NGJMcm1NUzdGOEdkeHU2OC82d1pwK0RuWFZHcmc5VHlOK0JZMkFpMFl3dGxsZkI1bTNHdHlWdlF5SkE2aHVXT1d0QmNRb1BKdlVFWTNabHBobzNqTmp2VE1XYld2OE1DdXRNWHR6L0dUZFFzWWZINHh0SkNmdW01MnVRN09KVlRaMVk2ZmdHcnRtMWIzSjVEOUY5ZVRWVnl6ZEVOb1VzZEpwUjM5bWx5MjJGUlF4V2dFRFk2SHZHT3lJNGo0LzZaZkVmSDdsVTBEeFdZWTYxeHVNdnVjMmRqZDFvUFNQMUFDVjljNW5HQXByWTJGdE5pUEJLa05MSUljalpzazRka1BzYzNzRW5MV3RESU9jbXUzRU9ZWUNTLzdsQld3R3NoSnVDLzFSZzR4eExJYThvNXdYWWVuZTdjNXlhdlprTWtKTCtyMEpxb29CNUlzU1VaNlNraWgxV0VLQTBLQkFDelUvKzNBMUxHWVNkSjdIOFRTamFxbVlwQ3MzQlU2N1RtZGZ6dWYyeHBJRlVOMURtWVJ3bk43Z21IbmFjbXdjM2Nsa3ljWXQvMWZnQ3V3N0llb2lITDB3QWYwd1lMbDE5Qlo2M1ZEZmdMR3dSQXZLRjVaSkowVnNSMkJVYUlCVUdnVkVEWUszR2JiL2xSOUFpRzd1cUhKRnMyaHpoRUQvYmxrZ1RuYXVHNnJKWlovOWZrVUtVUHpJWFduUktJVEJTaTlPL2xpbU9Xck9OL05kZk5LMm9mR0FyMHBxUWJvcm5tY0ZaYlBIRC9Jcm82blBoK3FxS0Z3ZG1MNS81R290SGtlcUpSST0=", "pin": "111111" }, { - "pubkey": "02132660a55668156cf1c2be27f8fb2a4a9b388d3fa2fdf3ba4677545c41c323a3", + "pubkey": "036cf9d03c6ec86101bd51daf16eab62bccf2c5c03e4d29679b2200d1c0d3d79d6", "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023386625", "alias": "virtualNode0", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "gp+ishyWIxHWzKFPRdBn", - "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", - "contact_key": "MIIBCgKCAQEAyIeBzOPjcG6+G54qJDe4v3fS3H0UrsN13wNZxeJbNkT37uiqbvcHA8bfnks4ga+2WXUm4ut9gGk33yzS8TTjfH+F5BKHYJWyF6A3hOi8Ywh5e5o+OXE7uAjYCxBhQbvLvJ1CF3wwSJ9TzbVS/z5ABlnhUv+Pee2ILu7ZkAPwSkgM6TYTAKXC6ybHvwrtFE7lTvnavPg2Oi6LRQC/uFnrN0ANYW+PTSxWS+VZ3EVFXj5cvxl1JHeHrxS8eKgaltzhw15gIh3WQPxwCSVRcyEl9SII2PhRMjyq2r+bc10xBvX63D/KnDFBWxRcju1IC+/gn/vWh14RVBQ+/U/0BRYahwIDAQAB", - "privkey": "MIIEowIBAAKCAQEAyIeBzOPjcG6+G54qJDe4v3fS3H0UrsN13wNZxeJbNkT37uiqbvcHA8bfnks4ga+2WXUm4ut9gGk33yzS8TTjfH+F5BKHYJWyF6A3hOi8Ywh5e5o+OXE7uAjYCxBhQbvLvJ1CF3wwSJ9TzbVS/z5ABlnhUv+Pee2ILu7ZkAPwSkgM6TYTAKXC6ybHvwrtFE7lTvnavPg2Oi6LRQC/uFnrN0ANYW+PTSxWS+VZ3EVFXj5cvxl1JHeHrxS8eKgaltzhw15gIh3WQPxwCSVRcyEl9SII2PhRMjyq2r+bc10xBvX63D/KnDFBWxRcju1IC+/gn/vWh14RVBQ+/U/0BRYahwIDAQABAoIBAQDGgPVpyHE9vDJujmwy/AHjb48Jerw9n/mPsPZuH/ugxjcUhbcpL1n/UB/Ox7GBF1qQRZsf6HOM6RtIzktmQK+sb2Qv+HOQlb79CjnLVMQf2KTBSVetbzzpmb+bfDR6aJdu99EUBHibezTvHj6xsoKYhuK5UYhK72ru4rv1hyCXtehNot8MiYSLL+VACe94oAFc+SpU+SCnGhMFe1AJsEBiAfJCB/OmEecxdhqh4TfU77N4Tth6VT6l8pRP3GlwFON0EZSWIwWoxeAOr9GdRkLFzsitW1Uk5793pCh4HO/j9bYZFpspYTBkCEJ02s4KOWc68g7VHQY9CUqFDs63zd2ZAoGBAOrJDKhb5rG3VRyZrmdQBlqyWCiwfMW6jmCh9RrDulfqcld/WCkxgjyBB0Q980yXzUQ2KiIhzhRImJFoXSYioavxWCxC2fOGOZQh0a8ti1OEiJk3g4GE7BxFG5v6PyyXWrln1J5QZfWDbU2Dxw0n6rud/kc5/bEvUI+cnDZouodrAoGBANqmD/pGMl7WknaChN9xRLfANAOKwwm+E7DM52PTdKViPLlB02DL7ar9aEhbWDAdLIIIUu5pvN+RljsZQV9p6TygpKpfhXAxOjU8bHsgavrFq4jggJaVqZgb1+NYN6mmS91oSylkTz7ErGdbD0zKNQ1ATSkOM2Wn79jZbyW5kmxVAoGAVitl1uCr4avMtAt/Y/GN83mjO4PSt2tJ2BN49tLBMIUeZBibzbqa9wPQG+60vfa04oUSn6ZSkUU3oZ5xGY76UTXpy4zZmzQ3K7Ph1m5bxVJOJBWo0T9svM9sW6nTx9Tg+k0uTtBpK1uKITntM1nkH+nTqmaRQpd/9MVg2+NCGnMCgYBAH3uIFpYnIh6KCvUU4o8YpJGciFFyxf/YVf92U0leR1Uvr5JiTOxCvVacAc33LlcjO3W23eO6XWQFqP53EQSJ90LThHgJ0yYS/smBwpwdN2N7HPwZLYMzTNcfoXuRkWemYzPHy9dBvUQie54dEyBD5pu6cqO4KGw62Gm0UpwSkQKBgGAL17KhSNU5Ot2AeUfMdMxL+zGem68aOQkmMJBU4gmknavBwWUpepB24I/Zp1/EpGobOYsoJmtEPgtuvngZ+f4c2q+R83OOAjy5ji4lwM+FAcjreVBk3H56+m8/XGYpkB59CqyMfBLNZk8JYiyZlsy3K5Fz3WH2cvdTNIbxwh/n", - "exported_keys": "a2V5czo6QXdIcVRuOGhJZ3J1OVVjRFlaSWdkZkxqKzNpcGNvb3Q3aVNBZlkrVDVWUmtPVXJtdjZzZmJQOTQ1YWFwTENwS2xzQzVYVGpFMTRQZVlUTkZyT0dsakdZMjVvT1IxVGUyZ0RJaW5RUEdnZldVT2xjVnFQMDhRYTdyU2F1eFVQdEJCakwwYWlZVTV3QStxME5EZTRFa1BLdlV3d3krQXJkQmdiRnVUSFNHalY0cGZFenFCRjJ4bUFvYk9SLzhFK2htc1FXc1R0UmdsbFE5bmJSYXN3TkYvWjA0cDNZeUV2NzJtYWlGMDArelhLaUNZYTVaV0RUYkJjWVJHN2N5SWJQWW9pdTlCaERCOXN4eTNYK2RwbFRZbmdJcjA3R3VGQW1HWkViSW40bHFGWTlSdFZDMm1xKzJXZHNPdFFFOGtSczFPdDVTRElwV0s1a3Q0VGdYVE9HTDBiZWVSZTZKSEpabmVWRzJhZDk4U1k3SWFjTGI1L0lHMXlmbVo1UjZFcU1wOUgvSHd5T0NsSnE2VVMyYlUzNEJySVRpNFY3cWxLTHB3Uisrei96WXcwd3MrTHRqaERSRzRtUDBTRERSbGtVQnZ2b0Q3VjlSQlkyb3p4d3l0ZW81MjI2YnZzWWFHeXZUYzRmQldmNHlwYWNQVzI4TkpyTFBaeVJ5VFlqMUFBK0gzMXlKWGRWOVhPNG9qMTQySFd0aXBNN1hvaUhHUmJQQnlWTFlkdnFaZjlJRFl4VUJoSWhyR2E1OU5yRFd3WFNTM0lXaTZZckdWcnp4UGFkbGl0YXd6NGZ3RkNIUTF0QVVjQ2Rlb25Da3oyUjRMRndlTHB6aW4raldPdHdDYy9PSzRlbnlCZ2N0SjNERXUvRkZla3gyR0xCWlErUlZaS2J1VDZ5dm5HOXlaZXhPVmxreHVXdWRCa3BYMnUreU1VcDRSUkxJSFV5SWpPMGZXQ0luVDhwOGNMN2tmMytaa2d5c1RZOTJsNzZPdGVVM2poamx5a01aRkZkSUFvN2RGZVN2cjBvVjVOQVk1QmlDc0xuME5zOHFFenhmM2djUC9pWWFHQzQ5UzN6K1g4OG5OaVc0QVFjWmdheC9EdVhnT0lPOTMrUHBvZS9hWGE0eVU4dWxVSjU3NFFQcFlONEd2aVhNTFNlQitWWHRhRytOYk05bFhQcjZFZmRvZHlQVzZhSi9QWEZFK1RESmh6S1RQeDE5STRJTHRJVGc3MUlqKzJYcnRWMGxNT3lzU0Rvc285RWlCUm1mL1FhUlVZYlR2QnFDaWZ5aU9UVjRBTWowQloyeGMwL3Z1S3FzQ3QyMnYxQlFVR01ONWRUejR3TS84N3dvL044aGx4SjNqTC9LemVOVTdKSmplY1VSYWJOeFhQdnM1SVU5Um41SE1reWIxcHAwT25qR283b1NJa1NuT1VBRTZuR25TNVRLUHpYNnhSRDV0a0ZVck1Rd3VIVXc5cXU0Sk5KUkFST0ZNb0RveDJVYSt6eThRRVhVMTM1N0lvZUpVb0xjOHlTUHdxdGp3emdMR0ErWHdRdGFLWTZRZEdDZk5wS2ljSTR5U21yUE9seExTNGwrcHhWRXljK1MrNTBkdVB0UWtWUXMwUEljdFNpM252MnRwRkNRMy9qVmdhWEhlVEFkdHVoVzhocXFDMzlURmdUVWN0KzA0TkptWVdlT0JCVUsxbTRudDhuVFVKYUNOU3NyS01UWXk1OThpanl3TXgrMStsSU1rVWlGOHdieWV3SmZoaDB6MFBJQ2JzYnRpbFVxYkkvenpJNlBqNWRJSGNWQlV3OUcwOGtQRldhUGErQWdha0pTSW91TXBIVXBvWG5uZE03MnNwYnNqZ1ZpV2R0SjVYV2d4b0FKd0gyVFllVjlIVE1qU1pGUjBYdFVpVTNVZDJLOXJ2Y0k4KzBxazR3VFIrVE9UQmRiejlCR2dXMGFsczhLVXVwaFpXSTFLY0xmZ3JVWmtNb2gwUlgxSDdkb0Z2NVlkZ1RFK2FQZjRoMTZ3VzBmK1V6WExCaEtja09UN0prVjdUYitzUWYwRGVVc2lHeGFDdWJ1QTlyTXRnWG9WNVJHL3RDeEhON2lRWVZlaTJhYmZmUDBxWExCd3k1Sk90NllhOWlEc3V5U3UxUkoyZEJ0TkZIWTBBQnBsbVhCZW9oUXovRzJNb1Qvc2tGbkVkVXprUWsrdkRvL2JBVDF6SENZMGRBd3Z0ZEFYTWZRVENlUmF6eTRYdnZ1Q2UzcXRDMFF6b282VW1PUTJZUFV6S2N5WC9SZkNtVUhxYnpuUmNrZHI0QjVKV1dubHVVUmNwYlBaU3dGMFR6ZU8vTGdId0s3Si9JQlBOV0wwZytBVk5BcUxmWkwrQWdSUVVRWHYwQlptUlZseEZGUHRLY1owNmpOdll0MzZFanFNOWZwV01HdDdwUkEveGJ4Zk96MjVSK093dG9QeFppQmg5VWRLaC9VREhLSVpjZ3NBeGhrT0xCL1l6MmY0UEtlZENZbUhadytLVzhMWDg1eEZEQWd6b0ZZdEJWS2F4b2VOMWVydWxsOGNBdUlVMDRPQmU2WDArVjZwdTJ1aFY4bXlRb2RINnVheXJFbWF0NDExb3Z2MXdkWXFOelVIaFhoUE5RNFIvY2xVbmNPYURUazdSR3RZR0lQb3VNZ2srQUF1eVJjMmRVZTJXd0tIbUdKamllVHQ0bnZEbzg1OVEzWWhnRTZaQ1ZnZVVxMzlmWUd1M3M2V2I1d3I5aXl4TG9RYi95RTdlMFdTOElhc2U2MGJaOWw3L2JGK3U3alJ4SUptNGhsdE1wTDUyc0x4cTVSUXFPcmE0ZDZUeE1PZi9qeUNrQ1phNXBDRFdNQ0lLWXZGZklxYWFkTXhKV040ZU1RWmUvY3BhYTA2OG1qbm9mVnFObEw1dGhkMjVHcDFYazRRTEN6VVZBR3hnZUE3clN5OUQxTENQQmJxQkloS2h1cGpTc2tMLzV4dmlaNmJHL0xqZGZ4NnNybTN1czVEcm9PdlJTdUNydUxZNUxJNVhyZmlGQ0RWZzNuTXJMeHowZ3FVUmZ6QWVQQ1czaGE5NnJVWFlIcTVBTkY2eS9KTHV5UHJUcTI2dFJGK2RKZlQzOTNoUDE5aGRDaVhyTlRBNWpOak9Lb0FoenlFWlVWOVhtZXM0Vk5zRDRnc0lLaHRTSnV1MkFoMGV6bkR5bFpMZ2JFRmJxMjYzQ1NLajMyeVlkck5FOHdVbDRWa3BDTHo2aHluYndVT1ZXdXR1M09UZ3dSenpvRWVxVXhyYWZsWUQrRTlMSC9yQkpJbiszU0VHMUlPaHk2aUs1LzRLVFNlaHNPTlFRU1E3WTJpOWMranBuQThBWHVId1JrZ0FLNHFtbmNZRjZTU2E3WVNvd1MyRnBEUGg5aXFIYjNkZDZWUEZCU0pQVUVicmMrZWhxQktmbkpUaXc5ZU1lT3hjZlN6b1JrQnhBanZIZFRFWk53NHZVMmlMWUtuQWFwUlZQUUtGNFdoNjVoN25ySEI2QnNPc2NhQWlyY2YwRUlwUy94dEJEV3phY0Y2TW1xR3cvN1ZJMXQ1T1g2L2VCMW5xelBRTkcveE44NVVlUjc2T3c1OTU4RnoycnVWRW9mQkx4Q3ppYXhaRkVId3FvbFUydzNhdjFvekxZN3dKOHJLNGJ5d3pjQm1YWT0=", + "authToken": "zzR68UBkVCsXrOBiASz4", + "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", + "contact_key": "MIIBCgKCAQEAxWepRsOgmSWzo1xn+nMX24fJ2isQ/Rt86ydBArtgLC5Ujukq8DtKA8JiLVMccJQHPDblFXe0hofuzo0QwpemVWzrwjzGX4bJFyjYe+HIjtNVHRvLxpFb0VA4NYui7iDlDh/yxf928JpQIVdFQyYsCb9opGXIIZzfzxGYS9pNKlh4ejdiizfpSs6mNgcSs5KTHTdev69iwZEdk+NWUPo7vFICgizMqMiwEzDvgSb8NdNiqNcEmKEyzgSmePSi32tO9SDtfE5yZ4CQXw0166zjqZc1pBCW9hcYnrgQfxkOhBP36yIfRmKPkXWA9wXBb921pHv4IPaEH2zoonTbPin3jwIDAQAB", + "privkey": "MIIEpQIBAAKCAQEAxWepRsOgmSWzo1xn+nMX24fJ2isQ/Rt86ydBArtgLC5Ujukq8DtKA8JiLVMccJQHPDblFXe0hofuzo0QwpemVWzrwjzGX4bJFyjYe+HIjtNVHRvLxpFb0VA4NYui7iDlDh/yxf928JpQIVdFQyYsCb9opGXIIZzfzxGYS9pNKlh4ejdiizfpSs6mNgcSs5KTHTdev69iwZEdk+NWUPo7vFICgizMqMiwEzDvgSb8NdNiqNcEmKEyzgSmePSi32tO9SDtfE5yZ4CQXw0166zjqZc1pBCW9hcYnrgQfxkOhBP36yIfRmKPkXWA9wXBb921pHv4IPaEH2zoonTbPin3jwIDAQABAoIBAQCG8hss7dSefMB1n1jRQ9Z+UzAwvRoK/LyDgD0X4gGXkkBpxYl92fn54er9cwBREVB04E3wQ/mbsdcVSie37rVdVm1ARg2SBfD3rQt4fFt/D4bytCq0Xm/3AbC7Ie7KfKA47KwooD+tsL+wWxlVEwYtz7R4FcAfAj+ZLT0ANYZkuAviUw0Hl+uu7fQy1gJpTSrQehnbBbSojtnIksE7ZCOFq/sYahA8za0Aqpd2D29OFpMRhmX8kAw8cfXcbYHyTPjgNeGwIqNbENnQKCuEV7z0yRhXmdn/OGqEDMuEsnKHGlvTW4YSchYvUfbVyOggqIbAt57HlNWOieJt/mHSnY+hAoGBAPEJvcdWWWSpJcRoqKIqaz5fYndjvhuUgFdfiss8tu9oqbERTxjDC0S88BIC88LbIQ53ltraMOhDV3gXFBY48hpsXqCwxQVAPeA2OHbLTkFRWeQIL16osSJsYkQbP2G9ir6DrjDtVY3Ek64lbXYEQNuUs9lgqzjl1G6D33xo4BW/AoGBANGoj1Lia38IT5eE9Tkvx+jdsEYq8jMoZ9PWBl/ypmwR7LZT6s0zUlBwPOv1Hjd6IAoxhyiXAUoB6acBiMoLVxojtJqNoLVx4t+yDoBe4Y+a3z16yy7Gw7/rvxKjGEQ55OQjmdePWf75ptXauM2OnShz6hxeAFoUZNgVcpbjmbIxAoGBAIwFY6iDweRW2mixf5zM1YXjNTkzyQEOkEuxZdhQidijzUfeTTuOOmKQ+0kLS/2a/CYCVLEH5TdXv1000udh50pwP7xLU/iL7CXueXiQ/AG3t2dfVd1AU74yhhcYWQZ3bDzmE++6P2PemQemGGNhbyffx2Z04KJp6LDWjKIh7mLTAoGADmy3d69mT/Yla7pVGNsluOrPvvQjd8uW4Sc/hwht1M+i5qR9aiLWzfv65Q0XSB/Z5nmj3/ILv6jEB55+Z9BB7OV5/owx+2nbfyKEBucAQ94W7+br5cr9Gs5AdirMd504F04vvnn5aiaJCPukbVgbjfXzrIH3Kjtu+ML5AFKmd3ECgYEA1aMk8/hgUVkBkrRGNScHE6i4VB74PNAFFLm9hTC8bunlU0Dz2DIyR8DoVwfuJyLDg3kWAGrq1tO4RAOYwRgQpiOZ6kS8opJf+/dvyiI6qHIeqw2MwcB4W8DwxTfaCjdZeaZnBBe6fWdu9QPBVKQ8a35cjtWC6ZXiTW2k0bgX6m4=", + "exported_keys": "a2V5czo6QXdFQkJ4cXd5SklSVkdjRzg2RmpLTnhvb1l4OFkzcnpraE1FT2JkS1NqdVdkQ1NyMzlCd3U1Uk9DRm9aUUUwenliYkJWUmpkV0EzWHpsbFZDQmx6T2xXMENhTHdFZjBubHhsdHNmZ3ExTDN3WGhTUW8zazBYb25BR1lKNndnemk2N1g0SFRFa2p4TFZ2ZjRURjlWUUYvc3EzZzFGVGVHUHZmOFBIOFNzUno0b2tGbnlRb1pwejhscHZVUkJ4YUZIYWtPQ2tOZmE0YVRkVzg5YUIyV2V4VUVHcDUyZHNUSXFscGtoSEEzbVZNSmRTYUFWM3NPUDdvbkt6cWpzS3ZUNERXNDdSRFppaVR6QStZZWtHWWE3U0l4bmJnclBSN1VTRW1PcG95aXI2S3NleXF3QXp4Wkd3VXkzd1JmWkV0YWdpQkxKSzQ2UE96U2VMVEFNZThSUzMrbS9TMGlnMFYyWUZPZjFiR0ZxSHIyMllHQkoyRFRSVmdLQjdwNnBXdG1zTXFSME9PLzFscmMvTWZOSkoyTzlLODBnV3RhVzk2cjQ3bjlzcVRKb2JBSDI5T0VOakNJaUgvZTBiUFJ2ZncyTHFSZFBhWU5HTzR2OUV0bW5lcVE5eWJXd0RhRi9kQUNlMVJnWVRMUlluNXd3QTllL3duRXFQUXhSMkVlMFVtakRUMkpQaDZlcW10WGJMNWd1TFJrNnRNeW16YU5IWEVrTFkvdzNGRzFUMUh2M1orR1lLK3QxQjJwdUpiUnd6Z0YzZ2NTL29vL3Nua05mblZ0NHY4RTVkaHV1Rll6dGc3T0dvY0duOXViUjk1RDlFaFk2c2hISC9DSHF3SEZ5T1JOK3ptbWU3MnFqeThma2theXhKZE9qQitnZVhSQWdzeEc4MklHbThJUml6UFZDQXJBUGVUbUFNYWhVU3FHaHZ3dTNOMUNWdytIdDZxMGJwZlM1ZldSWmNDbVpqdnNwK1FRQkl1amZ5dC9sbzZWSVZpc1VvNGsycDJ5TEh0THdmZFBrUm5jWFBuUzk5eisvRmIzSmxubEZXK0xuTlZjRXp1c1doZytDSFhhdG1xcCtrZGJXVk0yWnZOcW1pUG42ZTZpd3JCOFZMUENrbStXSDJGU2ZteU1vOS9NdVI5ZEx6ckZwTlhZMTJGQWVyTzlpNXQ1VGFTQVZMS1lZV2hPRlV5TThBUUxQZ21YMklnZStwRmNwNE43aG50T2dyTDZxWVlQV3dySGZBWTNXbXpKTWpBWlMxb2hJZEllNzVweTdkLzdmNWNIandKUzdFZmlITVJEZ0ZlZ2FjWUxvUlA0TWNTU3hZL3NVNjFiWHJjc09tY2VEclU0aEo5aUNVMkMwTHE0SzlhZW94WnFnUXQrUVFOT3pUTEsyRjN0dDA3blhJVmhuY0ZOWmwxM0MxL3NRSS9EUHB3Nm5UNWNYWkRYdk1ocWNiRm1tVmsvWFkrWG9pSERIT21KMisyWXJYSlNiQTRNV05CQXFoUFcrRFZzejUxK1cyNVpWNnlPWFJaNW5qdVo5c2lERjA3SHFITTJDcENjQmgzZ2RIWXB6cXliTVNXMC9WU0JVNFNxUzVYaHBKMGttalhtcTlIYTJ5VWdTN2VVdzMyeDdSVDJTMm5KL1c3cHp0Q2FPY3I3V0gxTi9uWGsvbFpVYk1oYlZkLzJkSktOMmJZWUhuWm10K3d6YkJoM3VaTUlwZDhHK1pMNDV1VzJpYngwMTZDTnlmZ0hGdGY2azFDUXl4R2p2bTRDU0tiK2VUT1A3cXFySGdvenNia0RWdGlsdUxMT24yZWQ1bGRRNVN0ZmJGMWFGVkFwUWEyVCtyUWZGTGdrUkZuMTZZNmJwVkp0U2VDVkNNOC9ad1FvRDd6bGM3MENJYzFsNkNITTJZWnRXOWV0OWtyUTJhSUFsQVhoUHFCaU1FaUo5dTlKZzU2bTl6S0ZtNDNTV3MyRThtN3FBQzRWUU1JV1lXNkd5RzdaWVlxaXk2YTFDYVUrSjFDRnZuR2VwREFsUk5LUm4vSWYrOTZhZTlBd0tQeW1WdUdVWU1YRHFFSUlQU25RUHZYM2Myd1REWHZOWUpBSjVvTStUUXFvdVc1c251dytOQStiN2h4MUNzeVNaZUNVRC9UNmV6NEJFWUdFSmpzRDVqaGFMQkFQbUp5d0M5NkEydGVYNXJ6SjZBL1Q2dXJmUG9acHlzc0FLaHI3eEZsanMyVW5yZDh4UTJVNjdNbjBIVW81YmUzNjBBclMyUWkyK1ZEWGhxd0NKQnlmVTlmRFdodUtKdmVjYVRzNXZPK1ZnVkJRRXhFMjZLTDJTeStXcDU0Yy9PMm5oNjR1RU5EMnlBZmVHZlJWMDdZSWJBbkY0VDROQ1JITTNiNlo0a29SbXFFaVQ0MHZjZy96dmpESzhjL0Q2c01raFdYWU82WmFHVGhMNWF6ODZDcnJRZ1FJN0RwRkx1ZjZaZkJHNTUvVHpYc3F6NzByb242MXZoUGFPeTVIUGlNbGt6UjB1TkRqbmtzdGZRUGswSUV6QVlpNThwZTNydllremxUck80R1o4TXl2M2o3QkVVVitwaXU1cG5Rb0pXNXc2aFdSVE55L2hVSGpuWDgxZ1IwbGRsOFNJbEx6SXBMNjJVV0p2UzIxNWxVQzR5MllBTXYwQ3UrQ1RKSEtQdzBrUjZteHgwU09KK1pPUmhXR1lTU2UyU1lMWDlmeVY0a1RXSEFSb0VYblQ4eGY1WjcwVEtFeklTNm1lRnBqemtPaTNjeHl1eld4T3ZBVkF1MmFBZldzQTVHWEw1WHNGOWtRYzltazJtd3VKdHo3aHV5Mk5EMnFscC81WGJRV050R3ZHc1pGNHB2dzUwdm85cjcrdnNwekFuU3BCT2lZenM2YmpabnJVYmJjZ254RzM2dUdoVk9aRVArMlU3bUxnMTdVQnJtZmg5WVZLQUhmeWkreHRDZktwNTJQK2hUQ2g0VWQ0OFBWOGZtZ3RQMzl2aXJ6WkNtcWxDb2JPbmZCdzA2cnlzZHoveTBDamtpZnhmK0R4QTJucE90R1l5RXhGYW41MVRYS2gxeDYweXlVWm0wZGY1SVMyRHVPemMyZGFseC9zaGZ3b2E4Y2F6VHFrNXV2V3UzQzBHSWYwY1VDUnJGWlRHcXlrQjVHUmtzaDZ4cytycGJZb2lKNHRyUzJpMmFlSkZtZ2VraXA0VDRnbytwYU03Mk5OY0RUelNxWDlQMDMvVjluazNpMjhXZG1pMllmV092NTh5SVRUaElUSkRTOFFvbEVMYVlPREFQQlNoaks2R1RtNTRLT1YweHFxZStOUGlkSXpxZnI5RlBiczlLRUJRVlhPemlueW9HV3R0VmFUYkxJQkFuOXA1blVGWElrM2dBNnlBVTA1VDUvOUxUaU1sOXNmVFN4YlhKaytlZVl1dW42SVFEV243eVU2UWtPWjhsbjd4MFRscnlBa3hORXl0VWpPUHZnR29xcVhya0huZEsyblIxMy9ZK0FyYXIrQmFmNXdnZUtZaGZZOWh3UnJabGV6YlkzbzdOeEgyWk1mNEtiMTVUOXpKMHZnc1lRZVpEVEZjZHpZbUZMU0pFWjN6Syt1YnlzeGxYaE80T1lnQ1hOR01DYzNZTDA3RnREYk9BK1B1c2ttajFXMmg4cHZOY280UE1QMHhYbz0=", "pin": "111111" }, { - "pubkey": "0382314dab08270ee1afbfa60f8aafc31c17e4cfa56b67e34d936788a1004db8a5", + "pubkey": "03bdfe28c65ad9e2186f4630bddadffff1dee1094cd60fd6ee1445f5d0cb315a68", "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023452161", "alias": "virtualNode1", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "eARizF6dDJ6RFf6lf1Yb", - "transportToken": "MIIBCgKCAQEA4e0uVbnAwZaIagzR3qNggjuPkVn1YW0pHLqh1zvwCarrzopo+RDw\n+bbZB46o+NG6SPgNG/qXVNdt6ic+Dy7T7AXdijD7/9XzDpgMq2rQsS6I1L+FgIEI\nMdC/XYB79Wptdc0+Jsq3xdOrlT/gCq+050d2fWVHBYShdq25rdPWVR3VkoESNdkw\nk1mLOHiYwbmbGe8W+qlzLR+OkpvlUGPMm6smhJEVm4XldIQZNG/SCJ+/c/DHHzZ8\nNVi6pSrxagvgP/Cco14w3sSHy9kv8P+YpwS6mjzuGY64tnb1UmOFvMBM6TvuHJEY\njOV2phPFjp6Z9xTIjdv/lbF3DCOmqcARVwIDAQAB", - "contact_key": "MIIBCgKCAQEAyCA/IhZp+GZc65lecegloTYaB181r/Fza2wIcZsdEt8dP6wgzbWvjXC/IAZCHKemU3B3CszP5vPLZ+eN9u+crJS63LfOodCj+aA29dRjYGaU1GmOqdbGeGwrw6TCGpeJjG6IDo1m8RI59Gt5bVWaqiyHw8mBryOQMgbNas6TqwhQRxLtBpF03vN/SeODZmKrWaj/qwlTL9Jbp4qP/lZOJeARbMUYBMuN//jP8LMPW/7uqP8u4Fsqb7ddLnh1uCWMRq8+gVcAEFWh2gMpGV23NMrYPucuuMfE3Ma81+vnJ799UUmgOUXJuWST3Oh5saJ83u+SWsLCMYMeRSR83Y0GhQIDAQAB", - "privkey": "MIIEowIBAAKCAQEAyCA/IhZp+GZc65lecegloTYaB181r/Fza2wIcZsdEt8dP6wgzbWvjXC/IAZCHKemU3B3CszP5vPLZ+eN9u+crJS63LfOodCj+aA29dRjYGaU1GmOqdbGeGwrw6TCGpeJjG6IDo1m8RI59Gt5bVWaqiyHw8mBryOQMgbNas6TqwhQRxLtBpF03vN/SeODZmKrWaj/qwlTL9Jbp4qP/lZOJeARbMUYBMuN//jP8LMPW/7uqP8u4Fsqb7ddLnh1uCWMRq8+gVcAEFWh2gMpGV23NMrYPucuuMfE3Ma81+vnJ799UUmgOUXJuWST3Oh5saJ83u+SWsLCMYMeRSR83Y0GhQIDAQABAoIBAG8YH5Pvt2ISiRCsshYvlfwZSXfALdB/C+CdN07BmfEo9FatWgR4EH1HEoJXlwnLM3TsYNkY+2ys98S1cUScnW/cnKL8UnPXm79uZjQvc/9G0uXbtzunI8Qj4GOaKbqTVuMjVNonOvcmdA+wPdcpB1PipndUfG5aIqjyx8O765OsbU8510pxVR6RRepO2ZHracrykbN85vdUKXlvAROVtmcPmm7dLELtvqbeUVPX2+IKzdgaTeFdfKgZisAoY85cqRhl7Rb53QqAEF91mFRE4DnyQMhbX8Ro4SsZhhGqhX7y+Pkg5c0jKGnCO4pD3Lo6WQ59+kpwdfrw2dLSkUoMad0CgYEA6zXwuuB54wQqWVFZGkRtf2rIiAeHUSfRsDaWXLekiQ0Cwi1qCcTaSyMLRu0qKbIMMuLjRgvyIJRxmcihEG9HgyaXoH9zsI10QG7+sGNjiEq5IraE3fALzm6KAoWUCnFqXSzpfEtFOcEC9BbzidnOdnIAARYRbRkUw9wy9ATLql8CgYEA2dBzpDCLTCLk+1wjkGJ4QI4SO6E84HU0DXi0dXVpgsAP4q0GRTK8D2K60+ru7/dYrJF+uaMmt8/tlMZwfCtm0VMLXrpBWR7o/PAsCkApT6oC4oOBrU93nmNo9X3N6/itfgKZv/PvMvl+4V9TFlGcXszA5Rth4PW8Dauu6vt9gZsCgYAZFGtSwdS9TBhn5bCmiF1UlMJFHuhi0ugc7fUidcJpiqWcptMDr6XHFTmCmo9AWufKFT8+nM94gduLFkV2RydM6LSKPIzNaofWxv8JN8/JHI6ZEPUh5RKdNFQq6KtcYbOBs+RBiJUdD2ONO1VEgaDuKEGv2/aHt4DrUXNtaYV96QKBgHryiCQY5rgeRkSAOO7qNliyGSahl9xXK/+ir7JRiTItuYnJAu4SekbxAuZWCXNYmiwmoHKm3lcJPmEpNhtQ4GOtzZA18Gce5ILKCwHqP6dhHum/M3ahkbLNCFTyI0dcgonLbAAG8HFEldMfXKYPgQWd7BAmybQS4YiR7VVkie6bAoGBALFrCqOUqG3A0y9/I3MEaFXYdY1AiJ+XLsVzrqpP31GBLR/WSNdWlSH/Zjg+rBhqrEX3QFSl8mRRu0dncOqhkILjLF6hNKWxHEF+eNpTPxkm5NaDihqhdjCmpdDqb4aDEkQmrGS0SYvjNL0v0F1BhsS/lasoM0o4B/jPcYiRsHsF", - "exported_keys": "a2V5czo6QXdGOXZBNEhYanNNZkhQV0N1YlNJaFZRc3RBazIyeWI3eEIyTU5Kcll5cHUyY3E5RXV5RklqOXB5YnhhVXh4dzZSSUd2S1hrdkdVR1FmTUpjb3QrdW9nSllkUkpwNEVoRmNYcGRRVk5hMG55dkk3ZWxoU0RST0dMTFJUa3orbkpsM1NUOGJsTW5wcWRjYVdQZUJzODBTbGgyNlkxeE9zSWdFZ0dXQ3RzSGpaQTVWQWJ5SHB4bUhCVndFVkJhVmV2UW94SFFTbmZmeHpTemJqakZWdlhoY0FOVGZOYXNaM2tKTzF6NlViVW5NenFjUjBmMCt3RStiVmlCT0pjM2k4ZnZOS3Y3RXpoSmxVVm9oT1d4WnJ0SkhCUkk3bEFBbWE5T3plMGtoNEQwNEhVWWMxVWRxS0Q2UlBnVzc4SEhvOUo5MFY1elNEZ2ZBRHdkUy85NWJ2STVGS0lKQ3V5ekdkNlNFRXlsNG1wMk5aNTNXNDFwRjZTWm9iakRYWDlhaXFJalFXakhYNi9YeUZuTHNoMVU1ZkFVRWh6Q04wZzJuSmdtRExCM1lZcXRNSWgybmFyRHZ4WnVWN25KaXU5cXBWaUpxRDZDalZSa0U5WHZrRHZNRTBOWHgvOW4wSzdYekFlK000MmMweUduaHExR2VDajRqM1VwS3h1eWJwd3drVUdlcVVWdWVQc3RTaWxNdGRCMWJjK2tNa25QeWRGU3VvTnpUcEhTMGFCL3NkQXJyUFlTK1BDRzMxZFhWeVBmOVd4TXpRdmxleWV4VEEvTjllSkZRVU8vOC95K09hRDcveEpaakgxK3Byc2tCd0hlWExaYWR2MUxrYk92NHFMalB4dmljL3RhTFRtV0dubkc2Q0ZkRmlCRVlnWjE1dzAvUzRPK1Q1OEZQUlo3NGhXcldGSXN6VTdvb1lNU05QdHV0b2RjOFhkNDhSR09BYmFFYjFuYVB4VlRCOWpZaXg5UlpuYXdOOTBhaUFuZVR0Vll2YSs2Q1IwUGhXVzdCV04rb2QyaFZ0VVlxMU1tWnJUV29qVnRaTFZEWWJvZVZiY0ZTbTlzWXFsK0JIbDdxSUw4NUQ3OVdKNlpMczR6cGs0UkJ6aHJFeDRKQklhZXVoWHZmVXFvb0Vucnp4b3NtWlQ2d0gwNFhvL0Z5aG1nSEhraHVKTkh0TFNBdTZ6QkdQMEJ3UkJwSmI4NHdWcXIwc1lHY0lpbWZGajc0a3hLMis5VVdnM3dlTEI2THptUVNEdlRzMGR6Z3ZLN1NnaU5TeVVTbGgrVXBpaFAySXp6blhkRWRBTmpXWjNGMFlyQi9vNzg5a1o1VWFBNXBuTEFDZElWc0IvRTNpWTVEbEM2OVJIZDk2R2cyRUszM3haK1NBR0ZYU3ZYbEVOc2psOS9rN3FZeGZXdVk1TGhYYk1aRWU5Qkk0WVpsQXNtb3ZFMGtIVzMwdFA5YlI5T0NNcE54ZTR4cFhGaU1NZXBvM1ZOVHVubHRCZlNBMXV5eGoyTUtrQXBXQXZRNWVjSVptVXdWYm1HV0NzMXA2N1g3YTVSeG9sdk0xOW9iQUttckxWUGhjWTYyYWg3ZFFkZjB2UGVHcjhOS25xeXZKUnFaQ2NMdUlsMnQ4MTJGSWN6OGh6OGZncEVFOVhCWWtpc0Q4TUZSbHkweXdkd2w1bU1uNHFOdmZhN3FvK1pHVGlERHhQMlNjTThJcGJtOVpkdXkyekV1RHQ0OXo3RGk2RzYyVVhJMkhSMEQxNFpzNE1kYTNFYmVFbXAzRURjTHVRc3RoVVBOeG5uQW4yQit1RUgyMm1IdERDL3R0UXJ6TEh3VFB3OGk1MDB6NlZIZCtCUUNKR09HNzAwZHNqN0Q3WldZUng5VUxvSkpXL2NicnhGQjI0NXJ2VThvZHErQmNqcUxHdWVacWZGT1JabFIwMnpHL3RCWXpveDVrT2FueWhvUUNwV200aCtUSlEwNU1uT0tKVkNxdUNzUnV3WElxVWtzbUF6VWdFMytKN2xmOTUrKytVc1ZPTzJzODFGdDNFQjcvOVh0SzNSS1JSQ0pWMEZJZXc2M0k0V1BBeXBDczNEdlUwbEtZOXE1MHNIT2paVzlTeHp1NzhwNG5tSTA3RlFlYUwydm9sNzBtT0hBK3BORXZXMVM5bmUwd1owUmpGYXNVelQyS1kvb1JndlZVd3NtaEVKUWlMUUpjckxXRXFzMjhQZ2YyZ21VbGJpVG1uTk5OTElrSDFydDNua1lzS1RwRUZRZ3lxcjkyazlZTWk3Z25wL1cvRGNUWlBNcFBXSjlvQS9oK05TZUluZTVYUzFxVGRUdjdUM3JCejYvczdvbmJOdG9UUDlzUndmWTd5dkw2aEZWN3Y2M2tOeG53U29obGpBVmZxRVpvTzlTS0JEYU91Ny9PT3RuM2FzK0pMMjBsa3VkTDRHMktubDQrY29Gekt5dTZ4Wit1dTZUSWkzNmx6RVlhb1VhNSthNTNlNHdRU3J3Q2puMTJndlhVRlowUC9zVldqdGJBZWlCUjNQZTYwN2kzNENZZ0V1ZWgzM2MzUnJqb2F4MFdxZFVKc29qZlRoLzN0WHlpNDQ3dHJheFdaVnhyWlRDOUFGVzhrRjdCTkFrWDl5VmdUbll5TnI4bWJLekRPUXJHWTBJTlNubEdqTkQ2TWpucjFoVWxUbjEvUlZCRW5RSWluc0FsNXpYMytBeFB2RUtLNHphNGRlZktJNVNHM3RveWc4TWkxcXhYWEsxVzBUWXhsUHYvM2tHRGRueHdQcFZFTFdTajAyUEE4RXIxRFQ5OVFaQ3NodEs5dFBvanpsSnByYU9INVNuMHdsLzhoNEd2clo2ZjNsb0hzbXpxS1I4dXpYMVQxck9QK05ud05sT29YbkU2S1pMRnBJVWtXQmN6WG5vaVErb3hxYWJTNnNHaHdXcWo1emMwZEJvbUFJMHNWdEYwbEM3ZmM0QjFtbWV4UzNBbmtqSFZYNHNQblptK2MrcE5SclFjZ0ZUdDdidCtzNHBGRGlKeE5IYW5NK0w2MUg2WGJYMlY4cjc1ZnREc2FJZS9RN2hKOUExZHFVcXV5ek1sOEZwcm1FYjhhQ0ZPSVFNUlJ4bUJVSlBuNmdsc2dqbG5uWXExV3FPaEFEUStXWUNEV2xqeGFBZnNpMUFWVDFUc3dWbzlkNUpCbFpFWDNLanByRllKd252c3Z1RlFwVHJTd2tveWR6RnRMRlA1ZmxqTnlhTWcxdW9OL0dPbXdOTDY4ZlRrc1Q2ckduSTRVN3piaFJTam9HRUtzZ0VCdHphMjRVUnZYMjMvN1k3WENXUG5NSnZrdEY0OGE5MG1nZk9hRTg3bmk1UzJ1ZE9iTTBkVEFQT3N5LzhNTXU3dk03QlovYmJENC9oSUM1SnpaTVRnUG4rcENOY01aS05PV1BzbUNNZ3BBRXd5bGEweVAzQXNYak04QUtsZXNmamp6S05lZ0tQeGNNWFRjeEVDTWpIUFIyU0s2M0FGK095bENrY2NVdlJHdDRPNDBIOEgzTjdJUVhyeGRqK1JxZ0NvTm9UVGJnSWFOYVhyWmdsWXZGdk1sUmNVZDEyVm13bTFSbjZDemJDYUZBU2ZwcG5ZMWphbnJKVVcvMDc0NTZHUG9aOXVZWUpoalhUa1FqMk4xd1pUSVVOWStKR0NZcVRiYnFFcz0=", + "authToken": "4+v/7sYs1r9G9JBt0NKY", + "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", + "contact_key": "MIIBCgKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQAB", + "privkey": "MIIEowIBAAKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQABAoIBAHMYsV11fpgeef0ASDMqLJr2XqQkBot2PskdZZWsq3cTlTbuCMkmBVzbNsxKKTwMDZWvq245s0LoyIJjP0dYUzvGpg1AdqI58YuEHPCJlvYrh7ooK4TPtQX781enQc5nOwTEzg8YtiLWi13aYH0MVPd5mv5ulJNIMYAW6q4pLHc17PirzkoWVqRcOXYOOE5vjOXWh1ra5JnkeBBfR76/uFKk6pGnMj3tg3urNigiSS+6sE2dHnJjT1InHG3o89sc2JnoY8ioWaS0dMH4/Lj93tWktVnod5hadhdhiurAk0yxL28MXHjNoTTknGX0d7wOwbu5kIZAKKkPfuq4JrMVsdECgYEAz/HqcgTnPQIgaMAeXtqKTghraq2ObL+vf3xP38OUW6oykSVhgLtgAE/i0FwNHrh2W3q3/5OOyTTZn3AOaqS/nTMudG/ew9GlGkZWcaep7hh145GkRadwxyEeT0KgCcjv3f/TqTi4PPUd65lbLrlj8J3JNsmxpCXLN3E/04Sx3/sCgYEAwQdxU7rfv1r6ciAnZs4DMwPYj9t6R+GEbX9Ri0I9nQGkKdmY/8++EBhyf7GnRwLHzAOKLq7ImmPalgOJx7a9p/+KFIb+v6AYAuZdtj1FfOMDXvIrmg9CZjxRlNArO5GZKW+C+ZNmohCavH4LgcC/LriJGY4kwowMcfCcTmSF/icCgYEAqIy87Jh+2lub62w18cqQKjn232w4MnuZA+u+TnCYE0i8Xhv/kTnP0dDu1taWJ916yiGJfNac+QgmkW5hsR1C12fB8s0usmh+u/JhZRRyz7Px8nh9v5u99RoqGDK3x9agXsBbTyHTbE1+aBZQ62mH0WQD0a3gmF2t/42DH67CAvsCgYAISEV4jkAjecfdNbv7EUPZ4IReR9CLXQXNnPTmwMTcA8IDea6y6zsAfcwL5peC2H+yJUS8lAtPdJFgdm5m/1RL7Q8Dqncryba+CRxkQWTF4we1/zYXuifjMxtdA0GXoLutp3c7NjPlKEk7ZT0hKCAL5ScczZiOMGwoR2athmqpaQKBgH4N6DaZOD1zpW4RnPIlIMrAuCnplan5N+vof4JgEJod59KO4UJ5hzIcEot+xULTHICN74jY5McDiw4meGpS/uk/6CP1UzGZixxd5n0+FppstEyWJAgK6naKaJxYffrytioKdiV2dOzRQ2YgJhsNu3WqAXg0XTeo0lSP6L2o6ECG", + "exported_keys": "a2V5czo6QXdIV05sUTlmYm1oaW11dDNiWU4vU3k4M0FFY2FmRXVPam5CTjJheUxMYXlMNjZFR0dLMitLbC82aXFzNzY1K1NZbE16Sy9ybW9KVHM3aW5qY29uRTBoKzBsUitsQ013YndyVzd6ZEZFSjhwUURSSWpuWndHM2VpSGJzZVc2bk5vR1JXY05iN1JjS1UvcGVaRlhBUWxPNnFmZGdrbVJ2MmordC9Ub3Q4akVVb0xNWkNRc3MvOXU3YXZIelBRMnJvUGw2QS9wZ3pqeGxxd0lNSVJXK01sQ21ZQlVXMHR4UTdHREN1aWI0NWlybWNZOTEwU2NENkNnY0crdHNxMUxDeXdVOWQ0MVVUSTVER0xsQkpPdWJnRUthUUhMdDZvYlc1a1FaSFY4RDlGUVFGS3cxRlBpMEszTHNHVG94Y3YzYW50UTErcUUwOHRSUXBMZ1IrM3NBVWFJZnlSTGJhVXByMW5GaFViUDJOV1pPTkx2bUJLRDNnQ2ZrSzJIUzBpNGZRRHptS0lJeWUrWDZKTkNwRWROUzhPdUFVeHExWis4YXZxN051MGdWdklwQWovNEZpS2NtNUxoQk9ud3ZTWDZ4dnlpb01OVG02QWpaOGxYNElqU3N0NWlzV3JPTkZodkNJc0ZsNDFtMmdocGk5Ykk5cFVyNktVUEhhSGZveW9TSlkrdS9nU1RiaVZJSDFqTE95UFRoRnQyeStyNC9WeFlDQmFRYUs5UFhZTC9aaTRPclB1bWllZjFmd0txVEVpV05RNW9XNTJLV0IrZlcyVE5mZTF2MHU5NktWenFyZ2lrZGJzMkh6QWVQbXNXOEN2U29yckN5bXRVa0QzNTJjRjhMWkZWSm9VaVRIZURJR054c0s0WTkydjNlMlJ1VnRTQzRsS1VDdXVGY0NwVHpTUmoxZDkxOFBnVkkxMTAzSlRUV0w0NExLU3NhNE84TktoRm52UDB4Wmc0amtOZmVtYkt5Q1VUcUpqL2J5YUtCTlZMMS95bE84R3F0ZlUxdkRabHE5WlVwQTR0Wmg4cUhQVVErN0Y0N0pyaEF4ek9DNnZGdDYrT25nQ3YzaU9hZzBGUmxPcHdPM0tpeGU4aVAyWitmNXBoQTJFVlJ3L3J1cVVidFYvMTBIMnFEMmtXZEUraEZEa1N3SkFSbEwybzNuellya2EvdDJsSGptKzFTaE5rdFowYnlYYWhvREZsZ0UzZkxXd0NCT0pHb3BkeDVyN0hBK1ZhRXBmUm1MdkJLZEFjRU5HVnZNMEJveUdiWDI1TjVUTTVCZjVwcjFkbk1lQzc3TjNEWU9nUlI5aGF1dE5WZE4ybGhrTVliSDlhRHpqNXovWjZnMDNrYVVzY3hMNzB2d2F6VE9uN1JDT09pblZvSkk4REhqSEtpRW41SWg5REtOSnc5cEhrVjZFL2d0RnMrLzF2cG4vL2Y1TzFuLytxUmRZZG5NZWtrV3pzQkd1eTJBZDNjNEtNN1NoaU5zRGF1UTBISU1PSE9lN2tGU3p3MTd6cmhuN256R0lDZGNYOVBrTFMwbjF3RFhQNGdhdStLbjNzeUZ1dmlaRjRjTEcycHVKRjl0aFVzSUJTWGpTK1ljdlljVFNkVFpZNlVkUW9FSkJwZy9QRmtjSmV0ci9qd1dpTzR1amNxYjgzNFIzU08yeUN3QW0xNVpUb2tsUWczYzIvbzJqRVd1d1Zyamp2VWo5WDhIblVnSlczSHBmdDRNRSs4VkNNQkl5Wm8zbjNkd0NSZkFHL051bzlhVHY0allOUnVOWWw5Ym1JVzJra2RyNnBWc25HMjY2NmJWQ3RHKzdFM1Y4SW1RTjAvSzV3Q3phWUl0WjBEK2V1V2VCQmd1Ym1jbjdsWkZsQXNmTmVqN3NjZEtGclR5dlN4VU5UNi9IbHE5RVR4YVhSSjJwcE1JQlM0Ymg3UHp0UEt2eUM5eWIxVWU3ZmZrZi9XTnhib2I0WDZpanhFY0VWdTNVWk55MzRxUlYvNmM2STB2d2xJYldlREE2dTE4d1V0T3F5cE9HNDc5OVpnUGJSTndpbk9wc3pLczdqRkVIRkN4Qzh2QlFkRnVZeDFHSTE0ajhBWmRqb1VEbDBodnVwUkQvU0FTYXdMa1R2TnpEOTc4K3RHOEJvcURtYk1PRWI3NVB4U3NBMzhmYm1BdDkwSGtQRFBmUzMzc2hHR1JkYngrdUZLMHA1SkNlTGJoUERKMnNqZ2VrSnlOZHZaclJxdVJZcWhEUnBrbFFvczRsSkxwT0hnanl1WVU1K3F6dFhvSnJPWEVTYmFLcXJDdFdDODEyVmt6TG5KTWJCWWw0Kzl3SkhkUW0zV1VMS3lxWkZLcnVpMm1UMzJTRGRNdzBJSlVKSi95d2lWcml1akhueGpwempqZTRRYnF2dVZocjNiNC9kUGJ6a2JoOW04aE95OStxVTJicUM1TkhQRlBaZVZvTE5wZmt0MTd4c2tLOUFyM2d5Uml2U25rcTJJYTlQWDc0TXdMdVdkWFVGOXQ0eGM2ZUVpRVp0a3ZpbENCSWtyLzJwWVJDYUJKVnA1L1ViV1pBTWZPS2JKN05ZdGNHTUM1Y0s0c3FYU2FqNHQ4T1dIa1VaR0dGcHZsVkpYNHZpUWVTdC9nb2FhSlJncDN3aFBOUXhIT1dxYVNEVUtRaG4rZ3ZXL0E2bVFlREo2aVlUWEdLQWw4KytWZ3NVZ3ZxdE4xcGFjckxGSnBxOFlLQ2lNVm1kemgyMFhaRS82NDB1SmtBUm9ZdzQ2WDN6a0hZUk1taUVZOXBST1hhRGpxNTZodnFNWDAxSTExa2U0Y2lObnNkeVBPOHJVQ3h1cHAwQjQ3Yi9ySWVjSjI4SHB3ZHcxRGVBdUkvbDNFZ2syTWU3L3pDVVRJd1d2bHJYTnJicGVXUEtuTHJmV3hWZ3owWVIvemlyRDVCVVpBaFZvbWMrb3dPcmpJUUtnUWZJQ0QxbFJHc2g1d1NHZE1Xa2FRN0FuUzdjSUxZeU9EYjVnNjR6MWIxTHdLRkxwKzdZMXJteEZGWkRVMnlKNk5nQ2xwMXozcm42NURIeHNnUWlPTng3L3NuRFQ2QndRMXkrdFJCeTBEelJYMmhMUHNJSzF6Tm5hWGFuR0Z1ajVob2NTODBXS2tpb1ArcDU1NFAxdi9Ea1dSb0duR1hsTW45ekJZQXBSQWFDZlFYc1lVQkhxMW9CbXZhNVl4OU50c1JQT0FrRUJJMlpwa1ZyNENvVXVnS3dlajVzc0IreVVUQnUrelZ3V2tKRWJsYnNRb2RkOGszci96Q2pzRTY5K3JsenJFZ29nVUsrN0puMXBBTlBFbGcwYjJpdm5tYTJjcWhPM05PK1dvNUJBNEdQT0FSaUkzYW5aRjhQZmlseHY5cDUveXJBOWE1QnJ3RFJ1bis4VnRTNGlxL28rVzdqY0JQOUhFSVlBUlBteEZpa3VOdlFmVy9HWjlKT2gzUFFHMnZTOUIzZVJ5QThMYmRDOGVEZ2RJZGd6YXRLbXIwWHZMYWZtVHNuVURYbCtkV0pFS3hiaFdITnVXZVlJQlEyWTkvSUJ0WVJONjZNWGYrYUp5ekJaaXNqUU9mdlZnK0JYcnVLS2tIZHhtWXY4ZEFLeUlBZ2Vndzdpdm9oc1RoUkhQbVNteldGc3dHRC8wUm4xTHdsejN6N2VzVi9TRWtxUT0=", "pin": "111111" } ] diff --git a/src/tests/utils/msg/payInvoice.ts b/src/tests/utils/msg/payInvoice.ts index d30cda5ec..c03dba701 100644 --- a/src/tests/utils/msg/payInvoice.ts +++ b/src/tests/utils/msg/payInvoice.ts @@ -24,10 +24,9 @@ export const payInvoice = async ( makeArgs(sendingNode, v) ) - console.log('-> payInvoice res', sendingNode.alias, r) t.true(r.success, 'Put method should have succeeded') const paymentHash = r.response.payment_hash - t.truthy(paymentHash, 'paymentHash should exist') + t.truthy(paymentHash, `paymentHash should exist for ${sendingNode.alias}`) //wait for PUT method const paid = await getCheckNewPaidInvoice(t, receivingNode, paymentHash) @@ -38,13 +37,6 @@ export const payInvoice = async ( //get receivingNode balance after payment const receivingNodeafterBalance = await getBalance(t, receivingNode) - console.log('amount', amount) - console.log('NODE1 === ', sendingNodebeforeBalance - sendingNodeafterBalance) - console.log( - 'NODE2 === ', - receivingNodeafterBalance - receivingNodebeforeBalance - ) - //check that sendingNode sent payment and receivingNode received payment based on balances //3 SAT ARE ADDED AS A MESSAGE FEE t.true( From 00f822a46b08483d6d6c3e56332ea5f335705162 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 30 Aug 2023 18:40:54 +0100 Subject: [PATCH 89/93] update: triggering github action --- src/tests/configs/nodes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index 6be00a488..c37ca79c7 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -69,7 +69,7 @@ "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", "authToken": "4+v/7sYs1r9G9JBt0NKY", - "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", + "transportToken": "NIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", "contact_key": "MIIBCgKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQAB", "privkey": "MIIEowIBAAKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQABAoIBAHMYsV11fpgeef0ASDMqLJr2XqQkBot2PskdZZWsq3cTlTbuCMkmBVzbNsxKKTwMDZWvq245s0LoyIJjP0dYUzvGpg1AdqI58YuEHPCJlvYrh7ooK4TPtQX781enQc5nOwTEzg8YtiLWi13aYH0MVPd5mv5ulJNIMYAW6q4pLHc17PirzkoWVqRcOXYOOE5vjOXWh1ra5JnkeBBfR76/uFKk6pGnMj3tg3urNigiSS+6sE2dHnJjT1InHG3o89sc2JnoY8ioWaS0dMH4/Lj93tWktVnod5hadhdhiurAk0yxL28MXHjNoTTknGX0d7wOwbu5kIZAKKkPfuq4JrMVsdECgYEAz/HqcgTnPQIgaMAeXtqKTghraq2ObL+vf3xP38OUW6oykSVhgLtgAE/i0FwNHrh2W3q3/5OOyTTZn3AOaqS/nTMudG/ew9GlGkZWcaep7hh145GkRadwxyEeT0KgCcjv3f/TqTi4PPUd65lbLrlj8J3JNsmxpCXLN3E/04Sx3/sCgYEAwQdxU7rfv1r6ciAnZs4DMwPYj9t6R+GEbX9Ri0I9nQGkKdmY/8++EBhyf7GnRwLHzAOKLq7ImmPalgOJx7a9p/+KFIb+v6AYAuZdtj1FfOMDXvIrmg9CZjxRlNArO5GZKW+C+ZNmohCavH4LgcC/LriJGY4kwowMcfCcTmSF/icCgYEAqIy87Jh+2lub62w18cqQKjn232w4MnuZA+u+TnCYE0i8Xhv/kTnP0dDu1taWJ916yiGJfNac+QgmkW5hsR1C12fB8s0usmh+u/JhZRRyz7Px8nh9v5u99RoqGDK3x9agXsBbTyHTbE1+aBZQ62mH0WQD0a3gmF2t/42DH67CAvsCgYAISEV4jkAjecfdNbv7EUPZ4IReR9CLXQXNnPTmwMTcA8IDea6y6zsAfcwL5peC2H+yJUS8lAtPdJFgdm5m/1RL7Q8Dqncryba+CRxkQWTF4we1/zYXuifjMxtdA0GXoLutp3c7NjPlKEk7ZT0hKCAL5ScczZiOMGwoR2athmqpaQKBgH4N6DaZOD1zpW4RnPIlIMrAuCnplan5N+vof4JgEJod59KO4UJ5hzIcEot+xULTHICN74jY5McDiw4meGpS/uk/6CP1UzGZixxd5n0+FppstEyWJAgK6naKaJxYffrytioKdiV2dOzRQ2YgJhsNu3WqAXg0XTeo0lSP6L2o6ECG", "exported_keys": "a2V5czo6QXdIV05sUTlmYm1oaW11dDNiWU4vU3k4M0FFY2FmRXVPam5CTjJheUxMYXlMNjZFR0dLMitLbC82aXFzNzY1K1NZbE16Sy9ybW9KVHM3aW5qY29uRTBoKzBsUitsQ013YndyVzd6ZEZFSjhwUURSSWpuWndHM2VpSGJzZVc2bk5vR1JXY05iN1JjS1UvcGVaRlhBUWxPNnFmZGdrbVJ2MmordC9Ub3Q4akVVb0xNWkNRc3MvOXU3YXZIelBRMnJvUGw2QS9wZ3pqeGxxd0lNSVJXK01sQ21ZQlVXMHR4UTdHREN1aWI0NWlybWNZOTEwU2NENkNnY0crdHNxMUxDeXdVOWQ0MVVUSTVER0xsQkpPdWJnRUthUUhMdDZvYlc1a1FaSFY4RDlGUVFGS3cxRlBpMEszTHNHVG94Y3YzYW50UTErcUUwOHRSUXBMZ1IrM3NBVWFJZnlSTGJhVXByMW5GaFViUDJOV1pPTkx2bUJLRDNnQ2ZrSzJIUzBpNGZRRHptS0lJeWUrWDZKTkNwRWROUzhPdUFVeHExWis4YXZxN051MGdWdklwQWovNEZpS2NtNUxoQk9ud3ZTWDZ4dnlpb01OVG02QWpaOGxYNElqU3N0NWlzV3JPTkZodkNJc0ZsNDFtMmdocGk5Ykk5cFVyNktVUEhhSGZveW9TSlkrdS9nU1RiaVZJSDFqTE95UFRoRnQyeStyNC9WeFlDQmFRYUs5UFhZTC9aaTRPclB1bWllZjFmd0txVEVpV05RNW9XNTJLV0IrZlcyVE5mZTF2MHU5NktWenFyZ2lrZGJzMkh6QWVQbXNXOEN2U29yckN5bXRVa0QzNTJjRjhMWkZWSm9VaVRIZURJR054c0s0WTkydjNlMlJ1VnRTQzRsS1VDdXVGY0NwVHpTUmoxZDkxOFBnVkkxMTAzSlRUV0w0NExLU3NhNE84TktoRm52UDB4Wmc0amtOZmVtYkt5Q1VUcUpqL2J5YUtCTlZMMS95bE84R3F0ZlUxdkRabHE5WlVwQTR0Wmg4cUhQVVErN0Y0N0pyaEF4ek9DNnZGdDYrT25nQ3YzaU9hZzBGUmxPcHdPM0tpeGU4aVAyWitmNXBoQTJFVlJ3L3J1cVVidFYvMTBIMnFEMmtXZEUraEZEa1N3SkFSbEwybzNuellya2EvdDJsSGptKzFTaE5rdFowYnlYYWhvREZsZ0UzZkxXd0NCT0pHb3BkeDVyN0hBK1ZhRXBmUm1MdkJLZEFjRU5HVnZNMEJveUdiWDI1TjVUTTVCZjVwcjFkbk1lQzc3TjNEWU9nUlI5aGF1dE5WZE4ybGhrTVliSDlhRHpqNXovWjZnMDNrYVVzY3hMNzB2d2F6VE9uN1JDT09pblZvSkk4REhqSEtpRW41SWg5REtOSnc5cEhrVjZFL2d0RnMrLzF2cG4vL2Y1TzFuLytxUmRZZG5NZWtrV3pzQkd1eTJBZDNjNEtNN1NoaU5zRGF1UTBISU1PSE9lN2tGU3p3MTd6cmhuN256R0lDZGNYOVBrTFMwbjF3RFhQNGdhdStLbjNzeUZ1dmlaRjRjTEcycHVKRjl0aFVzSUJTWGpTK1ljdlljVFNkVFpZNlVkUW9FSkJwZy9QRmtjSmV0ci9qd1dpTzR1amNxYjgzNFIzU08yeUN3QW0xNVpUb2tsUWczYzIvbzJqRVd1d1Zyamp2VWo5WDhIblVnSlczSHBmdDRNRSs4VkNNQkl5Wm8zbjNkd0NSZkFHL051bzlhVHY0allOUnVOWWw5Ym1JVzJra2RyNnBWc25HMjY2NmJWQ3RHKzdFM1Y4SW1RTjAvSzV3Q3phWUl0WjBEK2V1V2VCQmd1Ym1jbjdsWkZsQXNmTmVqN3NjZEtGclR5dlN4VU5UNi9IbHE5RVR4YVhSSjJwcE1JQlM0Ymg3UHp0UEt2eUM5eWIxVWU3ZmZrZi9XTnhib2I0WDZpanhFY0VWdTNVWk55MzRxUlYvNmM2STB2d2xJYldlREE2dTE4d1V0T3F5cE9HNDc5OVpnUGJSTndpbk9wc3pLczdqRkVIRkN4Qzh2QlFkRnVZeDFHSTE0ajhBWmRqb1VEbDBodnVwUkQvU0FTYXdMa1R2TnpEOTc4K3RHOEJvcURtYk1PRWI3NVB4U3NBMzhmYm1BdDkwSGtQRFBmUzMzc2hHR1JkYngrdUZLMHA1SkNlTGJoUERKMnNqZ2VrSnlOZHZaclJxdVJZcWhEUnBrbFFvczRsSkxwT0hnanl1WVU1K3F6dFhvSnJPWEVTYmFLcXJDdFdDODEyVmt6TG5KTWJCWWw0Kzl3SkhkUW0zV1VMS3lxWkZLcnVpMm1UMzJTRGRNdzBJSlVKSi95d2lWcml1akhueGpwempqZTRRYnF2dVZocjNiNC9kUGJ6a2JoOW04aE95OStxVTJicUM1TkhQRlBaZVZvTE5wZmt0MTd4c2tLOUFyM2d5Uml2U25rcTJJYTlQWDc0TXdMdVdkWFVGOXQ0eGM2ZUVpRVp0a3ZpbENCSWtyLzJwWVJDYUJKVnA1L1ViV1pBTWZPS2JKN05ZdGNHTUM1Y0s0c3FYU2FqNHQ4T1dIa1VaR0dGcHZsVkpYNHZpUWVTdC9nb2FhSlJncDN3aFBOUXhIT1dxYVNEVUtRaG4rZ3ZXL0E2bVFlREo2aVlUWEdLQWw4KytWZ3NVZ3ZxdE4xcGFjckxGSnBxOFlLQ2lNVm1kemgyMFhaRS82NDB1SmtBUm9ZdzQ2WDN6a0hZUk1taUVZOXBST1hhRGpxNTZodnFNWDAxSTExa2U0Y2lObnNkeVBPOHJVQ3h1cHAwQjQ3Yi9ySWVjSjI4SHB3ZHcxRGVBdUkvbDNFZ2syTWU3L3pDVVRJd1d2bHJYTnJicGVXUEtuTHJmV3hWZ3owWVIvemlyRDVCVVpBaFZvbWMrb3dPcmpJUUtnUWZJQ0QxbFJHc2g1d1NHZE1Xa2FRN0FuUzdjSUxZeU9EYjVnNjR6MWIxTHdLRkxwKzdZMXJteEZGWkRVMnlKNk5nQ2xwMXozcm42NURIeHNnUWlPTng3L3NuRFQ2QndRMXkrdFJCeTBEelJYMmhMUHNJSzF6Tm5hWGFuR0Z1ajVob2NTODBXS2tpb1ArcDU1NFAxdi9Ea1dSb0duR1hsTW45ekJZQXBSQWFDZlFYc1lVQkhxMW9CbXZhNVl4OU50c1JQT0FrRUJJMlpwa1ZyNENvVXVnS3dlajVzc0IreVVUQnUrelZ3V2tKRWJsYnNRb2RkOGszci96Q2pzRTY5K3JsenJFZ29nVUsrN0puMXBBTlBFbGcwYjJpdm5tYTJjcWhPM05PK1dvNUJBNEdQT0FSaUkzYW5aRjhQZmlseHY5cDUveXJBOWE1QnJ3RFJ1bis4VnRTNGlxL28rVzdqY0JQOUhFSVlBUlBteEZpa3VOdlFmVy9HWjlKT2gzUFFHMnZTOUIzZVJ5QThMYmRDOGVEZ2RJZGd6YXRLbXIwWHZMYWZtVHNuVURYbCtkV0pFS3hiaFdITnVXZVlJQlEyWTkvSUJ0WVJONjZNWGYrYUp5ekJaaXNqUU9mdlZnK0JYcnVLS2tIZHhtWXY4ZEFLeUlBZ2Vndzdpdm9oc1RoUkhQbVNteldGc3dHRC8wUm4xTHdsejN6N2VzVi9TRWtxUT0=", From d85d971057e82c7fab2efeb2c3586b942b22241e Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 30 Aug 2023 20:09:33 +0100 Subject: [PATCH 90/93] update: ensured message response are only returned to client after they are sent via the lightning network and added the min-amount to escrow test --- dist/src/controllers/messages.js | 4 ++-- dist/src/controllers/messages.js.map | 2 +- dist/src/tests/controllers/tribe3Escrow.test.js | 2 +- dist/src/tests/controllers/tribe3Escrow.test.js.map | 2 +- src/controllers/messages.ts | 5 ++--- src/tests/controllers/tribe3Escrow.test.ts | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dist/src/controllers/messages.js b/dist/src/controllers/messages.js index c55d8bda5..419294590 100644 --- a/dist/src/controllers/messages.js +++ b/dist/src/controllers/messages.js @@ -387,7 +387,6 @@ const sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function* () msg.recipientPic = recipientPic; // console.log(msg) const message = (yield models_1.models.Message.create(msg)); - (0, res_1.success)(res, jsonUtils.messageToJson(message, chat)); const msgToSend = { id: message.id, uuid: message.uuid, @@ -425,7 +424,8 @@ const sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function* () } // final send // console.log('==> FINAL SEND MSG PARAMS', sendMessageParams) - network.sendMessage(sendMessageParams); + yield network.sendMessage(sendMessageParams); + (0, res_1.success)(res, jsonUtils.messageToJson(message, chat)); }); exports.sendMessage = sendMessage; /** diff --git a/dist/src/controllers/messages.js.map b/dist/src/controllers/messages.js.map index 43bea88d2..7d8e367bd 100644 --- a/dist/src/controllers/messages.js.map +++ b/dist/src/controllers/messages.js.map @@ -1 +1 @@ -{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/controllers/messages.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA2C;AAC3C,2CAAoC;AACpC,oCAAmC;AACnC,+BAA8B;AAC9B,sCAOkB;AAClB,gCAIe;AACf,0CAAyC;AACzC,2CAA0C;AAC1C,sCAAqC;AACrC,sCAA+C;AAC/C,0CAAyC;AACzC,sCAAqC;AAGrC,4CAAoC;AACpC,4CAAuD;AAGvD,4CAA6C;AAC7C,4CAA4C;AAC5C,gDAAqD;AACrD,mDAAkD;AAMlD,2CAA2C;AAC3C,MAAM,IAAI,GAAG,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAA;AAEpB,MAAM,gBAAgB,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IAC1E,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IACnC,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAA;IAC5B,IAAI,CAAC,IAAI;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;IAClD,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QACrD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;KACxB,CAAC,CAAY,CAAA;IACd,IAAA,aAAO,EAAC,GAAG,EAAE;QACX,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC;KAC1C,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAXY,QAAA,gBAAgB,oBAW5B;AAED,aAAa;AACN,MAAM,WAAW,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACrE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IAEnC,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAA;IAEnC,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAChC;IAED,qBAAY,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;IAEhD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACvB,mCAAmC;IAEnC,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;QAChC,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACrD,MAAM;KACP,CAAA;IAED,MAAM,sBAAsB,GAAG;QAC7B,UAAU,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;QACtC,MAAM,EAAE;YACN,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACvC;QACD,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,MAAM;KACP,CAAA;IAED,MAAM,oBAAoB,GAAG;QAC3B,UAAU,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;QACtC,MAAM,EAAE;YACN,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mBAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;SACtC;QACD,MAAM;KACP,CAAA;IAED,gBAAgB;IAChB,qCAAqC;IACrC,2CAA2C;IAC3C,IAAI;IAEJ,MAAM,WAAW,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC3D,KAAK,EAAE,gBAAgB;KACxB,CAAC,CAAc,CAAA;IAChB,MAAM,iBAAiB,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QACjE,KAAK,EAAE,sBAAsB;KAC9B,CAAC,CAAc,CAAA;IAChB,MAAM,eAAe,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,oBAAoB;KAC5B,CAAC,CAAc,CAAA;IAEhB,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IACF,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,MAAM,KAAK,GACT,OAAO,CAAC,MAAM,GAAG,CAAC;QAChB,CAAC,CAAE,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1B,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;SAC/C,CAAC,CAAY;QAChB,CAAC,CAAC,EAAE,CAAA;IACR,MAAM,SAAS,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAEtC,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE;YACR,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC5D;YACD,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACpD,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC5D;YACD,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC5D;SACF;KACF,CAAC,CAAA;IACF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACf,GAAG,CAAC,GAAG,EAAE,CAAA;AACX,CAAC,CAAA,CAAA;AAxFY,QAAA,WAAW,eAwFvB;AAED;;;;;;;EAOE;AACK,MAAM,cAAc,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACxE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IAEnC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC,IAAI,IAAI,CAAA;IAC9E,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAgB,CAAC,CAAC,IAAI,CAAC,CAAA;IAC9E,IAAI,KAAK,GAAG,KAAK,CAAA;IACjB,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE;QACjD,KAAK,GAAG,MAAM,CAAA;KACf;IAED,qBAAY,CAAC,IAAI,CACf,6BAA6B,KAAK,aAAa,MAAM,EAAE,EACvD,gBAAO,CAAC,OAAO,CAChB,CAAA;IAED,MAAM,MAAM,GAAgB;QAC1B,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtB,KAAK,EAAE,EAAE,MAAM,EAAE;KAClB,CAAA;IACD,MAAM,mBAAmB,GAAW,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,KAAK,CAC7D,MAAM,CACP,CAAW,CAAA;IACZ,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;QACpB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;KACvB;IACD,MAAM,QAAQ,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CACvD,MAAM,CACP,CAAc,CAAA;IAEf,qBAAY,CAAC,IAAI,CACf,gBAAgB,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,EAC7C,gBAAO,CAAC,OAAO,CAChB,CAAA;IAED,MAAM,KAAK,GAAW,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/C,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE;KAClC,CAAC,CAAW,CAAA;IAEb,qBAAqB;IACrB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAA;IACvC,MAAM,MAAM,GAAG,UAAU;QACvB,CAAC,CAAC,MAAM,YAAY,CAAC;YACjB,KAAK;YACL,KAAK;YACL,MAAM;YACN,KAAK;YACL,QAAQ;YACR,mBAAmB;SACpB,CAAC;QACJ,CAAC,CAAC,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAA;IAErC,4DAA4D;IAC5D,MAAM,SAAS,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACtC,mCAAmC;IACnC,IAAA,aAAO,EAAC,GAAG,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5C,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC5D;QACD,kBAAkB,EAAE,MAAM,CAAC,mBAAmB;QAC9C,kBAAkB,EAAE,EAAE;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA/DY,QAAA,cAAc,kBA+D1B;AAED;;;;;;;;;;;EAWE;AACK,MAAM,OAAO,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACjE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IAEnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAA;IACpE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAgB,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,IAAc,CAAA;IAC7C,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAChC;IAED,qBAAY,CAAC,IAAI,CACf,sBAAsB,KAAK,aAAa,MAAM,EAAE,EAChD,gBAAO,CAAC,OAAO,CAChB,CAAA;IAED,IAAI,KAAK,GAAG,KAAK,CAAA;IACjB,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE;QACjD,KAAK,GAAG,MAAM,CAAA;KACf;IACD,MAAM,MAAM,GAAyB;QACnC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtB,KAAK,EAAE;YACL,UAAU,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;YACtC,MAAM;SACP;KACF,CAAA;IACD,MAAM,mBAAmB,GAAW,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,KAAK,CAC7D,MAAM,CACP,CAAW,CAAA;IACZ,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;QACpB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;KACvB;IACD,MAAM,QAAQ,GAAc,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CACvD,MAAM,CACP,CAAc,CAAA;IACf,qBAAY,CAAC,IAAI,CACf,gBAAgB,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,EAC7C,gBAAO,CAAC,OAAO,CAChB,CAAA;IAED,MAAM,KAAK,GAAW,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/C,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE;KAClC,CAAC,CAAW,CAAA;IAEb,aAAa;IACb,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAA;IACvC,MAAM,MAAM,GAAG,UAAU;QACvB,CAAC,CAAC,MAAM,YAAY,CAAC;YACjB,KAAK;YACL,KAAK;YACL,MAAM;YACN,KAAK;YACL,QAAQ;YACR,mBAAmB,EAAE,mBAAmB;YACxC,YAAY;SACb,CAAC;QACJ,CAAC,CAAC,EAAE,QAAQ,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,CAAA;IAE1D,MAAM,SAAS,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACtC,IAAA,aAAO,EAAC,GAAG,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5C,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC5D;QACD,kBAAkB,EAAE,MAAM,CAAC,mBAAmB;KAC/C,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAnEY,QAAA,OAAO,WAmEnB;AAED;;;;;EAKE;AACF,SAAsB,aAAa,CAAC,GAAQ,EAAE,GAAQ;;QACpD,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QAEnC,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAElC,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;SACtB,CAAC,CAAY,CAAA;QACd,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACzB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QAE5D,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;QAC9B,IAAI,IAAI,CAAA;QACR,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;SACrE;QACD,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QAEpD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SAC/B;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QAExD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;QACvB,MAAM,YAAY,GAAG,OAAO,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,WAAW,CAAA;QAEpE,IAAI,YAAY,EAAE;YAChB,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;SAChC;QACD,OAAO,CAAC,WAAW,CAAC;YAClB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,MAAM;YACpC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;CAAA;AApCD,sCAoCC;AAED;;;;;;;EAOE;AACK,MAAM,WAAW,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACrE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IACnC,QAAQ;IACR,0CAA0C;IAC1C,eAAe;IACf,kCAAkC;IAClC,IAAI;IACJ,MAAM,EACJ,UAAU,EACV,IAAI,EACJ,WAAW,EACX,OAAO,EACP,eAAe,EACf,MAAM,EACN,UAAU,EACV,KAAK,EACL,aAAa,EACb,SAAS,EACT,GAAG,EACH,IAAI,EACJ,WAAW,GACZ,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,IAAI,OAAO,GAAG,mBAAS,CAAC,aAAa,CAAC,OAAO,CAAA;IAC7C,IAAI,KAAK;QAAE,OAAO,GAAG,mBAAS,CAAC,aAAa,CAAC,KAAK,CAAA;IAClD,IAAI,GAAG;QAAE,OAAO,GAAG,mBAAS,CAAC,aAAa,CAAC,cAAc,CAAA;IACzD,IAAI,IAAI;QAAE,OAAO,GAAG,mBAAS,CAAC,aAAa,CAAC,IAAI,CAAA;IAChD,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,KAAK,IAAI,GAAG;QAAE,UAAU,GAAG,IAAI,CAAA;IAEnC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACvB,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC;QAC1C,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,UAAU;KACzB,CAAC,CAAA;IACF,IAAI,CAAC,IAAI;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;IAE3D,IAAI,iBAAiB,CAAA;IACrB,IAAI,cAAc,CAAA;IAClB,IAAI,YAAY,CAAA;IAChB,iDAAiD;IACjD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;KAC/B;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACxD,MAAM,YAAY,GAAG,OAAO,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,WAAW,CAAA;IACpE,IAAI,UAAU,IAAI,UAAU,IAAI,MAAM,EAAE;QACtC,MAAM,KAAK,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACnD,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU;gBAChB,MAAM;aACP;SACF,CAAC,CAAY,CAAA;QACd,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;YACzB,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAA;YAChC,IAAI,GAAG,EAAE;gBACP,cAAc,GAAG,KAAK,CAAC,WAAW,CAAA;gBAClC,YAAY,GAAG,KAAK,CAAC,SAAS,CAAA;aAC/B;SACF;KACF;IAED,MAAM,aAAa,GAAG,MAAM,IAAI,MAAM,GAAG,mBAAS,CAAC,cAAc,CAAA;IAEjE,MAAM,oBAAoB,GAAG,eAAe;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;QACjC,CAAC,CAAC,WAAW,CAAA;IACf,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC7B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,CAAA;IAC5B,IACE,UAAU;QACV,aAAa;QACb,OAAO,aAAa,KAAK,QAAQ;QACjC,MAAM;QACN,aAAa,GAAG,MAAM,EACtB;QACA,UAAU,GAAG,MAAM,GAAG,aAAa,CAAA;KACpC;IACD,MAAM,GAAG,GAA4C;QACnD,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,IAAI;QACV,cAAc,EAAE,IAAI;QACpB,oBAAoB;QACpB,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,OAAO;QAClC,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,YAAY,EACV,CAAC,OAAO,IAAI,aAAa,IAAI,iBAAiB;YAC5C,CAAC,CAAC,mBAAS,CAAC,aAAa,CAAC,SAAS;YACnC,CAAC,CAAC,mBAAS,CAAC,aAAa,CAAC,IAAI;QAClC,MAAM;KACP,CAAA;IACD,8CAA8C;IAC9C,IAAI,UAAU,IAAI,CAAC,GAAG;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAClD,IAAI,SAAS;QAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;IACvC,IAAI,WAAW;QAAE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC9C,IAAI,cAAc;QAAE,GAAG,CAAC,cAAc,GAAG,cAAc,CAAA;IACvD,IAAI,YAAY;QAAE,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;IACjD,mBAAmB;IACnB,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAY,CAAA;IAEtE,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;IAEpD,MAAM,SAAS,GAAqC;QAClD,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,eAAe,IAAI,WAAW,IAAI,IAAI;QAC/C,MAAM,EAAE,UAAU;KACnB,CAAA;IACD,+DAA+D;IAC/D,IAAI,UAAU,EAAE;QACd,oDAAoD;QACpD,IAAI,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,EAAE;YAC1B,SAAS,CAAC,SAAS,GAAG,UAAU,CAAA;SACjC;KACF;IACD,IAAI,SAAS;QAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAA;IAC7C,IAAI,WAAW;QAAE,SAAS,CAAC,WAAW,GAAG,WAAW,CAAA;IACpD,IAAI,cAAc;QAAE,SAAS,CAAC,cAAc,GAAG,cAAc,CAAA;IAC7D,IAAI,YAAY;QAAE,SAAS,CAAC,YAAY,GAAG,YAAY,CAAA;IAEvD,MAAM,iBAAiB,GAAsB;QAC3C,IAAI,EAAE,IAAgC;QACtC,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,SAAS;KACnB,CAAA;IACD,IAAI,YAAY,IAAI,iBAAiB,EAAE;QACrC,iBAAiB,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QACvD,8DAA8D;QAC9D,IAAI,UAAU,EAAE;YACd,iBAAiB,CAAC,MAAM,GAAG,UAAU,CAAA;SACtC;KACF;IAED,aAAa;IACb,8DAA8D;IAC9D,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAA;AACxC,CAAC,CAAA,CAAA;AApJY,QAAA,WAAW,eAoJvB;AAED;;;;;EAKE;AACK,MAAM,cAAc,GAAG,CAAO,OAAgB,EAAiB,EAAE;IACtE,MAAM,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACJ,OAAO,EACP,cAAc,EACd,MAAM,EACN,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,SAAS,EACT,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,gBAAgB,EAChB,MAAM,EACN,MAAM,EACN,WAAW,GACZ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE7C,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC9B,OAAO,qBAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;KAC9C;IACD,qBAAY,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,EAAE,SAAS,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAE3E,MAAM,MAAM,GAAW,KAAK,CAAC,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAA;IAE1B,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,WAAW;QAAE,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAA;IAE7C,MAAM,GAAG,GAAsD;QAC7D,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,OAAO;QACrC,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,cAAc,IAAI,mBAAS,CAAC,QAAQ,CAAC,QAAQ;QACrD,YAAY,EAAE,YAAY;QAC1B,MAAM;QACN,aAAa,EAAE,gBAAgB;QAC/B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;KAChC,CAAA;IACD,MAAM,OAAO,GAAG,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACxD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;QAC9B,GAAG,CAAC,SAAS,GAAG,gBAAgB,CAAA;QAChC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;QACnB,IAAI,cAAc;YAAE,GAAG,CAAC,oBAAoB,GAAG,cAAc,CAAA;KAC9D;IACD,IAAI,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAC1C,IAAI,WAAW;QAAE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC9C,IAAI,SAAS;QAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;IACvC,IAAI,OAAO,GAAmB,IAAI,CAAA;IAElC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAY,CAAA;KACxD;IAED,MAAM,CAAC,QAAQ,CACb;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;KAChE,EACD,MAAM,CACP,CAAA;IAED,IAAA,sBAAgB,EACd,IAAI,EACJ,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,CAAW,EAC3C,SAAS,EACT,KAAK,EACL,SAAS,EACT,UAAU,CACX,CAAA;IAED,IAAI,CAAC,MAAM,EAAE;QACX,IAAA,gCAAgB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACpE;AACH,CAAC,CAAA,CAAA;AAzFY,QAAA,cAAc,kBAyF1B;AAED;;;;EAIE;AACK,MAAM,YAAY,GAAG,CAAO,OAAgB,EAAiB,EAAE;IACpE,MAAM,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACJ,OAAO,EACP,cAAc,EACd,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,SAAS,EACT,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,gBAAgB,EAChB,MAAM,EACN,WAAW,GACZ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE7C,qBAAY,CAAC,IAAI,CACf,qBAAqB,MAAM,qBAAqB,YAAY,EAAE,EAC9D,gBAAO,CAAC,OAAO,CAChB,CAAA;IACD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC9B,OAAO,qBAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;KAC/C;IACD,MAAM,MAAM,GAAW,KAAK,CAAC,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,OAAO,CAAA;IAEpB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,WAAW;QAAE,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAA;IAE7C,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,OAAO,MAAM,IAAA,4BAAiB,EAAC;YAC7B,MAAM;YACN,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,OAAO,CAAC,aAAa;YAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;YAC7B,IAAI;YACJ,MAAM;SACP,CAAC,CAAA;KACH;IAED,MAAM,GAAG,GAA4C;QACnD,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,KAAK;QACnC,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,QAAQ;QACnC,YAAY;QACZ,MAAM;QACN,aAAa,EAAE,gBAAgB;KAChC,CAAA;IACD,MAAM,OAAO,GAAG,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IAExD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;QAC9B,GAAG,CAAC,SAAS,GAAG,gBAAgB,CAAA;QAChC,IAAI,cAAc;YAAE,GAAG,CAAC,oBAAoB,GAAG,cAAc,CAAA;KAC9D;IACD,IAAI,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAC1C,IAAI,WAAW;QAAE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC9C,IAAI,SAAS;QAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;IACvC,IAAI,OAAO,GAAmB,IAAI,CAAA;IAClC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAY,CAAA;KACxD;IAED,MAAM,CAAC,QAAQ,CACb;QACE,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;KAChE,EACD,MAAM,CACP,CAAA;IACD,IAAI,CAAC,MAAM,EAAE;QACX,IAAA,gCAAgB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACpE;IAED,IAAI,GAAG,CAAC,SAAS,EAAE;QACjB,MAAM,KAAK,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACnD,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,SAAmB,EAAE,MAAM,EAAE;SACjD,CAAC,CAAY,CAAA;QACd,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE;YACpC,IAAA,sBAAgB,EACd,IAAI,EACJ,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,CAAW,EAC3C,OAAO,EACP,KAAK,EACL,SAAS,EACT,UAAU,CACX,CAAA;SACF;KACF;AACH,CAAC,CAAA,CAAA;AAxGY,QAAA,YAAY,gBAwGxB;AAED;;;;;EAKE;AACK,MAAM,gBAAgB,GAAG,CAAO,OAAgB,EAAiB,EAAE;IACxE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,GAC9D,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE3C,qBAAY,CAAC,IAAI,CAAC,yBAAyB,MAAM,MAAM,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;IACzE,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC9B,OAAO,qBAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;KAC/C;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;IAEvB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,WAAW;QAAE,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAA;IAE7C,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACpD,mBAAmB;QACnB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,SAAS;QACvC,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,QAAQ;QACnC,YAAY;QACZ,MAAM;KACP,CAAC,CAAY,CAAA;IAEd,MAAM,CAAC,QAAQ,CACb;QACE,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,EACD,MAAM,CACP,CAAA;AACH,CAAC,CAAA,CAAA;AAlCY,QAAA,gBAAgB,oBAkC5B;AAED;;;;;;;EAOE;AACK,MAAM,oBAAoB,GAAG,CAAO,OAAgB,EAAiB,EAAE;IAC5E,qBAAY,CAAC,IAAI,CAAC,4BAA4B,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;IAChE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,GAChD,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC9B,OAAO,qBAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;KAC/C;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;IAEvB,MAAM,OAAO,GAAG,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACxD,qDAAqD;IACrD,MAAM,KAAK,GAAqC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAC1E,IAAI,CAAC,OAAO,EAAE;QACZ,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA,CAAC,kBAAkB;KAC5C;IACD,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAY,CAAA;IAC7E,IAAI,CAAC,OAAO;QAAE,OAAM;IAEpB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IAC5D,MAAM,CAAC,QAAQ,CACb;QACE,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,EACD,MAAM,CACP,CAAA;AACH,CAAC,CAAA,CAAA;AA1BY,QAAA,oBAAoB,wBA0BhC;AAED;;;;;;EAME;AACK,MAAM,YAAY,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACtE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAE/C,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAA;IAClC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACvB,MAAM,MAAM,GAAW,KAAK,CAAC,EAAE,CAAA;IAE/B,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CACzB,EAAE,IAAI,EAAE,IAAI,EAAE,EACd;QACE,KAAK,EAAE;YACL,MAAM,EAAE;gBACN,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE;aAClB;YACD,MAAM,EAAE,OAAO;YACf,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC1C,MAAM;SACP;KACF,CACF,CAAA;IACD,MAAM,IAAI,GAAS,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;KAC/B,CAAC,CAAS,CAAA;IACX,IAAI,IAAI,EAAE;QACR,IAAA,2BAAqB,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;QACxC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACjC,IAAA,aAAO,EAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAChB,IAAA,sBAAgB,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC1C,MAAM,CAAC,QAAQ,CACb;YACE,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;SACrC,EACD,MAAM,CACP,CAAA;KACF;SAAM;QACL,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;KACxB;AACH,CAAC,CAAA,CAAA;AAtCY,QAAA,YAAY,gBAsCxB;AAED;;;;;;EAME;AACK,MAAM,aAAa,GAAG,CAAO,GAAQ,EAAE,GAAQ,EAAiB,EAAE;IACvE,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;IAEnC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAEnE,IAAA,aAAO,EAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAClB,CAAC,CAAA,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAED,SAAsB,oBAAoB,CAAC,GAAQ,EAAE,GAAQ;;QAC3D,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QACnC,IAAI;YACF,MAAM,QAAQ,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;aACjC,CAAC,CAAoB,CAAA;YACtB,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAA;YAC9B,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,+BAA+B,CAAC,CAAA;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,KAAK,CAAC,CAAA;SAC3B;IACH,CAAC;CAAA;AAZD,oDAYC;AAEM,MAAM,WAAW,GAAG,CAAO,OAAgB,EAAiB,EAAE;IACnE,qBAAY,CAAC,IAAI,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAA;IAC7C,MAAM,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,SAAS,EACT,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,MAAM,EACN,cAAc,EACd,WAAW,GACZ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE7C,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC9B,OAAO,qBAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;KAC/C;IACD,MAAM,MAAM,GAAW,KAAK,CAAC,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,OAAO,CAAA;IAEpB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,WAAW;QAAE,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAA;IAE7C,MAAM,GAAG,GAA4C;QACnD,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,IAAI;QAClC,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,YAAY;QACZ,MAAM;QACN,aAAa,EAAE,gBAAgB;QAC/B,MAAM,EAAE,cAAc,IAAI,mBAAS,CAAC,QAAQ,CAAC,QAAQ;KACtD,CAAA;IACD,MAAM,OAAO,GAAG,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACxD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;QAC9B,GAAG,CAAC,SAAS,GAAG,gBAAgB,CAAA;QAChC,IAAI,cAAc;YAAE,GAAG,CAAC,oBAAoB,GAAG,cAAc,CAAA;QAC7D,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;KACpB;IACD,IAAI,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAC1C,IAAI,WAAW;QAAE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC9C,IAAI,SAAS;QAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAA;IACvC,MAAM,OAAO,GAAY,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAY,CAAA;IAEtE,MAAM,CAAC,QAAQ,CACb;QACE,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,EACD,MAAM,CACP,CAAA;IACD,IAAA,0BAAoB,EAAC,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAE1E,IAAA,gCAAgB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACrE,CAAC,CAAA,CAAA;AAvEY,QAAA,WAAW,eAuEvB;AAUD,SAAe,YAAY,CAAC,EAC1B,KAAK,EACL,KAAK,EACL,MAAM,EACN,KAAK,EACL,QAAQ,EACR,mBAAmB,EACnB,YAAY,GACE;;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAW,EAAC;oBACjC,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,SAAS,EAAE,IAAI,CAAC,IAAI;oBACpB,OAAO,EAAE,IAAI,CAAC,EAAE;oBAChB,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,YAAY;iBACb,CAAC,CAAA;gBACF,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAA;gBACrC,mBAAmB,GAAG,mBAAmB,GAAG,QAAQ,CAAC,MAAM,CAAA;aAC5D;SACF;QACD,OAAO,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;IAC1D,CAAC;CAAA;AAED,SAAS,kBAAkB,CACzB,QAA2B,EAC3B,cAAsB;IAEtB,MAAM,WAAW,GAAsB,EAAE,CAAA;IACzC,MAAM,UAAU,GAAqC,EAAE,CAAA;IACvD,IAAI,kBAAkB,GAAG,cAAc,CAAA;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QAC3B,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACjD,IACE,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC;YACzC,gBAAgB;YAChB,CAAC,gBAAgB,CAAC,OAAO,EACzB;YACA,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,CAC5C,CAAA;YACD,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;YAC/B,kBAAkB,IAAI,CAAC,CAAA;YACvB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACzB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;SACnC;aAAM;YACL,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACzB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;SACnC;KACF;IAED,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,CAAA;AAC3E,CAAC;AAEM,MAAM,+BAA+B,GAAG,GAAS,EAAE;IACxD,IAAI;QACF,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,qBAAY,CAAC,IAAI,CAAC,CAAC,yCAAyC,CAAC,CAAC,CAAA;YAC9D,MAAM,QAAQ,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7C,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACzB,CAAC,CAAoB,CAAA;YACtB,qBAAqB,CAAC,QAAQ,CAAC,CAAA;SAChC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,qBAAY,CAAC,KAAK,CAAC,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAC,CAAA;KAC7E;AACH,CAAC,CAAA,CAAA;AAZY,QAAA,+BAA+B,mCAY3C;AAED,SAAe,qBAAqB,CAAC,QAAyB;;QAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,cAAO,CAC3B,WAAW,EACX,GAAG,EAAE;YACH,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC1B,CAAC,EACD,IAAI,EACJ,IAAI,CACL,CAAA;IACH,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,QAAyB;;QACrD,IAAI;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACxC,MAAM,OAAO,GAAkB,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAC1C,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;gBACvB,IAAI,CAAC,OAAO,CACV,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC,CACxE,CAAA;gBACD,MAAM,mBAAmB,CAAC;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;iBACzB,CAAC,CAAA;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC;gBACjB,gEAAgE;gBAChE,KAAK;aACN,CAAC,CAAA;SACH;IACH,CAAC;CAAA;AAED,SAAe,mBAAmB,CAAC,EACjC,MAAM,EACN,IAAI,GAIL;;QACC,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE;aAClC,CAAC,CAAiB,CAAA;YAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBACrB,MAAM,YAAY,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;oBACjD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE;iBACnC,CAAC,CAAoB,CAAA;gBACtB,IAAI,YAAY,CAAC,MAAM,GAAG,EAAE,EAAE;oBAC5B,MAAM,aAAa,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;oBAC5D,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;wBAC3B,KAAK,EAAE;4BACL,EAAE,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE;4BACjC,SAAS,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE;4BAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;4BACf,MAAM;yBACP;qBACF,CAAC,CAAA;iBACH;aACF;YACD,qBAAY,CAAC,IAAI,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAA;SACtD;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAAC,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC,CAAA;SACrE;IACH,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/controllers/tribe3Escrow.test.js b/dist/src/tests/controllers/tribe3Escrow.test.js index 099d89a33..b728cd750 100644 --- a/dist/src/tests/controllers/tribe3Escrow.test.js +++ b/dist/src/tests/controllers/tribe3Escrow.test.js @@ -63,7 +63,7 @@ function tribe3Escrow(t, node1, node2, node3) { //Get balance after escrow time const balAfterEscrow = yield (0, get_1.getBalance)(t, node2); t.true(balBefore - balImmediatelyAfter === - tribe.escrow_amount + tribe.price_per_message, 'Difference between balance before and after message should be equal to the sum of escrow and price_per_message'); + tribe.escrow_amount + tribe.price_per_message + 3, 'Difference between balance before and after message should be equal to the sum of escrow and price_per_message'); t.true(balAfterEscrow === balImmediatelyAfter, 'Balance after escrow should be equal to balance immediately after sending message'); //NODE2 LEAVES THE TRIBE let n2left = yield (0, del_1.leaveTribe)(t, node2, tribe); diff --git a/dist/src/tests/controllers/tribe3Escrow.test.js.map b/dist/src/tests/controllers/tribe3Escrow.test.js.map index d02d6487d..e31450a47 100644 --- a/dist/src/tests/controllers/tribe3Escrow.test.js.map +++ b/dist/src/tests/controllers/tribe3Escrow.test.js.map @@ -1 +1 @@ -{"version":3,"file":"tribe3Escrow.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/tribe3Escrow.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAAsB;AAEtB,8CAAoD;AACpD,wCAAsD;AACtD,sCAAqE;AACrE,sCAIqB;AACrB,oCAA4B;AAC5B,sCAA0D;AAE1D;;EAEE;AAEF,IAAA,aAAI,EAAC,qGAAqG,EAAE,CAAO,CAAC,EAAE,EAAE;IACtH,MAAM,YAAY,CAAC,CAAC,EAAE,eAAK,CAAC,CAAC,CAAC,EAAE,eAAK,CAAC,CAAC,CAAC,EAAE,eAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACrD,CAAC,CAAA,CAAC,CAAA;AAEF,SAAe,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;;QAChD,kDAAkD;QAElD,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAA;QAEjD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,QAAQ,KAAK,CAAC,KAAK,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;QAEnE,2CAA2C;QAC3C,IAAI,KAAK,GAAG,MAAM,IAAA,kBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,yCAAyC,CAAC,CAAA;QAE1D,oCAAoC;QACpC,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAA;QAC7D,IAAI,IAAI,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAA;QAEvC,oCAAoC;QACpC,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAA;QAC7D,IAAI,KAAK,GAAG,MAAM,IAAA,gBAAS,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAC5C,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAA;QAExC,sDAAsD;QACtD,MAAM,IAAI,GAAG,IAAA,oBAAU,GAAE,CAAA;QACzB,IAAI,aAAa,GAAG,MAAM,IAAA,mBAAa,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACrE,CAAC,CAAC,IAAI,CACJ,aAAa,CAAC,OAAO,EACrB,uDAAuD,CACxD,CAAA;QAED,uDAAuD;QACvD,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAsB,EAC1C,CAAC,EACD,KAAK,EACL,aAAa,CAAC,OAAO,CAAC,IAAI,EAC1B,IAAI,CACL,CAAA;QACD,CAAC,CAAC,IAAI,CACJ,OAAO,EACP,kEAAkE,CACnE,CAAA;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAE5C,8BAA8B;QAC9B,MAAM,KAAK,GAAG,IAAA,oBAAU,GAAE,CAAA;QAC1B,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAgB,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE;YACzD,MAAM,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,iBAAiB;SACtD,CAAC,CAAA;QAEF,iCAAiC;QACjC,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAe,EAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAEtD,gDAAgD;QAChD,MAAM,mBAAmB,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAEtD,yBAAyB;QACzB,MAAM,IAAA,mBAAa,EAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAEtC,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,CAAA;QAEvC,+BAA+B;QAC/B,MAAM,cAAc,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAEjD,CAAC,CAAC,IAAI,CACJ,SAAS,GAAG,mBAAmB;YAC7B,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,iBAAiB,EAC/C,gHAAgH,CACjH,CAAA;QAED,CAAC,CAAC,IAAI,CACJ,cAAc,KAAK,mBAAmB,EACtC,mFAAmF,CACpF,CAAA;QAED,wBAAwB;QACxB,IAAI,MAAM,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAC9C,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QAE1C,wBAAwB;QACxB,IAAI,MAAM,GAAG,MAAM,IAAA,gBAAU,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAC9C,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QAE1C,yBAAyB;QACzB,IAAI,QAAQ,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACjD,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;IAC/C,CAAC;CAAA;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAA"} \ No newline at end of file +{"version":3,"file":"tribe3Escrow.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/tribe3Escrow.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/messages.ts b/src/controllers/messages.ts index fde8bac88..b24140ac1 100644 --- a/src/controllers/messages.ts +++ b/src/controllers/messages.ts @@ -461,8 +461,6 @@ export const sendMessage = async (req: Req, res: Res): Promise => { // console.log(msg) const message: Message = (await models.Message.create(msg)) as Message - success(res, jsonUtils.messageToJson(message, chat)) - const msgToSend: { [k: string]: string | number } = { id: message.id, uuid: message.uuid, @@ -498,7 +496,8 @@ export const sendMessage = async (req: Req, res: Res): Promise => { // final send // console.log('==> FINAL SEND MSG PARAMS', sendMessageParams) - network.sendMessage(sendMessageParams) + await network.sendMessage(sendMessageParams) + success(res, jsonUtils.messageToJson(message, chat)) } /** diff --git a/src/tests/controllers/tribe3Escrow.test.ts b/src/tests/controllers/tribe3Escrow.test.ts index b125793df..b07e19430 100644 --- a/src/tests/controllers/tribe3Escrow.test.ts +++ b/src/tests/controllers/tribe3Escrow.test.ts @@ -84,7 +84,7 @@ async function tribe3Escrow(t, node1, node2, node3) { t.true( balBefore - balImmediatelyAfter === - tribe.escrow_amount + tribe.price_per_message, + tribe.escrow_amount + tribe.price_per_message + 3, 'Difference between balance before and after message should be equal to the sum of escrow and price_per_message' ) From b247583259de0b0271346f92d1f7055fcb112504 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 30 Aug 2023 23:45:33 +0100 Subject: [PATCH 91/93] update: updated socketio test to follow the right progression --- dist/src/tests/controllers/socketIO.test.js | 6 +- .../tests/controllers/socketIO.test.js.map | 2 +- src/tests/configs/nodes.json | 68 +++++++++---------- src/tests/controllers/socketIO.test.ts | 6 +- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dist/src/tests/controllers/socketIO.test.js b/dist/src/tests/controllers/socketIO.test.js index 322b95d3a..257eab80a 100644 --- a/dist/src/tests/controllers/socketIO.test.js +++ b/dist/src/tests/controllers/socketIO.test.js @@ -59,9 +59,9 @@ function testSocketIO(t, legacy) { yield (0, save_1.joinTribe)(t, nodes_1.default[1], socketTribe); const tribeMessage = yield (0, msg_1.sendTribeMessage)(t, nodes_1.default[1], socketTribe, messageText); yield (0, msg_1.sendBoost)(t, nodes_1.default[0], nodes_1.default[1], tribeMessage, 10, socketTribe); - t.true(responseArray[responseArray.length - 4].type == 'confirmation', 'we should receive a confirmation'); - t.true(responseArray[responseArray.length - 3].type == 'message', 'we should receive a message'); - t.true(responseArray[responseArray.length - 2].type == 'group_join', 'we should get back something when we join a tribe group chat'); + t.true(responseArray[responseArray.length - 4].type == 'message', 'we should receive a confirmation'); + t.true(responseArray[responseArray.length - 3].type == 'group_join', 'we should receive a message'); + t.true(responseArray[responseArray.length - 2].type == 'confirmation', 'we should get back something when we join a tribe group chat'); t.true(responseArray[responseArray.length - 1].type == 'boost', 'we should receive a boost'); yield (0, del_1.deleteMessage)(t, nodes_1.default[0], sentMessage.id); yield (0, helpers_1.sleep)(1000); diff --git a/dist/src/tests/controllers/socketIO.test.js.map b/dist/src/tests/controllers/socketIO.test.js.map index 3b29e99dd..95c0dfe53 100644 --- a/dist/src/tests/controllers/socketIO.test.js.map +++ b/dist/src/tests/controllers/socketIO.test.js.map @@ -1 +1 @@ -{"version":3,"file":"socketIO.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/socketIO.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"socketIO.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/socketIO.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tests/configs/nodes.json b/src/tests/configs/nodes.json index c37ca79c7..5977e8f2e 100644 --- a/src/tests/configs/nodes.json +++ b/src/tests/configs/nodes.json @@ -4,11 +4,11 @@ "pubkey": "03a394d0ebf0d003124ab130c6b12b8b990a50a30a464354800a51981ba745bb07", "ip": "http://alice.sphinx:3001", "external_ip": "http://localhost:3001", - "authToken": "maPk0GOsAXRDwPYseJ5K", - "transportToken": "MIIBCgKCAQEAsVjAAHNblgh0ZvetxqtFvh9IGq97ifk9ljzxYqbpMui6uSE+2Mjn\n8PYDWynJyOMXUtYlVSncqARtP+GfzolLK5S/61T0xdsEHaLrFQuFFgmUVjmQ3Edp\nM7+u4KwZlAPYIGkVdQciPCpw6mePvAjheE0QAlxdnbzxqdIFJ0LJ4q/T8t/dT4PG\nnKXhp+OU5CquyUkNIu6BnS3EyuQF8pTrBRRX02hjTOYlRw+xxYsRfko99C0xFVTu\nVK6PZlcIcO0ycvHSm3p73xq9mY8bGqqiEhEoV2j3yl2XrqScedH63zwnVB75iizH\n+VFWigkRrcUI+EfJkgeOWTx5sKc1Hc73OwIDAQAB", - "contact_key": "MIIBCgKCAQEAvOY5hPIS1MI3VFu8cy7jqUBA/oNu/KhrfISlDEMT35y754SvT9WLoQJ4R/EYFdaoWxYFgD8WhSsKmKqEJdpQXhsDt78LmGz9Gfda0fIvorsHQLp14wRiBziCCoobm1z8qEkjn3LBOsSmkcAOqyuB1HqGdbI8bqyA+/MwnmbFEoi7ZNRvL32ERDvrJaSrlb9kROo6Wk4MkWOVmDS3K54NP1MF4LSWSyeEJocV/4oqy7iuDo1m8cJ3FnQpCO0k+dWaNpb5A6Os2s++nr/dqQdjHNc91nWnND69E2zQ1P2d8r2JvIfYj848kEpqmz8fYV0wSmFaIDEWfemGzTacqsyk0QIDAQAB", - "privkey": "MIIEpAIBAAKCAQEAvOY5hPIS1MI3VFu8cy7jqUBA/oNu/KhrfISlDEMT35y754SvT9WLoQJ4R/EYFdaoWxYFgD8WhSsKmKqEJdpQXhsDt78LmGz9Gfda0fIvorsHQLp14wRiBziCCoobm1z8qEkjn3LBOsSmkcAOqyuB1HqGdbI8bqyA+/MwnmbFEoi7ZNRvL32ERDvrJaSrlb9kROo6Wk4MkWOVmDS3K54NP1MF4LSWSyeEJocV/4oqy7iuDo1m8cJ3FnQpCO0k+dWaNpb5A6Os2s++nr/dqQdjHNc91nWnND69E2zQ1P2d8r2JvIfYj848kEpqmz8fYV0wSmFaIDEWfemGzTacqsyk0QIDAQABAoIBAFO5Gq9Q94WzGwDZs/m9Q4xFfUkRCgUTxKgoxlpb9Jf8iNABYA5bUIqpZJRGSG2NeYr9hKylyZ52SDkIApAgZdR/1rL/Cu2hCMEUf/1jgTd3+6v1uMBItgYLRp/TPI8stJMF77MBEqGwfT9GR3oYS2/YanYJ7H0FGhoRXHAojpo6ml24hOSXGHHi2UOSWH60FVH2//EWmB/e+IHfeb1raBXCuuN/lrsebsNy9W0bjvZ0jXkGi08anuBfHhjzCU8TF2yF5gduPfFq0Q5qrLoBUpN1thXG26bA6tCIq4amSMNHeAmrGH7ezWeGQEv2gWFQuK8ROJrhO0YLUM+W6ho26q0CgYEA8AWpXX4xzE5HFifK0/viez1Tno0G9gKQJiZVbWz8ER7w/OFHzSwo//QetcHpTlwqyvitKIy7Nd0GsV19LLrLfY8qe00By79QIxkYudgc+A9ZhtjNC8Ze0ngr4c94Tq2dhgVv8EYliBgLOOyAB/Yqp9A4oacj93e4Xt7QJ5Ai/GsCgYEAyXlag7fV2WPJAIsR5yx3lWHVbj7Ax8NMqvQfyYeXprceVZ5cHh5/zL2Ab/aMmUK5qdIBKtLKMkbru0Rh23qI2gUfvW5BTwVn17lEFf/oZRIEwZkHYbJZWZRgAALDi6mhQkDRVDl75U0k3szoReSSw/yI+30ChrgVVWrj+q1r8rMCgYEA2WN3UxtBxRY8oh9mP/sJ1K7ltltqq5QEtNjRVKt53ZPVlmP/4R8W/0M+MUawpW0qwOzcADb+NDm8nxXakpGYTl9FjalgcAYVccSANYo8KpvUbSKdDAYdyahXrkx3XWM3obP4/3i483s7ZtIk35Egbx9Su26jT7ZaAWrywnJ0jYMCgYBZonDfqxksJ1XUtQqZA9KMFkOjUa3o8f2ZDRVbTsTsegm348Vt7PnEuAZ9SX5R7Tq2z+SPDcrBRYY5AXpb8A8UmDT/zR6nLmt9sUIWW40j8jlFfHSpRXS1AusW9iPTbft9g2LeCtkRMhoWOamY9tFI+oBjCsHl994d63lUHHWrOwKBgQCAhZYCoX6SEtx1wpuEkSYA1ajwHJNocIKyTpDBLoQuTZe4esAYh26OBf2hvGi3gtW7yWf7r+RObyEQdhvaGhRkblptaJrP/aZj0UdSpKeAQERcSFpSRudO+FW24p4tRuitMU+AMh32LDWaYvB4EuZt6wGSPGrXj8GoHXnL71aQnQ==", - "exported_keys": "a2V5czo6QXdGMFhuZEJzNWdOdkkyak4rRE1wZ3FZOW9Cbks5V3RsaXltbFUyZ0RYUWxUbmllQTBHT3Bqd3M1a0N3TDdMK1JIWXc3MVBTRkh2YTkyYURrM2ZaNGxDRzd4L2FWWmNQcmd0SmxEN0JORHdublQ3eEoyQVA4SjM5S2ZpdzhlMlMxRDIzNC9aTXh3QW50dzdtUWtxdnNtbWpmQWhjNHV1OXBoYkY0dVF2cXc3TThZcGU0VGlVTG1Xellyd0NPdTlwWkhDTFZ0eVdXK2ZRbWN0OWkyMDhvbnBjNm1CTFRkSWhFekZuR1hEZEVnWVdVdUJDSHZHWmptUkFBN3VVbVpVOTBOQkxoQ1EyS2M3UlpuOXltTGk1dlRIZVdTSFpoNnp2VzhUR1ROOFRDUnllNzR0aEFCSXQ5NDVaQ3pJUG5oNWMyRGhZSnluNmljWlQyNEhKVW5xUFM1WmRnTVFjVTR3eCt3UU5LYW5pMi9HeFBSUmZNZDE4TjJTckczak9ZNlp4c2ZIa0NPSXZIK1A0M3ErVGpzUndOY0djcXQ3ZlQzbkxyNE1adms0VVFRbEYrQndGSk5lTlplcTVuVVUyTW4rVksxYmFYQ3VVYW44Vmh1c0w5ajBXeWNlVUZvaDZ6TmRBam5uNnFadGJOd1N4NzVWNWNQMEtPOHMxYnBmdGVOYUtJTkhCcEVUeWVyUnZZRTRWeHZSeE9PanFxWS9IOTd6ZE1BS0JnbzNQY08xYUx6NmZ1NDhMMVF3TkFwZ2pSQklaMzBRTm05aGV2L214Rk9YQ1ZqYnQ3cDB2NGVzTHZqRDJJVUVkbjVRS0VNTUFTenIxbVo0ZTBuWDROSHVXT1oyVUEwakpscmU4bnBrR3pucDZHM1B2TGVqeUY1b3VEek9VdHVsT2FZaytFZ3Z6bzljbnBSZmg4cFpORkhPczR6L09aRkVONjhDZmZBTklnQUdaZkFZNW5JTk80OWFlT29maWVBMDVUZVgrL2FTdTNFWHNnWXp3UEJQUm5uWU8zd2lCNzFyYm5iSWc1aTgzTm9ibFI1eDdieVBTSDl3N2J3eDhnL05NMjJlNkJQSUhudFU5WEVPaUVGUVBqamtydE15SWZXSlcwMmMrL0szRXJaTjdUSEZFZXViNEhYVDRxRWJaczdkMGZNbWlWNFNuRG8vUiszQUhxVTB0aGNaYUxqTkJVVlNucVQzUzB1TzgxM01kVWxLcVlmUlN0NWtSUWczR1JkdFdRR1lKRHdReHZNTEdrcU5qWXZMeWlaTTRrVE56Z2x4Qmg2bXdud2tqcDdoeHFPOWE5QVJWSTlYc2xCY21NdU96QkZ1djljNmtoelRXQ2d0eTJvSFpMN3hRVmx0WkJmSUR0OXFrWEhiZFRLM2ZCcmVMUGpvRVhOMmYyVGx3RkJyMHUzS3hIQUs1SndKb2lsV0JBbFpySnl5dGRDWnpFYkFwM0RNS044eXpTQmR4Mktsak9MM3NhbXJhSzZPckZCOTFYLytTYTlhcEE4aUtOMXpnRnU5amI1c1JHdzVaYkI5Qkt1QUZXMUlERFlBZzBlSXlqYWx2ZXFUTUFCbWg3ODJGbVFTY05LeDV3Ty9Oby9Xb2U1OU4wbnlKQ2JSK0xQNDFrWTZ5bUdKZ0ZZMlpVVTQ2aHZJcVVQVWdRUW9QMnNNTU1pY0llb1lwUW9kZ250TGxJK3pyRm1DMms3eEYxNWdmYlVzaUVrc2ZmZ0FPdmtDZnFqeDd6QmVMQy9lS1FxMm43MExkdTd6a3ZoWXFDaTRnemFjT3hBSGYyRVNnT0NQbW0xbEpTN0hGR2ViT2swTjJXMHZaQ0U0eXB4SUxtQk5qL1pDejYyU09yMjAvN3BKV1dYSkdiUkw1OWdRZjdZYXZTMktTL3Fybi9abi9yQW5ldTdpVjhDaXIxbXJncWswbDV2REFvTjlEZlZQRUxROUVlZHF6eHJNUTRheVJudmRiU1E1Ulo2T2ZLUytFVDJkSnBKQXF6c1ZOblpWMFhGbWQ2RjZhbG5ldStmQXFtczlQOG5zdmFYNlU5Q3BGS0pEejM3OFh6RWZPZDRKcHF1ZStENGtJb2piUkZINlVRWEpTWVZESEJZMTlzZUtLSWZkOTRGMm84U29vaEZhbHBxUXJvbjJ5VGdFSkZmYmlTOURPTnhabXFyd2s5YXVuaWFGeG5KWVFpRXlDVWdXLzZRLzNHak1SRW0vZTNxY2c1MER1cGdHTHYwMXVCZGRHcGV4M25JcjdSZ3g3NlFlN2NVemJIaW9hZklHWExZZWI5RGNGbU9ta3RyN0ppZEoyMWluQU5wZUY5aWdrNTM1NFFmQXZWTTZwWGR1UFNteCtxam84OElWVy9yZmFCdGxqMTZGbi9HUTJod0RwQUZiamxxSkZZcFM4bnJsTDNmNFFQbmc1NnFHOXNSRnFSNGYrbnpVT2I2d0FMZ0xUWDh0c3ltSG5KcG1NUGEwRDVrc2s1NTlNMi9uK0xwOGxidzhMOFNQbUFId3ZkY2pmTEQ1L083RE80TTNZa1ZXNDZEK0ZZSnBZSFdpem9wdFZYaVFWaEk4cm1QMkJ2VGJ1d3Y2OTk5Uk9UUWhCRlhqT2lzUURNUWtMYUsxcVEyak9wVXlxeW1LajM4MVp0WnZDRDVjalpjcy9Jc1c5bXRwUFgvUnV6ejZjSmo5UWdVTDJmUzNHcU45S1RieTJMekpuU1ZaUnF5ajFmTHhRS2g2N2tDdExEbW8yQ1JxbTJQSE5JbGVmVncyR3g4WThJK09uRWZYc09QeWhOTTVRVHRuOEFDb0gveVM3NkQvN2dsOGVSVExhQ0pqSXBoeDlaTGhwRkJaV1hUYkREdXNIS1JNZUg1RHRxUVYwT2o3RUZMeWZIamRZc1ZMN0pFUzRSeE90QmF0c0JuellVY0dEM1B0ZDY0MCszRDJjb1hwODJYYk9haG44bXlsOURCQmJ1ejJEQ1JoanRsMjBIZE1Sc3hwaUJ1V3hkcTZkbGZ2R1piU2llNURmSStmcHpINm02QmxnTTZ2eUhxWFIvMm81Q0QyTzJ0dVd0d25zYXArdVVVNjFxeEdQbW1nK1d5ckprYmVwYjdWMDJzemVOR3pvdGhOdGpiZ3Z2aG0vTEh5QWtrOEpGUk1tUzJxa1NwZ0pvVXhTM3h4Mk11YlZHbXEyOVBQcU1IWWhoMWxNZm9LSXZkR2MreHAzLzRJSHV6OEk1Q3dTcldiZkZQL3lMb2J1OEZmaXAxZ0tFbW9jbXNpUitxMjQ0Q1RHNHQ4bkhhMEVnUC8zTklTK0hPYlRDOWpDM1NKM0ZnbjRNTG0vbjZjUlVzMUl1aHpLY3NNUVl2T1NidUhzT1JFeW4wT3g1Yi9wcXVJYjk3dktJTjdrTVhyaklaSTlRZkVBT294bGErWmQyTE12WENVUDJ1MFhYS0NsMVVXTHRWcVJXdFNaTEE3YkREWEhtNytkOUlXTDVnd3MrUkk1c1lNZ2o0czBjY04vc0JjdE52TnJYWlAwdVNnVjVIMUMyaVRuRVkwSGJqTzdvb1JTSWU5VHdYMGgyOGpkU2VXckNGb2tUUXVqQzVPd21Wa0QvOGM5aWxsQjFYQnNIZXJpNzZZUnVGVjRqLzNRZzEzS0VtOHplaG1DWFJVUVFiSFpMLzZucFovY2hXdm1MYlZMZ3ZZd1Evcz0=", + "authToken": "9GkuVR7+rQ4QwZt4bbym", + "transportToken": "MIIBCgKCAQEAyi+Y72/S1OLQp6au0oQXCY4x0jGqPRjdco9S5j/Rln3938kKTXTx\n26Ax7heGjtvRQURrNajV/d2qtMUkdJgPlDoUYNhpbpZYptmY55KBBeV41DVRrXW3\nEIddmh4kE3ZITPqIwdAn8Pu+vxaVeldKVyFjjzpxqv3BdSqIxo/syXX32ubBOYIz\nHor91aBdtw+ImSa26+X1kNaHGpVd4mNn2/OXgmSjWEnUz5ihVparjRaZpY+HyU2i\nX9rdSZUYYvWuz03IkhQGUMrqfk4u/eC1a4fL3l1/DGtncgufvASjRGBXbBphGwcz\n8hlVF21nf5JvTv0Z/uLd7djjACDNN+u/wwIDAQAB", + "contact_key": "MIIBCgKCAQEA2WG1ahTWbQ0ETlwytJH566bjo5WkqHR5TVLNIE2+9cDZGd54/Ar3ZyuWsY/rpZFvnQcksRPYCfDGSLqzgwwcu1mR047fI7Ts1sTw2WAqLqIhIsuQyHB9r/Zg1Y5ocSN0DS/CBGyxDHFxAdujhUrMLmsi1XA7AySSsR6BiAuqQ8RSal260gy7LlYJij4dzz90nDF668O28SL0ERI4hWvufnMVg82AAPIbPG/PrxE11sxQ0+wSNOH8XRwRVcPR6AD4Rgyo73OLCW8CUwMsbRvuTZFj34mz7d7hjkDHjOm/K/zuCdWuMuALcVe1kdZBgj0N0dSqb2Arqm+psc0GRz23HQIDAQAB", + "privkey": "MIIEpQIBAAKCAQEA2WG1ahTWbQ0ETlwytJH566bjo5WkqHR5TVLNIE2+9cDZGd54/Ar3ZyuWsY/rpZFvnQcksRPYCfDGSLqzgwwcu1mR047fI7Ts1sTw2WAqLqIhIsuQyHB9r/Zg1Y5ocSN0DS/CBGyxDHFxAdujhUrMLmsi1XA7AySSsR6BiAuqQ8RSal260gy7LlYJij4dzz90nDF668O28SL0ERI4hWvufnMVg82AAPIbPG/PrxE11sxQ0+wSNOH8XRwRVcPR6AD4Rgyo73OLCW8CUwMsbRvuTZFj34mz7d7hjkDHjOm/K/zuCdWuMuALcVe1kdZBgj0N0dSqb2Arqm+psc0GRz23HQIDAQABAoIBAQCKWjyrQo3ipCk8ckO3Vz0YNYSmhcRhjpfxlaSGTdUe9ll2tHiN+bDSkhR7+FyDaRf/eh9pMHcMhJi+i01bN6dFulEss77jK/CdFIUx5JmUSo4KZkNEvwvPpWCmKtfgQi9HgUDbrg3VHJJPG2psmFlxpbBq5d45NtrCLedFHh+Ets8tI42KRIKKqucCKeWc29GKSm/SheSxOcguUSMFwxVeYVQTxjuaU2l+gB+v+/IXvo57dhYcq02EUNt1zji6vXd8y5J0Wcy0oCqv9A5hqPqsnV1r28wGFCRy8sl1D65p+LsRS+An3t3KdMQyqU8samBvPonJm0hA8gRLrGD2UwrlAoGBAPYBd1Mhxqdexi8SLizUJUldQ8dXah6tCta7SGSDhU7qHtuUbT4S8qID0HK6m4bp1kld9DShJ9Ae6MR8l5QfjeOg7Cb9lDoFB8/mGmPMoymSL5t1D361bk9qO+z9HwAL0cunwOORtjutenFMImpIUPZ9Ux00hu+xxEOm+9ZOXWhHAoGBAOI2izK0c/sOqieJa2vz5OliSvKGj5KQRQH3r88wrINTZw80kvaHBfyJ/UJUdUcbKPG3NL7nSt/zTwZGkBnPwH28PYYmQp0/g4zXhl4Ic1dFzmQtahK9rVKLLqdQkz+onzlsS1g/QIv+QLbYDB+D22E1iu32LqAwT2cQHzWKaft7AoGBAN7PySG0b9bb0iiEEOptYzAlluQP2n/aPvzqN9FCBhXJmxVKQ/967eOsDLo9Jex2Eq30uOCKLiMkO7LrHeb9BWhsMjfGaOB7+e1k/fXyPL3EN/ZXeidLcJPhJlGpmNBT5DrOv7feG+3FXCcNzAXzZdE7BXJoRucGXTrhHSunYpa1AoGBAKzSiPQbA0S6BmsgRK577dYT3zh8bzHFAMOpDGsZP6MxU9o9C05HB97ROWi0h8jkShqpIiX7JKwGAcjEnhDqNKCa8NINZvUl8gXnHuO2RxBU54KHY7Ofr8wRQ3pWR7jpxYOkZcesw05w19YZJuHo5fDVbCey3hpJ7k/J9F3+OkwDAoGAIDnO3WjbgM0jMN5ibkdCCspGYHbp3U+H0cfJSidVwY1j1dBlhtafm0/FaQr7uOG6lgzzfqYR+upFWIur6hRYMfAUsjuoTgu57g/y6rI8VRQWNmy52rtB1rkD8BAFUfdzDcUxqWu6J0qT85rU/WIV8me8QhQrrSvs1ttGj6158CA=", + "exported_keys": "a2V5czo6QXdFZEtkM3VQZkhaMG4razhta2J4SE4yNEhBSzRHY2pUOVp3V2xUdTA5MGZFWHY4dFB4WmxzY0VjaTJDWDFSV0lJQXBva3NRYTRwdjFDbWNDVEpZeDIxQkw4T2tKcU4vOXN6MkZuSThNWFAyWDEvM1ZJdHV6UnN1OGYvZTF4ak9rZVhWcEpHZUtlNHVwdHhWNHF6amQrTmF6TGxHZDlma0tnUU1tYjVJUExqU3pDQXd5cmJuLzlCRnVZNm9pU1I2MGpCN3kveCsxQnBzTDJBRC9Ca0MyRndVZ3l1MUM4MEFTL1lIUWNINkV1eXZuQXh3OU5vaEVXRytpN2dncnEzVHU5RkxaeTE1OEJ5WVo0cGpqS3hoTTlJcUdJa3NPVks0SUM5ZVNpSE1aL2NVM0drQ00rL1JvT0NFTU56c0F3K3NZUzFHc1lLTTBsK1I1TWRRZXkrNUZYd0lkT2M1Q2xKL3JDc2oxYkhjWENJWTMwL3JIM3Nnd1BXei9oc1ZIdXkvM1BVeCtjSTg3ZVIreFYwWkYwcUI5MzV6cE5CMHlJM1pJN3ZOVTZzcENwQ1FNMUxRYkFIY2NJRWphUTFZZzBkYjJ5VDF6UnJ6b1VXWUpTU2FxL2ZSdSszR1B0Z3NRZ3JwTzZXQXVTVGQ5Qklvd3BlSUt4SWRqL2lxdHRqaUxaNDRCc0pVRVROVFpQVTY3bEZMMk5hZVpTLy9waVhGSUZSQ2ZBeEZ4cFVndkQyMDlhUTNPQldvNkgwNFNtVWJaMUpDRnBuRWRKSTk1TG1uMG9UN2QxMFkyRDVHcnNXQmh1TVBGSjY1bzhiQWw3SFA0LzM2R3cwMWhOZVdLWFpUa0tzRlB3WGp2bnRLVk5HRXhkbVhnUFZYRG0xdVByVUNJTVpaYTBaMCtrQmJwUGkvNjhtUnkzM2R3KzRlL0NJQlR6Q3hTdkNxTmU2dk1RVjd3YzBsTkVZdzRHMkp4UVBZNEwvMFhPVDdSdVRRQ2RIOFBCRytCYVhpaXUrTDFodHBRRU9KcjhXaENEMVR3R0FOd1lndmErdXdYdnhBZllpMEVpT3RYOG9uVmF6NFBSTXN0aDNHbFl3YU1ob1c4cHNJOHpxbEFNQkVmZ2dOcGR3S0hEUDdVOUM3MGFESDNuWE5CUnlyMVZwZlFZK1YzYmNqZDFnTExHZmU4aE1FZzY1MXlsdXhZb0xiK2pxVGpKMmJOdmxWYW8vaWpwQXZMcTRDZXBDZEFnWUxoTHc2UWtuQTdXZlNzcmFWTjU3d0o5Ylp2NnhRTS8rZHVIUjNOWEcwY0RQRkE5dWdGanZqaE5IZTJUdVhvV2JNYzJSRTRZaVVYUlBvUXhLbGNOMTVQSVMyTjhDQjVFVUlCdUdIM1RRS21CQjFOWmxNZ1daQ1lqdVZRZ0picFJOKzUyc3VlWm9ESGk1cmwydWR5MS9HblpHSkNEa3pMZ3NOWnFDRGpMdHBzeVlMV1k2V3lMQnBQcWM2Wlh1RW9HVHIyUWkrR3liSGhVYnJudHdkUlI1S01VUEZ4Vi9ETjRYWFRUbmdEUnNxYnhPVktGVzVCNjFRVlhGaVNXSmhucThMTzRpK3ZENEZMS1RUS25ndkVqdm5KNUlNQ1I2WjA0OVFkM3hGUVRtUGpWZ014ZnFISDNXNWtwdVZHZWlWNiszS3hKQ2VyWThkNzlsc0F3VHkzRXo3TzNkNVZBbHF6MmtKUUMwSW81WUZZRHRMNWIyck9tc0huOGsvRTIzOUwyMktwaFZKVVJRQkFUakdZUENzM2lKekl0TTNaanh6U0Z2YUR6Mm1vbUc3aXB4a3gyb3pBcHM4YzF5RGYvNVlHaDRzSk1UaG9YVG5qVTRqMXFwcWc3UkJBcDBHeGtzNXlIWStVVXR5K1o5bzZwVjgzRTB6WXpsNnExbHBxV3hyVEZ3eldCbDlFK0VFL1lndUV4QzRMcVFQWG9GcUprdmhLK1VwV0U0bTJ5Q3I2dHNMblA5Y01GNGhicWVkVGM5ZUU0Y2RUdzZPRGNERjZiS0FOYlpxLzlDYlRINFpleVFEVnIyOGU2K0tnMDEveDZxRElqc1NoelBqR1RUc3JadkRCdXdSQjMzR0lCb0VjOGhza0gzRFllNDVkL0hNUnBzRkdWWmlhSXdRSE55eDQvTk8vOFRsc0lGVnkzSllZN3hHcDg5NGNqWXkrTHZFc1J0Y3RkNEFTeWVrUWh2a3UrUXEvaHZVM3gwS25iTzhZeE15R25UM1A2amk5bVcvSkxzaU9LMkJVVGxkK0JMQ2djYVQwYkU3UUFCOXhnV1pNd3F3d2tldGhIZ3JpYzZEZlErV0hqN1ZVSGVOeFA0U3Irc1J6UmhtckRZWHhYVms0Qk1nMnMxOXArcFRhenhuU0tpVFNoRkVrMW9mRVNjQUlSWFIxZHJZYWVyR0czYnVuSWRBcHB4T2FOT251b20rOEoxTWFEMDhZQTRqRUdnVUxSZ2hNUHlkaE9iU0krS09VcVRLR0d5S1drbmtCZzZNSUozTVhPZ3Q1ZFY3VVlYZCtyUnBNYXpxcWRVdWhSenpXcEVCWWNlUE1WY3JrQ3JSMS9MUlNEdkgyaWo2TjNrc1kvcHI4d2pkbHRyaDhtWURrZlo2YUwxa0ltR3M5ZVBJVTNmakI0enFsZGV6NE1xM0dQSlhBdUpEbmxYc2hUazZ5YXFqcFEwdWdzTzBkSjR2MlFKOUlaMFRJUXd5YVMveFpZeUt2WmJpMFlqNU15VzJvS3owMk4rdHhVdWF3ZTQxZk9BZVJTb3N6UFZEd0xIQVM0RkMwU0N4TU9XdUxZTmNjOVhFQVBVVTRTaG5KbjJNQ1pYTWRxQ2JRVEs0NXhIWWNWcEtDSENyUmgzSjg0Zm5wbHBhdmJOYUZ6dU41U2JyeWNEakVEdk5Sc2FpTjNmTHk5dlZsOUVBK1Q3TFJQVWREci85Y3REMnFyRG9lZnJzaU80emFZWEMzWEJjdWNMcmxGVlJhbld4NkdPT2J2V0JFRWlKMmhDalkvZVVIcTQwcUJNc1NOV0ZHdzBhRU1KTGxMakd4bk9ONWZPQ0NIL3dhVUlYN2Q2YkI5RVY5TGlDcm90dlEyNUt1UEQ3ZGlOSW1DTU84a29GVjRxSXF0dnVYdkFDSDYvYU9YK01nemlBcmVPeTNUODg2VHhRZUpNNWlkUWtMZk1VRzJhcVN6TzgrMTRLdCtVTlpuQjExeEdHRGxCWlFqTE1Hb21HM1hjTFhMK3BTNkQ4ZnZuQ2cyaFhCY3pXNm9hMkRtRXNpQ25QSFVpZ2xsUXlFZzMwSWU3N0xvWW5iVkxybjFSdmJKLzhiRnk0RkhBUGdWMEdJbTFvN0JMZjU5Tno0dzA4Z3NZUEtDN2JIY3cwRk4xZGZWcU5UbDlPQkU4RHhvVzh5WXZPVzNmbjUydVA4bGJLMVVLL2Nuc09nd1dNRDNxQmtmQ2ZMcFRoMVI4elRXL0p6RVBtWktLbnVWOFNIcVNOSmhmbGlHZ2RScEZUdHYwbVo2bUF0OW0ybThhY0RTVGFaWlNhU1ZRcXRqWnhjRDdiSStFeGVCN2FqVlJRbVRnVG0ydzhLS0MvM3hTRTZLN1FnUFg3RG0wK29CeXNLTjdRd0tLV005N3ArNzFzQjRhQTlBZDdqYWo3THowYjZTL25iV0N5K1dSTXdLWT0=", "pin": "111111" }, { @@ -16,11 +16,11 @@ "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", "ip": "http://bob.sphinx:3002", "external_ip": "http://localhost:3002", - "authToken": "l+7am3E9nW8jUPxrnB3Z", - "transportToken": "MIIBCgKCAQEAtYiWC/NDPUABjWjvYFlUg3oDzd10aebHIHT/VlqvWubCEvrcSF32\nJmqRm6kMuGjckKx5xqUGmlwNbXB0tj3tsIGpcqI8FJpElq4aJO4d0IyaglXsB8N3\nS35kGWQ76qNwKeRd/vJptjo6CE6KFHfhO9xGbSmaFpYSG2ErPAOHOQ8dDjk6/TxJ\nk0j5veAKXkeND4qv/rv9wbGjjhfUn4z2s1UAEtZQHTc9FrET9Z3QdDSgVXozu4wD\nCTF4TfF89EVnP2l2uLEq40VzZtXkNgovk6K1IdeLlJqO1qvQ9Qj3iRhajgE6JBBC\nWBvSTEzDFOPEaKMxI6Du3b45X1nTexHxlQIDAQAB", - "contact_key": "MIIBCgKCAQEAz0J3x5+AncS3xohw16DlHxjUj6Sy3H3L44JG5jqQylPY1nPC2SurB77cfsBdMLcBzriE0hC8wmQX19c7zexAK1FZ6qDQ9r/ZvQedPtzgkL8+3r3eSmbd1G89EV+UCsQ6DF0U1xsQS9MjccDhzK/UADLkN6wEkSFBlZS+1e6vZtzdpT0bfpV/Trgu3wxqnDl4BJezYVwrE5j2LP+DGKYymRoSfb3Ho3K1julJK7Jbq5vS0SSjGKpXJIhLzs10xPimNgc+dRJEq+Xe/lnah9u/wNqvWJ7cvMz509ys1F+/XCMkUe7RbRCjJ/1g8mZxy8i//2xKfiUD9pULzu8RZ66+wQIDAQAB", - "privkey": "MIIEowIBAAKCAQEAz0J3x5+AncS3xohw16DlHxjUj6Sy3H3L44JG5jqQylPY1nPC2SurB77cfsBdMLcBzriE0hC8wmQX19c7zexAK1FZ6qDQ9r/ZvQedPtzgkL8+3r3eSmbd1G89EV+UCsQ6DF0U1xsQS9MjccDhzK/UADLkN6wEkSFBlZS+1e6vZtzdpT0bfpV/Trgu3wxqnDl4BJezYVwrE5j2LP+DGKYymRoSfb3Ho3K1julJK7Jbq5vS0SSjGKpXJIhLzs10xPimNgc+dRJEq+Xe/lnah9u/wNqvWJ7cvMz509ys1F+/XCMkUe7RbRCjJ/1g8mZxy8i//2xKfiUD9pULzu8RZ66+wQIDAQABAoIBAFb3EeFuOP56K46fc5HWziz1M0OunOpN0n59DJjQHC75bbPWUPzlCNewKz74ImIteBGwdPLb2QhMDYEgq9Rk/Cvw76S2o9fVelyJ1F4rOgMibBP0YVCgxxW7M0mV7D10RtMnP3ZewcC/MFEr2NMVOAR5Vi9R+3yWErnb9xM3GtwysP5RCaavD+xz5fBTbiwEXdBlyO4Xm8ldHIPN8IIu9UyHN/IHovYmEBg6JYZVmORY6sa0+0sLym47ey1WkXe8UYflN2hRKPrX5Gnj5UF0FNe9p+/qLV4zK2SONCRxdHAUOeazMvT7/AemMdgzPSmf2qatE91MwYaCOnBa7er+Hx0CgYEA9sW2Ut5IdFqMXUzVRaCu6shcU1/UPnUcwvKb4J64YF/COoyVq6Vzp0HxxogdoMKTzWcsSSZAcJSHxs97F3dp8KmvGn+ibSyV0Sgyh0PS5fQMPOKS7uhO2IjwIEIfQTbjrqCI0ziCKCz+Xm02vdGZDpXg7I3EeTpSd6yFjyXpmpsCgYEA1wKC09Zaqof/TBvtJgMC/UbGIQdhrqpDNXtT2i7JyglWwlxGXXVEvBO676hA0BSXiL7ddNdz6cPFyFMn0Bg+jXDy8bOToj9SJXKAqp9IT3arw1+U9hC9An2GR02ZP/2jr2viS7H+C2HmhX2uojwbMOspgE5NsSTFIBF+VNsFg9MCgYEAwDRMhwz0+BNSwpTGhH3b36iBKLs6EA+dgEYAnRpi10WefYXkSZYLl5moXA7GrOEAx/p1JuBxTn6RposR/7wVusofRY9mDoysgAVEHdD44fyMz5tWAFjWmJdIGIgH2f6LpgcJqyKXVf19fkSoX35yLUcVsonVHusLMoUgXdeUtMMCgYBzkTv01TCinLrSk+giGFhQ/uub8TXGBmpdos5tZdy8pcxmZ+bCcTfix9Ag5RUBQzA4Ji8ukGgTbFEw3dF2frGQoPdUhyuBd/uVeThDfZ4GaEjmmMeeg1y0q/ey97i5toF21swp16AvSg34DpgBR8Ftx9jkyDHmV1dFZ2G6BoeuVQKBgGhn17hI+8VSq6TTM0LH7L/YGCGEp3nzLX/Dgdk/Kb87J21001WAe5TS8K7uWyU8OyXODqprnwFGICI1lNKGDEplOwsGaY/8p7LXv3+kwvOYIElAsIOwZtFduuTFKDbqHmFnEhlpX7GTZaAPbe/fTGkyAOIQ6OOPyZY42HlpRtRR", - "exported_keys": "a2V5czo6QXdIQU1Fc0VjZko2dVpMNXhkdUhWVFlBQmRoczE1S0ZOQTVVTit0ekNMQXdPQlNHWUNNV2dPMzcvUFJmcWxaRlY3enV3djNUdkhSTitkSGR0dVFvZEJpSVFjdU1uVGpINFFlUW5YcmNtY0pZTkRVcDZ5cEdlMkVZQStJMkZoZ0ZMMGlMRXBHNHBGbkN1Y2NJTjFoNnl1Z0xzeEJnaTZWbU9RQUNnUmdFc0xJUXRVKzJJbEMvZ243Z0dIdUp0U1lMVW5sQ0RhTUtjYWNCVTcvNWYxay9IY21sM1Irbi9Pb2gxbGlBeS9KeGJTY3cxakJ4VkJSWTNmVnB3TU1jbXBZeVppUmZkWTFTMFJuVGFib0h5TEYrdUdGTG9tMFN0Y1pNeVpSMloyV3BYNWVBSmhjcVdYN0xVdVBrQmdURzU1TENsc2dEZlY2bDcvMkZXWk5rTGI1NisxUkptM3h3WVluVzcyNFUzRnpjNUpNVUwxeXdieVdhUFduV3NIb09mRWdIK2hFRERmSExTZWVya0c3RHQyZ2hIdllrVEpkRkc0RnBITjRtRFF0Tkl0MFZYVSttbGJFK0dFZElhcnd2cDVUdmxiT2Z2RXdodUMxczM1Y1RCeDdkak5qeHJ1eThMSUo2U3VzSXVqZnp5VUJyQ3NGMUs0YXF6WmliRytKa0UzUnVad1RJdjg0Y0wxRTBzT2dKSDhJa2Q1ODQ0azBDdE1uV0c1VGtjdEwzZVVVMlhnazZkeGlCYUlnb1ppNWFZclAvT09WV1hFczBJcDJSUS9zZXFuOVExdnlXY0oxYzhtRUV5cEFHSEV6TFVFNWJuOFJCR3ZQTnRkRWdDL1g0VHJMN1ZHeDN1cmZWY296UGNkMGZwVitNaXFEK282c3l3eGF1YWtWVjgwbHpIMzlINy9GOVF6Q2IzUnlIUitsem42cksxN2kzdU5Zd2RyN1k3TTU2NzBhaEFSMHlHWk5STklDQyt5S1ZLVi9KMTRvUnBzdW9mT2xzQjhnTmZuemlvZVJNa2NlR2dZRWVrbjJCU1MxQ0o5VlR4N2s1MlRqWnBlcFNzQk5Ic0hTWUVoVm9ua0ZyZjcveFJwTW1ESUl2NzJiNk1VaFRpb2d0b05ITXMvRkYwRUNCaXg2WVNJd1Y1Yjh2bWtvUlVqL0YwZ0pCUVdCS0pYb1QwU2lTS0FLdkdaOWVQekZsMGRSeTFhN3RZcGRrbXU2eTBGRFBNNEhoR0ZFdEk5WDJMNTRtQU1pMGpiakdZcmhkMUFhOVJVNUxJMDF1Y2NvYW9pWStLaWpyd0RrVGRvQTVjY2E5YVFqMUR3cVVVTnBCZFJDWXBDUzhaRy82YTIrTUZlOXVOS1l1QXc5UTBLQW9XTmlTZkJxVWIreHlCTDZER1crRzdjVFlkMmFlSmdoek56dEUwaDNMLzNrRk8zR2gxWDZjRmoyN3daVGtQMGFXcU1mVWUyMXNLS2lONkpMQ2pBbmRtcjJqbTI3WGFMa2VRK3RkYTNlNEhpMDdnOVdDZDk1M295RlFINVloMG5jMzRPdGYwL2pBSkFTL2tQeUF2bDBlaXFQYytqWmhvWHFMcDZNUGZsRm9nbS9jZXQ4RDhoYkQ1aTg1NDR2aDZBYkJQT05XNVNOL3MyUkJzVFJXVEk4TStjdXR6UzFjSHdGZ2ZrbFMxcWU1dlc5dUhQdnFtN0VuVUgyU2dwKzRza3pNaS9LNGMzWU0yeEduaXZzNHBVRDhvWUhZclVxcStXcW1RVk5GZnkxV2NhNm5kYUpYN0sya3NONXhuYkVLT2laSUE1YzU1MDhQNnAvSVFyZjRLbkoxTkJQK055S0RnaWlDZXZUak9QVTZPVU1TQXo0Vk5SV1VyUUgxRVYrdjhEOUlPbnVJU2NNU3I0T21Wc2MwNlc2aGtTZXZobHYyQUNTZ1BtUmJoQVNYSGRLNmV2N2VpeG01bFRIbEYwVDBZQnc0TEVIZG1GNUZ6VnV6dnBHOWZmNllTUTlyb1pnTVJXVTRiTU9vSjlhZjl5cm9PKzJrd3VtVWJlTUVJUEhmeXMrOUhyNjJZeHI3b3IyRlozVE5iaDRnbzd6akZKVmlJQzJuRHlhYy9iZkRZczQyTTkwcXZKbENYcUoxT2lQN3A5a3hhMVJpZW9mN21QVU9OZWJVYm1tTy9oTUFmQ1dUWHNyYnhBVUppcy9jc0tPT2VQQTNmbThvREV4b3AxSnVlSzlkeUU2UUlZL2Z5VmFUcHc3U0FpbFA5NUhGR09YcjhCaVdENDI3QWIvNjFaVGFtWTdWTVAzVU56YUlMTUpJaHk3YWtmbkZIbkptK2cxQ2RoV3RLOU9FT20wdjRpTlVDdXdhZVBDWnZWUDBSdEtHK2gxa3EwYTk2b2J5N3cxRGtUV2tabmJ2YVhDUGtsYW5FWXJlTVpuallZWk51Q1dNMkU4UnJFWWdCL3daTUdqZVhHZDdZMGw3OWpFVEM0Nnh0TTdWNGV2Ri9YN2xwQktXamVoekNMWXNDbWVJbGY2SnpDTGw1WmdrdVltN0lnY0ZlRzk5SUdqTFk0cFhRNk9SRUo5bTNEbDdWZ0tDaVdsQjhwakxrbnROcEkxSDE1QXlMZG44U0lsQzlSeUNVMVlhc2wxQkduQUZheUZPNnNXVzFFV2hoeXEvWDN5VVljdTJzOXlLNVRra3A4ZDlTWmcrVmxDbktPeWg0ZW5pVVl5RDNHR2hNa3FDUVRRNWtwRWhaQU5qY0tVVXdJMFpPMHlqWTNTbTRTZUUvUkxyNitsUnpXMGt3a1ZwRVJpRHkyTk9vVmxBLzZqS3VWTURHT0R0YUlVM0hzdGh5eHBlb3IrQWlKaGlZMVpnQk01Q3A1aTNIOEdrMHF1NklhQ3R5d1BwYmZVYVN5azlaVUF2SU04VW9LTFhFREhCSGc2Z0YxYjFpZ2J0OHFpT3ZObHFINDllYWFVbmowTU5laXp2cGRwb09XSDc1UWNYRFNnaXJ1SjFPd0FDdytMZHh6WkpYek1FbVp6akdjajBpQjFGQ2I0d0N3Y0VaOUtRSytzNDBldW5BZThPU0ZveFFuSXk3eTRSSlRwRC9NVW5sOEErQTRWL2lFNWNGNVZUN1FjK2V1R3FkTzI2cUxCQ3MyN1dGWU51Wm01QzFKZFNDRXpCTHk1dkZnS1VkOUJVeGgwanorTDdCdWczcjRJdTBtbUdVdXJpcWdPdlJndTZQaEZrZU5XWUx3V3FQNmJaZHlraysxZkRwYzZ5M1RqY1BuR3FISFR5ZVRrc2QxRTVTdUdIM2VXbGR2dW95R0ZML1JwdTFIOWxZQm54aEwxVkQyd0J6d0tRMVJXVmZKclhFQi91dFNlbm5TSTR4eG9ESUNaemhPTnBWOUprblA2VGdGSHg4S0p5RU1wVHZXbm5SYURXZmhHenBaYU93MFFGbW54Um90QVA4VGJBcVNJdWFiOElCcFhsa2Q1aGFPdU9GYlJkckt6TjAwRmZxL0kxa0hBeTcrL0xFdnNhMDkzME5xSjZPR081Z0hIQm1OMUE3cHQ5UVBVczJmZnNZU1pGUTBKMlpIWHlMUFJFdUpxRG5iODlEcDZ0T0hhRDFoVmg0dG9nNEJ4UkhXNzNzUll1bzRxM1NJcG5UTENiTU1TbFp5bFFEbzBTb3VINm1qdmR0SVg4anRxMmdJcz0=", + "authToken": "ZZkWTqtEpohxTLoBBtO8", + "transportToken": "MIIBCgKCAQEA24WOqUgstwVwYo17DxRMrc4tnq/u6HxacEQFjtwHZ0nCJhDFyWaV\nsSpHdeiVM7ZJHsW3pDjbNNHj3uTPwU2j4w4HqP3BmrwlgdOU1gsTJKyr9dcWgym7\n3nhxD7g6g4RgSd2km2st/QT7p0aYxgcaRFG1FPGhTu/ERI764Azu2eCx9kq/zocN\nLo4WnPd+gu3mrfeNkQsf/ZV/AlX+r8i7dTBLVfnUaFeg/IsAOXaFrPtJKaq+a0QH\ncwKukLAiraDbGU4UweqxLWmN1G1PKhq8cXk5IxAEgX8fgvUn58UOzyqmBHbrpj8I\nwPn40uhHkhLVixUOAk+MpZzV5GKE/8rLtQIDAQAB", + "contact_key": "MIIBCgKCAQEA5p86Pehst4Al/lxj33Q7+cUNL6eJJsac0D9EqGYpMwzyUCQn29VRD1P7QDcCNDUXlbxT3wHxZg8FbpFvlvSQqJHhofsrgiLBbBtwKvsUOKreysyUXenAMFQ1J5ZyRMdiymxOSbDE8hamEMtcbN/FAXWaDd3QU5D5SmLxV2CZU39Tb4955AhcrPEglC3CZu3FBPGh2F4eicwizAouDtPcBfIW48K+/olBdOEu6c7KVK2lrKoK6ynzuYX5mHbYE8KsJdcTosiHpzOpkpXFZEabS4ilbZSytv8vOEFJeIo6GoRVVzdCsqXH90Zn7FRJs0NYTkVZniUerOc8yMwSd+QlaQIDAQAB", + "privkey": "MIIEowIBAAKCAQEA5p86Pehst4Al/lxj33Q7+cUNL6eJJsac0D9EqGYpMwzyUCQn29VRD1P7QDcCNDUXlbxT3wHxZg8FbpFvlvSQqJHhofsrgiLBbBtwKvsUOKreysyUXenAMFQ1J5ZyRMdiymxOSbDE8hamEMtcbN/FAXWaDd3QU5D5SmLxV2CZU39Tb4955AhcrPEglC3CZu3FBPGh2F4eicwizAouDtPcBfIW48K+/olBdOEu6c7KVK2lrKoK6ynzuYX5mHbYE8KsJdcTosiHpzOpkpXFZEabS4ilbZSytv8vOEFJeIo6GoRVVzdCsqXH90Zn7FRJs0NYTkVZniUerOc8yMwSd+QlaQIDAQABAoIBACV749+EE4eP0J0TLzh2j/j8yjPgqy4eQganAeXNFQ0zIX9dIQ1eEprHL6M0Tatmpbq0rX0lt7K65kseYGDMx2Zer6nARUYVmBKWMxkJTjQXsbaMoeDRyWcRiMIydcgwECKOj/ryPFCM1dkM9KzNghvGnY97agzrF1m70zY8gS9Mx57s1C/Bq+tw9g1j/tyqgV8BUZuJaI3mSY4ulOxRcUICgmSYftUpSs9QlFLKIQZnYSFrUXC/OmIgnP/e+AvTuUJeEvSgdN60ATwtyOuPT3qb2yWfb2y9Hamw3ueEdk7Fw1FkiOhEpp/rIKR/oLoXMXf0dl0yxdLg9bznOKtZIMECgYEA+1KSr8UKMcQpWa5WblQfLAsgk4osTj88hG3/1POHywIJVATIUHK1sN4yQom+HxT9sqxs17FFLg7bF/jngcX9JA0ksnKbkSztpSztDMeSckxXMWbkGR/FQBtD32B4mREGzP8J2VczfKic7WgsSUiNFVPt2T1NtptqheoqWaMnQUUCgYEA6uoGzwJ+OTTMvWubn89KFBW5+CyrCLzLO9IRlFm56F1RV+W79asQ/nP+h4w6Gzre+BOloIbhI9f4SepBYDv+IJulFOP0+lfWUCUU8IdbW2uM1S4jW0r7AYDPcu3JMpl+os0T4ZlqDaxArlco7vnCMU9fVB4ZLzbpbM2X4PPXa9UCgYAuIgQnG6Y5aGamvafD7NEkBo7eRljHrDfxnzd84Y8lpqQLti0HB2dupfrX1+z8S6AeMiRwm2u1fqidB+WHHs7O1VLNJtiDl5mv3kVNOT0amgTPXrG0Iu7US6zzzgOVJVj4PECUkrsywMi9k4e9lAHBznw0ilo/kNvG5SsM9TP5eQKBgQC88Y6YYgD0MiubDzoUx71lejQiEItgc7ljXAsXrzOAWc5bTERpzDXW86T9kSQLUsaT8fl9q/7ZvZPOn8QFiztTLt0QeGlKEewmeizlaXlpho+3x2xYuW46P0ibv/Xb5OmeOCSNh79tT+aWUzRxQiGXV6ftGGhZOWl2QcavAHF8IQKBgGqip9j/ihIzaLVjGZ9+QiMOXBTsG7EKeXF1M9IfvOmioyfRSDPvcM3azBj8bCN2Zd8mKjNeh6SQOYFSDtjCcdomMsJBKVknN2LKN9kJPMeuV/IzIIDgLeWYwtYklZuuvuxn8L0ZOCBidpmi3uSUIcmsf7BhtKKVhTQZBTWsxNe5", + "exported_keys": "a2V5czo6QXdHRjg2aGhPelZwSTZPUlo5clNpVlpyYXJrMm9sV2dSVU95SytJSTJSWnQ4UnkxUTJTYTZpdTlQekJoeHVhM3c5ck1FSGRBdEhSZ2xWRHhmdTRyRUhrRDAyZFJMdytHUXdVeVIwb2pCbHJOWVhOc2RZVzhscFQzSjVWT0d1U09ObTZLNG1sc2hMc205SUV5OHNZMW1QZ2Z6WklpK3orRG5qQUgzTWJ2VHZZRUVEZEREU0piK3cvS3d6TjRWM25hZXJEUTJ3RGFrbGJQTjlrUEZZM0lqQnpjMWh0N1RXbWhOdzd6RTB1RndNc2lFUFhCVkE4U05HWnBUQlFSREZRdjUrVFptUjMxNU1sOEdVSkRPUjlOQndvQ25TWG5hM0tDN210ZllWRUcycEw5YjJEd2VESENXb0JxTTBvQTlodjFXaC9jZEtlQy9DYkZ3QXpwSkNySEFTTmltcnJXNitPNE5WeW4zNklrT1NqWCtmeThBaGVJdHFJcjBDUXdKcHRwWVlxQkNITWpZQTBpUmtzN1RvL1JIem5MMGFSZVU2cDVvZUgzZ3hia0xldHpHMGhxUlZuQ1ZiZzE4ZmdzUUdCVSthRmJldzh5MXVROUMyUGlLSk13KzN4cU16M3ZFRDArWEpPeXpITGsrb1hQL05EZDRpTmFpaFBZRGw3dkdPcDh1ZUh0NWFHdGZIMzlwbExiM1hSbVUxUE9DUVFSaGdwQ3BFdUtUaXl3QlVNODJQc3orWjl0SzgwVXpuRmx4VFdZLzNRU0JJai9ZK1B1MHlkN2liejMvQit6aXA3Q2ZMSjExVkxLWk9vY3RtY1FGREcwNWNRWCtrRGwrU0lqdnllWUU5aDBNZEZ0MFNiUVpGb1ZRNWxteHFCMTZ5RG15M0pxOW5KT0lLa1J1ZDZ5Zyt6TmNzKzU3Rmt5enlWZlRkMTk3bzFZaDNWRnVqSmFJV2hmNUlRZTZlMW9kMHdseWNuazkra1JwZkVBTi9sSmxETFp5NWlQU1NPdXAzWUhneGxuK3QwbWIxTTk3dm1zT3RQTkhpaG1EYk84b0pMeDd6RDg0WU1lOTlTQ2ZmT1RNYjNHS0U0NDVpMUtSWnI0WWs2ZjF2SkRBUVRncXVwWURBYUtGaWROQUxocnlBbmd0MVJaVVdhQmZVWFJ1MTUzanp2SXFnaTFSdkpLNWlmdlJkWTdIZ08rTTJ0akxFSmM1T1hYWkFCUWFZdXNvT0J6eHpXYzlhdzRvd0gxUGRmamxRT1pkaWdzZDlFN1lSeTc4a3NyeGhXU0t0dVd1eUdENnVXQzVmcFRSVkduT0JjQUMvZTY2OGs0TDFUNjlNdDNrZmtNUngvd1VKV2paWGIwMFB0Y2xzMUtZd2toMDVPeU9RVHpIREFWak80amx4bm5PYUtXMzFlc2YyTWxPQlV0a0Y1ckp5YzBTN0RxRUpiS1VqRG42azAyeDY3N1YwRFo0ZWl2dUp2UmNaSHF0cnQzRUVkNnRBR0FxR0h3MWNoZTRiZ0l2ZzNUd3BJcEgvQzNya2ZUU0JaK2ZETmlURFQ0WEVpRUhqQmFQRjhqVXVtSm03YzJGT1ZyQi8zL1VGRTFoODdtR1VTMUEySmt6YW03aVFONWQ5djBNLytCMlNHMGVibnZRRE14L1Jkcmx6K2RqdjMzelhnekQ1UnloTkJjYWUrdHY5NU5wcGhzYjFKOG5FeE5kbXB4YmJDcjhWRVJmVlFBMTIxcUYvMFZYaHp0ZnVNMTRqbEZ2d3FMSEpJSlJ6SEJOZjYwTmR3aWlQYTJlcjJCWVl3ZlRFS2o0ZTJibU9MZWVIQ2tGNzl1NTBCNlJvVk5Iem1KQy9tbWIrcE5DaTJONjlDdFMzWnFnSjZ4YzloWm5GTmE2ZURDcWRsSitiLzBhYmFtRjdNbWNBb0R2Ly8vb0tPNmZ6OUN6MkxzYXBLM0lMU1FPMXpiQWs3RHV5cmpKb212amJHT3hteUtRaEhvdnU3ZSszVkpYUDAyMGZxR2tpZWo5WEZqeW03NUFTdm1neUEwNXgybkthTDF0VWVrOGhEODdFNmlJRGNvODZQT2FLQjMzS3Y3enpxUVdxTmFFMGprUTd5VW9IVmo4THZlNlJKRXRCK2NmUExTRjQ0bXdiZ1hsZWplcjM0K2VDc09XUkdBaTlBTnRLcSswaGJwNm1uVHhmeHA0dVoxSVl3eDdoMmRDOE1lWWtGTzlGaFBscnM2Nis5ajA5TVk1OSttYit0bUhFRElKRTljTkt3Wm1VRzBQUDNkNkNsN1hJRmhRUDdsUjZWL0o5TVVvS24yUEdjTmhQVEZUQ2dTV1BDWkxQSGNaeUlObXVUT2RDaFhoOFNYd1dFTkIwZ0N5ZzV3U1VjS3p2OWVYcHZvYno4OERkOTFsaitmNlhkVjFUdDJadlJBN0pEUG1iYXloWWY4NG1od2FNN3NNeVI3dlJrN2Z2ZEgwbTBuNWVFWWV3Tzk4dUtYQWhJcWlEYjljamt5WWZiNGFLcXJNUDVLUVZobzZQT25HZnQxUUJyeitxQWdBZXdoRlhxa2Zodkd3NzVPV1YyZ0NQdGxuRFZXMStkMmU0YmVUL1UvYzU5QkxDQjhyZlVGeEZGR2FTeFRiYjlQSjBibGNoeUNTcUtSMEdZWElJM1NIL0IvWlQ2SVVmbzlxRHh5dUF5eU4rUTBQeVNESVgvL3V3cCtPakFqUmFNZlpuUENFN1BKejRXN0VVZ0hURnBkeG5PbTBCZzBXS3c3WWRQTlN1QVpKODloYml3WmdGVzdob0NISS93YkxaeHhMODJIeE8yNUdKc2hPVVIwSjJGcG1QT3J6endDQUtESnE2Q2IrUTVOaytQczQvSDh0dENOciszKzlRcHF0ZzFhc2hJa3Q4ZkF6RHAyQ1VKUzhibDlpcjNIcStVdVZiSEJ2VlJwbi9LVERId01BeVhJTSt0VnM3NXNOWTBmSGtpbXBtMW5IQ2NQdkdQeWs1WnZuRzh5d25OWThTTGNlbWpUa2RmVFcreUMzay9aQk9tYUpDY0hOb3piQ212c25LT1UxWFpibmFVZCtSelkyWmEvTlpVNW80MjRDTUlJS3RjSm1FNzR4OWE3bTRpV2JZYjBIVEZmNk1HNUNoVzRWZU1pVlJZdTVYV0taUzVTRXE1T2gwYlB5bzR6TFZFL1hDRkRza0RPZko2MndDR0hJanpqMnBpMXp4NklnWFA2SE5RQzZ4cy9vMW9UUnN6NVIwQjlKdmw3V0JvVnU5UUlEWEtUQ21jOFRBN01jczR2Y0ovaE5taXpmWkJBSEhCVU1wVERoRzJOSnRJSzFpRlE4Q01zTnVXb0sxNWVsVFNsT3Jvcm1tNXJuS3ZiZHBpZTUrN0Rjc0hieEU1d3h1OE4yOTlQNzZkdmJscGZ5SjRIdS9xckIxN2IzTHRDOUFWNnI3WkZYdHdsM1RTUElRTEQyYUtaelhqYmIrM2dzSHFOQ0JJZW9QY1plWlJESm1uTmlwK1dPODBQQjBxMXlmU0tKd055WWVKOVJRQ3p2L2p6MmowNGtZTHAxanUxTFhlb1FDUDQzZ3Q0aGJadm1VeUEycHJmYi9VMUgyT2k4eXBneWpJaCtKQzd1SFFRYXFEdXhqOWw3RnhmMkRPTGx4aFNaN2FsY2x6R2JtbEZ5MjN3N0taTGtRcz0=", "pin": "111111" }, { @@ -28,11 +28,11 @@ "pubkey": "0364c05cbcbb9612036cc66297445a88bcfc21941fd816e17a56b54b0b52ff02b9", "ip": "http://carol.sphinx:3003", "external_ip": "http://localhost:3003", - "authToken": "fPp0XqXb8AKktav55I3o", - "transportToken": "MIIBCgKCAQEAqpp6mQIwmyHD0Cy3clfU3M3KxyP8tKLCWyirSpqEPukO5m/43liG\nXjpMW5IQq2i6Sog6ftaHQeRBJPfujrFWU/IlC86SE6ke8rieGm4sP0mmap9TioxC\npE9u22Ip9aKJbrCueDqn8npnTG1kAovcmOCJ96glk11M1qWb7FXRICYqxT3rcRhf\nRq6zSPxVwzl5e42nlOyejcPsYEe0O1mvo0wRfc70B87BtgbVho274g2PishHiBvI\n3Q79OYMFabw/cDHdpfErN294wpy9re0Juv8QbEBw+Nl/+ErxAMpNx9CJYNkuaOXt\nJ0wx1xUNE573waKHWXXmAncYENte1eulvwIDAQAB", - "contact_key": "MIIBCgKCAQEA1gukg8VKp787t/sLwFKb0JK1eygoHIpd1zgxIHXOnq+ThuboAwghWeXzq2wMvP8w39ewm9ti2goaA1L4C7Is7+nodnuledpyaNZOlD5oXjgblWc5OSqtDZ5amzEsJyVYQMnngfv3O0x3Y+fb/oGymluZVlzuG+d5M7VgWwZNvKQoi+zL2oF1UVhNkW5wbj85DrYmrwZP7+M3U4grwq6uTEZh7/LjrYry7ZQfPpFy6GeQ8YlHUOuXf3QlJa6UB+hhpeUzkIXYB6OJPpvwCbZUm9EXCPgdaLPCmud1eQ7q0I9w8ulq2upW63pynHQGOIqAw98QezoA9hYqFCVzGAkNHwIDAQAB", - "privkey": "MIIEpAIBAAKCAQEA1gukg8VKp787t/sLwFKb0JK1eygoHIpd1zgxIHXOnq+ThuboAwghWeXzq2wMvP8w39ewm9ti2goaA1L4C7Is7+nodnuledpyaNZOlD5oXjgblWc5OSqtDZ5amzEsJyVYQMnngfv3O0x3Y+fb/oGymluZVlzuG+d5M7VgWwZNvKQoi+zL2oF1UVhNkW5wbj85DrYmrwZP7+M3U4grwq6uTEZh7/LjrYry7ZQfPpFy6GeQ8YlHUOuXf3QlJa6UB+hhpeUzkIXYB6OJPpvwCbZUm9EXCPgdaLPCmud1eQ7q0I9w8ulq2upW63pynHQGOIqAw98QezoA9hYqFCVzGAkNHwIDAQABAoIBAQC2RTPTAi6QqkgwY5eeLrqA4m2ocom1xB4lJ7St76QDfYAjYH4yFrpP04GseFZgmu8Drqi2EBwdkHyWWBDh5NhfdNCAFMrU+TB0FgrUMlCt6xmSIFSaWb0D29VMUpNGwoZkpYp/JhFibbs9WDP+hnOQ/m+VG42oNXUAk3N6D+QivhjpZXCMwOOVaHha/P7FFeoq5x2UAnRXwXUoem15q3BuBxSvV5ZAzSa5WOhCOUFkcIzUT+XSkkExPiBUXqm55M5uwm/BuElncV1AZAnDqXz0oFiiwGtFh3PyeSD85uunu5rr6WVHpY+Nrt/W0vef7+J/TfElP5+KyvawjaCou8ABAoGBAPGVPv/fk8DwIsmlALDzsWwTb+FqZMkitHZlAwpr6VHJSibiQw5zHVg7MG2CtpnjeIh7PhZDcJ7lpm0Vd/wx1geenTZyQsgZYSMCNxpBkmfmUd101hlmC4TYssCAr5JJ1lzx2IYPMK1AxYrgoDnKhgVUXH2p3mYxQXUIkl/VtxORAoGBAOLRshTZ0i4cwAVgJbQFByAPc7x7rTs7UjejcHqkKUdB2ZN24NW0GcDVCIfr2RHWUb4qIBADiPjg2kMia3IlRWVjYybJhx8NG+tKxfZ6/OA9lS6zuXAFERQZMRg+y31zKq4+spOLFp7c6mvRUa1e3SGthsFDCtlA0cO+oySf112vAoGADCdG+RZlV4J9LYnIhB5uYZKEwWFZ2qiNTZt9UKvnG/81ZMljODngUwz/PbMivpEsAim5EOOpqcTB36EB3UUgkFeRbyjGZUypj1pQLVj5JZL3sV1sW/C/SZqhO3/91S0zxI9CJlRjTYQBrB/qz515qpD46jV+g8OcmGeq/XlB8ZECgYB3TUK00ulJVdfuO+c469gWleoTPp4cZJRXLYFREJ2hnFI7zTBvVz6gfazyCSxwxGDUfEXHBoT6GxLScv0+2bnJnWAem6uVuohv1zGO9puhuuKH4QJtmEymXKXFEepofrX5VoMJNgRc5Ofsc/nZDeeT+jjB2GiRYxWyNsiK0AQwgwKBgQCz8DbWjZUYUeDFLjTTeTulvDUTueU8F3hyIZzQGUuqJ8Jx+RlnzXvW8/rH5hjl2Lp1xoZHvmG4ihj3vqr+Fb3bEaaV+OBaxSEo9xyUebem1oPPnP/7Bybog/esT10OR8vP/kmvdQJEL5bjFOUUmd/zZJuBjAQgSmxjSXkjYecyng==", - "exported_keys": "a2V5czo6QXdFb2E1UEd4MGpZK0wyOENmaVJkMC9sbjJoSTJHV015R1U4YU5zRVNEZnVaR0EzMHAxOUZTc3NXN0RuTTBEUXMxMEhPSkZmcFVxaURTYldEK21FbGF2UlBCRisyRHlVSTIzUmhURFZFZ1RNQUVIZEs0eVM1TDFPblVwMDhvOVFta0xiKy9lQ0xmbVQ4ZisvQXh4VC9kQ04xdmFSaWxNVnNqb0pHMW1QQ2FLTjFIOTlkUHpzWjlKcXFrUytPSVdhUkIzMXhtRm5MaFducmlJZnpEWFZqWGZ3TVBQbmd3NlNjVE5jbzlBUHhNSm1OMXZ3dkdQQVRma0JOb085aktnZGkvMVRuZTdrcWJVQWhiYXJxV29TWFZTam0rL04rdnZSUDNvZ0trb3hDUE9IaUdwMnY0ZUNIUG1sZGpPWHg5M0dJSjBIN2VtblZmYjA1dmJlVGNPYkxaNjBmTkY2b2tORFREd3QvTXVINm9vZVEwMUhuMkhRamwwa3hRazRXY0xtLy9nd1NzZ2JGT2JBQm5vaTUvUHBYSjRHUWZMTUFjV3ZhV1hIbmVaeFhXNjBNR1FpZE40UXBLQmdVUS8xcnZVZlo2cUdRSGJEMG5Ib0ZhalJ0Uzg5WFR4WUFyRkJuSS9icUcvcHdoMUQ4ci96S2NaSUV6cnJaSklwSHVLUWprSkFGMGFRTlMwcXVpeGNNc0l2S0VUU0lJL3hTOHlORkpCN0FLOTBmb1dneldiOUd3cTd5V01wS3BNNzFzSDZtSzZ6V20ydE5ObThGZDNVR2FsaW1HbWs5VFk2WmdhM0d5N3N1OHVDRFRIOS92SDdhYXFrRG9oL0daZzd3ZGU4dUtUMWQ0ZE5MY20zUGQ5MEJhcWo0YW9wNlpXdnMxV2dIUmJTenRIelZEeWNXS2VTS1ZxaWVhVXlld0hiR1VHM0diVmxvd25TbGhJeHJNNWt6dCtaaWxoWHloQklEOU9DbTlha2dDQSttRzEzcWNrMzZsNzRJYy9rOFJSZnk3eTZ0ZExyeUNTWmlPcmNkT1pBdldlaWt6YmZLSHBHdWFpUlpZaDZ1cUQ3a1E2NWpWMFhJd0p4TERvTzRaMWxGUTJsOWFkQ3hkZUkwOUI3TmVFa2RwZ0J4VzJJbHF3Z2RDSVl3aWI5aTNwRjdCcE51SnBTYnIzUVMxb01LelgxdWUxQWpYemxiM0dpYVNmSkVOSC9VbnVGb1I3NElGM0hZZTZtWDF5RllhSU5jOUtsdFFMYy82eUJxV2gya2krQ0pKdmNNQWNobE5mb0UxMFMybzZINHNtb05scEllbG8rRzVvdm9IbWhLUmRsOEhHdVc4cjY1NVdrT2hCRG5BYmJjRG5xbzhZYmFtZFRCRURXeTVYaEpCVDRxbUtvTnpwd3JINFk4OVpycDROei9iUzMzUTRrem9VY0V1YWtLdmc3dVkwUjcyYUlKa0ZKUzNIWmJVckFRbVBrY0JDemtkQlJ6Y0V1NFpyaTdvcjZqeUM0MXI5SWFidDFKN1R5aDYyemNmOXRMMHNtTlgrNWZHNmhIQ2xGQXRNRTljOU9VQjJUV2VrYmViZ0t0bFFkNlNZMWx5eTdvRFRPcEpKM3oxTU44ZTBuV2xrQW1vc0ZOTTVqTW9nTS9iNmZ1V3oyRmpHOFdnRVZKTjhkd0VPd3FyRGIxdUd5ZTZYYXM3MWJBUGdWaHFBbld1dWJ2K0ZYNUNyQ1k1d0xnRGJzUUhLT1ZPcThvL2lZUEdwczVMSjlBSlZkT1dYRk5ibCtWVVdqZlVJWktKL2k0NTU4NStBNFhaK04vajJ1TjR6YStsZWVqRGM0ci9pS3hIN1p3VlduRU5RVTdvamg3am1UOUNqN0VLU1Vwd1UrVlB5NUZtU1pFYWxpVVNFN2kreXRvbHRYS1hSd0lXWUFhcGd1eDJxeWRwNmpCeXh4bTJqaFp6MDJWVWc1WHdMT0tVdVQzaHVLajIwQmVNdytEQSs5ZzZYK3pWRjRVN0MrKy9ZbmZxMVpUcklrVVpBNTBFWHJwREdwb1ZpR2dZR3NtNVpZL3NLQXVkLzhYS1lWdHdkMUdXdzcvYmhPM1B4OVhuVkFsSzk5bHBzTW1jNDd5andlT0NvdzRjV2ZMdjJiVEZtajh1RThueGxROFI1dDh1eHA4YXBlaUNQVWN3M01jRHowUkVWMjB4QlFQTVIrMjQvY3Z1ODBpd0ZzVnZiTUR4QUhtcjg0dC9QR0RKeVdRVU83LzV5clUyWkFkWWVJSlRJU2tMTm5PUHFwZFQ2ZTZPVURudzdZc01wd1ZMZHVUMEVCbGx2TE5qc1Vtc0wxRXhkcC83WEZUcWtGY3lCN096eit4cUVjSGlFTjh1eVovTnBtQ3hCSW5wcHdlRXA1cnJSZGtlMkVsVUg2eGNlR0NUd1E2YTB6QlA1Z3pLNmhYaHBXTWF1bVVON0w4UWlLajhnUkNvZ0p2c3daQUJVcThsaWVlVU5NN05KSXJ1ZlNMSm45UnA3WXlWaE5ISG42bWVNYUl1UEwzbVhHVTY3emxZMXI1VU5PTXhYOGNCMEJsQkVzalA3aStaNEI2QkpwMzNmQlNpUEVzdG5ZQ1JnMGhiMWMrQXpvL3RoZnZwK1BXNGQxT1g4cjd3bU5SRHQrQ1hYZGZuT1M1OVBoUWpPbEdBNlkydjh4eml4Rk1GSGdoaXlrYjZUVEVWTGpCbTdoVFlyWkZESXpYUSt4YW5UZEVhREdvais3RHdldk0rNUx6S2djM01rT2daTFByYVZWc3MrSXE1S0tvcmEwZWxNMTBSK0FMcW1uMzNvb0U1a25XUGhzUit0Wno1VmhaTFBoRWRFZWVlcGQzRFFWZ0Q3Q0UxT1c4TDFOZkFoNjNZRGlnVGwwbkJqbWx4M2dFZWlrVWRHNjJvTmhIOU5KMDNDR1dCVkVrVHFOR0p6dTlySWJCUU53cVhpcFFKR1NsR1lEU01ES1lwU1pSUEZhUG1rdkJxOGVLVHp0NjFTNkhod3puR0ZRU2hWMEpjanNNR1pmbFhiV0lEQjUxcUozTE1YTGM1TUZUWElqY3g2Qm9Rc3Q1ZVlLQ3Y4Z2Q4TVozSWI2OU45cUk1TTdTSEtzbmVJSnVsaXRkcjIxU3VhVzNiaTRUT1p1cXIzV2RvQ1EwMUFDVFJkZ2gxcU1RbFloYzg0ZEJaVVNQVk5wRmNUWEJXZnNhMkhUcndjVDE3Y2hKbFFMem1ZNkdnRGo1NktnemdmMzFuUkE3UUV1ODB3ZmQ0dElPa3llZVlWbjFydDl4SEJDS0ljS0FtcDZxSjVVSkl1KzNVMWRtSjBmWVM2dHRkejZhMndQbUhWUzNBVmlTTHppOTJSRVpmaGd0V3RaT015V3BtOFgyZks2REE1bk9WcGZzYWVUdFJEdGc1Z2VSVmZhTVU4aGEzYWI4a3pzaG5nR04zU05KZU4zdnkyZ1EyMGFUeXV2QStXb3hEbXZacDJrZ0RNY09nRERQVEE3bW5RSit0em0rbkhUR253aUdnekVBaTRWZ1Z0R1JVK09SQ3NYSFhKREVNd21qTHp1NElWbVJJd3NoU0F5WEpuRkZLam1UUFhla1k5bFFLOW9YQmFFbTNpaUVwZ3h4QVdEUUc3VGZSVVhlR0V6cHJjK3lCSUpmZzRYcVhlSkQvTHJ2WnBKeC9EK0twcz0=", + "authToken": "S6UVW4pCYsbzHU2IfrI1", + "transportToken": "MIIBCgKCAQEA1w8ON9XYG18XbWxZMOuOPfplPolwVXg2YDMV8r1J+6JuVlRngrCb\n9W6gby0tSoLC2hMYytaV6M+dVJeNhgeqGjVX36TdIll1wWZHYojQbqDWvL+tSDqm\nE7WSfiWwQkt1bXZTqbzRxnWCvKu3GG/0YHIeJ1XyjZP2P3L7mYjreRMSoSW6prd9\nFbnHxZDRQkSh3+u0qtogSIuBYOp/5mjOU3vZyv/0DQXtxhj7Uort+L8upOjN4eDa\nKW5NdURD/FDo8W8oBJSxfHXYZ+c/sbL70gkKmz/sXKiK1bxm2OH712tNCFQC7ugQ\nv9RwV4UktRsoyul6JPuCZsXNVTkDdzoClQIDAQAB", + "contact_key": "MIIBCgKCAQEAwxupdk2oPbpQMiSzevxRmOv80PJSdt3Ek+iLbFJxOi9jD/AYE9eqdROr9sN8gBkY1a5/IGIj+dFkFPUNXMZ1yjiombJFhgTpf5f/f/ElND9CBCqZR8EIv0jyAYp4eHUECKfjXG68dBPT3aDJyUwckyPdGir5fqm8Mf3iaUXdXyriF77etw9uPyVB/tEyr0jssbGzH5TCQPHqQqt0o+JV6kS3VxWceauiJ7Q8r3oAXdnxBFT0Ef5b2zFrLzgZFm/wEuSiZP37IqwjxQ72ZoWlsVsMRz63AFZcz9q53E7R+C1Hl4i66FqFe768iYAjFtANJaQjVIMF5gRPuKwH718lAwIDAQAB", + "privkey": "MIIEpAIBAAKCAQEAwxupdk2oPbpQMiSzevxRmOv80PJSdt3Ek+iLbFJxOi9jD/AYE9eqdROr9sN8gBkY1a5/IGIj+dFkFPUNXMZ1yjiombJFhgTpf5f/f/ElND9CBCqZR8EIv0jyAYp4eHUECKfjXG68dBPT3aDJyUwckyPdGir5fqm8Mf3iaUXdXyriF77etw9uPyVB/tEyr0jssbGzH5TCQPHqQqt0o+JV6kS3VxWceauiJ7Q8r3oAXdnxBFT0Ef5b2zFrLzgZFm/wEuSiZP37IqwjxQ72ZoWlsVsMRz63AFZcz9q53E7R+C1Hl4i66FqFe768iYAjFtANJaQjVIMF5gRPuKwH718lAwIDAQABAoIBABPJHFhI68TGvhc3rZPNPqEZXVv7Fu3C84pkTK9BdQYHhC47lNV+S2TwB8JQdLGw2dnhhjbMfQV6fIG7kA1Wet90+3QKpg4/NUahLWHWHIW93H37q+ug4bg0N4Z8elcM1snh7KaU/DtxP0z8Xzowo70wJ93decukftc6/djbIuXhj8kfOWHepz05xVjLaZ4NxmpmvEleB6mSW8WLa53BSoiKSamg0ZO5+uKMlSPSe0zeejCQuqETxZFBeeVGJJvPSuk3vzIHErCgia7bPW76TNduSIe4Ew600ATVr2g0bO+LdREiqCPWcz6kzl2GPeWKfNhzY0LN20N6zYUR4R1c0bECgYEA+l01v+q4EEx0iIIxO+SLRfrvy2ziw6GK9UlAsp08wzbpXUaUHkGjXhluNsuZGHu7cLDhoaXBk//cx1C/rwkshaTgP3g6X3rNV4ZQwS2UiYlVq+gZC6IkXxE4Hp6HI5u5JRHOGqbaZPVm18bRaCJpC0/kRKc2JQxomrNro1lhXX0CgYEAx4AGNkC+3Uw/YN7R8kRolRCxxweUcvd07R68JKrbzBndJ4e+Tqo4i651Lsg8djLxAfEwypxfCcMtYgyJwKUwDR23o8zcFCfwRhEZuAalT4006TFJJ4ZCrkESw//FLAM6QVCo71sN/ak9bi9cZemGbJMaF+jO6tBIsqMgkZsUFH8CgYAP242G/V/xMFaFOvHRYFVt9knv8ZKfX4EErkIZzhnGJ5k6XjkNfYzSbfvsHpMw2M1zgtCXw37yV9dtDHFHreYTBPFrM7tGxulwrMI6qh9pYrh5bfcAJKH3H4kVb2cR21Arx+ftCjp1AJImAqLK3LsYi1PjAVBNom6RteGQdB3VpQKBgQCK/JxXS8AtOKOm/1VQ7WvW/ix8tsErX07sq87z1L0Qcqxqj917vIdsePxWvVWyG0dgzQHrBgoIKRwDBS0rM2pImP2Jdn2U5UY16k/6r1aYF45XL+kBSj5GXDuQpS5evVjmjCVFrDARGskbbI94yLrIBavWIHGXkcgz/AYCqwHQTQKBgQCla1omYRcR5QKeuj3pXthQtQh9bs/Iu1UCAhp4IviXD1iW+DGQ3bPsQqMNBmTCGdAyJJhNr83ktyFCociJFc3pB0JaQJLmBskbq6R90nSBMoCbl3mplzwtSEBSglFFRKaGwOO8X4wtFT2XpwNw1MZO7/27OQWJtV5Ufuam+cOKow==", + "exported_keys": "a2V5czo6QXdITytNYWs2WWY0UWNudzNmeHQvUzZpWUdxeWVaUU9qRk5SN1ljWDZTbHp1TzFWbGE2RHZxL2xCVElmeVR5UTgzUkJmRzMzWitWVjBMOStzdlM2aVJycWZZTlNJMUFjQkMrRFJ0cmhISHBnOTNrK0s0YitSUm9KWkkvYXhsUUE2ay9qdHRYYnFTVHNZQldkNUZjbjZNQUdBNmNSamN5aWhSNE9MVFllWHVVallOVmt6aU5RdUtCeEhPYVMvVDB0V244bHBVaUpuLzgzRGtTT0Z4QllBR0FFcFRqbkMrQkJqWHIyR0ZmZUIyeHR5U3RSM3ZZcGVJT2xXMFEzK0w2Y1ZHZmVjaHdaaENpOGgzVkY5L3Q3Uzdka05EcEFGZDQ5amM0bDA1QU83ZXl2SlZwVU5kTUdQVXdXYlRJZkp0LzFubFNtSlc0TWE0dUNsMVVOV3RvSllncmJWcTZUTThURnpDNWpDeUN1aVAvZ0JrK0tFZWxWN29sYkR4ZnV3ejRiakpGQTVkQ0taRkNUSDFEb0kyZC90dGl6RE5zb0JCUXhsMGRvaUVRRk92L0tpZ3dWQmgrVks2SU1jWFVVSEU3T2FzVTVtYVJjU0xjT2ViQkt5UVZoOWROYStOODZod2k3ZFJtMVh1TXRScXBGbDIzT1V1RElBUlNZNjQ2V1Rwdlc5cnUrYUpNUjBJeEJ3aWNxcEF1TnA1TDZhT2o1UjBEaFlXNTdkVGZncURuRFAzK2M2M2wyRUxBckhPVkNGOC91R0cwQllPS29nbjF2R1NSaTJiS0VkeXdTYkI0VnNsWUVGQVZYVjhvRUY5ZzRXbHZNZFpPLzB6T2hhREhSSUhFSEtVK1hqL29QN3Z3REZDd2NrV1ZTcGQvazNzbkZZUFpJbWl4aHhXQ0l5c0Z4NVVaUXFxWW9OMWkvWUFzRzFNSUVwaDN6VllLL3Q3VmhpS3J1cHg0MDNDdGZIZzA3Tm1pOGFoMkxkVWliMnY2emtQay9tRE9hbnVoL1JOSm5JSjQyTVVMOG9SZEdva010d3hsT0JMSHVBY2RtVGVadm9hSytVM3V6T3J3bmw5N0hGUmNUZnAzOGxxZDhDVmo0TFNjZGlZSUcvbi9oV1d0WGYzanJJYkp1MkdTb05CYXJhcmF5T0F3UjFvUmRWTW8zelNSNkxOMUVaS0kzWDF4ZS8rWW9mV1JwT3c0c3ZhS0d1ZHRNVDcwWGx2anJFNFRuRXVWV2VJcVlyRGsrOVF3bm9YWHJIbG5ILzZZTG4zRTdacFRNMnJ0MnRUWTEybWtOTlpmOEIwZHhnWkF0dktFNHVvcmF3Q3ZxWkZqSDFlL1M5Zlc3dVBhZUNIb2phUERJR1Z4RmlsRmx6Mkg1RkV2djQ4NEdNL3V4M1hTL1ZwbWJHaGVlbnQ2Qm5GbkN4NmRTeDJBaE8wNG5yUEpTYlIzcDZRNXlrR0JyM0tPVWVpb0FyUUsvcWttbUg0alZpQ2w4R3FkZFZMekxLeXdmaGhmR0tYSGRTK2VSdzFRcGduZEVsTDRObzYyeVl0RGdPSzZkanI2OTJZeG9lN2xydGFTb05seHNha0tkYk5QazFSYzNUZWhKdDdhRE5wQU11ZlhGQ3ZHcTdTYXhURXN1bURVemh6UGhSazdNVU03Qkp3TlZqVnhNb2FRZkZBTk80b2E0YnltdVRXUUZpWW54amtsblEyU3EyTXpIMWJvVUlDSE5NTWtHOVg4WFVIZ2FiTUZDSEJ1ODgzZXNiUnpXc1QyQ0JwQ3l0OHRFUENTMWZmLzBZZytvak5EcnJPWmROQjB6ZXNBaDZEZmRBeC9yU2JYRmI2SHllSUtEMGdWbDhlSTlqYm83NVVPdmlqTlAwUGJIZjdFeStHdHpBMmJxSWdnWnBPMk5Rd0pvOXRMVDdSbTdJUG94SmlLQkdVMkkzSnNPRVdpeHBkcFQvb2xzTlFMMm5LWUVCQUVGczFpdGpod1NUR2N6U01zYzA0M1B6Z0gvQlE5QWlGTDJQdjRiZVVZeUVEa3ArcTh4MGZ0cVh0NFZzSVhMejRTK3dyS3dDcEptbU1aNDZCTCt2QUR5MkRBZktLakhsTkFuRkZBbkdnd3FCeERQU21pTkladW55eEZCUU5ucUZUSUh6dmM0cjVoK0NWdy8xU3QvYWhTWUkra1libkowdWkrNjg3d3Q1TlRUc24zT0NtUkZQN212VFJ2ejdnY2hUYkRaaWZzeURpZEcrMlovbS83akc0bjVKMXppOXAyZmx3bkduZkpwMHFaeEZYRmJkaWIwN2xoZUZOOWxzTlR3am5xTEdUalZvRGs3TVhKdGh2cFkrZDJVd0hYZFhPbXl6bW0ybklKUUxyZWVaYndheEdaaVZsK2RjNFF5UTU0RXR3eGRtNnkxN09xdXJpSkdtWm12OGVwSkFOZFFBbyt3aFE5NHVHRFU0QVRTSXFSeTYxNTBzQkt2cWRleTRsNVowV0d3VmMwK1JKamZ0VEhkZTFhRjFuYUJUUDJwUHZnUWxGQ09henc5eVdod1FGTWdpVW90RUIrcnV4UG5UcVBjL21aV291WXRFblRrelJuQmRzUlFnTkgxbEZYZzBiVWVUZ0NHS2V1TGFxRmhWK2YzTkcrd0tMUWJWc1g5MWRDN1BPdFhGWjM3cVlaYlAvTjM1THZ4TmlvWGlpc1JsYW5mNldKN2ZuTWpLSnUwL0RDM0U1clNFNS9JTU00VFJhVGhtYVMxRGRTWTU4TmFZY0NoYk9aVkJYdG9vY21IR2lyWXhQSXZyMEx3cVNEQmZLQlhKcVdtT1ZPNkZrelVZZWorOXhHZTNSem8zT3cwSDl3a1NYVjFqZ2tlbFBhWUVTaUY2VjNrdG0rTWRmT0hXUTg2ZjdIbytWbVl0Nmc5RmV2RnNVQWtCSU9VS0ZHa2RvYkZKeE8yWUZuWjE4TDVSbHZ1Z0VWS0dGZmRBdlVFWFVEMWR6NVZsaVRxMmxjS0RISjg2NmRkTS9pdWc0ZWRyR1dLd0hoS2dKT1EvelpUZVpWcjgvWTg3Zy9rQTdWMElrS2ttNkh5OGZtQzNJT1l2YjBZbVFhcFBLYjFybCtmVFBPQ0d4aXUrNjl2L2U1cTBZYVp0a3hCVHQrMGljcFAycTFkaU5GSUFMQnJhSzdzU1A2VmdxUWZMUWY5dnZ2MllVZWgxN29ETHYwbmRIVnhyY3pLMU5TOXM4bTlGaDlEempvd0p2YkdNTTBma0V0bjhxeGVzVTc2Y3RMVmFtdVoxT0ppdy9nUGRRd1drMjBiK2ZweEorSHk3Q1k3UFVpK1hJSmlHZDdURzJSc3NXSVhoYTdTY2JsbHBiV2NHWEYxK3VyTWVNaDlRRGE2bE9ucTFMS0RqL00yR0tuM3JLUFNmRjZyTElRN3V0dzZuVE1RSjM2NGhvN3VNcTkzWnNkcFZzY0JTUXA4MTA3UWcxUUIrTC9KNmI3MGJlSGVDemJSc0NBSUZNV3I0WlBnRDR1Mkg2MW53dDg5QW04L3hEeFhCcERWVExMSzVlYnIxZUZGbHlJa3Uxeldmci93SVh5ZzNCRWhzVFFlMXdXaWdRM0k0NXkwM0lYZnl6Y0NuRkVqRGsvK3VqQWF1K3dEaTlFbXB4ZS9tbnJDV2R5Q0RtTEJQNGIzbkQrZHcxNzFqVXZaQm9KREV1Zz0=", "pin": "111111" }, { @@ -42,37 +42,37 @@ "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", "admin_token": "r46bnf8ibrhbb424heba", - "authToken": "nRJR4rdOz4P98bJfGpFx", - "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", - "contact_key": "MIIBCgKCAQEAthq6JTCalizrR7F8nQyucUej8FIooQVlDYrxYJ+8N6QhJrGpu4lKDgaTzvIOuJkj/7/5yf/w9wpOJmrneDyPlCKOVr/bvbyX345TzoOapW3XUr+tLCSMSEEICjVqpvmubzcw3pxkhIBDoX38AVyj8JVeydPkQcFBDkNmnYH9rWtkDEiK/ULPrII+HgGLtJklJVy32ZG3Ymf9D2ZkKgoBDD5z/ZLkc9xcbvNs0nSTJP8vMO3HjhjLRNBi75SErtq5REHM8Jgk/el3ei3puxH9qWFcS2f3SDfwfykSf2jnqCH0RjAZ3jMnP4B6Q3wrmAD0Saf+YuYlcG51Mg7SqRe5+wIDAQAB", - "privkey": "MIIEowIBAAKCAQEAthq6JTCalizrR7F8nQyucUej8FIooQVlDYrxYJ+8N6QhJrGpu4lKDgaTzvIOuJkj/7/5yf/w9wpOJmrneDyPlCKOVr/bvbyX345TzoOapW3XUr+tLCSMSEEICjVqpvmubzcw3pxkhIBDoX38AVyj8JVeydPkQcFBDkNmnYH9rWtkDEiK/ULPrII+HgGLtJklJVy32ZG3Ymf9D2ZkKgoBDD5z/ZLkc9xcbvNs0nSTJP8vMO3HjhjLRNBi75SErtq5REHM8Jgk/el3ei3puxH9qWFcS2f3SDfwfykSf2jnqCH0RjAZ3jMnP4B6Q3wrmAD0Saf+YuYlcG51Mg7SqRe5+wIDAQABAoIBAQCRYE7gZ6fRYbTGvENuIPSWDIoszXoP6f2dTSGbcInSpZ2thUGqLFTJU6jmGcl0xxS9FCY2g7N7lGeFNezpyPcaXGfjizDCjO91kesHv3pSvJicP9bgmaDAAeKIO9KT0FnYAWhrHtEEEl1ra+clsy5RXv2YBCeB8uSbnWUrMt4wdWP3uIVp/5F2fP4r1QL7PhNwX2ATrERxGYp0mvHVqFMpfBFbf5kW7Ccf28gnkEdeGP5Os6DVWw9BTLPzVtYKZj3JhXnlkz7w5PMDTKqkJC4F9V+gT2jWrAbXITQLzEEJoQQjzYT5sCeYsZbH1wgug+NHFYv9cyNZyrF4g9fAb5QBAoGBAOxeYB4XjAIGyZJdIJ7d546avTfAvesQJGJJEuJsSadF2LY63gu9kXk7KKlezrwvMdXGMYIJcaKi3TSqx0V1syPDjD08W+zJLT0cfqEDjqFgrjuu1wqdTq5RWr29io+YjsixlJs7zU0efPRm6KxbMi68fYI0OkMs73nqfTUZ+R/7AoGBAMU6mH3fqpVE7LSTk+jH81y0DbHdMuYqKSAiZF268SUpLWnCNmMtoNB2OwAb/IzI0Ec7HdJmNDe+2nq2e7ZI8XI+mkpPd4QaAAgVanBhhLrP9OWkWI0CBeFiNx/4kQtS1GkY0I0bZc/AY7zaRb8GkpuN713k7/FAXoAJe/Aahq4BAoGAVWFNxPDqgPzkqPr8woYTk55vhQkZUSSWj+4nZSSKgmKngkPHW2RRfQISkQOPF8jQbpDV50v0ATRlRRX/Pybh26RSLvhzmBefQLjfQNghGEftB+ADC3GBL1Rxu6IQwAfyY6pJrL0wTpAZwMq/dyrF+L3bdEHbXdKIenhqW9kS9SsCgYBuZp9njmUBS2SorBdWbV6nnM4xqt1MA3uj1jySTwufPo6CLcmd+LOVHSlnpULYV6xmwwutc7J1JetMV4umfOxShAJ/6D3Bf4BXBg3fvGa83515UmaS//fkssKirdQbH5FxBwfuhNCX21y5IQF7raUxV+EOkRFS3TJIv4ZV37NWAQKBgBo08Z5Pws1xMstW4K5DUw1rZJC4LDe3+JdgIwiZeFwOBWpB4FX+s1btqazGHUdHuIT1+6y+Pgt5/pIbsg9ema8IC6lZx2qR/ufUDKxGodRt5WDhUZ0vOOpmAgCReVO8RbrHuR5yi/0sRD8YRb4tYCi4v3Lncvgv8Wqwt1GTw4cH", - "exported_keys": "a2V5czo6QXdGTlNzb0xTYnpvOXFaU2Q0cG45K1ZxR3VGUml5UlRVQ2xWYUFIV3ZtKzlGSWtQb0oybCtkZlQ2elZzMktwUDdUQlFMSllSMjlhQWhCZ1hZZHpFM0s4K21JY0tHTDF0cXhuODI5N25VcWw5TmxXQU9kaXFpNnExV1RLaHVTUjZibmswakoyNnNCS3V1M1NtMDdKU1RGZUdTOEYxVEg5VWFOYnhHalJJeXJWWGFwWVo1MjhQemFXUS93OFpDczRzRStydDdBNnVJdklLMGxSWmVFR2xwRGRGbnhYdHJKaXJaRUlyV2xwRCtVMHptQVJLQ1ptcmxGTUxBc3I3bTljclZ5TWo1VVpOQjg3K0tPV0w4NHdxb1VWVklzSENuNjFKaTF2MlZBNXp4T1huakRnQ0ZNNHNtdzVETDV0QjdPN0wwWG1zUjdMK0xOYUZCTDd3dU1GZWwrcm12czRzcG53dDB6Yi9KcE9ERDJ1QzBRMTlLY2JrWFFXbUY0UEhONXJQRStSWTFMOHNWTE16WUYxemM2cE9UVVVRRnR6SnB6cUx2ZnAwTGhYTWhEbmxvc1J2Zk5Bd3FPdkd0a2V3eEhiNzRPd2lXNXZDZVBiNS9JMHFJcUMvRTJpQ0hOMFROQmovWk94Z1B5ckZoUU5sNEJQeVdMRUR2amNtTTd1aG1jVG9zemYreXBGUW9EME1XVm14Tjlja2RmVDg4bTZ0OWZmb1RBQS9DOXozUmRUTzhlaG5lNWF1YVZMMW8ycm96UDRlNndxUVRGb0hPZHd3ekpSdVdSZWdvU0dCNzhtdjR4WmFOeGUrL3B2a29PalhCQk5hamlndHNUTS82Rjhjb3pxVTJ4Mmw5ZTIwbS8rbXo4MHdYOVUxazFhQ1JiWkZ2cDZFN0tXSlpoVisyMHRHRFE0WTYrWHptNi82a2Z0bUxIaS80WjA1SHJtYnVTSzJydzI0QjlQUjA2Smk2K3lONDg3L243NDcwekZNWWJEa0NGOEJKUThKQWx0dS95dmdKeW04aVorUTgrQkxEK3dTUHByWkdzR21nUTRQMlVKL3VIcm8xNUFNaVNXOVV2Rk1LWTRiZ2UvZkNRdTZMTCt3cjZzNkFER2E5Uk85YWVkQ1hwUkdCdmZOVjNFK0FkQlhWUGJEYzd5dVVISkRtQ08wUG14L1kzOVU1cmo1QmU2bkhaU2N6MjU2MFJKZGpqMUg5OUdBK0R0NXZDSEJwblltVG5FcDdyb2M4YjdtSFFqSGZZeDErL2xqT1Z0NEJFdVYwY1M5Y3ZDQU1BdGFDMjIxd0l6UkdUazd4Mm5pbEZORzliV0lYSENlb2hoZmVZVEtYY1B1TGxxVU5TNjVKUjVDN25qeW9CK21Wc2prNDROMG1udW0vSUV2MC85QU1yNjMvWFFtMDdvb1ZnT3QwMEFEM0g4ajRlUFRmL0p5eHBzcWhQUUROR1YrM2s0WkRTeisyRmxldTlrcGd6UkNMVkpUaS9Ud3hmeFBjS2l3YlZGblB6QkxOOUxKbnZUSFI3OWZoVVpEWXB1RzJETmx1alY2T01jTmxGeVRMSGFZazRNUmRvZk84TE1XaG1NWGwzNkk1T1FYd2VpNllURUxuckh1UG93T0p4UnMwRm1sSVhnNkVtczFCUkNZSkNweVVJR0NqTXZXS3VCVy95Nk10S2RXNFVXTDhQRUlnbVhtNHEveXozRjZvdTg3UW80Rmc4YXIycitndXFmcHhmdVR5clNuSndQR2ZpSmV3Rm5OdE9mZXludzJxaG5HUUI4cnA0aXRPOE1wV0NVR3RoVTdVVnFiODV4a1lMYUFTSnFIQ0lsWE1wbnBPZ0NRdnBWTUh0ajl4aVVaSVhuSExNcUFxYm1HTnRkS3ZIc0g1OXc5Ui94UEp3OFNpMWpvb01SR3phdEszak5Rb2pZV2J0ZzlBdDZoR1FjcTdqM1JkWlZqUHY0OVZzT295TTc1ZVJqUEJjSnE2aDlQcXhrQ2VEMHZyVlpRWjI2eWkyQ3R3cklKY0x3MTRWekhPR1ZJajVHNjF2dzFEMXB0WXdaek5Wd2lEVDlWYzFhY0xMcHRJK2ZuZnkxQUxYNmdDK1ZHdHlyV3JGc3hwcDFvOEh5TUR5QXFkZ2hEZUJqWTlyYmcwd2VqaFFQVy9FYmxQNlNLcGpXYWNwRjJGRmtlS1NQQkg2Mm8rMm55M3lNSmozcFkwUEJXT2RCNzJ1WFp5RFNlN2JUYURzbExkR0VUVHo0TjFFQUhBWXVieFBiditVdjRHZGl4S1BHMGhmak5Sa2UwdW9GL3NTRFl4SllOc1MxaVg1ZGNUR0NCY1dYTzZxZGkvaW1XYjVkcU5EMmZxK09XYTBiMUNwZlI0UUpiQU5kT0szRnoza01PUC9WcG1iS1gwTjRERzhrd2pROFhFdWk1Rjd1bUp0ekZtUG9GaGd1L2VsT2lqWThvdWdQZUNoS001WDJITEV0MDBEWllKUURJVEtEenIyMjExeDIyU0czZEVyT0ZqZzVnNUhiQlR2SVY5aXN0R2o5RGhrWGZlbkhmTGZVSW1ueGZoOU8wUmhGd2t5dzdqblROYTFWMVp5akRwZFJ3L3pRUS9nbHp1eDFuQktIVE9sTkYxT2NnaW03U3NBeGp6eHppVzFkYm15YS94YThZc1g4SUZ4V1E2YXdPVlRzQkdqb3ppRWVyUm9xWTRBajhrb04vTGVVb2RKek5ZMVVhdWpySTVaOVhNb3RFQTA0cnoxRHU1WkJaNWZLbkJkc2h3MG4rekNwZ1Zib3pmYTVQSlNsOVc2QlBSNnpqRUlobktsU3VxbjFVVTJFMXg3WkVCYk1OdjI1clpsc1lacWxaeXRQL0g2NGJMcm1NUzdGOEdkeHU2OC82d1pwK0RuWFZHcmc5VHlOK0JZMkFpMFl3dGxsZkI1bTNHdHlWdlF5SkE2aHVXT1d0QmNRb1BKdlVFWTNabHBobzNqTmp2VE1XYld2OE1DdXRNWHR6L0dUZFFzWWZINHh0SkNmdW01MnVRN09KVlRaMVk2ZmdHcnRtMWIzSjVEOUY5ZVRWVnl6ZEVOb1VzZEpwUjM5bWx5MjJGUlF4V2dFRFk2SHZHT3lJNGo0LzZaZkVmSDdsVTBEeFdZWTYxeHVNdnVjMmRqZDFvUFNQMUFDVjljNW5HQXByWTJGdE5pUEJLa05MSUljalpzazRka1BzYzNzRW5MV3RESU9jbXUzRU9ZWUNTLzdsQld3R3NoSnVDLzFSZzR4eExJYThvNXdYWWVuZTdjNXlhdlprTWtKTCtyMEpxb29CNUlzU1VaNlNraWgxV0VLQTBLQkFDelUvKzNBMUxHWVNkSjdIOFRTamFxbVlwQ3MzQlU2N1RtZGZ6dWYyeHBJRlVOMURtWVJ3bk43Z21IbmFjbXdjM2Nsa3ljWXQvMWZnQ3V3N0llb2lITDB3QWYwd1lMbDE5Qlo2M1ZEZmdMR3dSQXZLRjVaSkowVnNSMkJVYUlCVUdnVkVEWUszR2JiL2xSOUFpRzd1cUhKRnMyaHpoRUQvYmxrZ1RuYXVHNnJKWlovOWZrVUtVUHpJWFduUktJVEJTaTlPL2xpbU9Xck9OL05kZk5LMm9mR0FyMHBxUWJvcm5tY0ZaYlBIRC9Jcm82blBoK3FxS0Z3ZG1MNS81R290SGtlcUpSST0=", + "authToken": "dlOR7rp7SM1DDyxLTPSi", + "transportToken": "MIIBCgKCAQEA0+3Reecd//bb38IcRgNfhhPnR7ucU66444I4YgK8m6ThYDIFZ5Nd\nltqA2UuFTFObtzuQB0TEyzM0LO/PbRyPt38wrpx7X19yPuOvErfwhbuTi3ruZJJa\n1h/yWPXsAsUwcoJoQwPKXbsboL4wQhCGJXa8YSezLcPhOODCDx1jrdPrZgBtU7eN\nJIaARU+lHc/vVwFlcIGNwsyYvetxMjBfOzu4DriPjNKHB7DTjyRWIVh7Of5X9Wxe\nMxDPdW/A2JlaTalca7bJ0LcIxNBD7KQVqfYRj4bSJPZk8rOklpbCoVKP7SJbOBla\nYRvT/zfo+sXs3BB1t5ZaA3RvhgpFylUoQwIDAQAB", + "contact_key": "MIIBCgKCAQEArNdqgb4iWSj7C6+H4OcjHoNcftixfDl5iHclFqgKBYeNsOM19Qsmr6kIWc7j89DWWXNqXRxL3/ARdm28Qd5ldUtr3+vjqjXNBcdPH0ReuXamd9o01jPcL0VdecTWC7u4VHgsF2ud0n57kcvgwscplzizRfG5VBjtTauZ/wXjcXWQdrpuidKxXcuEiLXOtN18ahf6JfofY+u71Fdrh2W2720x+IB2nBB9+qJSQ4ussJxLHI6ENlggwMbrxPbhdrkmHT2Gs7FvTmBbpRrRvfVnhDhz0MkPQM8FBk84KumtsWSjre41Uu+LEyvPRVxPhAE4lLxABfnETn7x8LNV/ozLTwIDAQAB", + "privkey": "MIIEpAIBAAKCAQEArNdqgb4iWSj7C6+H4OcjHoNcftixfDl5iHclFqgKBYeNsOM19Qsmr6kIWc7j89DWWXNqXRxL3/ARdm28Qd5ldUtr3+vjqjXNBcdPH0ReuXamd9o01jPcL0VdecTWC7u4VHgsF2ud0n57kcvgwscplzizRfG5VBjtTauZ/wXjcXWQdrpuidKxXcuEiLXOtN18ahf6JfofY+u71Fdrh2W2720x+IB2nBB9+qJSQ4ussJxLHI6ENlggwMbrxPbhdrkmHT2Gs7FvTmBbpRrRvfVnhDhz0MkPQM8FBk84KumtsWSjre41Uu+LEyvPRVxPhAE4lLxABfnETn7x8LNV/ozLTwIDAQABAoIBAQCgTxhhB+mxypm2B/M+PQNMvMfgerl7n49CbEeBERBieoyHwOV9xv71tBCjw4mXzV3SD4NaovEY3gBEWJlgepadyPtf79j0OPxU3LxdIru8xvi1dzTEa8tQKMT/OPrSXSUla2RxwIXcAyY3XuKzpafEs3lLaVzcTFZlUMD/UQXYZ4wFaDM7nG/FcYdur2IFa/WNkFP53Sv1m63M3ofarlDT9MnJhOK1yxXdSJ60PtQJlkmxyvrfnDlm+eBw+b2mQm9zoEQtogY2sWYz6ILyaLbFL35VYSR+xmj9LVb9PxSuJS3LLfzRZ3TeNWclkiLHkyQO+MUApiHljT5n95KOZRC5AoGBAOIEBzd5Li2nEJBupK1RC8nZrGWdLjPvv/UuUJS7KAwnNdR/L93kBBy3iEidzor3oYQgWpcUGucOOLk7OWUlp6dr2TSBtqN9gFJJfK8qebl+BldK8h7+lHL9MEBq5C4Uo4Z/mATkSYtF8ltBXn6HiaGk37B+RskPR0CQzA2+zKAtAoGBAMPFejnIQoW8YHF7wliNx28dHL7wlwgaDsLCSxjYzrcqyzWBPPg+KHj2l6XN7XIT1qqID9a78ayPBGBbNcT9zz51N91XcNFHjfH2GnT1eIhx4D2YxdX7rD7tJGQ941Wmy5nd+gpHKwZLB/p6dRhGzkpZYyQvFlWMZv4+RAkYxArrAoGAdWSSOwX+LkgwGlTdxAfsj5M4MC9L6D4G/lpoEFiFnIphM1Y8jov4dtH9P3p35UZp5i7H3uDaeFiyrcNNNHQyeItT7inRq2lsVVFGKdVuFCKZOI385IxmnrNTdKIQkr61kQ6E70WDzYsvLqbtZdsQaZ0xcoKkUZpV7/tFgX4w2qECgYBbPNqEuWb/StarrODbQmAy0Z+HATtyJCrC66fyEYDtbn08F1oh214jWdE9Dabepo5B9Z1kFz0/jXudqIR7pUoDsr9xYYILlsx5epfD8G7XMDMwodV5r4wL25s9OHaNgWmb8Q7J4XcUvL0gKBgQU1dq4RPKVkOTZRbO4Jf2oVskNwKBgQDGxcaQTJiBRJM5Ru3TO7UQq7Z/dYbYuZksVzx5frKdlLEQmM4RMI7k97Xpk0XzSFTL6xTNE3M+VJHsI+eHe+DKtSEA+yVzfSUmxyeIr5SniRkNBK80ytzHY250MVf5o4OFe2LEP5STo4yjq1PMEZzY0tZ8zBXvO4kWtd2vV44f9w==", + "exported_keys": "a2V5czo6QXdITE03WmVSNjhvcnlIb29WalplR0hTbE5QSm1WUHRRc0tML25FTU1vOGx4NUJPQWQvdWVFS1FQaW1HeXVvWnBXd0k0ZDdKaGRqTlgwUGJ5dXdleXN3VWp6N1RNZlRYblE4amVDaVk3THJ4a2xzdWZRM1YwbVArbWVxbFVLTnp6azhydmxMVkhsSFN4YUxiQ0dkdkQ5dGh4OHRNNVI3YVpEZmhjYjNhckNOQm5mSCtFcjZZRlBGZE9OcWxnaVJON2VZSmpmYVdSM28wUGluTUZwQVN0U1JmK2NveGUvKzcvK05RT1hkcFVNaVVnaExtT3krem1qRUVieUM1UUVyTlI1MHpDd3hPbmtNOVpmQ3RvWWczK2FiNlJIQUxXTDMvVlJBMmczQk1XZnZMUy9FNHdWdjMxVHlaNVB4TkFqRm91SEsyT2NmdXhCSmFVNGxab2VOUHRJZVVNaE5nS2puc2tRK0NlR0xuRmlZNFJLd0dvU0VmL2FNanBvVldKMC9iSENOWXZnQUxxeW5wQUx0NXU5UDdlVDYvNUZSbHMrTFBTWEtyYTNTa3pNQXBEWmJPdDdGeFltYzJBbG1UeEIzMWV0OXNzSE9lZzdPT2pWK0hRSEdOTVdOVDJqN2kxUmZsWTdtOWF2MHJYVEhEVVR2WHhvWWhMWGwwU3lIWHFxd3VvOElTcDBRT3d0WWw0WkJNM2FUZlliM3p4ampvbmNuTGM5ZjA2akdMVUpkY1h1K3kxQ284aUFtQWE3SDdGQ1I3SE0rcGN6dzkxYXUydjM3VG9rVDh5bVM0OUxWL05yTzh5VElkNDNCVjR4RFhGellld1k5M1dMZTlFb3dPNjF3V294VzZYNVhSNlZwRjFmT1h1YVl0c2dYTWdRMEZPT2o1UGV3cWMxZW1MaElPSFVKa2hlNHAzQnNURlM5K2g2MFExaHNUUmFSb0JmZHBpaEx6TGw3WldQdUhDdGpsNG5BaERXR055Rm8yRHRncGhCK2FtUExVTXhWdWxjUVJ5bnJIWFZGWll3bmRLNzJTZnJ0eHY1Y0lzQlpTSVdWOE1nQm5JVGlyaVc1cWR5WWM2WFZ4YXBmb2xKbFkweXdVRHZkTGlnVkJ5UDdkQWIrZFZ4OEl3bHdVdWIzWitJZ1pQVkhXTldiWTNqSHFkbDdKNENTTVZ3d0pIZURsd3BJVmgvUG02TXFYQnJtakNFWmx4TEMxWDJNSEtXRDZ6V1orSWNjS05sYitCTUY3dHV0QkF2ZHo2UTNRcTNJRlBPc3M1Q3l2dUdZTXBlQ1VYNVJDYnhPYUlTQnBqUkhMbGV0Y0JrQ00vOWFTcWkvWXowell3cEZ2ZDROcGRnUzMvUE5mT0c0NnZ4ZlR2WHZTYVUwdlkxdnlCK1lKaUJhNnYzNG9hTXJhVEt6ZmNhVFlTU1ovSTBJa296aUtvb05NajZ1eGpkT0ZIQ3F3aytqb3htMkJwT1NxSWQzODMvZnJGaUVqaVJyOVBSOGRBNW1vQzcxc2tTcWlETTVQa3VVNUtISUlBLzQxb2Z2VkMxTXFBSFpJdkFhOCs1czlwZ1M0NkVqbWF6ZTRFVGdFTkFRZk9BajRtWHlNd2FLbTU0MnpQeWh5QmVoWG1jWExGWlFqL0NZY3BOTkNqckpkbHhvRDlxcjNlSlpZUVpNeEtyd1J4QlM4UXQ3cGFBMmsvSldoV3NHZUhLOFp2MHc5NGdNTkxEL2lNUWxCY0hUYTlLKzhabWgyVy9EM3hYeUpEaEw2cENFYzA3ZUltZTJhZGRkQ0Q0eG4rOWxhQTlBMGpxNW1uelJmS1BsZGUzajlIVmtKc01EL3Jyc0ZYZURFWnc4elY4ZWg4THBZM2JLRUYzcGRoNFZGanZ6Z3RRaXoydXJwUjJRc3YzMUNjRXBFY3RpZmZkRFpOVlUzNHFTeU9uWHVyVkJZRTI5UTdJRXZXRXhqams3TW5xUDZxKzhiUXIxWnAvWlQ4Sm5BWnpwSzlYNlErcGltYU5yQ2ZIQlVjazB1Y29aNWNhelZWNGlCcG9odDVnK05IVDVBNDVvb3daa3lwbmlKbUc5d1JRSmxwSkZRN201MmRvVWhSaTMyelE2dDIzRG5pdUZ0SVlwWlVQZEVFYS8xN1lOc1VqQ3FxdlozODNreHl0dmlsYWszdTViRW43byt0cHlDbVdFdXR4ejhTeFNJUElsWFRDR3haNkZab2lFb3lUQWRGMVNDK3pwa0VFWnZHUitRbE5SUi9oaEgyWW5hdWRSbHR3MEkwUUJXTDdkMG5pQ09SRVJjd0l4SnJwanlYVXI1UnFhbzd6UWd1YXovS3U0Q1N5YVJJbzRiVElNK0JzdmN2dWNUUzM4WkoycWFOUDA2MTZuYjJtdEFqWEhsOXRaQmVrcWEzamZXK0pDbkhpeExKaTQ0U3YvbGJ0Z0czNDBhVGh2R0VnK3hNWi95M3JvU1grOXA1SzNTUmpMU1VibHMyODBCMUJIVzR1ekkrRlk4d2V4b0dyV0daNWhjTG04SUtBeHVvN0VQeDJORkVZQk9FalJnTVhUMmZtTmFBaG55dytZTWxWcGJEcEdmVHg1eHBPZ2NQQjRhWnQwUWtBMkZhN0hLZ2oyek9tQUJYQnpoMnpReFRhZ0VFZkJ0d3d2WG8zUWp1bnY4bFB5d0QrZzhtYnMzSXVWSHU1dk1rcG1LMW93YXlYUUtwejZGT004RlFnY3k5bTJZR0UzWVF2VkRINU5vMkhGMERkUUZIVW9GbmY4VGkyL0QzcVRDWFVFNE1PcW1qaDlzWkZaNDVJc29TcHErRWUxR2YreHZpdngvL3d2Z1Z3V3RnRUs4RjNFQ21mUmkwb21NRUd0KzVWUG04TFRUWENYYUl1R3pNSS9TcWFMbEdTVTNHNmEvQTlsN3Y0RDI1S0RxUXFLTWd6THl6Nkk5czhkUmFCOHMwaTlYZDJPMDE1L2RMZjBlT3lKSXFnZWNmRTdyY0dadzB1dWQxQjFwZVkwWTQrWkxUSmVwOGFNbVQvV2Y0TGUyV0pFU3ozNWJ4UkMybkJFRXhYZ2pDeUdKRzJsMmdwbDNSOXdBN0hyZFNNZHFELzRjZDZyRjlCQlJxZnh0WnpGUC9kUldxaGh2ZWtQQnh3T0RvOFpMcGF2c3lDNU9KdE9BZmJIdWJOWUkzY3VhbFltRGJ5Y0dpQmJoVjhWOWw0RmZ4VExDcE1pR0FyWDZJdkdYQWloUEtxMlRZVFdlSFNZMTNOYUF2dWlmaHZVOE5PUVhCRjVCOHFSbXVEYlpjVGNiR1ZKbVV4WU4vdkc0ajdvTmRFQzJCeTFrb2ZwQjZJcFBxT005MW1QZlZpcmU2VFVLcEI3bzdKckFWMzl5eUY5T2laWUJvaTZONlNNQW9DcmFGOVMwRk5Na3Q1REJxRU5YRHNYRlV5UjFtbkpsRE1yMzdRdGNxK3l4QWk5bXJ5cW90RXFyQURrZXUrRUcwL3p3Wm9Ia3NtdlU2cUZKVDFBWjBQKzEyS0xxSi9SSTRLNHJNS2VKOGVITTJpT3NaNXplRlpwald1dEx5Y0kyeGd4aStFY0lFbXJranNCVXdKbW9jbklFMVZoMGRZYmRYVTNaQlVxYS9jd2NKUjR6QXJJQVl6NDl0VWxCMWxoNy9lcVE2SEZLcHRZZXBOaTV3bjhqU3pBTTFDYz0=", "pin": "111111" }, { - "pubkey": "036cf9d03c6ec86101bd51daf16eab62bccf2c5c03e4d29679b2200d1c0d3d79d6", - "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023386625", + "pubkey": "02841e1cc175b0ac4ef317349a05cd1176c69026442eaf6f8efef809ed2c06c54a", + "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023452161", "alias": "virtualNode0", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "zzR68UBkVCsXrOBiASz4", - "transportToken": "MIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", - "contact_key": "MIIBCgKCAQEAxWepRsOgmSWzo1xn+nMX24fJ2isQ/Rt86ydBArtgLC5Ujukq8DtKA8JiLVMccJQHPDblFXe0hofuzo0QwpemVWzrwjzGX4bJFyjYe+HIjtNVHRvLxpFb0VA4NYui7iDlDh/yxf928JpQIVdFQyYsCb9opGXIIZzfzxGYS9pNKlh4ejdiizfpSs6mNgcSs5KTHTdev69iwZEdk+NWUPo7vFICgizMqMiwEzDvgSb8NdNiqNcEmKEyzgSmePSi32tO9SDtfE5yZ4CQXw0166zjqZc1pBCW9hcYnrgQfxkOhBP36yIfRmKPkXWA9wXBb921pHv4IPaEH2zoonTbPin3jwIDAQAB", - "privkey": "MIIEpQIBAAKCAQEAxWepRsOgmSWzo1xn+nMX24fJ2isQ/Rt86ydBArtgLC5Ujukq8DtKA8JiLVMccJQHPDblFXe0hofuzo0QwpemVWzrwjzGX4bJFyjYe+HIjtNVHRvLxpFb0VA4NYui7iDlDh/yxf928JpQIVdFQyYsCb9opGXIIZzfzxGYS9pNKlh4ejdiizfpSs6mNgcSs5KTHTdev69iwZEdk+NWUPo7vFICgizMqMiwEzDvgSb8NdNiqNcEmKEyzgSmePSi32tO9SDtfE5yZ4CQXw0166zjqZc1pBCW9hcYnrgQfxkOhBP36yIfRmKPkXWA9wXBb921pHv4IPaEH2zoonTbPin3jwIDAQABAoIBAQCG8hss7dSefMB1n1jRQ9Z+UzAwvRoK/LyDgD0X4gGXkkBpxYl92fn54er9cwBREVB04E3wQ/mbsdcVSie37rVdVm1ARg2SBfD3rQt4fFt/D4bytCq0Xm/3AbC7Ie7KfKA47KwooD+tsL+wWxlVEwYtz7R4FcAfAj+ZLT0ANYZkuAviUw0Hl+uu7fQy1gJpTSrQehnbBbSojtnIksE7ZCOFq/sYahA8za0Aqpd2D29OFpMRhmX8kAw8cfXcbYHyTPjgNeGwIqNbENnQKCuEV7z0yRhXmdn/OGqEDMuEsnKHGlvTW4YSchYvUfbVyOggqIbAt57HlNWOieJt/mHSnY+hAoGBAPEJvcdWWWSpJcRoqKIqaz5fYndjvhuUgFdfiss8tu9oqbERTxjDC0S88BIC88LbIQ53ltraMOhDV3gXFBY48hpsXqCwxQVAPeA2OHbLTkFRWeQIL16osSJsYkQbP2G9ir6DrjDtVY3Ek64lbXYEQNuUs9lgqzjl1G6D33xo4BW/AoGBANGoj1Lia38IT5eE9Tkvx+jdsEYq8jMoZ9PWBl/ypmwR7LZT6s0zUlBwPOv1Hjd6IAoxhyiXAUoB6acBiMoLVxojtJqNoLVx4t+yDoBe4Y+a3z16yy7Gw7/rvxKjGEQ55OQjmdePWf75ptXauM2OnShz6hxeAFoUZNgVcpbjmbIxAoGBAIwFY6iDweRW2mixf5zM1YXjNTkzyQEOkEuxZdhQidijzUfeTTuOOmKQ+0kLS/2a/CYCVLEH5TdXv1000udh50pwP7xLU/iL7CXueXiQ/AG3t2dfVd1AU74yhhcYWQZ3bDzmE++6P2PemQemGGNhbyffx2Z04KJp6LDWjKIh7mLTAoGADmy3d69mT/Yla7pVGNsluOrPvvQjd8uW4Sc/hwht1M+i5qR9aiLWzfv65Q0XSB/Z5nmj3/ILv6jEB55+Z9BB7OV5/owx+2nbfyKEBucAQ94W7+br5cr9Gs5AdirMd504F04vvnn5aiaJCPukbVgbjfXzrIH3Kjtu+ML5AFKmd3ECgYEA1aMk8/hgUVkBkrRGNScHE6i4VB74PNAFFLm9hTC8bunlU0Dz2DIyR8DoVwfuJyLDg3kWAGrq1tO4RAOYwRgQpiOZ6kS8opJf+/dvyiI6qHIeqw2MwcB4W8DwxTfaCjdZeaZnBBe6fWdu9QPBVKQ8a35cjtWC6ZXiTW2k0bgX6m4=", - "exported_keys": "a2V5czo6QXdFQkJ4cXd5SklSVkdjRzg2RmpLTnhvb1l4OFkzcnpraE1FT2JkS1NqdVdkQ1NyMzlCd3U1Uk9DRm9aUUUwenliYkJWUmpkV0EzWHpsbFZDQmx6T2xXMENhTHdFZjBubHhsdHNmZ3ExTDN3WGhTUW8zazBYb25BR1lKNndnemk2N1g0SFRFa2p4TFZ2ZjRURjlWUUYvc3EzZzFGVGVHUHZmOFBIOFNzUno0b2tGbnlRb1pwejhscHZVUkJ4YUZIYWtPQ2tOZmE0YVRkVzg5YUIyV2V4VUVHcDUyZHNUSXFscGtoSEEzbVZNSmRTYUFWM3NPUDdvbkt6cWpzS3ZUNERXNDdSRFppaVR6QStZZWtHWWE3U0l4bmJnclBSN1VTRW1PcG95aXI2S3NleXF3QXp4Wkd3VXkzd1JmWkV0YWdpQkxKSzQ2UE96U2VMVEFNZThSUzMrbS9TMGlnMFYyWUZPZjFiR0ZxSHIyMllHQkoyRFRSVmdLQjdwNnBXdG1zTXFSME9PLzFscmMvTWZOSkoyTzlLODBnV3RhVzk2cjQ3bjlzcVRKb2JBSDI5T0VOakNJaUgvZTBiUFJ2ZncyTHFSZFBhWU5HTzR2OUV0bW5lcVE5eWJXd0RhRi9kQUNlMVJnWVRMUlluNXd3QTllL3duRXFQUXhSMkVlMFVtakRUMkpQaDZlcW10WGJMNWd1TFJrNnRNeW16YU5IWEVrTFkvdzNGRzFUMUh2M1orR1lLK3QxQjJwdUpiUnd6Z0YzZ2NTL29vL3Nua05mblZ0NHY4RTVkaHV1Rll6dGc3T0dvY0duOXViUjk1RDlFaFk2c2hISC9DSHF3SEZ5T1JOK3ptbWU3MnFqeThma2theXhKZE9qQitnZVhSQWdzeEc4MklHbThJUml6UFZDQXJBUGVUbUFNYWhVU3FHaHZ3dTNOMUNWdytIdDZxMGJwZlM1ZldSWmNDbVpqdnNwK1FRQkl1amZ5dC9sbzZWSVZpc1VvNGsycDJ5TEh0THdmZFBrUm5jWFBuUzk5eisvRmIzSmxubEZXK0xuTlZjRXp1c1doZytDSFhhdG1xcCtrZGJXVk0yWnZOcW1pUG42ZTZpd3JCOFZMUENrbStXSDJGU2ZteU1vOS9NdVI5ZEx6ckZwTlhZMTJGQWVyTzlpNXQ1VGFTQVZMS1lZV2hPRlV5TThBUUxQZ21YMklnZStwRmNwNE43aG50T2dyTDZxWVlQV3dySGZBWTNXbXpKTWpBWlMxb2hJZEllNzVweTdkLzdmNWNIandKUzdFZmlITVJEZ0ZlZ2FjWUxvUlA0TWNTU3hZL3NVNjFiWHJjc09tY2VEclU0aEo5aUNVMkMwTHE0SzlhZW94WnFnUXQrUVFOT3pUTEsyRjN0dDA3blhJVmhuY0ZOWmwxM0MxL3NRSS9EUHB3Nm5UNWNYWkRYdk1ocWNiRm1tVmsvWFkrWG9pSERIT21KMisyWXJYSlNiQTRNV05CQXFoUFcrRFZzejUxK1cyNVpWNnlPWFJaNW5qdVo5c2lERjA3SHFITTJDcENjQmgzZ2RIWXB6cXliTVNXMC9WU0JVNFNxUzVYaHBKMGttalhtcTlIYTJ5VWdTN2VVdzMyeDdSVDJTMm5KL1c3cHp0Q2FPY3I3V0gxTi9uWGsvbFpVYk1oYlZkLzJkSktOMmJZWUhuWm10K3d6YkJoM3VaTUlwZDhHK1pMNDV1VzJpYngwMTZDTnlmZ0hGdGY2azFDUXl4R2p2bTRDU0tiK2VUT1A3cXFySGdvenNia0RWdGlsdUxMT24yZWQ1bGRRNVN0ZmJGMWFGVkFwUWEyVCtyUWZGTGdrUkZuMTZZNmJwVkp0U2VDVkNNOC9ad1FvRDd6bGM3MENJYzFsNkNITTJZWnRXOWV0OWtyUTJhSUFsQVhoUHFCaU1FaUo5dTlKZzU2bTl6S0ZtNDNTV3MyRThtN3FBQzRWUU1JV1lXNkd5RzdaWVlxaXk2YTFDYVUrSjFDRnZuR2VwREFsUk5LUm4vSWYrOTZhZTlBd0tQeW1WdUdVWU1YRHFFSUlQU25RUHZYM2Myd1REWHZOWUpBSjVvTStUUXFvdVc1c251dytOQStiN2h4MUNzeVNaZUNVRC9UNmV6NEJFWUdFSmpzRDVqaGFMQkFQbUp5d0M5NkEydGVYNXJ6SjZBL1Q2dXJmUG9acHlzc0FLaHI3eEZsanMyVW5yZDh4UTJVNjdNbjBIVW81YmUzNjBBclMyUWkyK1ZEWGhxd0NKQnlmVTlmRFdodUtKdmVjYVRzNXZPK1ZnVkJRRXhFMjZLTDJTeStXcDU0Yy9PMm5oNjR1RU5EMnlBZmVHZlJWMDdZSWJBbkY0VDROQ1JITTNiNlo0a29SbXFFaVQ0MHZjZy96dmpESzhjL0Q2c01raFdYWU82WmFHVGhMNWF6ODZDcnJRZ1FJN0RwRkx1ZjZaZkJHNTUvVHpYc3F6NzByb242MXZoUGFPeTVIUGlNbGt6UjB1TkRqbmtzdGZRUGswSUV6QVlpNThwZTNydllremxUck80R1o4TXl2M2o3QkVVVitwaXU1cG5Rb0pXNXc2aFdSVE55L2hVSGpuWDgxZ1IwbGRsOFNJbEx6SXBMNjJVV0p2UzIxNWxVQzR5MllBTXYwQ3UrQ1RKSEtQdzBrUjZteHgwU09KK1pPUmhXR1lTU2UyU1lMWDlmeVY0a1RXSEFSb0VYblQ4eGY1WjcwVEtFeklTNm1lRnBqemtPaTNjeHl1eld4T3ZBVkF1MmFBZldzQTVHWEw1WHNGOWtRYzltazJtd3VKdHo3aHV5Mk5EMnFscC81WGJRV050R3ZHc1pGNHB2dzUwdm85cjcrdnNwekFuU3BCT2lZenM2YmpabnJVYmJjZ254RzM2dUdoVk9aRVArMlU3bUxnMTdVQnJtZmg5WVZLQUhmeWkreHRDZktwNTJQK2hUQ2g0VWQ0OFBWOGZtZ3RQMzl2aXJ6WkNtcWxDb2JPbmZCdzA2cnlzZHoveTBDamtpZnhmK0R4QTJucE90R1l5RXhGYW41MVRYS2gxeDYweXlVWm0wZGY1SVMyRHVPemMyZGFseC9zaGZ3b2E4Y2F6VHFrNXV2V3UzQzBHSWYwY1VDUnJGWlRHcXlrQjVHUmtzaDZ4cytycGJZb2lKNHRyUzJpMmFlSkZtZ2VraXA0VDRnbytwYU03Mk5OY0RUelNxWDlQMDMvVjluazNpMjhXZG1pMllmV092NTh5SVRUaElUSkRTOFFvbEVMYVlPREFQQlNoaks2R1RtNTRLT1YweHFxZStOUGlkSXpxZnI5RlBiczlLRUJRVlhPemlueW9HV3R0VmFUYkxJQkFuOXA1blVGWElrM2dBNnlBVTA1VDUvOUxUaU1sOXNmVFN4YlhKaytlZVl1dW42SVFEV243eVU2UWtPWjhsbjd4MFRscnlBa3hORXl0VWpPUHZnR29xcVhya0huZEsyblIxMy9ZK0FyYXIrQmFmNXdnZUtZaGZZOWh3UnJabGV6YlkzbzdOeEgyWk1mNEtiMTVUOXpKMHZnc1lRZVpEVEZjZHpZbUZMU0pFWjN6Syt1YnlzeGxYaE80T1lnQ1hOR01DYzNZTDA3RnREYk9BK1B1c2ttajFXMmg4cHZOY280UE1QMHhYbz0=", + "authToken": "joxX+SSIvAa1BIWYadt9", + "transportToken": "MIIBCgKCAQEA0+3Reecd//bb38IcRgNfhhPnR7ucU66444I4YgK8m6ThYDIFZ5Nd\nltqA2UuFTFObtzuQB0TEyzM0LO/PbRyPt38wrpx7X19yPuOvErfwhbuTi3ruZJJa\n1h/yWPXsAsUwcoJoQwPKXbsboL4wQhCGJXa8YSezLcPhOODCDx1jrdPrZgBtU7eN\nJIaARU+lHc/vVwFlcIGNwsyYvetxMjBfOzu4DriPjNKHB7DTjyRWIVh7Of5X9Wxe\nMxDPdW/A2JlaTalca7bJ0LcIxNBD7KQVqfYRj4bSJPZk8rOklpbCoVKP7SJbOBla\nYRvT/zfo+sXs3BB1t5ZaA3RvhgpFylUoQwIDAQAB", + "contact_key": "MIIBCgKCAQEA3A+3hUnPxaG+E8HOfqHeSJzP5BI+KvuuTEzxBnxDR4ek0/S9KPHBkT8laZC5uce3qhC8Ok0nC6OZQXmodhb59U59u7ksuvCEdL/fct4y/sE//Og38xwyczRUCcxwHATb0GOF2kQCxQTuw2eTxJh7AayIbPbgOv1PHnVDKHeGCyHz4zkzZIiiby873bQAfGwa1xBrZtQi3NXBaCtDrYoKIuuQuFGHJWZnlEGecKD9F98cZzS7tqx3J6tIlwbypPSFvLUTZQKqAaF5Ee78/z6RY1auvdgCdXPhZI7IAe/HcMW7bMY7UKpWHmIcfvZxGqZhHlK29Vd1b9lC4zq1tZxqewIDAQAB", + "privkey": "MIIEowIBAAKCAQEA3A+3hUnPxaG+E8HOfqHeSJzP5BI+KvuuTEzxBnxDR4ek0/S9KPHBkT8laZC5uce3qhC8Ok0nC6OZQXmodhb59U59u7ksuvCEdL/fct4y/sE//Og38xwyczRUCcxwHATb0GOF2kQCxQTuw2eTxJh7AayIbPbgOv1PHnVDKHeGCyHz4zkzZIiiby873bQAfGwa1xBrZtQi3NXBaCtDrYoKIuuQuFGHJWZnlEGecKD9F98cZzS7tqx3J6tIlwbypPSFvLUTZQKqAaF5Ee78/z6RY1auvdgCdXPhZI7IAe/HcMW7bMY7UKpWHmIcfvZxGqZhHlK29Vd1b9lC4zq1tZxqewIDAQABAoIBAQCuEcCZLkmrisVP2337rQ6nYWMQhV2nom287R+6gZC2hBVdk7oNKS50Nf7iAhjnW5NsctBxTZYVHtObdyBKSOJvqCbM1y0KsjYUI7Icqqar3TFAXG/lXeiKOFpBZfVINI+rxw2aGTIXpk83Qjcgy3yBVniTuLSl9Lkg3qDA4cqmAj1d7DXgDucNEoK5D+nrkuKKXyEtaXFMANJJAD7MTU0XRKp0JFNuMC06X8srhYHNcOwaknUjh7ZTpPNS2AGedGwKYK7iEKzHyVpb+fMgI4HXLs404/sjz8OzecHrHVKx35CwmdttyvIn9LksM75v48WVhmGgFsJJS0jtBrXumRABAoGBAPp/s7iASPzzKuEVRt814ShmiR44kCM6LqjsOkpvtEHC42czYT7Kviz+4AUMxVWqn9ydY6wklRnDWKA0ZDeNe0u+MAMetQ0BpnsgaxnR+R+/XjoXtYu65Jn7PRpdSRQqOAmcaWdTd4DgCFCbdkGh/qG2BbtIaiN1gNCCP3ZBpnFLAoGBAODk5XYXG+XSA6T/U6xcDMYMVSaPjm9AvvdAHdBowg/wEA4O+qzEMye5+oop8EoZPlU5Eri030vfw3P2LL5MnnfyIYqSeSef8zz4DUtYJGgvbJPC9pydvs6qHymrIklS8oBuLVx8D5f+ogIWKbGB98KZ3INjAlNmXguzZKK+yl2RAoGALoFc1UkDw+pFMKppkPEIzx5SIIkxwUiA9x18KOuaFIdg/nzcdfLf4ayj3GwliqT1rtiNc50LDVBl+MAhRur+U+6ILVwbEsIWrU80cwO3c3xsuu5B5yIYZLnu+yEMezDnXGlsbCFj00pEYOqrxr2Tb2RCpiVohxK+indT3tmLVAcCgYBrtbUgZdj6rScJsy/D8SI9CFMP8Nlq9zt+97pPwpyPPY6y7QGqFR3a/Pu9iHCJTKXJ81fAFwCLOlRGCbVMPy32jIT79UMJc1Xv8W2MlF57d5ss+cdbI0HrgRcDwe7d51g1oo8fKFvflBjLnwnA9lpPXZl7Y8QNZY3NVNHyECajwQKBgENAKFY8NUxX9Etu336LZQiPVrDvYYGVdMVOXXQnnRgfrFzRdYpFcyWpBB7YCsb2pVkHj9l1mgXtqqmj9wCdyrmpLMpLxvnvFihxKzzVwKztrkkjOs5yMxHZNI0er2TlQDlQJ8yQnlAM0bFFthPRdPgnwX/ZRYMpr80KPcu1yqW9", + "exported_keys": "a2V5czo6QXdFbk9HN2xlZUkzUHJWR2ZLMFpuZFRJdE4zaDVRdHIyT2dEQ2cyRnkxMUZjb3hLdFduTjRjMG5YcDJUeFl4Tkc3VHlwSzI0NEVMN1NqOEpZeGJhK3lxUlNCZlNERlpuOGFMSWkyMnFrNkpONVVYL0FlU3dtaFovNzhRNld3c1RCYkdCNkRpcUtYd2dxNGF3SHJRcENlSEhJSzN4VlBzZVAxSTF0ZEtSS1NxWXViK3h2cGtaek8vcm1yNlBCc1hNcXNndVBMTmdBVXZkYkxQdDlvZU9WZkQ2cWhOZ1kzNVVhNW1qNXY1dUZYc2lycHdDd1g1WWJLb1l1QmtxblJpQmxPYXNWeDMwZ0pFTU81V3l5N3U0aUdzZmNtVGNsK1FZdFVuTmF4dVVNZnhFc2Y5WlAyVkYxY3BaNmZFNmptcE1yOWdpSFVhWU1OcTgrREM0RE9wSUlDSkhRYUsySTFML1Q2c2JJOVZmRytoQ0hvazU4cS82cUJWYUdZV2JWK2h3WDFMQ1BIN2VpeE1tdWFPT1IweUVobTE3Z05uekZTYXN5bzUxQ00rdDJJbXNjNkErQlowb0JDUXlKYm8xc0d1eExwUWJwQ3JTSjZTOXFMUGtyQ0hZVkJnSXQzalIxaSt0dUpHOE1EejF5cHEzVkZPTi9wQzRmczBmZnFTbkVyNGc3MEROQkRvclhuaFZkMWJna1FxQ3I5dzhpRk1YVW9HOGVId1FXUGlvNndPTUV5dXhrRXgwV3NKcWJzK1k5R1dpNU1uSTMrWVg4VlZQL3JPaGdUbUVlUmJ4TE9hRGRRaXgrTDlXTHI2YTZEeWVPd0hBK3plWk51OE5mVXhlcnBzVkdsWEVJMGliUDdHcSt4TGlHcG15dzdRR1FjK3NsOXozM01zdW5JV3ZaWVgzVE1yM3p6S0MxRWFoU1FUWmZFblNiU0pJZ3F5bS9iVncyZUhWZnlZNTl5ZW13NjJtNHc1b2d3cFJqcFZnV0hTbTNEbGtRNTNyc2RCbWMzaFpRcjUzeDZmbTdvZi9mUGlnTW1NVlpGN1BaSlQzVVo0Wmtqby9zZE5Pekd1TkU0L2x5WWVXYmpoa0NGRXdpQzNIZk9PNmpBWkRtVHlKY3UyaHZLLzZGdERwWmdoSk1oTkNtb3lMbU1QVWtSTUc2T2F5cEJlRTR5UWxkNkdVeWNITWRKbHFsTmhqMUlDRFQ3bFdjTTBXVUhlNVRhVWwyaFNWWXZqNXJNZlJRQTVaSEhiVE9VMG93V3Jac3Vpc3ZIMytIVDZ4WTh3bGJTS2dHSE5iOUhDdFVJMFZtMmxFbzdYSklYbkxwVCtBYk5zWXZQSnAxVWVVZEV1YkVHTk9UMVFzSEZBUGZQWnZwT2pkOFliUmxHTnhvWlFLT2dYdXpIRXFxdElOY0ljQlN6cU0rSjFTOUVvWjVGa3V0WEhaQXpzZEJqZEhLaThXM0tYSDE5VkpxNFhxRHBJSWQrdVhLcGlxaFoxNXg5V2tLbVNNS1lyVVE0VjErYVRnQlN1NndHVHA3KzBpRmxRV3VVeER0Uyt3RjVqUkt4c0U0Mjc3T2pkZjZvUzFKOFNVL2Z0UlphQnkxMVFIV05JbnlBSjJHamVha1lLeHYrcThLV3Zpb1BBQnpYZ0RQZ042OWtUSHJETHpFSnVqSEZwMmpWcEtEcEdTc05NcTlhSnYzWEF6NEdFN0hEOG04eWE1OE1zUHJqL09ZcUhscytYekdBeFVER1lyaHlITFBqUGhOekw5Q3U0ZkZ6YjJWU1dLd0tiZlZHYXIxcDlmYmd5MEFmSW93R2oxa0VnZGU2NktFY3JhUC9RQSt6RTd3SkJSVTBCWVRsVmh4U1V4ZDNqaWVnQU10aXA5TWl2NW1lcmhuVFI2aGxDNU01cnVzU3hPcDZoa0p2NWw3UlpCNFZielVLaytRdmdoR0hkSVVJcEFJcFEwYTJXZkI4N2VrQTlxL1IyUmxCNVdsZXp0b0pUWG5jeW1DUGRtckg0UVB1YlRxZC81Q0lRWEpsbkpKSk5BZHJZTXFiRUNrdFJkQzVjbmwvNGJzb1RidEhGYUpRL01QSzFBVE1tRURFc0NlT3Y3cnpycStKbGZRUkRXS0RsbUYyRkdmOXZ2RlVnazMyaWEza2hGSmJUaWN2TEJLOXlhR1MwaEpTSEsyWW9YUENHS1cwSS8wQ0JRdXZSZDFQYlFnSjRIV2RyRzRRKzNucnIvY0ZrN3JsU1VVRkQ1TitFNFg4eTh1WEc4cjlhZkFTTWR2T28vcFNBQ080ZC9rYWdHeHNGQVVtOUpKYzRYWUJBVUtJdE5qK1RXN3RmM2xXTVZDa09WVmdZM093eGdqQ0RnZlpFTVF4RFhjZTB2V2NoZktrOC9BU0dsQUNteDJ5UVhYYmJRQkgya1lCK0YrcTAyeEsydXRtblhVbnZXTzR5ak04NitKWkpxSnE3bVZrOGl6VjdlMHpuVVorNWhvWW83eVBseTY4dk5EMW1VdHNMaUhxcnhGa2lRaUkxWnZ2NHMxZkRCTWQxWXlhRkdTV2QvMythcWZSNGxRc0VPMkJrNVdDRXg3QTdqeW1BRVQxSzRKMXpTVG04VVh4ZGUxR0Z0MVZodXhqT2doN0Y1bGdFMEY4cUpXMEZkN3JyMUcySFhuZElLdC8rSWhacmJ5MWNVaTNLSFdab01RdDQ2cXJJVlhPT004VFRNbTdLSHhUakhuR2lHSjN5SmJ1Y1E4LzVLckkzTHZ1Mk81S0lOakYrZktXMU9GVEpqbGgrTTdHNHlPeU9OT3NRQU5VejF2TXRKSzlFdWR1ZVBBdDNkek1IYWhycTd4VHlJcXpyVW50MFp2Y1JadTZUNmFRNkFtWnBHcGJ5WE9DWUhhU3pwWmcycmo0Y3JwOCtZN29uclR5dUZvSzZjU254SGV6U3VSenhVU01Ybjd6bzJLZi9ReUl3MFl3VHp6WU5LWVkxaXBvZXhIM3hZdG52R3NZSU1OSGlzNUpDNkUydFZCT014Q0Z6QjVlTHQ5UHdPNjJvSkhUcUxzdE13bTk1MzZITHVvQnZ2RXZUUU5EOENXZWFhaThrekN5dkR1K3VUeXk1WUg1UlIxckdwckthUktMeVZFVGI1djNsWXdGYVNGSEFCRDNWcUZFTmRCSm9tQXl4ZjJ6QmloZ1oweDE0YjVxb2gyc0tnNXRDd2d2eXlxVjg4V0prclBMWSt0QThnK24xRjFlb2xUNmxzNUw3RjNsbzNpb1ZxTTZxRHg0TUdwYk9Mek1OMjhMa1IrMHlVc3FGWnVjUFhDakVLSHpiK2kzWGRaTWRIVmZ1b0h2YzVsa1RyUllTZXNWWEJvZkdUeUtHckxBVmt4Qm94SXI1eTF6eEFleU1TL3pmWUc3WDdHYiswcmNkbVljSGI1ZkFER2d0N1RIQ1I1MVBkNlB5UXZoTTVFZCtqNE91ZFNjbWVLZ010dmgvVjQ2NTlOazN3ZE9QYmswT0ZpWTFIdStFQXI5UC82TTdFVnVoR2F4VkRhMkI4NEFGcWZUMTFFbUZLb0kvY3VRK09pRWVJNGs3SlYzVUV3T0pTejNmdGg0ZG5pcTJ4dmM0RVgwbmtVUGJ6Nld3czBDeGEvZkg5RmhwVkRzbTE5MWJLcTVFd0Z5RnNrVmgySmovWnluN0ZZTEVSeFpaWmR6Zz0=", "pin": "111111" }, { - "pubkey": "03bdfe28c65ad9e2186f4630bddadffff1dee1094cd60fd6ee1445f5d0cb315a68", - "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023452161", + "pubkey": "03a2b42491b0e173792c4849e852df8e0ac078fb41fbd1f9cf546062d7023e7574", + "routeHint": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3:2199023386625", "alias": "virtualNode1", "ip": "http://host.docker.internal:3004", "external_ip": "http://localhost:3004", - "authToken": "4+v/7sYs1r9G9JBt0NKY", - "transportToken": "NIIBCgKCAQEAx+fbevw+o+K0reQIN67flZrqLBmIiocAC2SrdJ50X/F0JRkfw35Z\np70hTmAsfAyUGXmHsxMQRAgmVhlcp6j+jyXWYvHWtNqPn5TrGUjYUEkSHCyMgucj\nxmBjO9h2hqh3u1miEdYpJDQ1myxVVTiPoMT8b4s4TmUmeP9fntvZ+nYPanvx++sP\n8mNRt47vrk+C44dF1UTmtPL/9ayN58bksm1VR2OmtQfziKFy2AhP22dP/jSNhgnq\nB+xPrpES2keIRKlnekdgg46gYObE6TcIWMHPpVcs1P8jVglKFmBWABN2B+nXZh4z\n/9l5x5xSIkMawL9IaC96B/2oTEEZgZWpkwIDAQAB", - "contact_key": "MIIBCgKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQAB", - "privkey": "MIIEowIBAAKCAQEAnMttayqHUfRjrUv+04we7w0kQzDoLcoINnhtFTvL/5G4v+1Ebaf/gSRPpcE8wqmGo8FtPzlJewezxb2OQ6+DHm1KB71wl8+TDC8g3kE3RupBocpDX6cURdJJMtJ6a+FQX7LKnZdCypPBBLwRv75dzc0kFDrDibiMhyouYv9wc/tfirMZ4Rej5PwxPkRxlZuiUw7QYE4+ApbkY1nbZj2LBW+Q/gI/3OqErMfAwad2fmiIpD1Dmxb3lKa/tLbLFK0pOPEDqL+ZLq3x+mTsqtxuLCwdtHruguxiWrB2Pfq/lNazRgW0xLl07YeJY+JjV2mhG0AuEpQMc28xTTVDHLspPQIDAQABAoIBAHMYsV11fpgeef0ASDMqLJr2XqQkBot2PskdZZWsq3cTlTbuCMkmBVzbNsxKKTwMDZWvq245s0LoyIJjP0dYUzvGpg1AdqI58YuEHPCJlvYrh7ooK4TPtQX781enQc5nOwTEzg8YtiLWi13aYH0MVPd5mv5ulJNIMYAW6q4pLHc17PirzkoWVqRcOXYOOE5vjOXWh1ra5JnkeBBfR76/uFKk6pGnMj3tg3urNigiSS+6sE2dHnJjT1InHG3o89sc2JnoY8ioWaS0dMH4/Lj93tWktVnod5hadhdhiurAk0yxL28MXHjNoTTknGX0d7wOwbu5kIZAKKkPfuq4JrMVsdECgYEAz/HqcgTnPQIgaMAeXtqKTghraq2ObL+vf3xP38OUW6oykSVhgLtgAE/i0FwNHrh2W3q3/5OOyTTZn3AOaqS/nTMudG/ew9GlGkZWcaep7hh145GkRadwxyEeT0KgCcjv3f/TqTi4PPUd65lbLrlj8J3JNsmxpCXLN3E/04Sx3/sCgYEAwQdxU7rfv1r6ciAnZs4DMwPYj9t6R+GEbX9Ri0I9nQGkKdmY/8++EBhyf7GnRwLHzAOKLq7ImmPalgOJx7a9p/+KFIb+v6AYAuZdtj1FfOMDXvIrmg9CZjxRlNArO5GZKW+C+ZNmohCavH4LgcC/LriJGY4kwowMcfCcTmSF/icCgYEAqIy87Jh+2lub62w18cqQKjn232w4MnuZA+u+TnCYE0i8Xhv/kTnP0dDu1taWJ916yiGJfNac+QgmkW5hsR1C12fB8s0usmh+u/JhZRRyz7Px8nh9v5u99RoqGDK3x9agXsBbTyHTbE1+aBZQ62mH0WQD0a3gmF2t/42DH67CAvsCgYAISEV4jkAjecfdNbv7EUPZ4IReR9CLXQXNnPTmwMTcA8IDea6y6zsAfcwL5peC2H+yJUS8lAtPdJFgdm5m/1RL7Q8Dqncryba+CRxkQWTF4we1/zYXuifjMxtdA0GXoLutp3c7NjPlKEk7ZT0hKCAL5ScczZiOMGwoR2athmqpaQKBgH4N6DaZOD1zpW4RnPIlIMrAuCnplan5N+vof4JgEJod59KO4UJ5hzIcEot+xULTHICN74jY5McDiw4meGpS/uk/6CP1UzGZixxd5n0+FppstEyWJAgK6naKaJxYffrytioKdiV2dOzRQ2YgJhsNu3WqAXg0XTeo0lSP6L2o6ECG", - "exported_keys": "a2V5czo6QXdIV05sUTlmYm1oaW11dDNiWU4vU3k4M0FFY2FmRXVPam5CTjJheUxMYXlMNjZFR0dLMitLbC82aXFzNzY1K1NZbE16Sy9ybW9KVHM3aW5qY29uRTBoKzBsUitsQ013YndyVzd6ZEZFSjhwUURSSWpuWndHM2VpSGJzZVc2bk5vR1JXY05iN1JjS1UvcGVaRlhBUWxPNnFmZGdrbVJ2MmordC9Ub3Q4akVVb0xNWkNRc3MvOXU3YXZIelBRMnJvUGw2QS9wZ3pqeGxxd0lNSVJXK01sQ21ZQlVXMHR4UTdHREN1aWI0NWlybWNZOTEwU2NENkNnY0crdHNxMUxDeXdVOWQ0MVVUSTVER0xsQkpPdWJnRUthUUhMdDZvYlc1a1FaSFY4RDlGUVFGS3cxRlBpMEszTHNHVG94Y3YzYW50UTErcUUwOHRSUXBMZ1IrM3NBVWFJZnlSTGJhVXByMW5GaFViUDJOV1pPTkx2bUJLRDNnQ2ZrSzJIUzBpNGZRRHptS0lJeWUrWDZKTkNwRWROUzhPdUFVeHExWis4YXZxN051MGdWdklwQWovNEZpS2NtNUxoQk9ud3ZTWDZ4dnlpb01OVG02QWpaOGxYNElqU3N0NWlzV3JPTkZodkNJc0ZsNDFtMmdocGk5Ykk5cFVyNktVUEhhSGZveW9TSlkrdS9nU1RiaVZJSDFqTE95UFRoRnQyeStyNC9WeFlDQmFRYUs5UFhZTC9aaTRPclB1bWllZjFmd0txVEVpV05RNW9XNTJLV0IrZlcyVE5mZTF2MHU5NktWenFyZ2lrZGJzMkh6QWVQbXNXOEN2U29yckN5bXRVa0QzNTJjRjhMWkZWSm9VaVRIZURJR054c0s0WTkydjNlMlJ1VnRTQzRsS1VDdXVGY0NwVHpTUmoxZDkxOFBnVkkxMTAzSlRUV0w0NExLU3NhNE84TktoRm52UDB4Wmc0amtOZmVtYkt5Q1VUcUpqL2J5YUtCTlZMMS95bE84R3F0ZlUxdkRabHE5WlVwQTR0Wmg4cUhQVVErN0Y0N0pyaEF4ek9DNnZGdDYrT25nQ3YzaU9hZzBGUmxPcHdPM0tpeGU4aVAyWitmNXBoQTJFVlJ3L3J1cVVidFYvMTBIMnFEMmtXZEUraEZEa1N3SkFSbEwybzNuellya2EvdDJsSGptKzFTaE5rdFowYnlYYWhvREZsZ0UzZkxXd0NCT0pHb3BkeDVyN0hBK1ZhRXBmUm1MdkJLZEFjRU5HVnZNMEJveUdiWDI1TjVUTTVCZjVwcjFkbk1lQzc3TjNEWU9nUlI5aGF1dE5WZE4ybGhrTVliSDlhRHpqNXovWjZnMDNrYVVzY3hMNzB2d2F6VE9uN1JDT09pblZvSkk4REhqSEtpRW41SWg5REtOSnc5cEhrVjZFL2d0RnMrLzF2cG4vL2Y1TzFuLytxUmRZZG5NZWtrV3pzQkd1eTJBZDNjNEtNN1NoaU5zRGF1UTBISU1PSE9lN2tGU3p3MTd6cmhuN256R0lDZGNYOVBrTFMwbjF3RFhQNGdhdStLbjNzeUZ1dmlaRjRjTEcycHVKRjl0aFVzSUJTWGpTK1ljdlljVFNkVFpZNlVkUW9FSkJwZy9QRmtjSmV0ci9qd1dpTzR1amNxYjgzNFIzU08yeUN3QW0xNVpUb2tsUWczYzIvbzJqRVd1d1Zyamp2VWo5WDhIblVnSlczSHBmdDRNRSs4VkNNQkl5Wm8zbjNkd0NSZkFHL051bzlhVHY0allOUnVOWWw5Ym1JVzJra2RyNnBWc25HMjY2NmJWQ3RHKzdFM1Y4SW1RTjAvSzV3Q3phWUl0WjBEK2V1V2VCQmd1Ym1jbjdsWkZsQXNmTmVqN3NjZEtGclR5dlN4VU5UNi9IbHE5RVR4YVhSSjJwcE1JQlM0Ymg3UHp0UEt2eUM5eWIxVWU3ZmZrZi9XTnhib2I0WDZpanhFY0VWdTNVWk55MzRxUlYvNmM2STB2d2xJYldlREE2dTE4d1V0T3F5cE9HNDc5OVpnUGJSTndpbk9wc3pLczdqRkVIRkN4Qzh2QlFkRnVZeDFHSTE0ajhBWmRqb1VEbDBodnVwUkQvU0FTYXdMa1R2TnpEOTc4K3RHOEJvcURtYk1PRWI3NVB4U3NBMzhmYm1BdDkwSGtQRFBmUzMzc2hHR1JkYngrdUZLMHA1SkNlTGJoUERKMnNqZ2VrSnlOZHZaclJxdVJZcWhEUnBrbFFvczRsSkxwT0hnanl1WVU1K3F6dFhvSnJPWEVTYmFLcXJDdFdDODEyVmt6TG5KTWJCWWw0Kzl3SkhkUW0zV1VMS3lxWkZLcnVpMm1UMzJTRGRNdzBJSlVKSi95d2lWcml1akhueGpwempqZTRRYnF2dVZocjNiNC9kUGJ6a2JoOW04aE95OStxVTJicUM1TkhQRlBaZVZvTE5wZmt0MTd4c2tLOUFyM2d5Uml2U25rcTJJYTlQWDc0TXdMdVdkWFVGOXQ0eGM2ZUVpRVp0a3ZpbENCSWtyLzJwWVJDYUJKVnA1L1ViV1pBTWZPS2JKN05ZdGNHTUM1Y0s0c3FYU2FqNHQ4T1dIa1VaR0dGcHZsVkpYNHZpUWVTdC9nb2FhSlJncDN3aFBOUXhIT1dxYVNEVUtRaG4rZ3ZXL0E2bVFlREo2aVlUWEdLQWw4KytWZ3NVZ3ZxdE4xcGFjckxGSnBxOFlLQ2lNVm1kemgyMFhaRS82NDB1SmtBUm9ZdzQ2WDN6a0hZUk1taUVZOXBST1hhRGpxNTZodnFNWDAxSTExa2U0Y2lObnNkeVBPOHJVQ3h1cHAwQjQ3Yi9ySWVjSjI4SHB3ZHcxRGVBdUkvbDNFZ2syTWU3L3pDVVRJd1d2bHJYTnJicGVXUEtuTHJmV3hWZ3owWVIvemlyRDVCVVpBaFZvbWMrb3dPcmpJUUtnUWZJQ0QxbFJHc2g1d1NHZE1Xa2FRN0FuUzdjSUxZeU9EYjVnNjR6MWIxTHdLRkxwKzdZMXJteEZGWkRVMnlKNk5nQ2xwMXozcm42NURIeHNnUWlPTng3L3NuRFQ2QndRMXkrdFJCeTBEelJYMmhMUHNJSzF6Tm5hWGFuR0Z1ajVob2NTODBXS2tpb1ArcDU1NFAxdi9Ea1dSb0duR1hsTW45ekJZQXBSQWFDZlFYc1lVQkhxMW9CbXZhNVl4OU50c1JQT0FrRUJJMlpwa1ZyNENvVXVnS3dlajVzc0IreVVUQnUrelZ3V2tKRWJsYnNRb2RkOGszci96Q2pzRTY5K3JsenJFZ29nVUsrN0puMXBBTlBFbGcwYjJpdm5tYTJjcWhPM05PK1dvNUJBNEdQT0FSaUkzYW5aRjhQZmlseHY5cDUveXJBOWE1QnJ3RFJ1bis4VnRTNGlxL28rVzdqY0JQOUhFSVlBUlBteEZpa3VOdlFmVy9HWjlKT2gzUFFHMnZTOUIzZVJ5QThMYmRDOGVEZ2RJZGd6YXRLbXIwWHZMYWZtVHNuVURYbCtkV0pFS3hiaFdITnVXZVlJQlEyWTkvSUJ0WVJONjZNWGYrYUp5ekJaaXNqUU9mdlZnK0JYcnVLS2tIZHhtWXY4ZEFLeUlBZ2Vndzdpdm9oc1RoUkhQbVNteldGc3dHRC8wUm4xTHdsejN6N2VzVi9TRWtxUT0=", + "authToken": "W285gj7hLUmLV6TL03FQ", + "transportToken": "MIIBCgKCAQEA0+3Reecd//bb38IcRgNfhhPnR7ucU66444I4YgK8m6ThYDIFZ5Nd\nltqA2UuFTFObtzuQB0TEyzM0LO/PbRyPt38wrpx7X19yPuOvErfwhbuTi3ruZJJa\n1h/yWPXsAsUwcoJoQwPKXbsboL4wQhCGJXa8YSezLcPhOODCDx1jrdPrZgBtU7eN\nJIaARU+lHc/vVwFlcIGNwsyYvetxMjBfOzu4DriPjNKHB7DTjyRWIVh7Of5X9Wxe\nMxDPdW/A2JlaTalca7bJ0LcIxNBD7KQVqfYRj4bSJPZk8rOklpbCoVKP7SJbOBla\nYRvT/zfo+sXs3BB1t5ZaA3RvhgpFylUoQwIDAQAB", + "contact_key": "MIIBCgKCAQEAn5m+w1n0hzSDj4FXPRT/vfPNMNnFH5L7ZX340e4CZrmSBU1ijJkM2zid0iFkotvP2T99csyKa6dKRUjedmZyDZd1IPvJWnKZEwHHB78KtOdEPzc3EfjDEIN2C6EuG+k+p7l94LKHS55lSqqe5ZE8OWZ6JXAOLYhx6GUmgqU4LFDRS5mljdz+oT0BFLNT2uY6/XDAKhtD47OFbf6030M1ZtEU0ADPyNSvm85hz+WSySZ+a/qyqHBCTnpT6ygYTXn/tWb1DURQSTBgJy9SdVXGPyciTccmtgRHH4oWsiH/v/okgJ3roariVrXgGw4v2a1zPCt6NFEr4k/IlrlAMHeRbQIDAQAB", + "privkey": "MIIEowIBAAKCAQEAn5m+w1n0hzSDj4FXPRT/vfPNMNnFH5L7ZX340e4CZrmSBU1ijJkM2zid0iFkotvP2T99csyKa6dKRUjedmZyDZd1IPvJWnKZEwHHB78KtOdEPzc3EfjDEIN2C6EuG+k+p7l94LKHS55lSqqe5ZE8OWZ6JXAOLYhx6GUmgqU4LFDRS5mljdz+oT0BFLNT2uY6/XDAKhtD47OFbf6030M1ZtEU0ADPyNSvm85hz+WSySZ+a/qyqHBCTnpT6ygYTXn/tWb1DURQSTBgJy9SdVXGPyciTccmtgRHH4oWsiH/v/okgJ3roariVrXgGw4v2a1zPCt6NFEr4k/IlrlAMHeRbQIDAQABAoIBAA1FsdF5B5a+zTn/3Ytc1a+sOKIZWgU4KePUx/5dNqHoSLZcKxfaGnGYkbdJw56vfOdqGjqTu+cb8Fc2qhlah52NvNXTWnlFEmm8OhrwzikhGlHPe6ro7v/OjuCEtNrpWKaGDGvFLO8i6vV8nt4kZ8e2N+4pFWS/9gkHcF5o8vTsWfucVIPbZulEp7kG5dW99p4Cv4kAuBXoEsQfgUVOkpoFihDPH7c8cK8daW+LWzVhKzgJsf79nIxyMEG4NbI1IfItaJcLazI8aWl2oRJJ6elc68fus6SMxpKzJhMwnKNnfJjb66VkTQCSm6uubviXUz+VwKyoTX02a/nrtVu5JxkCgYEAzauYWml1Eiz0qE7o+OKJmV7JzbLM8LkZE6SspxUXRuQ3vlevCsl484vvwG/to8xr6HGYoon4gyXNycwKpPbtovYi3+AB58z/HcHFMRA5UWTHj7QNvl5rUPUlO9NyvzaQdNxMBJ9h9LLwfOiXnYJjBszFOTqS3bNfRHNPWXgzZc8CgYEAxqgR0moF5yltyMUaizpSF7WyzjcJIVig/TEF5JqMgupOvcsHbzV2m0vNUZIZD40yzqoEZfPVzqg3c3wxTOUeKFu28PyYc04Vd9tQRT0jZiM8SiD7eIkuSAQr408au7KmF7d13Ay3G3GfbBu5Pe4nA4zB1oREK4paJf1Jbh8EoAMCgYBCgjAFZL7n/sOrPcFW4qMOhrmJnD1rxt+WG5V9fnOFiD2CfwZq3ZYQY/tG5qsZYfyvMTTjsuw7NNlkXWg/yl40aZYDgYP8Oq1xKP0kjZOLf6SNEvOy0QOxLWU6AHnF3dY/BBJNGGFr6QWdzvVgiQ6O318Tz544tU2kbAmH7DfqvwKBgH1tssr63D1HACUqpgbQTPLha0MepqoiTotuf30GQ7+I9yyIW2pRBFErPDjLmP0jtreby2kf2pg/x7sn5+zYIQF0Xv6rTgpHe/CQTY9Z+dbMWo2nY3+Ihes8jwVXddabBpmk4UqN0LMIO5NDseMzUfjAz8aE/pHLKf4gfVOFTCNHAoGBAMkRjkhf1VBJorXZtzzsf5wahwCOg8nYb+pPumXzlZQZrFBvgV6TwEeF76CnXk4IYAViFX2H/21JlLZdMXy9EgD3jqTEywI8gdVgcNJzWTZWWG26cZWmsxLgRKBrAi1ihxoSqmEPecfOZHiFwYODvojIvvc4QwwHOLNglXW36jj+", + "exported_keys": "a2V5czo6QXdGWTFzU2oxOFY2d0xhNWM0ck5VVGVMWWlmMlllbE1JQVpsRk1oMDNCRkFoekZ0a0ZpZ0pPR1hVZ3N0NDBUMU5MbTdUbHAwTjR6VStoTlU5N1krY29RdVdWQWFBeFVkM3hlOC9rUUY4YTVybTlyMFFYQjNCelNOWTJNNGhmZVRROVVsSjVvVGRSaC95SGF0VTVzUW0rVHQvRDg1bndFaFlxU0wrVGgyUFlpdHhWYTFSa1hCREp5WVc3SFVWZS9TZnR5L3FIYitoQ0p3UHpBQlQ2WjFFTjdia044d2Z4Sm5JVG1OVmlvQUFlM1JWYzhZbXFFbHdXaktYT2VXbGhtWTV6WVNPdWQycVdueVVUdnl0WTNYQTkwT0k4NWxQb3pyKzk1NkhVaEJBUk8wVjRYaGVDWEc4WXBJRUdDYzRrbEJjSDk1dUJyckJMWTZraHJZZVRaYS81dGp0NjY4TE1ZQWVTR0RoYndaZXNBY1VLMUE4aVZsWVIySG4wZFd5TlpqVkY4cE1FNmtlam83ZU9XbS9uL2d5R1dva3Z5MzZYNE10K1hTZTRhbUQzbG40Y0Zaa1lUcHFjMkNtaXdLMTFWZDdVQzVYT080VGRpUDFSY0luQVJCRDR2d2I1NlRYYTA1S0NZR3hYN05JcHYrenRUVDRDRHlLV09ONXdENnlIVGFiaDRvMWg3djFmSHcxY3FpcHFvbHNzR2N4Q1hldDlSSklaRDdJa0pEVnhabjVuV0hENXZpaktnMHh0R0F1bkIzOHU0cFViTWhneS9tUFcxVEsyQk5QZFpRTFRFV2gxUTZlblVOL2RrVjFZVkc3VUp1RHNPT1ZZdGJNQU5wREdJRHZOa24vTmxvMU9OL2xCMFhKTEd1cHlnSEhzNTZpNGZvemFtZURaWnJUeW1hSVZHZ2daTDBuaHpVUXZLY3I5ZVNaVFBvVXNXalhsMWlpdTVXWDgzRHd3WHIxNUdDVkpHOUNBUUFHdnFXYkxSVnhOMVFPMWJBZmx4ZnBjQ3FlVGVmUEM3Zi9kYmEwVFhocFRJeFNqT0E1MGtPMXJoTGc5SzZyaEZzQUxlTWN2Y0hPR2pFM004bXBaRmtITHJDTENaYXJPZ3g4aC9XMDJqVlVWQXYwMnkrMnl1eTJpWXM2V0xMM1lnN3hIMUp0ekVVaTF1Ulp3KzV5VVJqb3RLVVllcFJqVGJlMmJhdmpETGlHdkhMOC9MWGFqRTJuekk3Tk5pWTlvNzJuQXVqVFRFSE50dERvMFJLaGdMaXI5U2pNOG1qb2V5RklpMkZkTWpXZ0ZOL1RtcmJpc3dGZXIvRTRBZzhsNFhjZGVQM3dHTG1ucWhuL0xtZGFSM1VIRTZIcjBia2xqNVJtS09xS3lqMWVLeENhYVZDREZqNVozc3FKWlBVb2NmZTNOY2ZPOGI1YlU5NHdvbTB3TVIxQjVxOVJWQlZ2dVVFaEZIVCtCL2VJMmhsVkFMVXRZTjVMYXVVWjBoRzVLbmZGaTM3dlJ2Z1ZWSmpQZW5TbHN2MXVwaUNURG9zTXZ6M0g5WW5DdlJieEFFdmN6Y0E5RU12Q0twT2dYRmkyd05xRXp4Y08wNzQ3TTFxZGJWT0ZmY2xuZ0wyNytVSTVWOHNtRURqeGUxZnJCTnFBeVFRTVZKb282Q0VmVzV5VGdLcVFEM2VIbXd5bXJTOGRpaWZTd1lJTHNpK1pSVjduZTR4SUQvRkIwZ3g2VzdMalIyK0FGYW1FbDNsL2JqWGsrQzR2WWV4U3NhU2czOElwK0JXbXFTaUpuUkJPOGdkMU5QWGxSM2RTUk1kVE81T1ZaOXpSYm9ZSGZaazRZbml6QnlrQUFQcVN0UHRNTlpMbFNlSGhtYktzV1dsRnF4YTl3YktVR0hCYURhY2hMOTBrbWs3SEJNa1NKUHVsK2E4dm5rR1F6elZKa051MS9iYU1pNThFMUhURlFOZFNrR1NhRm5NZTUzOHFsQVMzTjNKK3pRSERlVUMyODNOb1o2MXIzaG0ydjQ4T0ZmZFVLOGFaS3haK2xtVmpUY25GV05XUitUbkswNkV5SHBXQzNnblF0WHdFbUdaM0NNbmtqd3pOS09ybFFGTlNEei9FMzJkTnl0N0FFUnlYcUhXbjlGcDY2c3lPOHhqV29QbGpVRmZQSFZVVUlJcjBBT3VxNlJmUVJaNWlyNW9yQjkvb3pMalMwMEduMDcyeGt2VSt1ckx1MXlyVnhyN3M1WmNYa01uRWJSQkxTVWp4dGFiV2N5SmV2aUtGQkNmUnovUElObmZYVUx6OXpIZWxuZXBzZkRyMG40MjVNdjlWamRia1RoMUkvR2NObXljVUh0bVE0ZERnOWVKWGpwNkpzMUZobzBDbFFrSW8vS0p0cGRaa3IrMk80L0tFeURGT05YTTdIWlkwanZncXl5b0orcERuQ0tzcXF3SzBodWlSYjBqNGRXSTBtZ29LOGQ3dGQ2U1JBemd6dlV3cWVBZ0xPakdtaFA3TWFFWDVkRDdaVm1ueXp3TmpoU2IyQlYrWi9yeGNDTmxhY3MwQjRGS3l5VktNdFQwY1lZTE9DSjV5VjJzZ2U1Zjc2K0dWMlBHazBiaExkQ0ZpNUgzQ1h5anNrTHoyN3Z2bEtGbmlFcEJ6c2M0c0xMaXk4ek55aGNrNkFielUzRzBCYTloeENoT3ZhRGNxeHZ6KzdPcTNWSDFVQi8rMU1IbFdyNHlNK3B6enZHdWE5c1VtMncrcmVmWWJGYlFiZ3VESVpiNnNZK2ZiUzJvRE9MZU9HNnJaTlpCRkllczRiK0FTdGgzYXdvcHdqY1ZDTUhEMUhvMEU1eXZHNFNtS1JBNjhYa0xMblQzZG4vZ0ZiMVAwZTVBNmZhQkVvUW10ZTlKUlJwYnFwcnkycWZKaC9MWWk1ejg3VEhvcUdxRGdNZWl1Y1hPSDZqL1VOOW9vcWtjREVja2h3NUgxNXJCQUlqNHZLQisybnRoRncvcDZFM1RyMVZnbEV5S21vTW0xUEs2TFIwOTZxMlVrd0VnK3lGUjh0U3MrRFNQZE01cFIyV01kWGNiVCtOcUhncXQ2b3BySEhneVhkWEY4Ukg3Y2twUTZPL2hSN0tTOCtXT1VyazhWbkVtcjJ2WEJtODBUWGsxVkIvTGxQbThpQlR2REVQKzFiTjhKVm05RExuenpobkZXdmV2dEc1QWFqOFFTU3gxcC9iUndGUjByclJJV2xSTjYzYk05MUh5b2dmRHFydGlWV2pKdEFIdTRJbG5ONHhwZXNFZnRQS2lad2ZHbkdvcHZ1VVprMGltUHNlMnpYc1owaEh3RUxPTFc0MUlDVGJGL2UvSFZGRE9uRGxLWTNBUit1c0ZRNTNxeGkzMjJZWERaUVNnQlFUb2pxbk5RcklzTUpaWUpOVFlvSCs2TkkyMDZpWjFSaHRGdmYyeDBIZm84WWhhck1xQmRwcTdSMlhVY3N5V3VxZXhOaVNNdzV2NUNmbXQrRnNrV1hBSURQMHMrVzRHMXBYTk9CYzcxbGZuYkxBL2cxQktRSjhTTDJIMlBPOHB4YVgvcFo2Mm1EMDhEZzNYenNjYlgwTG1nT1FnejBHSzhrbHRaZkJaNURLZXFpZVVESG0xaGxCL2hzUDMvdEE1amE5VHpZZ2Riak1CVVRHckVORnRCaXFwQzN3NFhmQT0=", "pin": "111111" } ] diff --git a/src/tests/controllers/socketIO.test.ts b/src/tests/controllers/socketIO.test.ts index 7ea9289c4..33ee77959 100644 --- a/src/tests/controllers/socketIO.test.ts +++ b/src/tests/controllers/socketIO.test.ts @@ -109,15 +109,15 @@ async function testSocketIO(t: ExecutionContext, legacy: boolean) { await sendBoost(t, nodes[0], nodes[1], tribeMessage, 10, socketTribe) t.true( - responseArray[responseArray.length - 4].type == 'confirmation', + responseArray[responseArray.length - 4].type == 'message', 'we should receive a confirmation' ) t.true( - responseArray[responseArray.length - 3].type == 'message', + responseArray[responseArray.length - 3].type == 'group_join', 'we should receive a message' ) t.true( - responseArray[responseArray.length - 2].type == 'group_join', + responseArray[responseArray.length - 2].type == 'confirmation', 'we should get back something when we join a tribe group chat' ) t.true( From aa99747bc47faa1996d6843978e17814c21280cc Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 31 Aug 2023 00:34:20 +0100 Subject: [PATCH 92/93] update: updated config --- dist/src/tests/config.js | 2 +- dist/src/tests/utils/msg/sendPayment.js | 2 +- dist/src/tests/utils/msg/sendPayment.js.map | 2 +- src/tests/config.ts | 2 +- src/tests/utils/msg/sendPayment.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/src/tests/config.js b/dist/src/tests/config.js index c9c406185..563da8cc7 100644 --- a/dist/src/tests/config.js +++ b/dist/src/tests/config.js @@ -7,7 +7,7 @@ exports.config = { memeHost: 'localhost:5555', tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', - allowedFee: 4, + allowedFee: 7, cache: false, authHost: 'localhost:9090', authHostInternal: `auth.sphinx:9090`, diff --git a/dist/src/tests/utils/msg/sendPayment.js b/dist/src/tests/utils/msg/sendPayment.js index 48326328e..b83b7b911 100644 --- a/dist/src/tests/utils/msg/sendPayment.js +++ b/dist/src/tests/utils/msg/sendPayment.js @@ -71,7 +71,7 @@ function sendPayment(t, node1, node2, amount, text) { // console.log("NODE2 === ", (node2afterBalance - node2beforeBalance) - amount) //check that node1 sent payment and node2 received payment based on balances t.true(Math.abs(node1beforeBalance - node1afterBalance - amount) <= - config_1.config.allowedFee, 'node1 should have paid amount'); + config_1.config.allowedFee, `${node1.alias} should have paid amount`); t.true(Math.abs(node2afterBalance - node2beforeBalance - amount) <= config_1.config.allowedFee, 'node2 should have received amount'); return true; diff --git a/dist/src/tests/utils/msg/sendPayment.js.map b/dist/src/tests/utils/msg/sendPayment.js.map index 5fa16aa27..6603e60b7 100644 --- a/dist/src/tests/utils/msg/sendPayment.js.map +++ b/dist/src/tests/utils/msg/sendPayment.js.map @@ -1 +1 @@ -{"version":3,"file":"sendPayment.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendPayment.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"sendPayment.js","sourceRoot":"","sources":["../../../../../src/tests/utils/msg/sendPayment.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAgC;AAChC,wCAAkD;AAElD,8CAA8C;AAC9C,yCAAqC;AACrC,gCAAuD;AAEvD,SAAsB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI;;QAC7D,uCAAuC;QAEvC,kCAAkC;QAClC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,EAAE,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QACpD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAA;QAEpD,kCAAkC;QAClC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,EAAE,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC,CAAA;QAC9E,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QACpD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAA;QAEpD,qCAAqC;QACrC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,MAAM,IAAA,iBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACvE,8CAA8C;QAC9C,MAAM,aAAa,GAAG,IAAA,aAAO,EAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QAC7D,8CAA8C;QAC9C,MAAM,UAAU,GAAG,IAAA,aAAO,EAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QAE1D,6BAA6B;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAA,cAAQ,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,MAAM,IAAA,aAAO,EAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;QACxB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,IAAA,qBAAW,EAAC,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CACtD,CAAA;QACD,MAAM,OAAO,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAE,CAAA;QAE9B,yBAAyB;QACzB,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,CAAA;QAClC,iBAAiB;QACjB,MAAM,eAAe,GAAG,EAAE,CAAA;QAE1B,uBAAuB;QACvB,MAAM,CAAC,GAAG;YACR,UAAU,EAAE,UAAU,IAAI,IAAI;YAC9B,OAAO,EAAE,OAAO,IAAI,IAAI;YACxB,MAAM,EAAE,MAAM;YACd,eAAe;YACf,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,UAAU;SACxB,CAAA;QACD,kCAAkC;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAC1B,KAAK,CAAC,WAAW,GAAG,UAAU,EAC9B,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,CACnB,CAAA;QACD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iCAAiC,CAAC,CAAA;QAEvD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QAEzD,iCAAiC;QACjC,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,EAAE,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC,CAAA;QAC1E,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QACpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAA;QAEnD,iCAAiC;QACjC,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,EAAE,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC,CAAA;QAC1E,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QACpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAA;QAEnD,+DAA+D;QAC/D,6DAA6D;QAC7D,+DAA+D;QAC/D,6DAA6D;QAC7D,+EAA+E;QAC/E,gFAAgF;QAEhF,4EAA4E;QAC5E,CAAC,CAAC,IAAI,CACJ,IAAI,CAAC,GAAG,CAAC,kBAAkB,GAAG,iBAAiB,GAAG,MAAM,CAAC;YACvD,eAAM,CAAC,UAAU,EACnB,GAAG,KAAK,CAAC,KAAK,0BAA0B,CACzC,CAAA;QACD,CAAC,CAAC,IAAI,CACJ,IAAI,CAAC,GAAG,CAAC,iBAAiB,GAAG,kBAAkB,GAAG,MAAM,CAAC;YACvD,eAAM,CAAC,UAAU,EACnB,mCAAmC,CACpC,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CAAA;AAlFD,kCAkFC"} \ No newline at end of file diff --git a/src/tests/config.ts b/src/tests/config.ts index dcc5e7888..40dd24a1f 100644 --- a/src/tests/config.ts +++ b/src/tests/config.ts @@ -5,7 +5,7 @@ export const config = { memeHost: 'localhost:5555', tribeHost: 'localhost:13000', tribeHostInternal: 'tribes.sphinx:13000', - allowedFee: 4, + allowedFee: 7, cache: false, authHost: 'localhost:9090', authHostInternal: `auth.sphinx:9090`, diff --git a/src/tests/utils/msg/sendPayment.ts b/src/tests/utils/msg/sendPayment.ts index b078ca308..1365a3f18 100644 --- a/src/tests/utils/msg/sendPayment.ts +++ b/src/tests/utils/msg/sendPayment.ts @@ -78,7 +78,7 @@ export async function sendPayment(t, node1, node2, amount, text) { t.true( Math.abs(node1beforeBalance - node1afterBalance - amount) <= config.allowedFee, - 'node1 should have paid amount' + `${node1.alias} should have paid amount` ) t.true( Math.abs(node2afterBalance - node2beforeBalance - amount) <= From 2b15944451fe288043edeab53bcfa7c05c729ab4 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 31 Aug 2023 10:18:28 -0700 Subject: [PATCH 93/93] logs --- dist/public/.DS_Store | Bin 6148 -> 0 bytes dist/public/favicon.ico | Bin 2239 -> 0 bytes dist/public/index.html | 208 ------- dist/public/index2.html | 189 ------- dist/public/indexAuto.html | 188 ------ dist/public/index_greenlight.html | 243 -------- dist/public/js/qrious.js | 911 ------------------------------ dist/public/relay.jpg | Bin 263031 -> 0 bytes dist/public/sphinx-logo.png | Bin 43947 -> 0 bytes dist/public/uploads/.gitkeep | 0 dist/src/builtin/ml.js | 5 + dist/src/builtin/ml.js.map | 2 +- src/builtin/ml.ts | 5 + 13 files changed, 11 insertions(+), 1740 deletions(-) delete mode 100644 dist/public/.DS_Store delete mode 100644 dist/public/favicon.ico delete mode 100644 dist/public/index.html delete mode 100644 dist/public/index2.html delete mode 100644 dist/public/indexAuto.html delete mode 100644 dist/public/index_greenlight.html delete mode 100644 dist/public/js/qrious.js delete mode 100644 dist/public/relay.jpg delete mode 100644 dist/public/sphinx-logo.png delete mode 100644 dist/public/uploads/.gitkeep diff --git a/dist/public/.DS_Store b/dist/public/.DS_Store deleted file mode 100644 index 5a2dd65433a8bdcbd0aaba51b29a2320def1cd2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05WXvwh{RHfg@M5@(4lV-s_+Dby_85Glqiu=~_|A7l zNk~_O;7+nX`+j`RC&l&=5ihspf@nrW8JZx=U_?YcYMPj{7+Kc1Zt7Nb4^L+M?I3%f z&>h`ZH;dI^|4CmrMX{-x4g9jxkM;Z8#mm_)rf$l;w)VEWUPK5T(w17PsG%z=hZ)6T z=+Vu6{5ZdyzdlRu!8+Yt?Dy*LCuQ@_8E^)i0cYTUGJrcgayJH3e-@x5`#4y`e1&!VN}#`VkM*{!= diff --git a/dist/public/favicon.ico b/dist/public/favicon.ico deleted file mode 100644 index a9098435a0c7ddf6e0ad0729c6b4f9dadf64dc46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2239 zcmaJ@X;c&U9t|MiLjhS-7PT?RVl|me2!sTp2aSVp5EQgP1k2mMc{Fig@{cZQdWcqly>FSv2 zpin4X_Z@VWaz(4&g;36XI2=N|i@1>x3*zz<_S}G+ zP$&&6Av*vGV0uz`un5OhVQ_MhM9D^>oVLp)TwXMUpu?d^p_qz!({T}l7V@bWjvW)v zl+Yl7a7UsP@=Nq$^Ae+ZWIks5HnfwRq7)E82p26E#fW7TITiCsm!jOOt^o}C69kE- zV*XAlfa!y#!BPlqhqK4>Kq3K6BI7`NJefe;iYDMe5`ZTGpe+^;QtDh-%&qK^PZV3`1xplLK!*BsC` z9HE#G$ICW<;xL&Mcd-oNig}Pbor+Pa;Dkax1<#<9T%8$qc)BeK1R2g`dj~rgSE4Jy znL(nF9b6W7P6c(XBl}!;Yor~>~dY`%c zrE?)J$pw_j0IK2s*RU6_lnzpDzgSm!_+oxYtaQ9oX>G96>^cgi3Aodp+46xRPEd@o zzsbj*f+pLJ!HN9P^J@pBzQ%Qi21G-;#xh+kqXW)FQ0)W=nhm9Z+XUe!ZeO*zq&;(^ z%x0T>V}lFJ1)cv?Lkr_lj?HfL=)N=2np9dav@hZvYhZBmGd_VTd$)aIcz$8QvF7y$ z0J1+qrZpyP88)qJ2xWHmZmh08=;6Y_B=|gQ+xRF1F3!T!L8vTR}+h ztjY#Dtb?0vgUfZnvGOP`RSN!(2!QeolZ&=N@ zMP3$W*LqEG!Cm)Fe!MJLe!20@p=zShO=jS-;=BVE#Clf);pNFQ@(~beW;4_p9JG3# zAGvFiS>B;*mSQ1`rFndoiB$BoV2=TZd%0zrf9fHW>!*yo|3Z4 zbJLBSH(T{&-?pH9H~8>e^omI-k@Pf$(`SB(?%OGlvn1L4=S z4q0c77Zhq_*%*{Ae_s(qic5-lyw9W|=w(z0+O+VuvWkB}e?4PgXrJK|?Hd)qokuUv zwoKd$oGF!N6$87`>#kIE=h#$bjmmDsSVgQkq@90%S$gH{hy4#+yVg`EL|Xe-ERUKG z-mLC>{mIB9eDdj^x;WjP9PON)U7wd07?WReJ0_vx>o>BLxIu)=y{q0!N$rZ-l2TB*N z{O%D2=3I${Elf`8jd{BEbhsiu)BSCBVa?kzexBb_Dq>!T_Fyw73eP1%w_Gs! zcGx`Y^ZNHT8L#4`O|LN2Q?o1RyyNwHaMChvY?mfwoZn*!ubltbas0?toyS@%Q+|_t z){YU}a+R(=T3-eRh>6y}D4y0DJ5sWz?D51y#kYA~hCso`i}(U|<-{G^`{ott&tD4u zTyMTZ|45=*%c$jr_HK`)WSxs8KH9$TcleMcH*+;timWobITw5q!&j@T0UD)Wv5QQI zU;n0+hq5yLNpvukc7lqLoE>`g%iMfe7w6uKyy^XK`-;ws8u!;@!^S(Thadb*dk0+W zyE_?NH0f}(m{8^9*BuzFr#G_eVYB>^g6u1Q!L5L+8pX*Wu;YF`^*?r(Yh?<^g diff --git a/dist/public/index.html b/dist/public/index.html deleted file mode 100644 index 60878f6f0..000000000 --- a/dist/public/index.html +++ /dev/null @@ -1,208 +0,0 @@ - - - - Sphinx Relay - - - - - - - logo - - - - -

- Sphinx will not work unless you follow - - these specific channel instructions - - !! -

- -
- -
- -

- Scan the QR or copy the connection string into your Sphinx app. -

- -

- This is a 1 time use token to pair the app with your node. To pair other - devices, tap "export keys" on your profile page in the Sphinx app. -

- -

- Please keep that in mind uninstalling Sphinx Relay on your node will delete your account - and everything associated with it such as tribes you own, chats and tribes you are in. -

- - 
-CONNECTION_STRING
-
- - - - - - diff --git a/dist/public/index2.html b/dist/public/index2.html deleted file mode 100644 index 71a974e94..000000000 --- a/dist/public/index2.html +++ /dev/null @@ -1,189 +0,0 @@ - - - - Sphinx Relay - - - - - - - logo - -
    -
  • - - - -
    • - -
  • - - - -
    • - -
  • - - -
    • -
- - - -

- Scan the QR or copy the connection string into your Sphinx app -

- - - - - - - - diff --git a/dist/public/indexAuto.html b/dist/public/indexAuto.html deleted file mode 100644 index 85041ff9b..000000000 --- a/dist/public/indexAuto.html +++ /dev/null @@ -1,188 +0,0 @@ - - - - Sphinx Relay - - - - - - - logo - -
    -
  • - - - -
    • -
- -
-

Open a channel now:

- - - -
- - - -

- Scan the QR or copy the connection string into your Sphinx app -

- - - - - - - - diff --git a/dist/public/index_greenlight.html b/dist/public/index_greenlight.html deleted file mode 100644 index deab8e4fb..000000000 --- a/dist/public/index_greenlight.html +++ /dev/null @@ -1,243 +0,0 @@ - - - - Sphinx Relay - - - - - - logo - -

Scan this QR code with your Sphinx app:

-
- -
- - 
-      CONNECTION_STRING
-
- -
Peer to Sphinx router node:
- - - -

You are connected to a Sphinx Routing Node!

-

You are connected to a Sphinx Routing Node! Please wait for channel to open and confirm...

-

- - - - - - diff --git a/dist/public/js/qrious.js b/dist/public/js/qrious.js deleted file mode 100644 index ba1637ca5..000000000 --- a/dist/public/js/qrious.js +++ /dev/null @@ -1,911 +0,0 @@ -/*! QRious v4.0.2 | (C) 2017 Alasdair Mercer | GPL v3 License -Based on jsqrencode | (C) 2010 tz@execpc.com | GPL v3 License -*/ -!(function (t, e) { - 'object' == typeof exports && 'undefined' != typeof module - ? (module.exports = e()) - : 'function' == typeof define && define.amd - ? define(e) - : (t.QRious = e()) -})(this, function () { - 'use strict' - function t(t, e) { - var n - return ( - 'function' == typeof Object.create - ? (n = Object.create(t)) - : ((s.prototype = t), (n = new s()), (s.prototype = null)), - e && i(!0, n, e), - n - ) - } - function e(e, n, s, r) { - var o = this - return ( - 'string' != typeof e && ((r = s), (s = n), (n = e), (e = null)), - 'function' != typeof n && - ((r = s), - (s = n), - (n = function () { - return o.apply(this, arguments) - })), - i(!1, n, o, r), - (n.prototype = t(o.prototype, s)), - (n.prototype.constructor = n), - (n.class_ = e || o.class_), - (n.super_ = o), - n - ) - } - function i(t, e, i) { - for (var n, s, a = 0, h = (i = o.call(arguments, 2)).length; a < h; a++) { - s = i[a] - for (n in s) (t && !r.call(s, n)) || (e[n] = s[n]) - } - } - function n() {} - var s = function () {}, - r = Object.prototype.hasOwnProperty, - o = Array.prototype.slice, - a = e - ;(n.class_ = 'Nevis'), (n.super_ = Object), (n.extend = a) - var h = n, - f = h.extend( - function (t, e, i) { - ;(this.qrious = t), - (this.element = e), - (this.element.qrious = t), - (this.enabled = Boolean(i)) - }, - { - draw: function (t) {}, - getElement: function () { - return ( - this.enabled || ((this.enabled = !0), this.render()), this.element - ) - }, - getModuleSize: function (t) { - var e = this.qrious, - i = e.padding || 0, - n = Math.floor((e.size - 2 * i) / t.width) - return Math.max(1, n) - }, - getOffset: function (t) { - var e = this.qrious, - i = e.padding - if (null != i) return i - var n = this.getModuleSize(t), - s = Math.floor((e.size - n * t.width) / 2) - return Math.max(0, s) - }, - render: function (t) { - this.enabled && (this.resize(), this.reset(), this.draw(t)) - }, - reset: function () {}, - resize: function () {}, - } - ), - c = f.extend({ - draw: function (t) { - var e, - i, - n = this.qrious, - s = this.getModuleSize(t), - r = this.getOffset(t), - o = this.element.getContext('2d') - for ( - o.fillStyle = n.foreground, o.globalAlpha = n.foregroundAlpha, e = 0; - e < t.width; - e++ - ) - for (i = 0; i < t.width; i++) - t.buffer[i * t.width + e] && o.fillRect(s * e + r, s * i + r, s, s) - }, - reset: function () { - var t = this.qrious, - e = this.element.getContext('2d'), - i = t.size - ;(e.lineWidth = 1), - e.clearRect(0, 0, i, i), - (e.fillStyle = t.background), - (e.globalAlpha = t.backgroundAlpha), - e.fillRect(0, 0, i, i) - }, - resize: function () { - var t = this.element - t.width = t.height = this.qrious.size - }, - }), - u = h.extend(null, { - BLOCK: [ - 0, 11, 15, 19, 23, 27, 31, 16, 18, 20, 22, 24, 26, 28, 20, 22, 24, 24, - 26, 28, 28, 22, 24, 24, 26, 26, 28, 28, 24, 24, 26, 26, 26, 28, 28, 24, - 26, 26, 26, 28, 28, - ], - }), - l = h.extend(null, { - BLOCKS: [ - 1, 0, 19, 7, 1, 0, 16, 10, 1, 0, 13, 13, 1, 0, 9, 17, 1, 0, 34, 10, 1, - 0, 28, 16, 1, 0, 22, 22, 1, 0, 16, 28, 1, 0, 55, 15, 1, 0, 44, 26, 2, 0, - 17, 18, 2, 0, 13, 22, 1, 0, 80, 20, 2, 0, 32, 18, 2, 0, 24, 26, 4, 0, 9, - 16, 1, 0, 108, 26, 2, 0, 43, 24, 2, 2, 15, 18, 2, 2, 11, 22, 2, 0, 68, - 18, 4, 0, 27, 16, 4, 0, 19, 24, 4, 0, 15, 28, 2, 0, 78, 20, 4, 0, 31, - 18, 2, 4, 14, 18, 4, 1, 13, 26, 2, 0, 97, 24, 2, 2, 38, 22, 4, 2, 18, - 22, 4, 2, 14, 26, 2, 0, 116, 30, 3, 2, 36, 22, 4, 4, 16, 20, 4, 4, 12, - 24, 2, 2, 68, 18, 4, 1, 43, 26, 6, 2, 19, 24, 6, 2, 15, 28, 4, 0, 81, - 20, 1, 4, 50, 30, 4, 4, 22, 28, 3, 8, 12, 24, 2, 2, 92, 24, 6, 2, 36, - 22, 4, 6, 20, 26, 7, 4, 14, 28, 4, 0, 107, 26, 8, 1, 37, 22, 8, 4, 20, - 24, 12, 4, 11, 22, 3, 1, 115, 30, 4, 5, 40, 24, 11, 5, 16, 20, 11, 5, - 12, 24, 5, 1, 87, 22, 5, 5, 41, 24, 5, 7, 24, 30, 11, 7, 12, 24, 5, 1, - 98, 24, 7, 3, 45, 28, 15, 2, 19, 24, 3, 13, 15, 30, 1, 5, 107, 28, 10, - 1, 46, 28, 1, 15, 22, 28, 2, 17, 14, 28, 5, 1, 120, 30, 9, 4, 43, 26, - 17, 1, 22, 28, 2, 19, 14, 28, 3, 4, 113, 28, 3, 11, 44, 26, 17, 4, 21, - 26, 9, 16, 13, 26, 3, 5, 107, 28, 3, 13, 41, 26, 15, 5, 24, 30, 15, 10, - 15, 28, 4, 4, 116, 28, 17, 0, 42, 26, 17, 6, 22, 28, 19, 6, 16, 30, 2, - 7, 111, 28, 17, 0, 46, 28, 7, 16, 24, 30, 34, 0, 13, 24, 4, 5, 121, 30, - 4, 14, 47, 28, 11, 14, 24, 30, 16, 14, 15, 30, 6, 4, 117, 30, 6, 14, 45, - 28, 11, 16, 24, 30, 30, 2, 16, 30, 8, 4, 106, 26, 8, 13, 47, 28, 7, 22, - 24, 30, 22, 13, 15, 30, 10, 2, 114, 28, 19, 4, 46, 28, 28, 6, 22, 28, - 33, 4, 16, 30, 8, 4, 122, 30, 22, 3, 45, 28, 8, 26, 23, 30, 12, 28, 15, - 30, 3, 10, 117, 30, 3, 23, 45, 28, 4, 31, 24, 30, 11, 31, 15, 30, 7, 7, - 116, 30, 21, 7, 45, 28, 1, 37, 23, 30, 19, 26, 15, 30, 5, 10, 115, 30, - 19, 10, 47, 28, 15, 25, 24, 30, 23, 25, 15, 30, 13, 3, 115, 30, 2, 29, - 46, 28, 42, 1, 24, 30, 23, 28, 15, 30, 17, 0, 115, 30, 10, 23, 46, 28, - 10, 35, 24, 30, 19, 35, 15, 30, 17, 1, 115, 30, 14, 21, 46, 28, 29, 19, - 24, 30, 11, 46, 15, 30, 13, 6, 115, 30, 14, 23, 46, 28, 44, 7, 24, 30, - 59, 1, 16, 30, 12, 7, 121, 30, 12, 26, 47, 28, 39, 14, 24, 30, 22, 41, - 15, 30, 6, 14, 121, 30, 6, 34, 47, 28, 46, 10, 24, 30, 2, 64, 15, 30, - 17, 4, 122, 30, 29, 14, 46, 28, 49, 10, 24, 30, 24, 46, 15, 30, 4, 18, - 122, 30, 13, 32, 46, 28, 48, 14, 24, 30, 42, 32, 15, 30, 20, 4, 117, 30, - 40, 7, 47, 28, 43, 22, 24, 30, 10, 67, 15, 30, 19, 6, 118, 30, 18, 31, - 47, 28, 34, 34, 24, 30, 20, 61, 15, 30, - ], - FINAL_FORMAT: [ - 30660, 29427, 32170, 30877, 26159, 25368, 27713, 26998, 21522, 20773, - 24188, 23371, 17913, 16590, 20375, 19104, 13663, 12392, 16177, 14854, - 9396, 8579, 11994, 11245, 5769, 5054, 7399, 6608, 1890, 597, 3340, 2107, - ], - LEVELS: { L: 1, M: 2, Q: 3, H: 4 }, - }), - _ = h.extend(null, { - EXPONENT: [ - 1, 2, 4, 8, 16, 32, 64, 128, 29, 58, 116, 232, 205, 135, 19, 38, 76, - 152, 45, 90, 180, 117, 234, 201, 143, 3, 6, 12, 24, 48, 96, 192, 157, - 39, 78, 156, 37, 74, 148, 53, 106, 212, 181, 119, 238, 193, 159, 35, 70, - 140, 5, 10, 20, 40, 80, 160, 93, 186, 105, 210, 185, 111, 222, 161, 95, - 190, 97, 194, 153, 47, 94, 188, 101, 202, 137, 15, 30, 60, 120, 240, - 253, 231, 211, 187, 107, 214, 177, 127, 254, 225, 223, 163, 91, 182, - 113, 226, 217, 175, 67, 134, 17, 34, 68, 136, 13, 26, 52, 104, 208, 189, - 103, 206, 129, 31, 62, 124, 248, 237, 199, 147, 59, 118, 236, 197, 151, - 51, 102, 204, 133, 23, 46, 92, 184, 109, 218, 169, 79, 158, 33, 66, 132, - 21, 42, 84, 168, 77, 154, 41, 82, 164, 85, 170, 73, 146, 57, 114, 228, - 213, 183, 115, 230, 209, 191, 99, 198, 145, 63, 126, 252, 229, 215, 179, - 123, 246, 241, 255, 227, 219, 171, 75, 150, 49, 98, 196, 149, 55, 110, - 220, 165, 87, 174, 65, 130, 25, 50, 100, 200, 141, 7, 14, 28, 56, 112, - 224, 221, 167, 83, 166, 81, 162, 89, 178, 121, 242, 249, 239, 195, 155, - 43, 86, 172, 69, 138, 9, 18, 36, 72, 144, 61, 122, 244, 245, 247, 243, - 251, 235, 203, 139, 11, 22, 44, 88, 176, 125, 250, 233, 207, 131, 27, - 54, 108, 216, 173, 71, 142, 0, - ], - LOG: [ - 255, 0, 1, 25, 2, 50, 26, 198, 3, 223, 51, 238, 27, 104, 199, 75, 4, - 100, 224, 14, 52, 141, 239, 129, 28, 193, 105, 248, 200, 8, 76, 113, 5, - 138, 101, 47, 225, 36, 15, 33, 53, 147, 142, 218, 240, 18, 130, 69, 29, - 181, 194, 125, 106, 39, 249, 185, 201, 154, 9, 120, 77, 228, 114, 166, - 6, 191, 139, 98, 102, 221, 48, 253, 226, 152, 37, 179, 16, 145, 34, 136, - 54, 208, 148, 206, 143, 150, 219, 189, 241, 210, 19, 92, 131, 56, 70, - 64, 30, 66, 182, 163, 195, 72, 126, 110, 107, 58, 40, 84, 250, 133, 186, - 61, 202, 94, 155, 159, 10, 21, 121, 43, 78, 212, 229, 172, 115, 243, - 167, 87, 7, 112, 192, 247, 140, 128, 99, 13, 103, 74, 222, 237, 49, 197, - 254, 24, 227, 165, 153, 119, 38, 184, 180, 124, 17, 68, 146, 217, 35, - 32, 137, 46, 55, 63, 209, 91, 149, 188, 207, 205, 144, 135, 151, 178, - 220, 252, 190, 97, 242, 86, 211, 171, 20, 42, 93, 158, 132, 60, 57, 83, - 71, 109, 65, 162, 31, 45, 67, 216, 183, 123, 164, 118, 196, 23, 73, 236, - 127, 12, 111, 246, 108, 161, 59, 82, 41, 157, 85, 170, 251, 96, 134, - 177, 187, 204, 62, 90, 203, 89, 95, 176, 156, 169, 160, 81, 11, 245, 22, - 235, 122, 117, 44, 215, 79, 174, 213, 233, 230, 231, 173, 232, 116, 214, - 244, 234, 168, 80, 88, 175, - ], - }), - d = h.extend(null, { - BLOCK: [ - 3220, 1468, 2713, 1235, 3062, 1890, 2119, 1549, 2344, 2936, 1117, 2583, - 1330, 2470, 1667, 2249, 2028, 3780, 481, 4011, 142, 3098, 831, 3445, - 592, 2517, 1776, 2234, 1951, 2827, 1070, 2660, 1345, 3177, - ], - }), - v = h.extend( - function (t) { - var e, - i, - n, - s, - r, - o = t.value.length - for ( - this._badness = [], - this._level = l.LEVELS[t.level], - this._polynomial = [], - this._value = t.value, - this._version = 0, - this._stringBuffer = []; - this._version < 40 && - (this._version++, - (n = 4 * (this._level - 1) + 16 * (this._version - 1)), - (s = l.BLOCKS[n++]), - (r = l.BLOCKS[n++]), - (e = l.BLOCKS[n++]), - (i = l.BLOCKS[n]), - (n = e * (s + r) + r - 3 + (this._version <= 9)), - !(o <= n)); - - ); - ;(this._dataBlock = e), - (this._eccBlock = i), - (this._neccBlock1 = s), - (this._neccBlock2 = r) - var a = (this.width = 17 + 4 * this._version) - ;(this.buffer = v._createArray(a * a)), - (this._ecc = v._createArray(e + (e + i) * (s + r) + r)), - (this._mask = v._createArray((a * (a + 1) + 1) / 2)), - this._insertFinders(), - this._insertAlignments(), - (this.buffer[8 + a * (a - 8)] = 1), - this._insertTimingGap(), - this._reverseMask(), - this._insertTimingRowAndColumn(), - this._insertVersion(), - this._syncMask(), - this._convertBitStream(o), - this._calculatePolynomial(), - this._appendEccToData(), - this._interleaveBlocks(), - this._pack(), - this._finish() - }, - { - _addAlignment: function (t, e) { - var i, - n = this.buffer, - s = this.width - for (n[t + s * e] = 1, i = -2; i < 2; i++) - (n[t + i + s * (e - 2)] = 1), - (n[t - 2 + s * (e + i + 1)] = 1), - (n[t + 2 + s * (e + i)] = 1), - (n[t + i + 1 + s * (e + 2)] = 1) - for (i = 0; i < 2; i++) - this._setMask(t - 1, e + i), - this._setMask(t + 1, e - i), - this._setMask(t - i, e - 1), - this._setMask(t + i, e + 1) - }, - _appendData: function (t, e, i, n) { - var s, - r, - o, - a = this._polynomial, - h = this._stringBuffer - for (r = 0; r < n; r++) h[i + r] = 0 - for (r = 0; r < e; r++) { - if (255 !== (s = _.LOG[h[t + r] ^ h[i]])) - for (o = 1; o < n; o++) - h[i + o - 1] = h[i + o] ^ _.EXPONENT[v._modN(s + a[n - o])] - else for (o = i; o < i + n; o++) h[o] = h[o + 1] - h[i + n - 1] = 255 === s ? 0 : _.EXPONENT[v._modN(s + a[0])] - } - }, - _appendEccToData: function () { - var t, - e = 0, - i = this._dataBlock, - n = this._calculateMaxLength(), - s = this._eccBlock - for (t = 0; t < this._neccBlock1; t++) - this._appendData(e, i, n, s), (e += i), (n += s) - for (t = 0; t < this._neccBlock2; t++) - this._appendData(e, i + 1, n, s), (e += i + 1), (n += s) - }, - _applyMask: function (t) { - var e, - i, - n, - s, - r = this.buffer, - o = this.width - switch (t) { - case 0: - for (s = 0; s < o; s++) - for (n = 0; n < o; n++) - (n + s) & 1 || this._isMasked(n, s) || (r[n + s * o] ^= 1) - break - case 1: - for (s = 0; s < o; s++) - for (n = 0; n < o; n++) - 1 & s || this._isMasked(n, s) || (r[n + s * o] ^= 1) - break - case 2: - for (s = 0; s < o; s++) - for (e = 0, n = 0; n < o; n++, e++) - 3 === e && (e = 0), - e || this._isMasked(n, s) || (r[n + s * o] ^= 1) - break - case 3: - for (i = 0, s = 0; s < o; s++, i++) - for (3 === i && (i = 0), e = i, n = 0; n < o; n++, e++) - 3 === e && (e = 0), - e || this._isMasked(n, s) || (r[n + s * o] ^= 1) - break - case 4: - for (s = 0; s < o; s++) - for (e = 0, i = (s >> 1) & 1, n = 0; n < o; n++, e++) - 3 === e && ((e = 0), (i = !i)), - i || this._isMasked(n, s) || (r[n + s * o] ^= 1) - break - case 5: - for (i = 0, s = 0; s < o; s++, i++) - for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++) - 3 === e && (e = 0), - (n & s & 1) + !(!e | !i) || - this._isMasked(n, s) || - (r[n + s * o] ^= 1) - break - case 6: - for (i = 0, s = 0; s < o; s++, i++) - for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++) - 3 === e && (e = 0), - ((n & s & 1) + (e && e === i)) & 1 || - this._isMasked(n, s) || - (r[n + s * o] ^= 1) - break - case 7: - for (i = 0, s = 0; s < o; s++, i++) - for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++) - 3 === e && (e = 0), - ((e && e === i) + ((n + s) & 1)) & 1 || - this._isMasked(n, s) || - (r[n + s * o] ^= 1) - } - }, - _calculateMaxLength: function () { - return ( - this._dataBlock * (this._neccBlock1 + this._neccBlock2) + - this._neccBlock2 - ) - }, - _calculatePolynomial: function () { - var t, - e, - i = this._eccBlock, - n = this._polynomial - for (n[0] = 1, t = 0; t < i; t++) { - for (n[t + 1] = 1, e = t; e > 0; e--) - n[e] = n[e] - ? n[e - 1] ^ _.EXPONENT[v._modN(_.LOG[n[e]] + t)] - : n[e - 1] - n[0] = _.EXPONENT[v._modN(_.LOG[n[0]] + t)] - } - for (t = 0; t <= i; t++) n[t] = _.LOG[n[t]] - }, - _checkBadness: function () { - var t, - e, - i, - n, - s, - r = 0, - o = this._badness, - a = this.buffer, - h = this.width - for (s = 0; s < h - 1; s++) - for (n = 0; n < h - 1; n++) - ((a[n + h * s] && - a[n + 1 + h * s] && - a[n + h * (s + 1)] && - a[n + 1 + h * (s + 1)]) || - !( - a[n + h * s] || - a[n + 1 + h * s] || - a[n + h * (s + 1)] || - a[n + 1 + h * (s + 1)] - )) && - (r += v.N2) - var f = 0 - for (s = 0; s < h; s++) { - for (i = 0, o[0] = 0, t = 0, n = 0; n < h; n++) - t === (e = a[n + h * s]) ? o[i]++ : (o[++i] = 1), - (f += (t = e) ? 1 : -1) - r += this._getBadness(i) - } - f < 0 && (f = -f) - var c = 0, - u = f - for (u += u << 2, u <<= 1; u > h * h; ) (u -= h * h), c++ - for (r += c * v.N4, n = 0; n < h; n++) { - for (i = 0, o[0] = 0, t = 0, s = 0; s < h; s++) - t === (e = a[n + h * s]) ? o[i]++ : (o[++i] = 1), (t = e) - r += this._getBadness(i) - } - return r - }, - _convertBitStream: function (t) { - var e, - i, - n = this._ecc, - s = this._version - for (i = 0; i < t; i++) n[i] = this._value.charCodeAt(i) - var r = (this._stringBuffer = n.slice()), - o = this._calculateMaxLength() - t >= o - 2 && ((t = o - 2), s > 9 && t--) - var a = t - if (s > 9) { - for (r[a + 2] = 0, r[a + 3] = 0; a--; ) - (e = r[a]), (r[a + 3] |= 255 & (e << 4)), (r[a + 2] = e >> 4) - ;(r[2] |= 255 & (t << 4)), (r[1] = t >> 4), (r[0] = 64 | (t >> 12)) - } else { - for (r[a + 1] = 0, r[a + 2] = 0; a--; ) - (e = r[a]), (r[a + 2] |= 255 & (e << 4)), (r[a + 1] = e >> 4) - ;(r[1] |= 255 & (t << 4)), (r[0] = 64 | (t >> 4)) - } - for (a = t + 3 - (s < 10); a < o; ) (r[a++] = 236), (r[a++] = 17) - }, - _getBadness: function (t) { - var e, - i = 0, - n = this._badness - for (e = 0; e <= t; e++) n[e] >= 5 && (i += v.N1 + n[e] - 5) - for (e = 3; e < t - 1; e += 2) - n[e - 2] === n[e + 2] && - n[e + 2] === n[e - 1] && - n[e - 1] === n[e + 1] && - 3 * n[e - 1] === n[e] && - (0 === n[e - 3] || - e + 3 > t || - 3 * n[e - 3] >= 4 * n[e] || - 3 * n[e + 3] >= 4 * n[e]) && - (i += v.N3) - return i - }, - _finish: function () { - this._stringBuffer = this.buffer.slice() - var t, - e, - i = 0, - n = 3e4 - for ( - e = 0; - e < 8 && - (this._applyMask(e), - (t = this._checkBadness()) < n && ((n = t), (i = e)), - 7 !== i); - e++ - ) - this.buffer = this._stringBuffer.slice() - i !== e && this._applyMask(i), - (n = l.FINAL_FORMAT[i + ((this._level - 1) << 3)]) - var s = this.buffer, - r = this.width - for (e = 0; e < 8; e++, n >>= 1) - 1 & n && - ((s[r - 1 - e + 8 * r] = 1), - e < 6 ? (s[8 + r * e] = 1) : (s[8 + r * (e + 1)] = 1)) - for (e = 0; e < 7; e++, n >>= 1) - 1 & n && - ((s[8 + r * (r - 7 + e)] = 1), - e ? (s[6 - e + 8 * r] = 1) : (s[7 + 8 * r] = 1)) - }, - _interleaveBlocks: function () { - var t, - e, - i = this._dataBlock, - n = this._ecc, - s = this._eccBlock, - r = 0, - o = this._calculateMaxLength(), - a = this._neccBlock1, - h = this._neccBlock2, - f = this._stringBuffer - for (t = 0; t < i; t++) { - for (e = 0; e < a; e++) n[r++] = f[t + e * i] - for (e = 0; e < h; e++) n[r++] = f[a * i + t + e * (i + 1)] - } - for (e = 0; e < h; e++) n[r++] = f[a * i + t + e * (i + 1)] - for (t = 0; t < s; t++) - for (e = 0; e < a + h; e++) n[r++] = f[o + t + e * s] - this._stringBuffer = n - }, - _insertAlignments: function () { - var t, - e, - i, - n = this._version, - s = this.width - if (n > 1) - for (t = u.BLOCK[n], i = s - 7; ; ) { - for ( - e = s - 7; - e > t - 3 && (this._addAlignment(e, i), !(e < t)); - - ) - e -= t - if (i <= t + 9) break - ;(i -= t), this._addAlignment(6, i), this._addAlignment(i, 6) - } - }, - _insertFinders: function () { - var t, - e, - i, - n, - s = this.buffer, - r = this.width - for (t = 0; t < 3; t++) { - for ( - e = 0, - n = 0, - 1 === t && (e = r - 7), - 2 === t && (n = r - 7), - s[n + 3 + r * (e + 3)] = 1, - i = 0; - i < 6; - i++ - ) - (s[n + i + r * e] = 1), - (s[n + r * (e + i + 1)] = 1), - (s[n + 6 + r * (e + i)] = 1), - (s[n + i + 1 + r * (e + 6)] = 1) - for (i = 1; i < 5; i++) - this._setMask(n + i, e + 1), - this._setMask(n + 1, e + i + 1), - this._setMask(n + 5, e + i), - this._setMask(n + i + 1, e + 5) - for (i = 2; i < 4; i++) - (s[n + i + r * (e + 2)] = 1), - (s[n + 2 + r * (e + i + 1)] = 1), - (s[n + 4 + r * (e + i)] = 1), - (s[n + i + 1 + r * (e + 4)] = 1) - } - }, - _insertTimingGap: function () { - var t, - e, - i = this.width - for (e = 0; e < 7; e++) - this._setMask(7, e), - this._setMask(i - 8, e), - this._setMask(7, e + i - 7) - for (t = 0; t < 8; t++) - this._setMask(t, 7), - this._setMask(t + i - 8, 7), - this._setMask(t, i - 8) - }, - _insertTimingRowAndColumn: function () { - var t, - e = this.buffer, - i = this.width - for (t = 0; t < i - 14; t++) - 1 & t - ? (this._setMask(8 + t, 6), this._setMask(6, 8 + t)) - : ((e[8 + t + 6 * i] = 1), (e[6 + i * (8 + t)] = 1)) - }, - _insertVersion: function () { - var t, - e, - i, - n, - s = this.buffer, - r = this._version, - o = this.width - if (r > 6) - for (t = d.BLOCK[r - 7], e = 17, i = 0; i < 6; i++) - for (n = 0; n < 3; n++, e--) - 1 & (e > 11 ? r >> (e - 12) : t >> e) - ? ((s[5 - i + o * (2 - n + o - 11)] = 1), - (s[2 - n + o - 11 + o * (5 - i)] = 1)) - : (this._setMask(5 - i, 2 - n + o - 11), - this._setMask(2 - n + o - 11, 5 - i)) - }, - _isMasked: function (t, e) { - var i = v._getMaskBit(t, e) - return 1 === this._mask[i] - }, - _pack: function () { - var t, - e, - i, - n = 1, - s = 1, - r = this.width, - o = r - 1, - a = r - 1, - h = - (this._dataBlock + this._eccBlock) * - (this._neccBlock1 + this._neccBlock2) + - this._neccBlock2 - for (e = 0; e < h; e++) - for (t = this._stringBuffer[e], i = 0; i < 8; i++, t <<= 1) { - 128 & t && (this.buffer[o + r * a] = 1) - do { - s - ? o-- - : (o++, - n - ? 0 !== a - ? a-- - : ((n = !n), 6 === (o -= 2) && (o--, (a = 9))) - : a !== r - 1 - ? a++ - : ((n = !n), 6 === (o -= 2) && (o--, (a -= 8)))), - (s = !s) - } while (this._isMasked(o, a)) - } - }, - _reverseMask: function () { - var t, - e, - i = this.width - for (t = 0; t < 9; t++) this._setMask(t, 8) - for (t = 0; t < 8; t++) - this._setMask(t + i - 8, 8), this._setMask(8, t) - for (e = 0; e < 7; e++) this._setMask(8, e + i - 7) - }, - _setMask: function (t, e) { - var i = v._getMaskBit(t, e) - this._mask[i] = 1 - }, - _syncMask: function () { - var t, - e, - i = this.width - for (e = 0; e < i; e++) - for (t = 0; t <= e; t++) - this.buffer[t + i * e] && this._setMask(t, e) - }, - }, - { - _createArray: function (t) { - var e, - i = [] - for (e = 0; e < t; e++) i[e] = 0 - return i - }, - _getMaskBit: function (t, e) { - var i - return ( - t > e && ((i = t), (t = e), (e = i)), - (i = e), - (i += e * e), - (i >>= 1), - (i += t) - ) - }, - _modN: function (t) { - for (; t >= 255; ) t = ((t -= 255) >> 8) + (255 & t) - return t - }, - N1: 3, - N2: 3, - N3: 40, - N4: 10, - } - ), - p = v, - m = f.extend({ - draw: function () { - this.element.src = this.qrious.toDataURL() - }, - reset: function () { - this.element.src = '' - }, - resize: function () { - var t = this.element - t.width = t.height = this.qrious.size - }, - }), - g = h.extend( - function (t, e, i, n) { - ;(this.name = t), - (this.modifiable = Boolean(e)), - (this.defaultValue = i), - (this._valueTransformer = n) - }, - { - transform: function (t) { - var e = this._valueTransformer - return 'function' == typeof e ? e(t, this) : t - }, - } - ), - k = h.extend(null, { - abs: function (t) { - return null != t ? Math.abs(t) : null - }, - hasOwn: function (t, e) { - return Object.prototype.hasOwnProperty.call(t, e) - }, - noop: function () {}, - toUpperCase: function (t) { - return null != t ? t.toUpperCase() : null - }, - }), - w = h.extend( - function (t) { - ;(this.options = {}), - t.forEach(function (t) { - this.options[t.name] = t - }, this) - }, - { - exists: function (t) { - return null != this.options[t] - }, - get: function (t, e) { - return w._get(this.options[t], e) - }, - getAll: function (t) { - var e, - i = this.options, - n = {} - for (e in i) k.hasOwn(i, e) && (n[e] = w._get(i[e], t)) - return n - }, - init: function (t, e, i) { - 'function' != typeof i && (i = k.noop) - var n, s - for (n in this.options) - k.hasOwn(this.options, n) && - ((s = this.options[n]), - w._set(s, s.defaultValue, e), - w._createAccessor(s, e, i)) - this._setAll(t, e, !0) - }, - set: function (t, e, i) { - return this._set(t, e, i) - }, - setAll: function (t, e) { - return this._setAll(t, e) - }, - _set: function (t, e, i, n) { - var s = this.options[t] - if (!s) throw new Error('Invalid option: ' + t) - if (!s.modifiable && !n) - throw new Error('Option cannot be modified: ' + t) - return w._set(s, e, i) - }, - _setAll: function (t, e, i) { - if (!t) return !1 - var n, - s = !1 - for (n in t) k.hasOwn(t, n) && this._set(n, t[n], e, i) && (s = !0) - return s - }, - }, - { - _createAccessor: function (t, e, i) { - var n = { - get: function () { - return w._get(t, e) - }, - } - t.modifiable && - (n.set = function (n) { - w._set(t, n, e) && i(n, t) - }), - Object.defineProperty(e, t.name, n) - }, - _get: function (t, e) { - return e['_' + t.name] - }, - _set: function (t, e, i) { - var n = '_' + t.name, - s = i[n], - r = t.transform(null != e ? e : t.defaultValue) - return (i[n] = r), r !== s - }, - } - ), - M = w, - b = h.extend( - function () { - this._services = {} - }, - { - getService: function (t) { - var e = this._services[t] - if (!e) - throw new Error('Service is not being managed with name: ' + t) - return e - }, - setService: function (t, e) { - if (this._services[t]) - throw new Error('Service is already managed with name: ' + t) - e && (this._services[t] = e) - }, - } - ), - B = new M([ - new g('background', !0, 'white'), - new g('backgroundAlpha', !0, 1, k.abs), - new g('element'), - new g('foreground', !0, 'black'), - new g('foregroundAlpha', !0, 1, k.abs), - new g('level', !0, 'L', k.toUpperCase), - new g('mime', !0, 'image/png'), - new g('padding', !0, null, k.abs), - new g('size', !0, 100, k.abs), - new g('value', !0, ''), - ]), - y = new b(), - O = h.extend( - function (t) { - B.init(t, this, this.update.bind(this)) - var e = B.get('element', this), - i = y.getService('element'), - n = e && i.isCanvas(e) ? e : i.createCanvas(), - s = e && i.isImage(e) ? e : i.createImage() - ;(this._canvasRenderer = new c(this, n, !0)), - (this._imageRenderer = new m(this, s, s === e)), - this.update() - }, - { - get: function () { - return B.getAll(this) - }, - set: function (t) { - B.setAll(t, this) && this.update() - }, - toDataURL: function (t) { - return this.canvas.toDataURL(t || this.mime) - }, - update: function () { - var t = new p({ level: this.level, value: this.value }) - this._canvasRenderer.render(t), this._imageRenderer.render(t) - }, - }, - { - use: function (t) { - y.setService(t.getName(), t) - }, - } - ) - Object.defineProperties(O.prototype, { - canvas: { - get: function () { - return this._canvasRenderer.getElement() - }, - }, - image: { - get: function () { - return this._imageRenderer.getElement() - }, - }, - }) - var A = O, - L = h - .extend({ getName: function () {} }) - .extend({ - createCanvas: function () {}, - createImage: function () {}, - getName: function () { - return 'element' - }, - isCanvas: function (t) {}, - isImage: function (t) {}, - }) - .extend({ - createCanvas: function () { - return document.createElement('canvas') - }, - createImage: function () { - return document.createElement('img') - }, - isCanvas: function (t) { - return t instanceof HTMLCanvasElement - }, - isImage: function (t) { - return t instanceof HTMLImageElement - }, - }) - return A.use(new L()), A -}) - -//# sourceMappingURL=qrious.min.js.map diff --git a/dist/public/relay.jpg b/dist/public/relay.jpg deleted file mode 100644 index ff9d65cb6d545f2e67a8d277560cad4c266d1195..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263031 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

e(N8&9;6#S;^>tbUNe9&{on9Qm9Z6?XiB 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 z zkRVQM?=up+#EFIv4WIPY2@70&vsl3nuuJB7&7f9#;5OcQ50=IMi%W|MeuJEXN8cb9n{RBvD$M8DwzvC3w}GPQbY^`WQ>TyHhH@c!#D{-AJKCf zi^WtHu%WPc@k&EfdxFbtWfWE&|$M zqC?bHi$i&3ekUw1@+Ur26vhbkX;*VR`*Lr^b=&XtH*q4@138|=_IpILOexzo%eHGt z?v@#zJpo8As!+1hjk9i67kU(UzTl4^19lIEu5slKpC#>*q-_E-q^*~%-_1)u;&rv@ z=QciB)8fN?37dU`6JkKAZf&AMG&H#)m?Y7TKE&YJu^EZDy@whaYdLe1=Xlt+O%zF81ghEm7gC8xwb z#l5+j^H19zz%2^2Z5*)zPu?!wDcbG{C^CV>TQAwQ-*Yv1S8l>p{=Iw?bsoPr4N+~o zTdf@tj+gDSD~hSCO3U!9(Wx0xCrOUwt;o4bNtxxQ7XZM+n%B$-PxruXq_Z-QvF+*Y z{EslQe~E{y@c$+rUN!uec$o3Oh=*AR#KU8YW69I+xV2btrXPIGkc1Qm9gCUKx1mvA zx5zlXE+xXl#j)?`1BG}zPvZT@99R%j#~pEKEm2TbSwtt)ZwUO1wE!I*jpGq*g_eR} zA&6)WFdqT1{U0`V`qYZ{sabRWa3iXC%5&h;!Zhh%i48wr_bT#u#d%47qHUKi*zWY# zf!p@u_LBy?eD%9&S6w~+^j7KXu#mb-c4O$JQtIsD`Ws>u+vYW#d54l7I?Fzix2jMd zEHpq}D6*{$-4++Lmfw;Z#yY&q(6pY{xEMJ5LA@D&%AE6A`)~(I+Nmo;JlGv0)nhs# z|NH_9qtVcI%FNP3Y*57qXpAafkg>-ZD#N-W%iUzC(Cw)ynx1Lhr-9nzay(bv{@mqD zbq{5sOPvtGmiuRds+qOkDjv?G`nM|2O1*n=aql5Cz6DCAAyr8zHJ&^3ujW*wEc>fe z+{wNp8)X^GR+wuVF;4Mq1K%hu(}AV?9Je`+jwbjQ&mZl#*eate1RDy)^p?49+sX+E z0Op%gp(X$8HpTRx$F`QuAy%*SH%n|DU2(AWmf+|>kK@QGZ6`R|^DoiTC^K+Mek`eb zkf7hva@LA7kn>8*n8`pBqXPYm*$)>)M5TTb{{ zHK4I|_gcrzGiwvVS~csv^PoVkbWiYX*AsNoLHeoFk^@as_COkZX|~Hu&hM0x&@qz8 z=z8*Uj-zDm=R;69o_C^4`RbF$EiBZyU<*>pgD=*HIX%AD*QuP@TvXa@@P$W9rLCmwolq;QFmuDWwvj7^id(%sw>x} zzuLjz7t*@Af2ypJb)jBZe5#DctXa58Rtj$-eedJjtT$-Sr+0UFer{p>Yn(Q?A<^n6`zqMaAGzPyWZtG|9z$Z`bh5x0i?|tDM5SUroLYe%g$Jy%4c! zF@Q5QLmRp0$$E15Nr^VEeXL9lQmc)j1N?Yc%5}9qjjxXl%yI4Lq?r2M3FKQ@F3q7ncF*W1F1-1`(Yr0XUrNnqfAftq zU!}B%o(ju3w0Ndsyz-6A&n9@8HCN08j7fJ@#M!7y`naI>$3%|k6E$@G0&RV=6dbMd z9A8+OUwx4;_crd08dsE~#SLI37NOIBWB8I02j-d9oFjkG(onLxhakYx)_7=*$ z%cVJ*xA$X~8Z|?@y=3V4HtM&+uO0U{g_p!ff#Q?4`wAsN{Xh+U9uW1KOMVrFd zyo_sQ?Ltba46!poOre7rEi^HypwKzGoNLw@MzPi{ZM}y&t$j@vjkmsLRQaV|zbIzb zqCOK-jJT7xr>*4A*?AL!I^mAhWO8Plu_W^_4G&8F(62VOD*ZHGqLIzILAE_3v$`>Z zqs{Lok2yJIhR5r?Dj}Zsk-c%_O+{VK=tp$Z+lj|^qqHO?+IO{2-`q!3GH4YEd7?^{ zvuffo2%_u2G%=w%JOng}s*xwU^sYFS{)-_}GD-S7*o+q1b}wQznFy zmx0evLxF-0Fm zzZ%j4ok}9nJ~NZKe~{;US8}r7@xuK90fMM6$RIXN5FtwK3_IknA^>vOHns;yoj(J1 z?Q0zWQw=EfUcDF3hv#^0TFv5s6?hML=aUfINSg;Et86NQ*``d0Z6mrS%HKl)|DCPC zOTq61BagGafI+N3zp3^O_yP)Xh;>tUJlj=(C*DNalt=Lr&frtsHlw$%P_QJPpS}*I z<~*MW%n8^`xz4)e?53McOaVf+c{>c{gXS`a3yjMomL6V$fNdNx4t0ekWrc5yZw#<3x2*RkZXl#f{EFh)^&);kQ)UMS^xUZ1 zYjn6?yn|aNGvOKQ3vWADphzR@R+=W_Y>uknlQQU{E4W$BuPCpUlCSri@}h2up26-Tp~6CDYGe7bbCZK zHmmSP_ltR3a)h@A+ z90L!n3wP)M%BdL=7V-favNI=D<+Sn1O^t2qZQm6h%ylmhG^T%c9vUGZdr?O5RreJx z`&fKDKvq`Zyx4c1s@Iohe@av>fWikeSP8|$pNS^^g(g)}gDo=oN|id0upH2 z)%lY0nOCM5^s|Ii_s?0*3c|*xXvcf=PSB=byvQjm$ncoUs4xIr^WazL(-&4Uk^2}D z1N2c|^B&bta@`{TPX%ot4^h{KSTk!frl8$H6mSQ`5xap{Q`m{YbM8W)1~CwT4n?IB z@ol$eDXt`37%%2Mep9UhB)JDqr$e&`3_{{alX+dxf&q!2%FY2$rJpIxjYsv89A}Jv zw|aOcZUG0EucN7ezW*QjM!5uos6x+bE33%OW?ARKJ))b9&ot6bHXi79e%c`e2I*xR_&Av7OC_mg zOL>Gj?@k~_(XWUpSz;*?MYQsRJ>4(#Q%(Nx4#~IN|1$rLiNzbs$6o>c+G8{d?!c?E zr`9u%)LXLN(l#RXOpA~2Z-#Tt4w<3IxZ@uLM)j&)Wy*6Lq$S}Uws$Ah(D;iBJ>pMU zIu~KFsh7#}biMhLAKpAkAq`6VIb^wscnxKpoVJ;5QN@%`c{ujFV2@oT7(bfPKAxi> z7)`WFmE*Mc{yAJTLJ(B zZvY+wf(n~4(jue&0|O)i(K&G7=c`xo6Z}9HNI*S0!}Cu#faucoU;Oo#iDiC-e`^n6 z`A^V4Vij={F`hu?tB5yKe52DGz%q>%1v6WjuN71i9zei0kJW1N+u{J^p|BaA&jODw zd#aWH{`wCA!gz!tU@0IIpXf8<`E52E{O3dIzF}O_Hy|eDh?3yVRbsX}xJztcK)m^} zj|=Eh(hZtoh$6CcDVT8V(^dmgH>taVNt*9S1Dz-9#;d9xcx4tp%d4rWexQ{R9y{YN zef7MsNw?{#*Sf9J{>6GpZE=xhJC&>nM%gA+?t82YFW4yc6`lay8~kv3bLN4bTmA{? zubp>ra>!)vNlHe7RmzKQ6Q#wPn@>z_hrh^$gRtD|^o4xJ2I!?6s<3#SV{htF05oew z9H%koU_;W$I__cpkt=NPda1xNem^U__zz1mGGT$y_U!nROTK@;d-vss00k~y?@C7= zMn92(u@F*UOEN_r?J-nsa$AtcOwhN^Q#K|~U*LOLc7n_s{%4&Bi>D&ptYEqaRY|2c zC3nK28NQFS@3%-iGDN~+GAz;Va^K|yxmSXb<$GUx4qIBLsi)Ir z%-I~k|MPoGYTaXablH9vjzuTjKqmxitTq*TA0DtWTkU~HH18t!3(2*~|L z>KT+t>=4FA;G&eW&f|Mu_co|yh!jfiI*4BB@R>p8xW~(#M zGWX}!*-x!{lYxBW?gziG3?vQm>pr&r8lJVbu@jU*v2nC-z{g$t(+dJ!RNmZGsDT36 z?s{y1N|QMO=W4C-u@_*j`Z!ub;D;mcDp-~h@4~~Gpy?e&zfASp9f_FX*`%k7I4oB{ zmwynXR6$W5gly-|sKdB_^$jV&_HzZ9mzYo^>gRdbiL~$fGNTD?|iwkq^n}!W_Xs2?Vj7xK@@DK^=hRO;ZlO{XGRD53@PHpXg!FZU|Tb z^}Q)z4f3P|AAfq<{9+qF0wBrCu5SAk)W<@uBnG`3+;Q#oUw3Q+C+`N(uE1X#e+Pen zv9H2NBIwZc4gMz-Lon#wb#a~z;mMoKzdGA&HMyTt*aT{ihw53~O7Id_BtTQBjB6^s zE9@Y4$fuvd!ZgtN?Rv~6011*@S7Ge$a@*Lehkge++z0pLFWmq*6~qj8Iqd3T!FfKE zt+HiVoR8@N*Y0>tW`uWV`!Z_1iD|dK(OjpFMrk(e`%=mKWyg)HRF{*U8{NNSEq>ud zRAmkSI{i`cT*{WY@nF+<9TL2FSbOMIU}BS-GN|GTJALit`8EFrnbJF`{CoX4RC1Rm z=Zf2d5bInCXqZAx=DbK=HLzSe5>dPKdD3lU<>OLUAe%Pz%Y@|WB$S19pxl+(v&;da z3k9fN{Tn25ZX)NY}Iz_ z{puq1ane}5e@>_#KM2O=K_CD}j>RqiHT5EDJO9lth~f*zsqhNH!C#TZiCDz;`9;bR zv^IM>{l;4mYh3%L#azn4&m2LI^CQ5!MZ-{TA6jefu1fob(w`aspTkmo|L3rj`u`Y~ z@($QuU|0%xfhW)C!hAL26}RP1s7Pi9^eKli&;NvZ`$OQ8`-~)oo2c5(f9}4CKLz17 zC#VYeDO8D!ABeyA3ic4Nq~4?x68Q7rf$=M>t*NY=D-w1^d7=OEwIC`m6?2yb#}pi`eQ} z|HSS-Fbe+cfYw|@=g~;sggAf-0Apd+eJZ9Es1IfE2;hTKt})n9yTi=t#*79JMO)(j zAq~vKn~*SInDiZ+kRx0l1mH2vi~JST4*~O!Yz6-A3UCD#3@tv13l=OIXtCKOb$fws z0y5B71F&4Frb)<6#IoiGc0W)mV#u#%;p=6{2MC4*UXrWCtj?drsIbZbfyW&3(in+Z zFgU~g*-s2BaUk75ls8u0ksu&t+b_OHQ%45RGZz$2tl_u3# zNha`{k+lQd!_{*3i>0Oc=^Rt?mr#FWUTjcCL|t9_Z=?)T9#@nZjDAd0*gvJyAZJbI zi_x;$cRYKO?9D)uDd?Vc8%J8qON6>N}4Gu_y)}!6p7$Jz5 zw4tl;610KKVo~w1B90XM04RQ6p3<{1>;P&x7AX3O8tx^m05m7AMPS)cSb+5u{pko^ zg5E`70F3NiQQ1`RLydocX7e^#^L+HG9_K(fyoL06Wdiwa58`C z)259841)3BQBYdAEl_^~bF!Zp4BIuj+h`oFX5nK zi}7%Gax-Jp*kQ#adrzT>W6fG8&Mp2*X@8^ zoJ@!e0^o|tN;(+&q6GMk=X8V8Q%3#%6#^wrwS2fUpKHc1!uzO3b6(5bUD&pzC z*#l~LYGwJCy7q(ogWE4_5F<5`PqNy=|Fp>RN#M4-CqwZ)OrCy(8ih2!2H$cZ0s04M zDgx~@-W;$D9meMVhH#!BUBT*Cu-p?uz_b?rTfu^Jc(>M0c3>Asnqi5V23S0dhHq8wO5=Wcl{a*Y6&OOJdBJn)vahZ6FNHM8*amJvZdx zc=Ooh1kJK{ol~PtNneHs?H!zq<(e0H3;pZ1_n7q?TKk&vV{mx?ou-YOuClsx;r6|$ zx1PG2**4P&?K^ZU5|z|FT9jv2@W zd!q}$`Wt=XYMc);4zB^Rl?t_viLq`KVzl~tT5_}>OwWH9@~)ard^w0N5IUi(?EB&~ z=6u0iI`(j%L9^HkFf7^0%+;v{qr-A{aHpr7_dNm`^=zRWC0j<>4j zzP9vBEiHYqSWyN1D^ch+1OUG~>k%~KL5vw_+Xdf!$Mtmf-PLo8zuI?Ic%F64{90Lh zVXSfa`_gayx2qi7z#`51Tdy;| z*Gr#a7B9%fgP6WWp7D_fQFeO*TgE+a_?4$RD%qshyO#;iIJt<2-T%^N5+JTzr| z#}|1RapxLjGVOYON=v+9k4{y-9GaUR+Zpu4zOQ}+mcTzWjpnwWYG?JFXr4HmaLDcH z#P#!Z_siE_XX#(Dz4fT^Mn8P+S;85#r;S&?LomiVRmn!_L~WzDbD8!>BhefgPqmcm zhljX59){Xu%m8n>&Nd>!0%OWKjP1dSd{N`rZrbj0q01?L_e9;TH1rqRz2GDO!*m9-ll<*V ze5}%F6Gk~&U;8@(hct?BX-nLgicAunfBN3Nc$MqB38hpf_7G&bFWL%bXcDm}97qDbz&d*Pk3M{|%!ohayT zUK$eN%aM|3dz`0aouhBqhErdCu%4=ObZNh^Mp)c|D8sg6T)O8eG=^a(YMQdnb z9^=IM1=~Hg1OFjy>?F&O9wCo>q|48yp>{tRav9OZ#jb_ypKXw-t1AO9xa#e**nV8s zwN5!3GiKO-{im+^Ps?X<67^>(g)=q*IjU_;f7%F1H1qcCDH}=J>w2kxrfKzA`kB?O zShJhEp6yPF3>h9g;!SVeYL1Y&S&vn&+~V=vz1h?2iM<&Kcn^nfqm}O6HKa24SpI%4 zn&mxCjLrF(mCUqz-=Np+1w0zx#vJ*6E>fJ#0mJ1z8;*3_q59W^_NzQ3)TCC$ z#}~iVUMg9gFT6Y4d1v7Tw=D)&XD7~piMnG{@eIoDnZccBGnx$K_&uGkI}X_?AI<$o zbh-1d=<=QZ)IF?>t0i>@i^-)^J$bSD=B2t-g}q5R?P;PZsajfMo$|z;cr|Yq1-B`D z6zMgkm72&l%BQ2E5JDJ3I<)tztJ%$=vfAz-j-<-5-D&hwMbA*e&K~I=-(;64S+k2?Ok=3~SDn#z ztdf;8saEaIQvgkiZ_~R>w6B;2%@`#Rejb|sa&q0=T#xd`WnGO6)-PQ+H#c&Z8$xO4K?L8A6oOpgsy{2N|Xy14BjqbMW!&X{>W4lUA4z$p{FL>Ga z_48|)KW&<#_P-HzS0}yFlWFR67XzPv^X6V ztpVG`BAO=+g_kN=aP*!Cg@27)ud&_Gv>LS^8yYbR6zfavY!Yevc3kCf5hqKnSr5_T zU?|Lq4smk805%nuJ$yfReLdA{&-9g2c1WUyhbG_H`{x_p`}t)J+2;AGlBP8XXb#u&B76;KCiNW`fZXe%&&KoP!KH8f34qq`ga7ZeWg_f zpC+*WCvkp;=jA(#p8;B&okJ$lK(urNyNw^_k3&(CQvNY~3h_N3nj2&C{-1NF#@1Nd z#tv@dRze@nlf0q$27s@f0Db}=#;l3m8hbz^#cH6o4}HrK?^jusrJuGVhdl8J<5$p6 zmMYKfuF9_)xJyKoFS`FRTODSti}}ML@jOxG6)>)ld6WmzNB{6sfcYy2KAx(hiZYd* zq9~pd70xnnI4?W0<7KN@`uOWP?IN3__k+sBUh)D;j+JYa+o-B$`xY0eD`L73lD5Hf zR*_SCf+lJ0hbB5EUSyRFXw_$@^;cEBjlgk5-PU_qHMyW^BM4DSvuaRG3YqjMJ(1RF zFwm5dI#&0RW$KbP7OHMK3WD5MGrWeqHRE{t`^1-E?73v%CVGr<$ST| zLQ88;qI&@AkG)es23!_(*oF@$VOq7Z-=Kf?DA?Jv#3Fjj-^983O7(erEB* zpW(#$NkIl87mQbAuI2MWxzP;}Fw5@BjK0OjaFbdy^g$h%M4rA5S0sW3k{j-LEGTy( z&IU~|Jv)x{F>_c)dF`c#y(kAY@#pcSU+fD#L-^lZK zSo<+`|KLDjAF+W-Y1&!lUpE3({9RIzFjE!4rN23;Slp0xcIkhHhfj z7}Za`(^1`PDA??w42_1u{I8c!sg!)3bF|IA@npz;_nLjM_U+__fiq)As{rb$Apw5L zU>}VyN=Apb3`Xfi7g)qLw;$_ddKS0)qxISkI~}px9p7|8?2zF8sFoY$2cqs?Bs?sP zDl|9fPx+={$Dr;z?NIE>mQTp zUKL94EYUD6Mqg{_^;x{TaJsU(K1Zl-DJna=bxuZuCs(^&ew;ghf+h_}wux)DHF~IG zyL1MjpP_TtpA|}*n?`rEq;rm;O*GuCU{QIF4f3x}TM%p$^$^virZeb^B3Rh)>~?mpu6*l&^*P@wF96Y{@j*F?Sg{xx7kLV#Ha%p zH5QV{;xx+~>oqvQm0>-j!GzJEp1avmq_7}fUlnt{gcZ}|dcw>#)Z1rGm4H5H8r{fg zPgT*7tF7k<(!Wx6*S6}6`-=Npv!DdoW{g`J z#3}98*$-Axj@ovy6xCo=ZS0-4B(a{{HC$?YL*QR!?bX zzM4EO5>s5Zw3)x5Dv@eyu2#6fNJ-ThEbO(!S8Tq053f{+tXE?wb1o08#pCy*+gjJ( zGhi(o+{^DOM|)ohx2smHzVdX0bObJDQQZRYva6|PEdWT4$@bL);4n}{MiOpQNouH9O$>MHBGwXDXO=%m- zugr~Dl6x@;_r`8fHkaSynD!3Tr{I1F?BySyLkU-*Vz9bZ{TQuWC)S%IC|9#^>tX-r zT@3;~Lv!t9#Qor+kW6lx}ykrH&Ge~C`gx%>j?Rwhuq(hBNS6FOq z*egNx4yDP854XD88R>*1g0gH=ODd+VK-Yc`8e>yTAFi;D5Wc7IOHR1yqdWdbOqfmX zbyznm<>KF4TB>Cd{5?y9UGwveP*)3P_UwONtkYAkSZbB7I=+~nYwc99pb1Osudai22gv~R(ue9y-Y)Wc3LQXDfXR!5Mb4(#pI$BwakkWHf4>1 zX3P^Wk<+XTTTGNRQ8zH>n8s13NWL%_Mw($xD00H6@-nfzxP~m3JWr|MzPEGU#U2gf zeZeYlR?Z+T`h+a=_?T>6eO1n_k!06ze$MnW({fzn*w1-TNDN}8yJs_Vd&Pw%{``F@rJ4xqViS@a?l6_AiWCL?rE(ZZH83JpNq*Ju<1*ym|vp^$@#4akGvgpJh)3pHH-WT+mG~tkk2rZq^Iut|e zPxQ~9dpw6d{iWgXSaSg@-L}tX^(`o+Q=YlnQ)1;<|GLjNXvKeh#r@}ybboW${SRX> zrn~TMs_|1dzgi4s_xn)aM=SKZ!KYkB(9W4hnhz?(wK34T+V#JwvfkL=wLNCPM~o4q zx+lGl_wMr5JZ+8941Y~09NE7(-!e#PMr>Ily*pL6s6Z(RrGeaUTT=Mp3qi5xL8-QN zmQLNKEJdA?f$+owcp&Rp2;--j#;}Eq)rP&ibgT&1fEm>Nb*?|)D~sB=9`*)}GkLrg ze^RUWcty_lU)b6A-}R_SS+1vV9CeAA!|r3e3T#Zl80BZ(Vz%ezpsQNAm!I@R%kFTM zNO-78e3<4CAL(Z^-?~?-_gmLj=L@-UfBu>01iM^ISQ#;WN(+>{89=rT9uti@naAJ$y-@CR$3b&V;uF^lqYXg!3$Bl76&q_=FgH1K1NTxJ*&vU73+J zeiknxY$e5R>)*&Lt*raA!))xITezVPgRBki+s8d{^TAKkxcT$3vzs$q+{)$`-aUSe zBpcA#zaT{T&4LCsc2?)}U|xjz7KR8!dH=!?-2@mS1moWmyKZn%GnaTEhW-F}G@l5U zL6leF1D>tmNSvhPQn)!Mwr~|W&@6iUs;?+w5>$Mj0e=6i25uTYyb0kZ(MQ5(;(#ZD zn|UEGhz$$pglrra@!ym}0F2XusxI%G|EG@=0`A1k>H8q%1x9}GOQcr~vS0%>1j%)- zqOf@r)_IkOAonI|?^L0Idd^mYzCN3?XQu)Ig{|egj=o`EMSSEZ{}Av|xetk9_4w_G zikTSj$R@tx^Nt#nhoCC4Wv|_ZZpYy(a1r8NvoGnceE?Z$w`ga}*!1f>KA39XvQG`R zJpW#0pY}yE8ztd z=U@5UPUg+Tzs9uc&=#IVJ4K^2D)Xa?E%)S0nXB{jv;$qMO#HE{&r34H7QKJhZCV*<}}X5%(BxW!G-a^|2fFX1eVcfG8YdW|$W zU<)Wuo5XYM;CAvJfi{Khl);A+2HEtJgFd%e5%koDWc>chkK6ueh&{zA4IaL;%U8{U z(L54kRkiDRc&1w6tcB@;xqvoAkzOdHASR9ri)%k|Aw?Uf7_4S4*=)TL>dzo})A|X(F*DQF*u}tYY@HQ+u9gSQb{Yt_FF)4BLIZ+1q++m+F1@u z+uY2>#IEq(H01-tlKmmT%@zk!rxVb?AF!lsgK{2_K2r+t+>Eq)G4AW0*LQOLArw8qs37tg(ssZfZo-$8J4nH?~f zIouL&#Wc&FdY!tXzBu#FtFxNBu0&asGxBDIK(<+k<@Vv3a!AWT#h>iDwVyb)k;oMdrqO9g9J&gj#Wu z81w3y+Op3+8I<1`X?Qf$eOga7cepeyYhZVS;e&aLpt^pdcV0-`(1vAgv{sPW60dN4 zAf}iMhXt6672BrCo_St8v65vb#(6VXZBR^%vz}@fw@f>voVGK{!RTypOk;P}lK_8I z22;kDSC>imXC~wtIaii_PH&dhKe0@HhPrHx>2p80C~5t~u8NX@^SujNRAJ#3)SQR- zUZiLb`$F(+QZ_$3j1w{oqJ%sTmcXakR+)E@$h+{>weOd!G=dI}gZ4m1Pk8?gXPJ4$o7 z?|rHiR)%X=&*&q>mtw?AfqZekBc4!RI;l43;<2Qk_3DW+u&(1ndBx9NEekDXI8dk<2&gq9{mqeZrKUO1sN3L@+FOI z$~2eAMK@*6bO+?|_YW7_BPzpY z*^$&cJv;OGzd}vg{P)c5yx*8Anx*gWl`bgcK(`?8YeyIJ+wZr62-uw|*B-eR2hyUh zO;Lms|Ayb^b$enl^eg1W^HSpXetK!Fz7g7gc$nu{JY`pG!f$(5t`0^ObUd%)H;vLL zo5B7dq(jK*4qfyi-IgqU<(>azYfefkIL_ulT6j- z+ICrgf1k5R)rxpW^`7?c8DZ*c$PR!_M$K~6;at7!chF=C$oMt^JD{)ohd?KgbS+G% z$?S(fp#uLViSr)Gihy`d#ytp0u;F?FcRe4}vYiB01IRF|10VKq>konbYWx@YO%N?z z5>2hj@_m z&u>AIq#V=>mOhK(jSKRHP`J%%T>FGFw2{JQ^3CDgOGKWF3bz}<^@XuwQEPHP1UkSG z(1Kh8GFbPAfSL;850<3|^dHwj1J`2$_Mr0D9uTy(8Ghnl--5})IhFtU?YQf4D!8^y zu=OPYkoo)y^;JUCw|)pPt@w~0oOz727DQUP1pZ!&pdSa3=dH~mc=Yg?_e(6Li1Zd0 zl;aopcp;-DH-Gl?T-q0?@gsjwDhfYj+rPE}HSWldcskgw|7bXtOAETJ8j3=E@L&3( zMEdy}Lz~5q+levm=&1-r5SswN4Quc+%1e_FO`>&kb(*9C-t8oq zP@%%VPU0$sBjyEp7oaJKPlq$U=8!~id@kW0Zo1kyu(2t0&O1{!nE`?3q6mA!y7ukxv&lNFK+^y|n){$WvmA(ih!Or_Me0`n;x_QCO-R;V1e*Z;bqYX15W5hu0{e^3{(Ct< zXE1)@e_tBvzbFXtuQU8jwN3w^+JF2;Dqjq~KJ$+g{09a7>jZz3P#qv4(iRET0kZsW z&I06t=mNafbm(8V0+xg=QvT}<9}%>2Xf7L?0y`dWhBJ4N{>@ewIe}ZxRrBxXasi@K z77ecKKdCp54+!pGm-i5GRS)g&(?WPhz@~q%hX8DPk>ktHC2c)_0C@h3Kn%}pvHpM3 zFEE0Y;KR_G5MV75=MTVHK+gP|wV?l6Piu?qd0=Z-shdvV$bwu=mH*-zAQt|cPZ8Cm zIdDHGp$!!<(Bwal3RJ?D2>E+&UR!$u3vTW0-=z7^M+NNf4fSgAfw%Mh{QtP&Ee2Hi zn*skm0BQ}$oBw?P+zM+;iu_FjKLl9Th-&Cx+xrEOUGx7Yg5-bEF>Ddf2DINs<$dhv z2Rmt3fqi4YdRvG=?3-n4W``G{Ofas95RdELa(!e0%$aT14_>heT#?@P>8Cek20I2o zO61DU!;k8i+9PJda=Rcmj7_>07g*4{? zq&bQAO#y6$z;#nmsNpI@^FX%dk@A7I155za-Q_KH2hCRj>iqljIhDV6zQWoX)!BJs zZ9I@t`tQ&G){X9P2T}euLV40kK99YXkgz{ATD6 zfiYm>kr%;{1|dWONP~`97;`U?crI{mH^lXUt@ZHpNq>EJA7p<3Jr&;qB-Vx4?1k{t ze;@A4zf2$+fb!zkfZT4U@Ijdt-1jTCgS7b!5Reu4Nc0YAOg$FT;1p zm%j%P#@@pWL<@B%L<2Y62#9=lI#(8A0s?F70w!qWER}&nzx|bIizsg;j{*Yn;*&Xo z+$e8D(ojPmhbA~U&D-8ceU9T^bUpX6c9<8zAL2Ljd%(|9)|@!!<`F{<2G>)52sA(? zfa~2Bu%tEIhDk%uV7N-)Q1~UkX=gKD-hWvGxtT!+KVIsz)EofG9*wPN&{`3M%A+2BG z0)Bk%NNR@uU+84<#dm+BlcB*Y%-!n%@tfD6yD`6co74yUi8M(;hX81AgUdWu^B?nR z)wq<@m9G=apj@8hO6?-q>n+W*&v#+-h6%`(-pOu(RefDBIvf&Bs%!(3*mn<9!>$H? z(-#yZ5}ntk@0Wtj)?9~yaj~ru@3pznx`7|`qNT%gBH8z5jv$olR}w6ESj51H+Ilg6 z7ZKQ|7bj4p-|Gzm6QGVpV3remlJLMdF$0)nIW(N#CJd}vn=b}6fThM%p|xo^+hH6o zK^o7&SF6M}C}S*{GBJ!B;B1CW!6sj6uQ2^(G?_Lj6rMjfCf~cX%BhN*X#PC%Tg{jN^u>uio=#P@kNcysX7@m`Hp%)Ap@`Q)OEHy(4zOT8qH zG-f|5k0H9wXKe$l8IKjq`~W%ul+@eNosOLKw)(9vC*r`$d(!@(b}we&pL1cQ8K-K7 zH1mCac|t#zs##!s|Hc#X z+?%^lA*_6$!k-L^@TF2%FQv3e*@+c=Z&kh@)hT?IrtbTY>^GD;ZJFw02pw=K3z8mc3y5JW{q6P;jwCszV3l6_{-)0Y!?bcV&C+RXz zmkTq@jFB0;xcc-$aZEbaEBnH%8`B{YQf7^Q*rfbE1{NktAAz|wa#2Wia)j&tmu1#U z(@(?xplAn*Nf=zBmG3J&)v6djl_+zG=a`&k(G|XFE1%|jpZ!XXx<5K-s$;REPcvJI z*-+m$lB)Z54h))en+6)=bUHT?UNOV_-QZY6ATO78%8kpfVxv9>@(o>qDEvx}L989t z)>~*1c{oY@kGHC`3}%o#WHGpLnB4qS3_okABu=tD`14?Sjg#cZ@G}+l6F3uY5Bf zxDrSsaSuT270je^Z?B2H+W}h$smq>?sBva0#IEiQKrjA$-{-LT7d?34d`(Dt(fy&J zfvf3;Rds&x@_F8eV+Yu7u?^`m`zC93s{-z}s?s~cBHu-CKLxrm?$EKF^2unLsK`?O zDN#zqxv11xPZi9A{M5SF)?(eaF_&DIcsbv8AGwj;6?|07YyOU9%5X$VofYJ98d(j( z$hdfv5b2ihp!+3WY{Nm%Kjs=v_Noi1z|fISBNsNtWEiV8WnN>)`|HitHSN7I7nwWx z^x2l=s=({Tb2Xhis{ZV5rqXh@`^AW%E9ebstum(@k-Jl96?+DgTox6(v@xx!iMyvZ zZwsDU|J3!$gafGs6z~9hO%_kedB0B47n}^nkQ%#6JKc{%Q<3D7CYJqV#-$oFj;Xf3m;>oj805 zn+>d#d*D3>;!tcK1!fGh7{RDBI2{JGQU`O%2iW*2bMM}Tg#~|{MJ3>Z?f5fmX$ z!r4WQkPAr2!Iyv^KhN8mKiw%35E1UqUHk6O*J0xTl;T#a{p zfz7?YxQJ^lP#q|wm~%z6mwqMZsLu8%=+~})m_Xn$M8G@)Yc+o~b-{Y(A8yXfQ?zWyva~cXAiV%J)Y7%8qL{vHLDVo=L!o>e!a=f`;yk!dfbiTxpnf^KWO%FsB zq7g0#%Ak{1XSv~wBxDqI7xz3?vuky~W5E~_T}TEIw!V%nZ8r7w*<_jAn@(U|GTmoyh$xc#bZLN0Ru1M^at z+l63vt&1?nEXBI!V&e?Utlr9iDh>C((cx*|7<{FBq@D`n&<_D)=Anu}I#TK@e-H(0 z&~-%XE)P3C1}^>HZ<<wGQ7iW8f zpH@6;@tq$S6F@w0hZPdfXob^U#gz-wSiwzPl_+`%`~ZXJEaHwUOhyW(x2rU|=ICb9 zPhIh_>+p2TzfXv14j5=|HvCMaWRQuNBM&$N0@B>LhB3dj@do#Z#s zyCfSeJBx1Q#W$KX9I-7;%8et_0f;SiWOhPTqtLvhNI{Vhi&RgwA1l@En=va!j9o1n zIqmL#>rh5~b@}B%xI0FhX%|^S@}-J!B^a88MMGR=-m``s+)FH*=X0Q8^jpu;;@KRr zzAEG+tYS6#deRu;0Fv%i+-@4%s~(8@cE*{u{b@4OK&~wi2pZ#&*2KUO`2$2T7QPig zcb|@E%BNnU9fFBv(9YBYv{b^3(vx<@sg##}gq^*GpF5N+>+3?P5sDvfUnTdXq)N-n zluFcAVQ=l$t#HI(7K=CH+?%oTO#FLNB>pv}MJ00VC)Owgz!C^J#%+A>&5J(-b|K^R z6biU{-SvA*KM~DJJQbSgYFY_;CS$I+V&$hBpWl_%|Lpw9_h<1CMD^4&6&ZghZbY(q z>cXJduOYB5Xx|TX{5vC^jl8)@)*KgT}FR<1)nzK-~;KCrsyp#F7 z_s$`d$YTA;392ySz8)r+7_%{i0HzvR`tr+m_dluUOARCF=Q8&iQ2F~=OM_+|={Vqo zJQc}Pn6c*zFjd6HXJT{2FFx?nYb5RO>#T(|k|N0S+nXdX?lQLq=aZzw%2yR0WD8fP z$?mt}T(A$~rQB)dy(0AG^+_9vfeb&%r_Kh<6Il<|DXgVUA)O3YT+QU#u^dm#CXFZw zz$ncO!Etdi?l3pJ7jlR8VJUA~6BX)yXQ?&wPjq8kZqacE$#f@_1lk9=lPvocJ#a~M z#H0Pt^8<6(K1Jg|Nz1 zLd+qD9Fyc!4k2^eDyIl5XJShZ%W(-gggGz7Nr=3VJSQja^8}?Upy(G0iw(aJf%09x&i^egMZ53zT&REB~^-j4v!~GtVuV@WyU8&1x+ue% z{PJs{JzLv7tDdmOxyk=~g<0Zqbf>aJ=>cWUkL$Q&TLI~=wu{`9C$sJ5MVB8|SnglL zg(^(^!HLfV&i-ryV}rxO`OP|;L{Sd8S3zKtHjMG*&pu}dv=v?e<{|UgcSM)9op}ou zp(`}P7K^pPRgyYRpW*VQ2h}+s>3wmPKiG1d)FSeePt^HbwR`#?7B{~3pKTKwegf7AI^d9aXBy1~(D4ajfYuy{v#pDJZS|I{x=tzbX_xhdiJbq&Zd`1th6H~E^D9UwZ3l-jF5C6-KD(j=D z{=?QkXKOYTapN63)AE!PVql?T}`YDRz`F?nknyZX7xP82V|Vd+aPo6%Dw1 zIA;C`AkG9eeE!82qh#`u{Kcg&S{WioUiAeYtUd&HUssO29usj>SUjq|6n=TxQ&%s{ zF3h^6rff7%f~_^xSYFy&`!`k!m1Ev$nTYA+{Z2LAp14vxQJX&SmcO3`)FIPsEMt?> z@`_nU{h94XzQsM}`v-Up2ag8z``C@>UJLNhOs}jhH_e}3lyb%t)6|?y!riFPyRw9)V$E4ynV3_sXXp;KBLRL~Q$&*{>fPoPP9O^O-Kd2{+S ze#IL3m+TL7K`;VH47w4;n1CC$h&rA8+PucJ5eL{tdjr5ZA zZ~op=tl!0rotNJ7#~))CHb}M?y1dH0hNh9hJTO=1+uYmVKjqyRwfDAL?hMYFizr&pj z`MhD$h+iA04qIjwKCl(~ zhG-7kDSARJo-Z#GTnC`A`})lddV3W=5)4Q*V5fn=ID`Jq-(mZgmk`a(JT{$%^1I5v zCW1qRyUA?N%fA^6<0RkM{m;gH6o$y)tQX)|yo-&m2qoOun|eHC2YLkQz>>fKYNsM` z+hP-G%Wo7wvhW>TLs<%nzH&w?=X_l`+{bnp@Mpq{jmdEpG;#k$DH~joGt9Nbi*Igj{;WV<{`7}yC=kY}yGvs7%HvhOj*V_lL8boJHu0I(+#(`Ejl0SuA6 zUgKe0q20Y`o@*aj>2tjqOqYTu>e;8A{hsS>Sz-JHYne+eci-QJl{}wh%#T|Xd;$Gc ziL9}W(|~IbMd5+uc~s?N>MfGi_#lz^#KL>&%eDO=i$dIX-L-kdvExkl#JJplleR^4366 z1c*(6dDQ>^vtHCBvQ?mj@aanwk^wt}(Q$o5@n-TlOV0?Cvf6j>>DyytPv}oSF9#n_ zgG((r*$ZB;9-opEt(?Ly7?S@$M9n_Cc23>RaxLjGwz~yWZc`q(_-eMyS>nK`wWK`R z!eT=+C!IzrIvuFYSM{jIDh>9n_KM2qSlf4w&Nha1AI0r!I42#tRS>*#-RK9Gz<$HL zLcohhIDCLpDTeX25HWax4OG z+qe3)pXb!hJ=4)7p6XhUj9JY+4@)D57QuvKts+<+eamVR2`qQ3Bd@xw=Mu^iI!7y< z-zVN#)RZXNs&vbyu03+P{nRbKB%$lhr*!)yuVXVRC-;45&(oS-9mei!zx*`ei^u+D zqF)D>%A~nm4^Rb02GR5S7?cG8;>d&U2-;@Vpt9L37~s8%6-)rXb5=3UGHtRe*oOFNf0m-i2@TwCHFk#;C0@D6Kpi6cQ;?|c~ItNeP2|ao6LuuT$UlZ2o=)T%}D((#I@dzvwP?hp9hsr(yn}g52S%BSG^@#>sLM-_st9lzgck=~GYa zQ!KHmyql15v?vVGT}VD)nO3qEc-Od4;nzrtxA|O-m*(jQu5c5IVRF-ciUVGPZPht} zPNlrv)_d5!=4hC_V)3Ppc~HcjZWIs@Df2zY>E`kHp+6yq0#2sS^dD6VTN!}6#Id8! z7NmGc+K5Z0xzg|X4E9aA8y>n@>0l}9e>h!N_rnK6A)PzZQUSGEt2cF%mAmb3cN~Aw zX(AreIZ~96>vKIg)hd_jd|opx@5b52QcKI!&D!Qae*$z_n+v-@D0SxX;JAp{!{aN% zSX@h_UNup7UBK)o8oPyjLzJZD>{Ud%F7s~&(D@p|c&=8^Zf>$pusm~QWA-~RL?OKf zwq`(jX?7)wIEYp z_i<*8a64=sS4aPeqO*V*O6=boL}@g}1qLcbBo30q)q)h`8Ah0`D-wXVd0_owp4dcq<+4owM^pAXb z>~WiUIIrw;mS(tL-2(0DiJF#b@uwHxUdeyT?AI0lE8OjKP{O?H=S=P_ZB3_b43 zu9`cm^B!2S)``Bb!$DIj2KV{w>tW{t*zMLrR-3B*qdUy&BVi^6NlYCr)a3U04^s^R^4AXLCcdE zy9PJVxU@HjJm>3Gy{-U?y+CWH$WXm;+@~4uG z(qplgUZgvoHVxvfCFc^Lxe@9oCj%D$Je_ZjH znUPWBu7(oW`M`805^zbq?TAnr9p(!pk%a%C0r?s@)4-xlN=j_>?>;EpInSc8S+u3V z1VJ9sJ{~;{m(4|T2(sA8W5S%VnXzx%AtnG7Ch^A`&u3#jCp@}gpJj?%Q+v>13pDuPmq$zli3O_!E+HrTQZcX~Nb{H1N_)XYi{pe@Sb!dr`i5b6(5Gw(+v zz~{%D_wyR?-k3N9a6OV@8&aAF@_scRH)|XU>OZy8j@V6-uNgi++mK>%Y_xVo$UAJ< z!EhtnwK~D{##lS4x29@av#7a74RHkn-$fQb%G|4(5Qr8oiYEsA$g%t8d?`7gQ)}N? z*Y_kP!Vwi&m$$ALl*^mb6zu~#Zcvoh#yZ38N4*D-M$wd?C)-@l{JJonm>*NL-wJDN z_ejQ8>d6z|14WPYjGM}`KVYFxE+uNa9m{;pg|H`?SAHoboY(bYyzRs@;@KH%HyRnN z0W9wonHOYKFyr*Y#c`a6>TI;B#$w+F7u)sv%GEj)u3j?KF_i!MpMXbqlVCggg)-Mh*Nj@ zvOCjdj^D$^T#hhjuQ5}prX#k{V+c8RS+|d$I?M~Z*jV`L{g2zN1;k=DV$goU{?R~O zUy8#ao#|vX+P1?S$-7%6~>X4`Npapog;^vY%1v>8DWI#pAu!}n^nYhH7cHKX)lZeNSW| zy=oGUujIZdQ)v$yqDR!mGfo95yZT8V()YZ_NXVU2Qm!qfc-KkZi52a>Q?w0=rWKE( zChu3lU&2J=i=-^`jhxdZ&YYoJkB^iDrOqX~%2)T29V>xL+#r#El^4*U9S?%*^OVvYR z**uD=&gD1j%@%HY&b?dbRn99$^PyDns3s_7QG^Qltlu0(3 zUPx83xf`G6ChdHr=dslKY1k37Jc9*z_)E3Wy{Z#KzLjES30lkBhy<-Q;^_CjT^UmDN+egZOvF)tTdvS?=4s+}Q>qL>1Z{gQsx z#o+-rVz0=dr?x#%NPeBxdN&N<`0mT3e1at+ilMii>jnPcL3fT=cWOpM>B{=smj30h z;zt?XKIz@ccJYJoM4^yIf-5pI)_4NvqqV)i85v?@uZMZ+l)yn>jCnY7D)StSvk83) zgf_|%eFIl8b^B>4|3hbs7gJW zr{$N19g1^C9SjSgx9tmuZNiEhdF?FDE^ys=UI47J-hpBmoh5ubQU^?go!_0HAx!^( z1Z6&u;W{Vbi|SabviT>F{QKdNNFtDD4EFS1#kmacWEsHYe-%svmZiQ zyg;X2-6?wR;={rF5a+I{(qaUnI71NnfDV*(f~cu%Rlkl8`OugK3(R9tL}bQ{@3 z`&$?`SyjL9RKdmG9I-5h(;})txVKLIGY0#qN+{rQaER2O{U;!w;AcB#CUQ-zE?2iU9$&Dg_tlgwzF=+A_j}GA-;x}V8+T1Vwyd){H;nW+y}AuE_59e{xm zXwT7+s1x8)a<+jXnmWNu(3grM$yLd_tHH_M(6Mh!w&2uEoSpWGWkJw)Ok<&hq&S;>?R1 z#_BPUyt|;GY#oflj%+{3`V~TJm7o)DbAoB;Gl~2j=zYkR25Nkh--7{n{r@x2wgyp` ziu_sz9<6&L01vHJZ-CYN!Xx4?^D?R_l1U^VF7cqUn26eN%43h#i`O+UqF$Ne@DzB> z{s(9$_0G><-Ms!*y@V>QWLH$E)EezJMwW90Ip&O5+m0!{R!6t!iVmVe>tHX#(LjYYP1wn^raQghWq3=9l7TsY7cg-~D<^l(}O$~5s zIlR5$wrwsGid4wbN~w=Mv5g2)$aY8xJh}al`dv^hiVko82_}N3SF|<05LWDxQmFIu z`}8YYx6kffb_@0EcWy0%8$ibIVWVOIFF;h_kGId&CuEh2sxC{D&TnWg4&U*XnWVI0f9E*CKc zS$9CWa1`+S0)ci^d>vpGz8|PJ)%}9;{=simGr_w5R}jf*dkdI77vc|BO)!Kgo1y<;bx^+WBX}*_gDB&5Va>#8X7Wp-Wd_2iwSHOSptu=0=i% zVdEE*?imHP&=x)pwz+;X>V94~MW9`b{c5uTjvo-+rX*kZvd-0rW=OU<}cjqXqpK!74NSdJ~uYh4gClYHysN4%6%1V z$NgHKa`%G0$D1Cvb*^07ly+;wIayh<FMeV_ zXVi6)oJE-KF%_)57VMtlw;#GU?9;zYI!`!zh4p6?6nbC!)ZNx8l@v2#K5gI={+D66 zmyfRMD>yWkO+St6n6gbD>R(N~;iwmuWt?7R=XJA1tk8R~!a(#nF1FjXwB3j>;mSOQ z)lo0I?tAB~HCA0X9v59E^&>1f?@o@T@x>wIeytwkLz)#i-kdUxoJIa6{t!|M?^%Ws zcIG}{Vz>(8&Z1EkwS$1ghz@B-%Zgp_{$y{0c&mFZ-}B9MoZj`gd=sz4(aR_aa>=)$s$KFwZ;2n-Dg z`QYR@<1!7toclHVr{`verlzMIr?gWXUcHSU|BVhUe3)YNAmq*Tt1m~NAUz9iCd($N z=*y-nA5$8RQPxmu*ZA^El&`$>Wmgt?!~Kljfsu4TltCIyW-wCUs-^zDy|XN~x+}Ue)#lq;j8wh7ZmOB4KU*`Y+bY*dXGF>Aj`M)v>8|?~ z+Ss`FEUORAwDSyXVID{ONms>NXbFBlJ8ZJuS&Tu7QJF_C4tK~xzBlRl1O`?wUlyA< zpZB=9O^=XP0>P-*^vSo_p9)Q!6txvVriHe+S!wlG>rT{aSytpc)SBw9PCmw=T^EkOR%)Q~Ztp6G&8zhAw4&g|e)HGBp;e*$H~G?nCLU9Yxl+$WVgr_LE5b z`FDt578D?akc%RqZb;u`El)ta+X4~#KvztDV*1G4UhkgCh=y=akihrV9ELQhX=JovwJ-+4wZXkcH#XdJN(C6?9ofz>E#odaUYnd4_3~n)_IbZ_*MMv@ z+0Q~p40b8?CQBtbelAr0<)jP`9WqZA3wpOOoK(_vU2QhNMpUQvO#evq)Wea~jO7x= z{_vSdpu4k*T_?J&&{p{RSsR-!0NVX)2V*V|)6qsU&EcB`92yU4^SMI=8Z)>sHPtu|{iu0{2OGqLW?J4mT2=_O6P+%cG&e(hj z3Xl8fVIJ`j=PDLkq?uxSJ~Y*mAu;+%wUmqtnW?0G6H`@m(|&B z_KdFDZ>29qD-~*e;>Xbr*$P?NXSZ-#oRe&5&izHo$91h&a!Gd^QTtQp|KSv#R+vgx zdYGj$RHSw3Pf7bH?B4}a7T7(#Vdni+0STtVc{RUtgTwv$lyDuR)um9zUDb&)ehl)3 z^9<7n-hqR#%mtmJ5=90#aEg3+LOY5h6+qz2tRnewNzhuROOGL#oC~rrm7OBvvh{xg z*YRyot~}QTMc|(oM$Ej~gi>xtD1teTSZO4A2K=x92ggDC{vXGItm8VNO?{Z}4i#tq zCy>1xog21Z@PFSA|9{>uj#m-Sw}-Mpzwg#PWXCMt8^;ml??;l)Q1}?Of7pKluZ1;` zomo3gEe2*lB|(`q@lA#$Vc0SLcMgfuh1p6|o`+#R2J8*{%&1$j(6X3Q1;-q$?nc)tbln!elNA z(|T5N_D0L_!a^1e^|653(@zrx^#cSxs|C1U49kF3nYFa*#Lk9TGP9i<7RJz)!_5%_ zoS$=FoYW^^hM%cU%0E0TWSxfo{ha@Ty0sn55jNm*EO*j9pq3|6mw^@O zh!r1RDU z90-8zB=EluMey$*&H{J%m+ZKlUR7@JF>tFIuIkLwz-6-o|Ao-d*0z)XbH%|UfpmEm z_H-GAbzH-&3OdKJ*a(B2Tg#0eK&l|1FmSdvfYjT8^GEH8e%wqx6_UNKE3yST9ijAD zb-xbuX(l9!RR%f2hB=Svs#6YK4A9T3@YG5AnObT$uuImxf)zdJ*m~=AdD7Pd7I{MlTu*npVy&{UciZ2Q&dR?O~oJ!w4wBmg--AN8uh6 z;TTO5zfX%#2aS9_5RN)uznuenxo%Q)Stt10>kJW^{b+jAvgGOIZ;ynKdzj)v0m!(9 zDSvIgZ4TpSKy=yi$8_(TpT(@w_g6YTyo)LvRk2p;SAO;h1#1MpGv=WQHA{7_kvU{eBf$s`z zBAJpMNcBzZ&<_J`vuYF9-%KsGh=xA&g;s;!-5a$p<;B7d72ev%f6wTk#dSIAGRAFR z+J!P7!c4EH^e@~@mp$EKg;KdwX4;z}eA&Dh|64&TBG~I^QABsmH0lMhNwbfM9zK$4 z>iz?Ol0%oz+bh^{{xc_xn@OIJ^}J@r!=^333m4SB56dAon1j?}AmI`00aWuV{o z`y*CD*ZJth^n-o7&MY59IJ~^W%yRa+=^taCW_{p~2s~``UBe7@yx1t`L2bHp-+tS} zliqnZ(-v$@DwG+%=_U$q6WxhImGG_w_{{Ba>Lj*UFEW%kVmm2o7Z%1@TbBvlq$&<$ z1v={d*8b?{>8@5e?h6WAOk zi8P7!1S{_3^Lg1kZEETa#0=fsumGZUD7l_BIvVaLYIkx zlJ7hW$bS3S1q7)%RBXg?^0ZHv^T`oRU)A>rXz}#oMEWrDNW##7q=yos-2PC{T14N6L58QE8PR%U5|8}@+{G5Z4BQKBl7XRywPRqNXm1BsZM%wrCm&vmc z>WuWI%TnK_WgbVEQ0gPL4{2X4I$s`fnOC4YXp*ISt#~S5h@rgYgb;-zSQhi zR_P6;+XP+@Vwg|sG}u^JjZ@SvjshWyItRFWp;j(VS)Wk=HX=Q`+9mq8Z-zRI8&Ej0 zvPPqkp*|E*@}8n1Dd}Zwk>@R5F$4F4e>CDRhG|!3%sOme#0AEsIA6cuD=%X*;)}0I zD;+fjVNq4y==`5c%OZ=7UCUilg(#i59|?Sk{$=>qQ5g($|I>} zmMfNpxtP1^Yl0i8AR5-fh1+Q1WZd}t?I?=k%aJ}m)uh_K@JZF(UMZ@*4~A7j?)vDT z$(Fd4zv($~Ro`^9mXGu8-_NgP;1>crB}YCyM9Wha{m1OKlnqbyEt=ynl=rN;uKVX) z_N29&q_0lOBqDgq^%0`~mO_N`*m2Pvf#y9WZ9!gw1 zC)`eag*nbwjtFLg`X>dG$U=%P7KHui2vu$?T-aC@RUlsfe(vZY#TzxJj}*n3Ro89* z`)ATld@q__ClMn|lW7w6ktq--`V_#oU8V zLXzpGfp#?veuZB1SXsV&-xhZJk&H^kL5L{qk{INtp`urE?9z zk9;8)anIUpzWE0&TC}?@l0ENqlf7*Cnktvhn+GpgmANmUH1b(4!Dr$yogw!gkwN)Yr8?O7cVd{syS@`^aV)ksWFEwF<-HPM0woB+F#^X98jwJ< z9B4BafDo~BoQ+~AeMJP%{!ak4#n~xikw9IR&e?hy9?W-{XT5_~l3CK6RKga(pLp>!X{`>xY9bb&f^FIUuu@S!qjV;1;{x8DeM#0a) znfk*6I!t1<9QMSN9KMZELwY_mEi<}bb>UT#cyoqSwCCX57e_{kh5VusL^SKZv!bZB zVwgW~8p`P2jMPkfo4&14xr92b1#Znnoxn-mu!k*66matOdl8snE_{Rd;hifVOw#*L zz=3lR)TBni$&Yp@CQpU%o#T>qLTGL8^0lB@D~ZWk^d8xt**zME_7mng{=%Olub`s? zM?h1ea32>qfd3e@1(zy+AQF+q<$<-#8RCL#&ll)iLga3Oi9Ph0W|hvinjYeKb)8M>8 z;3ks$3e%-3gZx5W7k>uj(0kD}lQTJQU-?mf+d~Eom%alLl@ePRtb?Vnz0IMJcIeB% zM{)ckIPt{{w;Q9rn0t0yHOjbHcZXGIVSs3JZ2sc{pUWb96G*0wS5tfVPucnFZs0-) z>wR|3{GKV{Kd0~YpMdv+AI3zP=)#7#8D6Pf6g3IEcD2BgmmSvKze?JN%Hj(rqY*3T zDL_Lz_?A-<0?O!%Jx`2iT%E?7wvEOY&EJM8HO~yrK=AHhlvPdT>l|d4@P31kQv2&n zPrlmsLMORydx?8fc0K_&PS$_6>{r~dsq!oJL|q!68N0(jn=W+g8XlMz zDTuDn)b%wXPAj?C9{<7J!z+UR%77e4904orB|^*~fSK9)M)J=k&(HZ0kp&ZF>ZiPA z#b4IskpESBL2svULUT<5E}^hj-{S}I2N4<4LfvW|b5nP9B1Ahy%(4B+r8B}*AC1(E zX3~8Kz#X4%SSS%`SwM4qYgd*!57*d;m=fDX`W29*a}g( z*e3rGcI-9mAnMrQH9illQ` zTw)*!*80TIf*mmBQ6T^xdk*hkMSZNCAe{ucHp$sE5FXrK*L7ooM1LJjMrw+hoEgRs zB4N&HJDK9qodf>JY;g@qTxcGIMBNg=%-0uiez@|G@1&^$2f-AHujb})j187vgAAg% zCHFfI`VD&c7o32|X3>{_aAs$>6AtXo1qte#8H^PgHrEOT#B8%b&;k_Nx~h+<1iJ^m zSdf-HGY{Gdz{a#!a0fi|TMD3GDX+VumN_U=6kmq-LH3!ynIH_PBq4pD!va&U0+}mr z6-3{v{{$Wqf4ETRm(>IOkYtoFM2LMT4>8IV?>^$>g_c(Hy+_YCoNdXcgg2L*Quh2z z5;Hfe>L~Trx!*5c!N$j3W>#Xm{?3fGkQ>s%5 zwhx{+?SB!FVTW4ESYh<2CT*m+d7q9bi9Cbh?j%>m5UcZdSoqW zmh~$`6QD;bno2O;E$Sa@(UWFPD8X+GT&x6OB>(DOl&|}e&3gQF|K&$xohlyqdfmTpC*TR$S*oOe-)yMDsS2H}oQwD`Zy%Oec0D|75mBquu64U5pq8Oa8*p)X z(ep9u3UK%zv){Ha(G&*|mR#;SJEK8b3(||)c)|OK*v;=3d;Fh(kX#oNa-_#^BMI7y zmQB*cNiHh)$|^W1pLzevq^{mEOY;z7?bh(aiJn8VDbFR@ppo)82n-^0RhEZB=EfuM zaFv_LY-2m=)Put{!(F{1=<^kqxwkJl8A>L^j9{-{*v!1Cs@DE1bEPzVqp?UhtYG;M zE=E7)ZK6v!hDcln_0>Js*~`o(Z-f*>x1SM0o}S5mG!YVuEAo?|i>W+KBkA6IL{hpb_Wyg%#ol zsx+h{8NMmWk`Y)FHXvZ z9RRS=n1I_=q%baUxQ;vk=LWv^0Y_cc4F=@gI)}4{Y2SfQ00~{!L8h`XF0K9tp~Q7M z7q6ct{70lgg5ZnK*MkBXdm>=@0hsZYfpa+l3$XgOzgfEB07dN}*lW8ssJQu7qDuxsv$^H~G$30K7v!&VTY;W2M30~$_%4tgPL&Zv+|&WXO^RW3 z&YF_hH7dSXoo}Q|)zi73MA$)gi!v?m!Z{w5dRi=wxhBbvh-VFRdApfJR{|9sK!7Cc zY~Zf)uZrOG@mc)4zdT6Ts(1G}9EiE$@L&L%KOL@02l6L;fcgq}CeSUwZRCHh0&Bwb z*)yDZSsro#=EwqBhzoYgJa3DDhtB>d;21cBIvM|!%R}Py$KN3yY12`J)L|@)^qi=h z0|g=bho=`9^9i4y(G!&65%ta_hETf$M*?P&Nm;m><_E}@Lv4S zB6xB#@8SjhxW5C?Q#&`R1NDeG$kQUo<_0ey(!jQYuY5j?l?e}{);WV(Y5)MR0f)gR z48iGV@j`hvc+wWXND#Y4r*qzHfg(~Ji{mK({klO!`tqA2l_2ZU+KU&$f(Brac|oi* zPk51faBXr?_+CIVzn%`pv?JX9If#H0$V8B_k*{5wL@}t`3*o`^ws+#7w0M}yqCZ1I zoeLJAho6CGi0wz`9|&JxW-SJw`ktu~HI7OC0t~V)B9Be{?J2y|LKn;X8<08w34n-k zWHJW~U)_QBvcO;x%6kA7L&?r5eZ4j;n|CFUH1np7mJDm&BSic_#I64VQ*rbHlNyscmhSg!3*2u-jr?fN2>an zWv?t7&TzObNVWKNMH-6_UaeHxL9A;K7LN4+^6l_7BKs+8AdGLwa>dc{ZeQ4e%qtYZ zc9_UrHi3+PrHK+`rx1i>3kn_o7HPlhw8RoJvhg|O084*k+Wod<(&>kzKucsz{*8!D z5r6FA0JOD(JS7pcCvOg(z5ffR;O)i`~n5lD9{z?!kw49UMvW9@~mZZ?(wIXZUr&;+z%g?&hz# z4eOecdDpJG-*uZhe=mX4KR)`vMbUiNcl6mMl7$SWJD{XnR)%?OOA+lKC*p4Hq`lfF zn*PwvBWOy|!?=*adY>8)!G2^d_SV|7-(`L5)71Rml^+{21dkjqD}^VBERj0XC>)y3 z6aL+E(340n2wUDMHeVs1f*Hp-M;T_tSHe0}#ipnFu(!I*tgBgPajmCTLMqz zksBcgQ!dt$;#Kl34L9OqA-AV)%4$8rcBwQLU)tZELTSoLQo8@XLL&V3umX@<_>}zw zb6xK$t0!9B`P94S$tCDBdPM>|ABd(amgB3L7gMpLt7PW6UJJh6^~Mx@m-9aEEs#2N zpkyOdn5XBX5vSNN2L|$Gd3MvZs$*5gfYGVDGGc$aAG%a~+XpQrJ`UE?39ry!y>Pm= zAxFU$`qS}BCs(g)++BJ;HZXT@NQSLZhxoJ3>ou;IMHO#0iCFvB=Xl{B$8>@zbopo7 zYn4p3a6JL_2Ol~)+dXeik!O*ur5?;}|hQd1k%)2OfVr^z{mXZXP2~#4>twmTL zPet`fuz&~63<>4j!J%TQ*FePL1s?_`T5sMEhCe`_cke8#3p=kqJ)Fyf?j{xMFu5GG z(hQ8gww-Wz@4ihsF#s?eJJYY(kg?X2+`tvSoCIgBUloWZV?pW;Xa$i;v^r-849MYT zuNHvd0sZQEjl(Yto*!-?I7X^nyJdi$TBnU9BA^&EHt}j06pXq?R(@X6*ydSo4BsAF zs$|LB)g-IjveP)FP2mI5G28_Wh`8jQ) zWr=R()yGRIkC)PkW3X`?fB!WQHH605snptOQaff}eR2?Ex^Db@%SrFS`W~Zmh2r)h z(cfPuw%}woDnz0Va{h+W1HPgmOt5#-ajc)Ii@U6mD&RF<0xolZo9wG zb9qg2M%F#sC-2~)YF$TP%%>bXV@p2&IU#qTi$OfmcHEw38e;$2*~gudmBAK$ zGV!U{@D3rj1wjfiRFUGw#%yP&+zP;N<=si2-f>|5Z$yCzms^W>hqA8V-1pf!&K@GLnFQ&*3u7lx%r;uBG zG)qo+jgQ2EJZFv<`RiEZ%-GE9<d*KVYizUrFHRkyc%1cU|2B83osNRiKC$1VZSE z1ACR;{R6ai!1|qc{TX=0bUWq*cZV-+6$8IkbnH9}fc&DHUjXrOe#=}<7+`SDhpV8H zEj+irBM(AobSuIL&^S5?MF7JGk@oxle=L1_Jk$OEe&sG5WEJHQc6U@%66Lt9vry(x zltQSS3L|H>j^q&KSQ^XiFo#%jOqlbM!!TMQ%rLWLvyE-GeSR-}e}C|Yhi&h@-><{< zx}Mi{J^3O4x2}u$igJbkDoShUr+omi$KsQyMu0gjoS$7g0t@V~;tJv#JLTEPvYH6@Y0|zPjEh24t8twh3+BQ25L9^ji(^6R23JPiT)2cb;@bK%?8cySqejPyW6+mYjxc+yo4>q?#nGOXZ z^wv~}I8=q-q5GpxH!2E3<1v7w7yc_kW*+oL)P+9-^%8`X2v8ibrdY@bACJQ#mdK5P z*+gpy>&x%8R06>iEJvW9dIQ*3X01oJgBb!!G898`As>oiNoD!9frCj!j2fs50qGp7 zC?{{CQL7Gr+c^;xwm`nzwIW-Fd|pfp)!!)kI1mZ_ zPjBLNp%2yK-(=c8xEJN&;NZ#Fz3b2hn~ii4ILV8u{h5U-9q}1mxknW-jETz|ETBfV{f>zGL1mpJt?QxkH$w`c- zX>Xj5W2zo^g?|BP&@Ha3HCwg(#!1-uk}&^Wm6aBQl)PI;qASkQU6+>GOv8cnwmC!S`6N~GS|wvOj9Ykxiz!l z62*Smy*~dz>c0()kqdW+@{0tzE0!RS|0d}Cd=|J)TE^Et>>@nZP)e=e5n8?E<3oIr zne`d=z)|K@25qg@jxzn9RZ;c_uVqr4E8Y4XmKUO-=jBysovvJ$ZMs)OYfe6Sd1;Eb z$3AH*%{#cbIKYjYed9*^r0dfbbA!!4qwb_8rFL-EdxK!X_*M$brjlhIcJmh=Xo)^s zR`v^3ioNR!J{OMpsD95c^ii$OMIHE_Q|w(6q8gox3DVn;KC`s+$Gofz{|eiwzi65m z=5__+>U#XmEqT>wh)i@VP$GJx@?%N#8SYTq+bqrz${k1a}IPN`)Eo-bZW%B~M9%@xv)V@iG(v-flg^6sWzzbQ;3K z<zY4eTBpApn zMl^_VjEvToB9d5NI}pwoJ5XE(Lc=be62j$wYi^KmJ9>@dJUCD+12;RMk7e<`BwVYJ^v&EE z*6BU+CR_nJG9j>&POW90v6o9p=?mxLY{=lF%48j71+n9!3{hg#$`m$2K2`1({qZQ2 zl-&qeZongNIEbVqj&~Ko3YFan$i+>3k^ud1EBd{aEQQM$1=Ku>hgiFckj2N}sKC%z zkL>WJg>iM!Ycqg@Ty%5v27@#tYZ>bB`el(@((0g$fr4t6oQ`ui1V4BOC0OFqOLYV? zXQ7li45TZC|Cc;$@-$+Sp&3-MBp}d?kBUvK<%u5inLOAb=?7h1ku-Aq(|PJRQDya? zf!<)yNR-%yBGIU7oZcwoJBLmfdnAsA2lndD=_YYjX^BT`n^q-gy1fyAF5By=E#3Xq zYJ9@qXcmL_9fW{?I6gJSNSKf!K#pm?3^)b^j)*w`ePa9>6aWshF`Wy2eXIK4R?+DQ zZZ9lKmO&w$drFNvr;wfXSXr5#Z5-}yv_BCgD9?fCC0QNENL->ZaswLgb;rm1z+Hk& z0g!GJ!(vI{x#L{2eiR*20FXV4XGHFk$PNO*L##Bk0|Adhx{_3;`i}GHY}4!r`Cnhc z<%08oOI1qLB|4uWqsUa;;M$tU6hn8pps9zl%5)hbhKggHmfl3L7Gbyv^1LhuGqItz zj?qHi?LDS;0x2iTPB^gQ5gpXOYe?58TjLA2vfuscNcUff5*sX9-?HK9y4nFaqn$J+Bn?ht<6+Bt@Ko}MXGoGNw16A3TLZKnngnU z5Fj9IsCJ4kIX7mNznj}v>f`13j9?XFnPyJPK3rpk3ier!_^Vbe73&C+4rb9@UVc9w zsmZz1skUVjSG7AS#<6OkI65MpxilsK=~d~Ms{Cp^*?GQHjeXC@b_0h4Ol%|i7v&*m zrtprvYcF2;PG4%VDgI{!{9tqcgDTaBhsUCWRJ{%yo{$n=V)J(*k6^FP>HJuPY+n>d z;G=tJYBh=jF4t#fnuan$3>Ij&>a^;4$;iyQ;CRVSK@6KnGXPU~gISJ%+uEohcuYHL z1*v9+Ts;4I`_WP5czgDrhJxOV%*e&l-}=16Vd5R19vs#?xK`>xD?37m$_IA33nKKo zYXgm12A7mU?LTj3cCh|qShiCfUdu2ORhU`yyn{A(#)8>=X$2eXl+L(*%}nKNw82)J zKuX$RX?JDO*{W0doAh}_7G71~Nt2LyO^_j&%n6A`QztP$N%lCB>IorbG*q^&CU_TG z=i_O)XP%jqqtQu|%G)EGsxwORyvy_aTV;G|>~vigT(&g6H9F<TG&} zKM>lRxc3>uBG1ul>;yU(alG_wqw0rQH_xFQ$9JeAi^>C5d8!c>3Kr%tQ6YomUa@O$fVT7^55MvsV74OXQnFZJ)L1MHS)`D zc`hlm>xUQz&J`zj5W5=>MIEk{d350Bk4QQIy|*Baa_p8WS$co8ey@E%<|$gY@qrU0vc zJ`;h)cz~dLpqoej9=W?#5JfxW!8topsnm$zKvO=14uCL@1QM#|YUth=v+B?1K1G?d ze$Tv^b>g|+aMwZRO)-nJy92k))S6&}(g-vTvn(#Qrj1tM*1x6+?~*M9mjkVjk3@g*`kq=FKdj8}}ihd?8HqZ9eH#>*AjLV60x*>RGFyuLOmKg0~26RQH zI!o8P3CF^S+gf&IY-d=cYahp-%ET=N9oR?T!C&4J^Dj>n9%Mup2a?ZS=zx;NvbAI= zhd_#xlIU`t3S+)VAV<~5-pp~ylR8Kq5p_jkvgIJCf{r@8;nT6 z924UfQI{}OVSKV#ji0j^gI%#k3~fY+BuEx>yomI1-Q#$vEbdlzJ#PXd0vQ!^=q%~i zaV2V-R2?cG)b$F~~_E8Qw0T z1TW8)?%<|rFII`MUxv+o;#Q@SqQ*4AW8RZ~a0l?rq32K>Xb|VP#%5d!IlUu;FIr>6 zT?0@|+1g7W=i~A7RYr@wKF%wGl*hZpp1 z2re)28kWx}^l@w$wKu+(;RWMMM!R@=pI3Cl-yap6+f&T5VY$+pQaV zUtT_eHCY~1)Ysboq`vrC$pPgHVNNVf&klpsO!IOp6n>M{gNxhZQ{VkOP=a9_i*T_B zCG`F|7ez6uSWv*OwD+CqI{R@y-KuZ?&a3OguhVckU|F(2S1qN_F*eFjXt>B-A zx^Hc{A+K=weJbmsR-@~S0Rc7&a162titL0F%q}`I-h`Y&)zA1y~J}jRatSR_^!-B>b0NQXw2xsY=_a@;|S8Dbe5fqILWQ|at_CVR2WnNRL(@?Nu9N zkwu2OaQO`V4lv24ph&{4$9yo0Qe#GSDPkbzP{X|P1oQ8!t0>8N157}+3MC4E=0i4gIwMtF{(L!1!kA0q`9rX9Qc^#8Bfe zk(3#{g}&7}>cZYV4xanCn#5>fbx;ZRE+WXlOOyn%6Kz&O{MXDavGbbIbKk>C%S!VT zCx>Uo9HJw_CQwK8n)UAlOnDWI(REWBZ|rj{b^Hjd@y732iuqu=%ZtLPY2MqA9d7LU zN{&H$zoWBlRVYF0CBkbwJ%3~*Tib7(_-MQe+Kd=JcRv1_z=ghBTXNxnJ>x1nxPa}I zeX4Km9`zuMe5YxKwwx_abH%E8foBVQvs68;hYK)dU`i=?Zb590iej#Y|T{ z>=AFbPo}LQN>96Ut@N?e>&g6E=lun9C@*TuKseOzNw@zSL7;1Khi%og#g&Vdh<2;_ z5&Vgnr_6(qpe{z7#Eqm%`CK4t7`Qc(RUM(>MzvD050HPut;{#)w?u|>|`8ccdq_&(PS`mfsf-PHWN_@3Eu0@hgDJS72w zcSq2NiVbQl=Rwij9g2gUh%#L0Ss(eFk%)kY(-W5IYENg)fDWD^@s>g32Sw<}B(e-N z8^YBF052Mz-C)?nV*$CzLx>10umonz88QrF8g+&x3i_A-XPuNdvFY{rYaWUEIx!6X zlhJsnhA&i9(S+j?BVLb>j1y!s5rmdzQ7m{da5VA$gc*vg9fVTZLh&Ji4#$#?iQUV_ zwGh_(pmm2vJB}eLN}qTQ-#Sr#wVrzNT}{n^zV?o*@9T&BN{{|*irw#ZW1El1KF3vj$Pa^Rcq-y%;n57O!ztsc&yHn?uy z$sN56igWHQV~w&}&oWK~9XJxKi?_;G{h|8NOA;&_<7HcQ`F@($pTd^8RF~!ayt#*z z(L`oZ0U95g(N5e5B4NmDNSMi^$Y!uB!!<$!e%=3ld;3pM$CKEwu)P%hD;h1z(*8hg z71eQz{@?ie&#!S`tCKH+_3F^wFf--Q__iIb)3vu4@rFq!3PGcGBZqF?s{A~UIFdU` zA)_MypZ|*8IBCrO{GA%%<#A?2AahmU-FubIyZs?8buaPD#&++Oi-&9ap>eoMvUt}P z>(4&qEz)k|e<|~8(l<3~3P@Io56-%wui;w8cGPi?9(ipcd^M+WC{b$pVoJA*_GOd1 zg257~13}N-KY6IXC(@QAxmQZFRntzMyentA>yJt`$}+twc%jP_e(i{<*EcQeZdQlY zc430w_L}fe<$zL$ni6Ql_bh||7K3y!Q)ZKxgh;Q+@fXf}2kURraXWmRk8+Nc=)5cR z376)eisqF5*;?K~RXSmE;lcek(E|hf)JwDK4m5nQZhGB895p&-mcssXGp2JE}Ic@u4+BRS;(D#aX z%G z1faNfVe~-3$w)Vz*8~`YTL6bOc?<$N${52h2g$?pBo%PV{3ESP0&h(?ZbVNMdk{1W ztitHf!uiu3;oN4jY49vyB})=SckGmFdHdcQlGGv=!&f|n1FP59?J7!y02t4kJHz{X zc`*`<(^IgbV50!Qt_`M_OR*s&Kg^laZDfXkx6Gpta{p>#S=>d4pH1Rh5j*@2gbX-Q zDt{5m2guNcErV(jMKGA-6atstOgwd3oMJD_pdrkAUz-P zP$b#3%FyWo$Q2JbJ<1}$I}23cN?D}})j>Tr=`>x9LniF2aSo?1lJmo57uP_~kk??~ zdN{u+_~SFwAGh6cZFFFl0WAIGEAR>oLEt}iJ3C7hwMm(kIEJ&r^TC@nDaXu(b4kR= zW$6uYe@i94$3;;{>ic<;3m$9@U?4g^8pjJIXgr?z>MWr8z8V71=iUel52WCavQGCk z)I|i*siq+8%}^A0x=lqCw9to|PejNujNZF>h^2`1D3YJuDy{+neN%vzz@p(2fg(`) zY5=*!lA_#3_*fRAkTeSdU_fcvajUPUdSmv}#PF#kGzNNF4nlM`c2`rF^G8x^_gf!l z3Ndzb#_~9;tS~^YH%S}a0(l)K;g}RM3|;_kk2q#l?ePec`dZ+Q*RL!;3x<}15Gkq76YOY<0t~pq>%%;FNNY|ISh@T^H0K)-lLs=@}~lf_%bT2xsQJ^ za;V3a;35gEudXZsXB6ZSATO@~vRAT)z!LQtF0cfNt+-aUxNvoD42A;{>UqOi2!%o| zGWEbMTFFY#`{e7ahr~k}tiFJ7_c9YOuOF?ltY0?BMkX3#uu;ZA{P$oSu|#K= z=9$z4(FFY;K$#34KP^ikR)7#SPS=uGgNwkSQFFyC`c4*pFmltR;q;JLy|6MNNgwwU zM9y`jg&e+c!rOT3pEQilrjy-$`mfD}X0aMu{AJ^=LPedaE2iJ|hfEE&O$S78F>XDC zS2kn8d-IRnRX%)D?Ud^|rI?q(9E+Wb9?<{3f>7PB_ZstG%(T{oO|bBGTTJH0574y& z9{3pR;SDNM;=QCIY0o&@cKk7BH^q{@9RG&`K%-BNdWC1>fjXq%0^f(eNN;UCb~mmm z_D9FR6#jI7l~T5=$6bv=x0S0zhD#ju0&bh(=Iixc2mTXuMSF6uUH@I2BK_V>`%Yx% zr)Zj9V3zrL#dc+z$Q8AYP}3FO{XDl68I$xW@|RssTyhs`pfV~gOs8ZBCoybeZgnc% z{4G_8JF?R<5P_E(NV~_^BRsSARD%8uV_PUy5kplGQ9AAEo9q1IdDr}V6qxY6RW_k} z;vAH;3&wW;+BI|cTvWj?(i`%Wc>N?nUEuNZdbT1Nb=_G0Q&D^;XY1srTM<_dlT^~} zedDncS(@b3Paz~VBJLJ$eq6Tu*~78_!05Bfl@`&eBVgKnoP*HyzS3p z=AAX(^0)jvcgfVmefv6MA6X8bp|-PQN9)~Nt`=%Lvj?pU$_?WirZzZvu| zO8=Jk4)>`$M-2ohL*|d1Pw}9CUWj>{?TCNTb%$%Z-|yI^3#8pv#>DWrdY_+OJ!d|5 z{#x016w(zR?-Or6Q&|^%)90Pnotn=zwa;m_PePq?Ggbb3wg2@M#kl^i-OnEeX-#aq zfN`XhSXCL?=Nn!FO&N<;+lAyCr!saPx{5cfQE5SWTVrn~{71P`@K(sRjYlP;Qg0^Y z?jQV*Qek`LU}m`f5XJrus2GOJ8?ne#aVDV&l#%Afsi(;_3Lf;q0FfPWh%#JZ>mxHi zygOO#DTOHPlthA95IH~KqYz8Nqpm>lKx7~zRbJmA>sN3>Pl8E@ZQTPVIDuls8zfn( zWT(mj7t;8)(q{n>_0W#7fjNd%-L*Z_?8bybkzaJjjW&nl@jVar20wA~4UKgKu2(Tq zbTKq$(v6Vuy~8Xf)R&--84@SwdjrSr%`4|lk&MiCWa2(Tz{qvO?u7t zwMh;bdTEf*(LrW~7Is+eaPsGUpq(qt`&^ti9OT%yfbhhOKqp*&54j%ajK}R8G`;S& z1L%by^~b-9Y7+b$FW5i-b7Xy+y+}P3G|(9gS}8p-;7L!r@4U#g{f^9LQ=5+=IF{RG zTZNZD{xp7t;RlD`>AnIDtH|rq!*_5>FOCF|IQm6be zH`@+R9u2)c8!*_`Rihu4>UCj(?09u@!26hOrOO0z{s6EpX$zQ~zOh-jLR|(8(#ov= ziuowkF1m$jF)JDVc;_xhDgHl8lb^|Vg3a}RX{hhJlB}||if0^aV**+cJ1a?)3}qhe zlp`7D%Ii&9L{`Cx?`Yu5-Mc+kkQwHC#mFJY$~rkdT64Fluhz+Z^Pb2pJ-_Kf`7n}E z^@AQWh-Ui4FY2e(Ugxnq40Gwgq0RzAsO{AWN@ePNH)xPuqjaR(+|5!?Z`Zy3fA*(z z-k<&yp8a`>%KK)ny+7IUK)=p`pU|C>Q+jNK#8;QE7EGe{DL2StT162u3%JYufapOm zrMOoy>`sXpo~mvv3i(?`#WY)Gkq}+5^6cZGBx?R{um@qtwM`Q|&`FC_U?Q!bI4ldL zvdA=H_(a5-e?TlNfhpwTTK^BcJhDbd2^RX~QGaA*N2+uL7-o>PYAx8<<^>p?77zpr zPL&W5Plh?q<1YZ%$Jdv0hENh4J_bbT^2j#Wz`qSp`sFUui{OkzVW(O!kD+cHc*cAa z+3(i&Cb2~1K>_v*0N1+VZ^_OKG2JvGF|cFp-;IzurAdK{MNtqK8F|ZA8O5WEm(;_f z!e$;R)i6ny6UCxn(Eb}i=)=VD8MB(EfCKV{5hZsRrXWvP#5+SBA<}USA!r`fd%*t+f5aN2{HYE%9Q#cC20^&6K5(N>@m|Eh$sjk#R)#jnOxY#J!s= zERNkO+j;m`-L)L!kjQ#6FG2o9wgF@_dq6sW$@x##1z%6t$)T}h-#A_)c74(+F1pS; zDAtnd!YXXXujU6ipFW_&Lb626kL#gS{y2M0?t-*&Vpn4B=F^I6tk(@_OJ#)^huZ&h zuJ2A=V||?W{+}f=44iFZ5cJclZNiMC7=}Ixh%;XSXoKTQ1436ZKjAb;UUnIJ!~kgW zEghNV5DzQV`K1CVZ;h>jsiCldINC0t;787FIy51>eWDfJQKKT z54BzueHEXPgom$}*#*GjAfyK}%%X=Z{do@#+hW~dlG(s9bB@!LeDlepZofDhiMzcQ zDhBr3N7S2;0*e&S7CvkbBNj%gffA9}G?Z}izjTA$=12Z}d7(^cy{$p|$%0=c?t2G4 znJRWIT#Lo)cvXxZ*1aLGvB(0M3|a1pD#GU(d&z&nAJw1!BJdDlfOruupf{kw`QtSW z;3{e386nzb5RGp%>REf6E@m4xvr({K1^W-sJb<`8WfzzGcRZ-IrfBHdL&{J2pr!a|h#^a` z8uPp;w}Qd>k;k#Bvedt@v!Dg@8k|zWWl0AcBET#vY*zt}I6E?xT7a|~UH3QoqV_g| ze2e>3xXb`)1&uT?wWdF=ihsa<`8dg!1UoM095V5QbzXikV zUk;tEtVWTI?cyHM*bRNuVVfpr4^cUry>H8lTtr-!_fB`Mpnw0jCf&xH2^-LV#;~%< zGWrIrOCBJ`yvpa~{y#YUD7pjPJM{rp$iLGx|H^Q>8;K;cL-~5{XIMSJ)AT3-7HQ$+`9IR@hi~>Vl2yU8lRL@jrWNN-Ctr> zf%VO?IaV4#4l^*wmGlZ8aQr3~=C@BU`AIQjn(Xm5#OAqO^LI;rgn601G7H&#Bol-l z8WcD0%E6nP-faEh;~4Y>x#>u``IZfS6TJr~qe5)%8;2n5_dX&b!C$W6VM>Ea&K?ur`3&R)ekW7G20hlxLntSmDPT<)P9 zoce{oRxV?j4@woqmkqKHf~+79c0|XHO$Sqe*3+Z*v%v4etsUKpUf*Xd$7R2iU(oa1 z?!?@7ZgU=7i94MR&O&Cu9PwpxOlir;MZKTU5vG63RgE-km*4h7%e#~KVQ@MJ+rED| z+TGZ&v)9+ICkpF+iOmt8jBax-*!tn9)98_3n-J_$ukaR*rPOKMj*Xy){GR5-F9maC zmmuxP4RgjDGjHr2s1m#;L>?u4c<}FuS@ge;w?1cuc`;xqrjGe}Itng795bvjeO4f& z>#3<(7qQY1Y0`R6ep>=3EOM&w-p`2Sq%TQb#fT5q7Pd>MvRu=nUPVV>;l)RByW^WC zKk7}j4Wyo2_V%+t`xj*vt2#Ah?<5?pb*`svg z|F1yUF>zeMlE}U6Z^($HI6+=0S}nGVME$F%vdIl3n9AU&vIQpLQL8jfsU%osNU*Od zTVL>c(gdvB$2c!tqP7l|3fy|M>n}S#3AtG&ZVlpZ;nl;@yiJ z`&VHqe=y1Zy*FR<8ph~1O$nWM>O4s7)>UNx2<;qC&df5`@p3F#_UtRbJ63}9CB~`$ z__-HL!#c851Bz@K_WU!g<8b#sr<Vb+MO~E-t~(EOnSRQ9V8FjFzuR|6m+Molk(wsay6WI^$OTzljqv6{ zJLE`QboeejTFOyEiwm6M9m{4hFgFG6Jfq%< zYtMV?El6E^n!3_I(YmW2mN0^7^{z=B(&hE(hf9oX|11AdW^R#%ESyxB5{g5%Q}8{= z^$?$<4V9FuDGM8!hey6lzvSQIjI%Q)2_1fMF1zb5XvV=03r22n(#v{uekK+LTmee? zo*7s{OkUH!1C^FLnsh4$?$00nnGw;^d*j{8_%ng#^U&Q#6YW~UG-M7m=R>?dRyusw z4SX{F@;>@RZnloPlQ!W&e5qrx^IUSAd1QX%mB?#IuNNi8pT1Mkza2c!M3g%{P|R>b z9{)N|t~o=31(@BJ!m$p6Z{ACcA1;{&gqjAC@u2$pzV9I%8z>Sz?L+aHf8;#Ls01L2 zo&v`w8ELh&0kJ0{SX?2|rGWko2+&#m1t`q6gN;pqek#YMBq7-%wCSoKWrfstZebyb zk|>-9+m|WOh@u}E@uavUXY_4dL3TY3?1f=+veOC6e1ID1unn+How*{uWP>J4YBpmC z&;HDO<}h{4Kd>WwNs2>WW@K*y4Qwcj(n^II7zqW=eqso%*Yl8-{dgq1J|Zwh;Qmq8HHP3U z20eoHNJK*QM&MbLeu*UsN$N3hf%uTdIJio`k7~gH6BPk8r1>1A__#KMxG%dw-V)j7 z4=8}6JrT}Pm}ZXzP^wA69a5Ble3HPjErctMnrK6pCHb051rpPwQ8gK|P~6Ov zM)hDIT;-?22#u!%0BEwajQi&h0{?lI=&?i|p_8Mw8&qoPYss{);xBhX=!8ZX@Db&y zG&6GKZ5M`vrjlpyZ)EUL(Ez{RM2IQzh!3lWn5}mm^s5-WZ9+UQ? z`24>-G!SRXNG~GDP=;a%NHvCa9K@t!$kS91^a&0#WbhG2b1-03=hx6aK2>2-)X4<3 zfKXPV$;_Kp_?S2wOCOwAJ3_!;{>yT6m4jH1UngcoppqCu|G&x+r&e{)j0A@~YqAQ| zxQhyjVGB}I4i=z0Ak4fS%HT1{cp{^DVGca-53)oWj!8|F75)Y%otprW=?HG~3|S=M z{0I;-1GcafNLJB-*vC)MPnn`SLG922FxVCkubrR8z_A{}D8%t~3LKG~XoZn*d)4CO z5_>ZSwi3b`h4!uRO$U@8ijBGB!YDH!r5P91ZUP)I7#hID0KhmX2Z&~yLL?Y@G&Y2V z_18PSYH^>8LLz8i8IKb;AfN$jA9a!=J!*`YSPg8%W6>k@ z5eEG^L{g6kK)lu|Tl3$n5 z8alAHX}(#EZU_fC;)#{uX8m^H3pXP7@xC$!1G6{MlhAmOBt4~n2=FpX`*JkdWSiAP zWMP}s`G+)0I18y!M7ytA#6}W$Oja+vi)Vp?J6cu)C?^0s zrxF@YWPr2~=d+m0fhnvc!s5cJwp`+?(qXtP3C|{GSckjUu7Q2!F>%ui(o65%Rt=Lb zBs@amy?J#E>qqsh7+{)DH=0U&x!0NdZoHe+X)U>S3EBidPRyR%t$n`fD!ZeRGv=MG z;(6`H?W&rUdrt~(?8lw0eUsNOm6?p`C$*Ay&|Y+yDjIsk7T4IIc3H;Yt%6t<^IfO9 za={`)Ec?PC9{T6+{fBw9)$+~3Z`Z#P}&Q1#C2KQ>~NS-^{ z%zpZ!RS#N4?aD+~zOni6Q_*;UI_sF=9o7voh;YkPat_y=~Yv3>nrpt2S9+UaK| zj2(ksTOxkRNoaFEk?~uoq_tN-UV@X29M7eE();FhXn_N=1)#YDVv2wa=rJ7%| zauMA&z7FH%nNQ>-#Z2|p->;t8jd%f9@YE;lD7?_NeeTP9oE2wh-sQp)`I@^Ss0Xrd zcfAcOs2s2e6`$aYw?VgPs=>|QnjQa|Wfd+q!fL&#Fa5Q$*gTx4YjoF3^C069;bNL2 zwxZp-T?_SuYD&9|gIk3b%O@WDo@lVuJBau5YJW?;edaab>kP8;|Kc%WFuw;VSs4N@ zdu!F!5X*rnK|Xt~|KMkgQmDnZ8-A4~hn7t&Cy`r@)HqhBzdHRAHk0EaDf-XxeCdJS zQrS%|vo+CBa{?st{Pp`prTCalsFPl2lRGOi+0jrXXL}13=le8E+4vwWbGzK=QvR(d zuPW8+#<=Z*v9Km##}%?;7Ghpb(NE_C?fodT-KoY!9$QSYF#d*GN_9({wz(g<##{=z zjl~H0gxMZAoqqqBDOeo2Nz7LWl1i=!lOaqHnM^4C&gFbrN*>xpp%I_`+26kxd!{&a zOB_&@q&3Msq9=$B>!Lctxo?v8mklPSD_SFcw=(7oSu~n?~NzKMbm>HY$ zLTw#tV{DTR9+Vb_CSS4a_H?Z)r#uX+Z}a1RX@}&8sBFl;*e>3?`t9SSeH?@l2 zK?Z-uRj_CE=UiR)mwo(s$G^TfF#kondrsGZ75NKIM)ucpZmQ*Gy6?p%d8`vp2cs(*Nit2e%Uzly{iWX3!9BPU95Z# znax{h+p&|DKppT&S){!nZa5Zx*{jQnv0aP+x>%Vr2yf}1p^n`wA;d$rQ7Uw(n zH=F$zg?Fe(i)8ujSQlBl+Al{A{z7d}tM-;m)U+omG2}{1&60P*EW2Yz-h%_1Tnlnv z^cwBQ>6c5p);mLz%j^ecGN!`DUxY;)WJh09%5cr1&zI%DEK(=*668*P|CVv`dV{;u zeYEwMv$MBBh+}kaNFXLE!nDSrrlz7RC?qUU@2$t@y3cRNZZI;%|AGj0jb>T?O=MMu{$o{q|$03_)*9o_*)~GIV%y? z5xV@|&0UQ@KZ_`c;8GFMXFx%A%{-MYz0O|-q3Xbef?;C{)I!8)99}I--k6&Sb{0{e zn|qBWD9>rUVNr;Y@}6Qu>6ZkfW$_AcibvMOFTQ{O+t`Cc7HZ^bzSoyKH;BeU-KnrZ zCIxl{`hEPxW@C`U4eFKwQIY^y2A(FluM1($KNU%%q6$@|bxR5anOc%_l&o((+U>8a zW>Jm~YR@jdV7st;Z1&aj+$c{PHbMX2nlfNhSw%abE_#}0x-4!u5y2rjOAM!=eyc_K zV1<1=F+v^|vri-IkOmQm6Y%OLjMs@z7w2GRHmBRb7f)mqproh-bm}7;-ZEbuwLq%* zTMMPm9n_<$!w{_iKLZ$B1KM}dz!oRLXkc1v{#M&THVs(m5E>YK5ouAQo?}Vm1Mwi? zjfUPhwFdqcz{no3yA6TTe-Z$a3O~`CBAtie+XQ7W3!PI7t#xmoP})Qm2I8n2+BF#= z-ep~?bB-Zz7Jq)edt*DJ@^x+;^A{YNDA3!~5qAD##Z>NF+Ev!w>m8-PeJVc}4tW`w z9@9+MB`Cg&e`(xrn{}vNbmN|@-CCC{=c^u`-|^!9n-(S!oG&Q9DEI&FOA`7{&TF=b zPGwDQ-Mpl3c4_E=?VpZ6JAy6c-u`pqqeI+vEGS7@6rHT+bpF$+)?cT?x#*rjKYO=4?oP=5j4(CVmF)+M8}rA8O?jVyM=V{!&ctQrno%RgWov^QVn zXeK7*CMYmnIr*@ka4Q_+G9dku8E?j?5Wo$Sdt`B1QKxBL5=*MK?$s7?QPLtn-rOCp zwwzwSM~a~qRzgIBhae!dZ{6b>7aJ`zrC|lfr5Fhs^rce^ z|I4<9flh0KoDm_0UuOdh^B_dU*$sH}0hHtlS0%Vp$LV4&g|h%c_wAGedog7Gs=H>T z6^thwcMQO60*MRkKVhrht^LWL%=dptwzvFb{=k>?ZKD}RS`EPqO)&;Q zw+il_SVsI8FB9=rsnHr(cT*2Otf8C)pzm~`)G?B%*}v*ge+_gtRs%&6L~RuH zA((y?0Oexb(1q z8gqFGSO*0=3&W*GVk4L#f}z&GYHUn^=P}s75ms1CGL!}$#rOG5WCU%T3K{}%g?-j< zK&|UccJ{BZ<*yy#cUN)e=z4YHo3EsD;5Pn}C?N}=1IoBtARksDuScz6WNuKN7p`Ek zf346{E|4UcW+}1Th(S=t*ho?0LRI-zJfAgQGkv;aS$Yc%i>loZw9uf*yCfnGR!$Lf z`WWm#7Y{?I9ALeIMVYW6_&_R_&ZaBBm!~#CcbG=7E80#q9uc4>=P}LMdnL4n&Uqzcst=Rs|#;=v)*p94-Cu z@pGbT_Fk-qhw}ITW*Q2h+pnBrx_Mfpg(JuEZBIBDw5KQ; zvet{pldks(TA0nDINqt!E0YzNEfwqS)21CHcD>ps9kG5PmRh~uogH-!RYy*F{hqtH z-8ZaYZ%G1_IxV)w9X-;rDuJy05!Tej7BbX_fw);A7WY zi;NA({FY~wuC3kuvEoYMQ2xo^#m3icBh$P-TesPUJS(;>*IDIkxl+I~4zx&8^>(~4J^$>}zPu3m zuQW`(p?iF-$IBC6JxsN;CiLp-9$cU{eV<9&oT%m8suYunk85_jdduU;sS_{d&buG_ zY-?fTH|0Ysp?Mo$kF(1^IpA}#y8aG9JkSWXl}cSOVyOE7bx}!dcV%BUJ!xd$26C2)XzU;1)(%;Ye3pe`kzL$(JJ9;==*n=mESVo1;e8efSM-5od7pHjVE*B_q8KxDP~b%KN^scMT<7LPhAh9a=f^YSmMCR5a4zBBpdgw-n8XhT*dXn17Y8_hx=*u zN1g1_HntCRFyOuB_}|W3*4r2kwazHNan@meR5Ng{IePg{w#K`PC7TMuff@cwZ6VkE zK5ZA86M0ae!uDATV|R*OcwCdj+*%#d6n(u6(6@4?^HCOK7 z?qT?)0NO`Rk)s8?f3Ro)QP%2u{D+pW{^7I#kELsYXL^7CI;wS%)zO8*I!7nEvgn+- z%qpiuvd~pUr4khu!n7?Zx@b!()tOC4jFhDmDyGQjVluUg8m4AOGuzl^`=0-^e*f3& zoI1Tu_Wka2d7k(4Jn!duUpcDSFzEj}rDfZddq(MjwkECfNG`z9yM}q%O*b<$5OiT> zBf;*)!N-3+-u7#U0sk&0XVLet!%F9WdVH*AWgqo&{r>UG{N(V4&=aruY7}(Q*Shsc zGv8=mZAo^XfAh?iH8r@+Jzhs0xyx*8V{?~&-*%z&=COT?ym#EKoG~#4_hWwjUIlU5 zk&Q>U2&1zwOc6h(U7Z^LlAVUJr$u8f(kiY!c*1!}unCL4_GgaQ6T%rcjmNh1ieJC( znO3N!etOIO{P&SPl&w1MqtdfpRos=Hr|B-dK7tuEKp{3=EUVMQp}0`Zo?BUO%bn#Z zEqf1p?o-XZ@OfX-(Ph0G4*2e+74s8$O9HQRnNwy%W7zmH360raXM~&)7tf>Tsjt~7pPS)}18f2FdhmTt?N&8t~ zPi8|K_*Qq@AuQhx+obvJin-TlBcwUonQFid_skYz4K)*KKsS}M+kuD*qJPGe^H@du zF~T)GHP1+HL(3_rB@9)EfmUBLVH`}hlg~hifkx#ANcGfNv3-zZsK@avGBVThD_f+a z?H)gf#A~`F4jfz7xbGKv_Zm^f8l=Y8UBa}ryrJksc$i`9f}s%u<%um~cMMW*FgC#O zRDuzdNQ+YU zv=9FPz*+-e$SYAH$~rDzy~645 zJtv@j2Y6$Mq7k8n9Ptay`Ax4S!BQ+a1$>g-9?-KULrnCvws zWrEK8_rExgUB!elpq`IoeX7I8#T(;U9|f@i!>J@@knxZUj2vLbt0lYzk>!wFhO}Q3 zvBW{lI6_6*%c*^n4BfXO55oKbc`! z7ugSUrs)lgc(q&RPtw4@#&{TM;FU)I&n(Xla?JVxtSe%N$HQ|}kfzhx^Q6TM@{SIj zKG8rL1QH2?{xUp(H!nhY!7A6#J(L~oLK9Hi{kMP<8=fz9%%T%qU;cK1{%q9CLZ3Ry z4?w>GkWAp(j2K4a6?*eA9@iOU57k zyhw&80$&;MZxwWr>BmT7W&aAa5V|8K3-j&HS|e0RmZouX-T!wA8qH6V5o#vqn~-j- zS$(cU+2}6MqGh)Z;eHZlQqmBJqUCIe?7WnwB8KtAD>T(J(e}9MiuUB@8ayEjSuhT9 zFi5!J!%oOkh>t!Lz|*zA*hcWIVdjo<0EVZ+^B-Ap^3?_p$eodL&YPQF@Dke?@tnWQ z@{3<@BoskbuMhK#C?h(Q3^EzqU8I2t=HWwPNLqGc>AXN9kt5Xf;ST{p&A1&>xwi04 z%UL=M9q0juF-v2k2Mm3f-$39#hBf#N`F|XIy=oL;0%;Y`7r`_xD(1tB<6Wa8b}V|40m$zXN=>sq`kZl6hv9zG$0VuuS2b)g@UV^4HSr?R zeT@w;>mWcwNu&FAUkO5o4Kq;EZ=#2$pXOg#l~(O|R>!fPjq zW$X89RceFhs9cR-hlK&M#w4IXcnlFZ-mFf&ZDLb?{)jXOA)oRMG7{bDVUfCyTgi;c zGMK}w>&aeoDOJycY656J+Fze(5h&%#wDBx}4*0Zlnns*VKnQP$80r#QJ~t5})LyAb zSm#g_d6vmEo?S3vV9Y zEPVI!-rP?Y|GX=VDyw`?+bs}cK2;)9D9X~V&rwtxZ3e$bQ9rhF!~P4Q)rSnEf=~08 z*pi9o*{S_5&o2iH8}3Kb_pLv2S7W#Q1MWTTs$rAfDb9J`v#`VUesPgAM8`@Obww@O zkNd3HvBBnw?={?x_Q#JNJh{HUQGNuwrx(_{EAxHC6$YFsjv3^7eXi=?jm9MTODZVy~&Z{JNcr z9<)9B^YYe|nAm}xejm#AXWxF({$tJU2sLIZlEeBfIc2Fg3Uj`s(RSsA%V?(-lIu0+ zsq6mSRUHu^PVe<_9~~^q`_pccQ1mU<|tJysAkm}kBXAJPv-j;c0a%REg5Nnbx=M(u@Y6)BOAiHT2m*-|N2JA1#~^%*1Z5d_7l9!ueGOdav8i-Dr+-61~0ipV^_USzKHE z%EiemBY#wLq91*ITY?LD|6)_|BU&M{LMeU0K8Z}-xU+FC2wTrfUb6P_*s{|hlw7}Z z`jSHz_=SCQmu0O;9$7|Px}S-EiOiQWP?rzrcrzob^tGZH zxYQ#De-9~LvSH43Nx4lvf$nE}pKv^Wl8^*qg1c%U`+NDO&g#V}7R4e!JuA zz{zWOhZOivQC+Q_yZP24e8Ft$LZmHxXd6C$2V>Jv<-nI)8@m5-j9PYEd$s5F&ck`+ zB{Y{k<(jbaq?9dhet+# z#n$$+f0oYNkdnGoHIw1_+iBeSNhADUZ%0q3#eB2*Gvv}9rvp3ecc#5s(YZ7wPHXXW zsxRuy?TV*o=1xEDUZ@N_QMP44C&zJNhk-xiT*JP8!Ho0VZ8Jh+RHdP}?*xWD$ccIV zZ_VX*OSVht*yn1AMlvKjNgmr*np(d@3swkfz);zr3tl zrx`JLLJEuHhBD!U293d$Pf|4ZCD-9W$BZV@R9>DZW-GCc~)H2vz2~9 z+%*-pi`z=(MB1#|5Gdmw_bY++W8*iEOQoPD@&|6Cqs`i)o0Jf@C2ZKkQp&e;8@NO{ zByCQa=6XWR5eIBZjdk!ir*Wof=o;f%Q!hTHV}cnFJ6+(2=9xL_`Tz!3(Q?EFD0XUP zmtb7Ffcu?Le-8^NMkGb{%Ctt<3=Oo(K~9q0XNx(4?j`W`s#T`^bg!diP@w=EtnfA9 zP&yeO#vBpStP4Os6dLbAS?_-xFUqR<`H*nu$^-v}4>1tFD|=g-;qgVsQ1fA9}s)&BM;lH)FRi`%2mWOqn@; z?c}+?-?_sW2v}$}HMjfFp8E-ly6;zoZYo%F#;I6X7&zr!);`{B#Uj6IzsDW4-`ro_ z{^s8NDn2GS=SwA^z>|?I?}A#-9FbgP|Iz#EJ7cUdW$Lh{ga<@TQHPyT6#!L-H)t+~ z$l+F6OBrF4UO5HkfnxG=g_sdQ9>v)?S(BcY;TfD5TD|CJ^mg+4cnVCPW;Z3(*&at3 zo#pyH<#Z1< z$8??g;TS<+$LDh5h4$$k8vXt@YmN~5s_-g)wE*uvcoV*uzI{AI8O}$@Y6o7|q1Jt* zL3SX#K_HC{6TJXQ!q8DRUr+ksT~j<4EmP~M4zkZ_=fnoY#=)M6U`#DcBFJ@Tq663K zCF5C4%l{Ey_PY4#HMW*1>QNLt{^k7X`Z%mYEm%F6F7%Snot#iHlyVr7`jP$3_Y%A+ zC;p@Nv=e0Q!y#0|>mJZBS@GU$S#fPc`;i{(m%f|d9#|onWqsR9ymRmD96UH<<@<-7 zJDyVheUZAe@O(1z*ToZrZuImAl~e0+?H9pR_+MSX$uN{ak!#OVY6JcZDjj^{T)%l&syySjQ zj0MuVb+(DWydBv*wP$eoRJkDY=Iw!(=DQvIXm^u?eIus7l}F$FJEEoP*@ue0Y=>AC zh)%&&Gzi`Hui)NHPC8ria>w5({a)-j!Ds9pUaVd)=vUl5wBy;nYW9!WRyK~!fpnCW zySwv)I?}Q!A2=7!*SB|ke)-oLqM#>_z;;WDArS%$u|x8%|I7v_bUi)#S0l@AC=(tr zA$sJ+nBUW!ft!zRW&Cil+A<_M>n5v(c3U^x^nU%sg2Tu5;m*tVx+7stRXJJDJX`wr z9SeAk>pr4FZTq;dkN>%Q$)a~T-(MU|Ilj>T^^8e@Ka#!br)|B=dRUl1nGkAy~X~Ds~(SraySM*-w7V=%40Fi-*R6rVz1nJ=GNlocMVmW zVunvk1i|*3E=T!~h56y`?PT#~KwB7FV6ZgaQ1c!bRt_;Ylo8D`H!B;Twe}-!??u*$ zRUbmX&MJSDb4q{k!qGxmz^ex<&t11c509R$bykYcX?aH*bkDy2!t5NnF*}Tt-s}=P z@Fe+<;Fy~2M&?$JGUwSjq%G~sW-0bO=v?^ApSOr&+N>R)w;Yf!S>pWT`8xbj3UP*M zerthv93e6%B|mCZ(!*&uOj;269GTX>Y=3!MSvD+;df1H<3Xp0@eh<(Bxn`0YK|ggmx)$dyXpS@a881y1{x z5GUlmXRLsNZ}6{0$0VvZ_EUx~=wBw%z62k>=KRS2W}|)7qPK~s0;MY1m@l=HhM`66 zeA+>rm3%YYGI@5?&H=XN35S)9SG%t~MvtBO@aG%R*M(1}mVc`fEswePq1WqkBK@DK z%PMGnxf!+NlPTR77q5K4EVH>rndE%5p}JwwK9%3*sQ71gUBw3yc76}yoaFcy+?H5u zJh53=>U@!Z@Z+2K=)0XxHO0X(ZiB*qcD7SGJ4D?t%nBud` z6)=J+1`L;+k3a_!2z-vvpdasMH!)dHgS-Hpb)zdQ9l~&e{GBU3T_$Gx2(v*9+9L!L zE+4XVWsYU(6RqX^pzKby2xuXBVk3+c7qYj|Lx~U8ZWXCp2Al+p|z>hnpE4kl>9@1dC5N}QV1C0_qb^o2!kp0 z(~nEJcv2sZADm)W-tv>qCA5AQi{CqqO14T5SGVdGECX|Ph zl;OvKruMoO6KuFYWMhbB7GVyT&8oI=dS8PKK%=HD)~crsqw;08QZ z?C5Z)I{&OtkDZ3Pq`QqQP2>)XeG~Pc*|gfUL7|w3Q`-xN!ytz)tzh4(kBVL zF5x5`VKx(-B240#P_in{gR)*@7$cJyVJ1?lJ}W?yZ&%|nHpZY{$9tHlen{<_(OwD9 zi!L1=E+`V22%6?4ExM z)otJt1UW)FdSO~xBMy({2R>8E#Ma|geOO-&t!}Rn=%mCVk2pWbCbz*}cv5TGy-ENQ z_g0Ou(zL^#W51vsyv9_zY?B21qNb)UI$O$2YQ#U;gq`TkW>o2IB|u2?u~K5BY|giJ z1#`IJvBM~>c?%`pH|U%|=lxaunw30KP%JcO#2DD3jv+kFA5O4=4?9Nx*S7apGFd4C z;4b?3{j`fCZp21X+)p4h>`Tj3jq3N)DLS=22|9%~z)3lYGQ=AmcqESe%sIohB(sUg zeaKK`BPOjVdtQjpc0_LK_n(257AhlXkkI}BSzLk)mO2TAfgn(u>eLO%Z zJF~(hY~pYr&4C?z%NVY|-@q@U352&aqxojkltC>dpYSQN^FF)BqlAt{$z2wENd3tp zY7qNcJKy^vNMR|2>Lz_6NKVZ)RrH(BX_^(6JSEu(fe3?Qsq72L(=sfJof#z3*>i-V zEOYovS`5rQ1sHB$uaT-Jq8QTT z%fuLA^-NkAq}wf4Q0O#t>?Ztu-|tR_3`d>RpwSen;HBjM9`YHW&FJ6_t4H*$_%qgm zphow>mSoIznLg(x;oigy=CJp5z8xJ^>$%5Pt;b%d;|EIEy&mRTjnN63z+&b9S}}W- znkIPJXQP^hmm1V9I1EE27u#;a(r(DvaxHL44_Rl{lJ_9IfJFXkegLG!i4b^LmV6aOJW?Eur)H+wtX1|D3g05&!yPUDrde zg%0Cx>=~-gK+W0M*3ea6Mc)2w;leAmi?ja(QC;4T2kYVM#E5uS23g-D=uKM@-uT=NZcDYc0Iv1Gnp^yxV@~ z#HGfN^RYW#4htJT?MQ7a3<-?d%&Z(`e0D&lD7yzeK2dRjl&GcB;^Qvl+rEXzyc z^y!b}_+GoPe&}`c;gaaw$Ipji9!0qsy{8u6e?0ePDJoWQ!cA}eefynK7o`t&N6hTJ zttCUq+H(bG8+!^SM|mAQZ2jRyx6_u#SK>$wJ&S|$zB)|Uaf}<`sa%}pFmPYwqH zJWg^;Ls;E8S@G%rm_hWGV64JMPTO_Y93Gm1r;g6V20 z%a}qS3Utbwc*rL`w_>a0Lj738f}~y~8%!uiqGzu&Ofu#_Vw}!pe->uK50$xsCQjayJNx17q}jviw(kl` zf(&Ulz9k#j^TLN6-{R+1SB9l3fV!V@^9&kT*F@yAuRNp!d(lEd$Ogs0#-@%VSnE?Is*Xcjm?E-a66vKp2(ivRH1lZTs zUO}0H`#R)?fkG3|UY!J2YMM7hV~4Ad)DUYb58)1Bh%YWRfF>WZ1}uCfO*X+aAfnZ`51%&CdgsN>zZo@%rF{2-6_3rTY7gxl z{;kFsSueK0GDCt{kvH#D*`Bi6=-*<^6ke4RC%>tAgIC|X5Oq)1-QJ(-*E;;rqQ!c% zEVx364y3yoq+dg2Xy(nW-wlQDHAgq>ZdW|IxNk%f{62BXjpbZ!?1B}Yy9A3m6%K#d z#m$&G{^Bpba~DM4A(X`>do2$?bL-UeO`MDudrQ_`oH8?_Iq)hj%DQpM_uenx98>(N z{}ea-A1hfDc>a(Oqn*IwEC5!dP z4$X!B6rDqvZ$y^Sn-}Qoe_(1>q_x3=PN7sa51^sA2_IfJ4reE@(Ql(G`&4ii$WR%W83#_3$T)hU&o%gd=7XhX>0qXg#ppP!l_s{3+mX_IuhJ{km+_yn+AB#&(}LZoH|nKAdu zZ*-^J3HSQ#J#+`noc27zdtx+oe0w4dqxEUDpQRkhjV^MYbf|T0&ob8rQPvcv))Rm8 z12bMYuRPJwpqy3q&&a%#Sxd_jo8MjKWyC9P(d_re8~#LRK4kv$XZOJFt%XcUG;!I> z0|_C)u`aKJ8w4}Fw>7WXada24vShYgShvQHd$*uL>lbvT6d+7Ru(3Uu8U2?bXEazP z4SGO!uMoWEecp*o*`OR9Il0ld{^k~~He{%0;H|lK+w;-fpy#q_~iL?fmHvNAornE?tP8 zF~=q~pwx*foO=3-qjd}2(Q4^&@6$csd~E#u>V~kNez?wiJBe4iDJiTa=S16uw)cyp z7KLw?*l%C?EKCZ4$m%rKL=v=o;ZJh=1lrhexzcM75-HNy=h2$J!!Ct?_?M>9jvBB= zQezZaZ_@0ohojCES|_MMjetg!vO3$WGdXgZPziCUi4g$C%mvut=oqn}opjl=Cyo0W z!NAM_V%Wr#J_-$Hh(d=>3rVcEJw~%n##}U?j(8iD0-{PRUth)+aSdi_WQWOm%At6Y ztI=9un|c!lKO)J{LM8|$lmeC90t>+?ArN_{F}wm}YN(^Epw-i9m#pQ2RZiBO$gbnw zO!Bd0yXOMiNN0GT6=!f=m~Uy?2nY(SeDi_sDsm9nK!~E2LGUXRD&}xF-R)HB>0=ap z6iTC;EM&Yv3uFeJA#NrL?s{&%qzugw;-{G-&z{o4uS4e-N&Imrj_4)LQUb46^sg18 zm0GhNTJU_d`%a~ML1ZIcKJZDI* z7C(!uG_O1&JxQ4HQT5{xrvEP{vU`Q6ExP_O%8{B6_2y@)Z3bZg<<`{Q=pi|mSztQg2HR`I9fOa zWJQi^k`>SGw1Nf5iBTy?QiU^Cp9LN9PF0pZ0(!o_{-o9q_S!(4$>&tYYa{KH8{kph znWk)c(oD6Sl}YD|#02Rh3;>^mxlnR?5m62ySpO)Wr<-ZvgQQB>NM$7<)Cb{B@AI`w zM%V!n2Fc9`6Pi(5O0qRFM#GH8af<9t6VCcjU_}Q@&YRI>56VCiQ;=uC)lnnu@X2se zEfS?gPK!G-hr84=zAZ=|a8*G3c#@};a4Nlk#2`4K6nTH-`skr&m2hdTq};LHs>6;? z%kMwtagY&oPRyaH*a**&7fOIipQwoj@4Ow)vry`pXo0d2OgcPnhUuc*688D(93W$k zCQo$y&kRWWY(7I!h#8t_$7>;JS?S}+^z=fAPs>1SFH z!TQSc5!f2>IR4MUZv?p^-CV4Tkn6^%zHaCrz{JQO_0rpWrben2+V5#2Rs@d7Yfl7d zgTZ8GBZ(cz%azJNsMBgtrVw(tobFc3D^cJf(v5iQ1f!oUI}1{DoLvV^ddttP@HO7N z4058Zbr>>TDKjxbwZL|d(N&lD(nR%nirDTViLH$k!U}i2if=kBZ)opLP~`hx1{P%O zjL|E>h|Bf;*mxO8wa7$lJ{_t4S1dA&0~@d}VGs~ccT>SCQ zwPGRXMIb8WdUBif{s;)90jGAKkFb(!)bQwNu?p^u~|30jdIm{645NO^%qcyj)UQJ6buf>N6bR3qMBJ4d}D zxNeXZfphdrB0&nj%MmzW++KpS%1TdyKjP$KmPe{d_4b>I1V<5giJCWszfxu(u=)|y$jhr)^&3t zN@+;0Gg2tL(21u-98^lJDSk4DOqu@pLmE^BUHD?nG-Ty*9m!Xr3u4U4Q!H5onRW&gMk6UC>uSC^ zs7!l#9`17ebQ=7p0Jh%W@zJ=*riqf4K6CK@!OR^vTq8i>xHX7sH-! z=Ih=_>bSI5#1(OH5=>^LIeS;P3FdFL7#oqY`C>vY%_O(zEEn#n8%4s22u}yY78#Hy z5_o6Q3({f6Fr4`GepfA>8PT`Onvb)47(kn^G5T`7B6Wz3K>*r1NcG2>> zm*0(jMo3uh_L}2UswFG)D(-DG8y z3!lLRnGLtEmEP;=4DVOG5M&`!wGTNd`U%oci5HU7`&sjN`x#sByMJz59G5%t$75a6 z$hz&TF5`Zzee^DMKeDFhD@uSPSPiJA*o!6v$KV14mdyLfdCUL(rrcXTdAI+Wm>rci z{{NKvEq*Y@oE?$LU!yLJJ{Oj7pm2RkN0e_xLE;_W(wg`3l}fRwGik!lBVabgEOg>b zlxBE}X*ECm+Xlvm%a#;F%{-9z{zY1*5JU=eFG0=@91B~Oz3L^LS4i;XkH_-_9B>8l z)=5O6e2{_EV8J7>4Q6^8i^oy9nNd+PaQ_Cp>nh3%k`~Cb^8OUlFnuK`n%ge>e*G)=%_2S&qfrmfB_@ls0}N1)aXJk%%Ls(q34Iwj~w5Cevi`C)O> zR^cg@1omSnm6TTcAE4!`k-b_nm5p#?n3h*EPJ^wpzhN!qiRiq{nHH`{JVV3~{^X)o zCCMA9*EM`XVBSPu+x-~LSJ+h@))UA8z*FMy5O7#N$Ymn+ z4^Qe$fHdk1s2hNN)a&hyhfF7CwF!A>ID7HQQX4NiU#3NN$3sc~_9ik(rXO;*FGz2V zv?&yCnm!1TKf2xkh_9Xcud>gRdLmxa`=8kvus2YQ`s7_hr-g^t59Q}86f$_><+Wei zE%3g>7-NKhz&99RILHsz_5Gxx`9jd7C%_e{41hyg$5j~K{5A=FUnSg`f8tK)o-^7)!pUke)$9I@NUO||_|B#kBjKgq;HE+$W z9EC!0zC?t_*JS#e?mI32xS_cPUt6n{i@v4-F(e?1LMS4JSrU6ztiuxZh73DBi$Dx| zu1}B&`!muj@dW!?Hnf`h;y~WQNX?@KdD1iwL3%cblu5;Te>LJpB}_W5&(DO{@4Z6H zOtZpRU!qJ=d$?#*3tOcl9pHL%7R^U@<;!Q-9nc~Cf17bvXrAg`ffs{}qK z6t&GdlUE7Zlym%W;Vody!;}$CajFE5{w9;PBpW=A{c=(x=aU57VQJbR>k!bUTn6bh zz1X;Ck~_-IbJHXueChDV$t#$K8Fxl|05j5-rQ5FqDTKTnT*D4Fr~7}rs>4}W{)vd% z6bP z$Q1@4_mBqlR_zR0(Te}w>HGGzMnV8B6aO>mU8P3vvXquPl*{?D!H+O+1ujoJvU&}M zs5J1x-$+1Vt_%ecytUC|?0Z@!M0bNiwHq7{l{F1G^V-VFE4@S$ zjK^qN1Hfv68w*^ufRzD(4!>1{Bul+=v>I8~J1KNnuJ9mRX(JtQj%u0l7t^r|Tg|FA zCfk9D5Qn97O-E^uaJ6;aae(>KQ}<6JdwBpaSBs5F+Q> z4yQ))piZcHX*#^bra%cw4wlJ_N*O++n>I0C^w?eA0r<&*TQiRqdc~0g*WZ>FSS@gL z$oY^~dZ95HCbVazQtg@qWVo&YvG7^+D?9>_ax#%8u(_5s59w@147&>r_NtrLT`!a& z@yy7gV<{+8{cZqi#A*u_WCt^4A`bp3ICV{aCb!b3Rjm+-?N-aqPXR0!9+T%uwp^`8 z%#42lCM3$`9cejyoDnMsJLD8DZysbOVsi2L;&I+E4XDYUz%BC(wzj8Pi5RLJBV{92 zZJ=RMKIx2DAF*{;Bqw0p`Jbjm-M}}`8kMFAqz0gGnl3M5zFGuT<`a>_bx8WpNci}o z1at(y7uO_FwUEi^{TNZFJ-qCR1p9g>QfmrzpF{4r^Apr5g73XQMf zm!*!SqSu@^z0#0XzbDNbJJ{6hcuW4_x{<(zwLJwm9e|C3MWiWj6P)Ek=w8=sg%F1~ zKAAGnMy_e}urvaxA%_L0`Z$zx;qtLxw_A22$?h$a@K0d$4*zHR5R?+(45g$QQzMy7 zvT-#IX8X9HA$ODUn}8MuVJX~X?>r|kl&E1Cj)*5fm((^dh$E;bpV5h>wGeR%zScf9 z$qoJtS)oAiBbxMdLrpOPSdy!W5vhTd zVoDbNlNh3^BfpW% zj2F?{O%X)UIfk?kuT@-*2USukB&KTDn)Ss|$cchtWH(OozZ^~HLOhQX=BdZTa;rQu zTv^v8Rq*+dYTKUNSO}&{E$|GTjZ7z1O8Thq#xUw?Un+wZA{!tOW4;jO8nj@@T&9l~ z*y_m|+07}C%=Uz$v7pHNx>T6n=V!tan$A7GLb+nVRm%<|_wKQ)AF6|!IHO}&Dw>!! zf;_9Gi7sJ+30_Hj+jIfy{>XrnHMtj!RB}$ln~p|{ll6@s9vXzw3^0OeA7xfOs1b;= znYQtR9bo1~9LVaR!z^79!da&Lf$)V%q%bidoNbz2^@=$u8r&-S&ryZU?Mp8Gd4<~~N-Wfoj` zvF*Z{XzTN&Qvcg?9|oV!3Ga?>%ev=O(RQ#x>Jf6$KmLm2oa9%_ir6_@#drEE$Qa6r z1;z(^v**9_Ub?#1zYwNCem+p@wqoH-^Lw&CUk&r;yDv*AT>JZan;8`!17b;ksd(1f zKZ2JR5z_lp*FSxg^5^mgSv|15q?hlnL^xHvFWx7$S=X{*R>)1aTN-Qo`Jo~FB?;Tl zt}_J|P0M2L8vB+d>^k2H?Kkv2YX+-_kY{i0L zvtyPb-2C)Ylep5(FsnHy8#cd)h4(8OF*#VM)lfkvxy=te(&BcSq-a$kHDQ zob@{=ki`6B=+&>m7t~P|uQhMB!w3a51mUsJStR|OW~ywgKdc{n3FF`3jl#cgGIb^r zq%#2z82X$*Zw#WIduDcomP6xecmh*#WFZ@TN_f7>E9;Hsl~B?sHt_7>I>SD#nyv(_ zrppuojfZAgVHUyD8F;ymqq4AK#$K>q-{E**N4<9TWb(NHZ>Dr#vx^9t%Rc*yIXc7b z_<8A;h~Ix)$k@~l=y{h$eeS%`+l@A7aw?~WK1a1J*wCiPHyQ~sHR=# z&8B)MOM2QBu`sqeLVM7C{56)faN(uxr*5Yl>vx@gxnC4@^2On+8^8 za;>~@wvMuYfcfqFz>{KrNCOHMx5MB!%6-ZUIZf;fBz+uqO&50*ngUKBUri)SHC;)- zZk09*%+djOni9=`XnxS2DP&-W2!Ji5#7qh3U@G7%J#@gXcnVC_|r$xZ`Xy{>pJ4Rcw_%Gcbys$WJj)`%;3^2q01dvdq{tk-gdi=%UI6lqS0oF8bCX9gCGF%& zE1`@|2v7?Gq+*WAO69kqrT;_BeSqmKEM5ED?HE9zDVAF2-*zn5kMzP^jxi|i&jGs* z?V1f>jr95iK_E%Ipo>8!)7IZgQLsaPpn^nncfIntHNZEBJ|=6awA|Pd1MumC!JnE7 zdMJcIPa}$2?KMsg76v(qzQqr((`O~98?nNnDOP&D5`om;L|axeA5}(xAienbTfi_- zh}d~1ixJ$iXRkGVdY6fa#+!kT*Vs))fk=r!PEVg{`gXl8-g)j4Zh#eoOUNMa zyHqbvGZ@_m8TIa?Z|w`hKjbG55CoOPa1qz^)uD3}=6bu(!cBa`>vbSXMZowV$&Q-V zLjijFS6+svgcUCbC#ORr^Libt;ArW`a+(zi^;=A?!R4i(*Hs6{!T>Hh9Z%)07K6yK zs`cbP3PAwDf%7KQgyL_UE_?CG=eBABL#1xPuHQrYXgeYxa7C>8BD~WgT6nJDe&#I! zkp>$q6vMnYnr3uYV3kyEs8O|}%g7KDEI;NBb8k529B!a**caF(fHl*8duEY}%!fG~ zWW7?8KSARC^}2KjeETQG>Yeadjmk;~{5foB;JHG1-Xc9>~y zpNP}5Fs0F5qPO>u*pZJbUYeVWRH$2h@q*!gv`>4h%ZOK2WTgWqHZb2vn*hkPCKG-+ z1%fIpQXc`sFT(4J2;eNaDodUKJh29;$N;)Nz$p%g+iH(LWNn{<7XV3-1|lx2AW#BR z_0-T{D@ECrYgMrGvXj`4n^wxCu%~CQcab!MA_g_HL*I)$LY`z{nIPIj8SjqlNK?%<*s=Sh{AnnUC*BR!TK8CaJ~4(iF{8dBkuzW0#6$ zl0yPu%~g)rf!VwZ3j#Ld9G_bIMah5yak8cWnFkLa2lWU5Ql)rhMIqAirs*!6m4CxbjO1JJ)zDC0|Hx>gq{-4Nm4Bp{RkIPWz( zWlDq#ldxq!eTrv?L_M4kcQWdV^mn;%15 zLuE=IkqII>vL0D&!9>6AuyFwOr36zcD$WbT6=Fn$uuNu%X{(Awx=a~gt46{(p#!+XLZ3m@u+nEP)>U7{4lk+w@JLvmVv zIWuZ5Gw3Zw9INmz0XPbEha5G~K9?^~@0=1YYTB#D$=G4A)S87SL958qk|(q=P$;z- zr%nQ#l8>PUm3VaYN~CrVrpQC7fKnqkp;M30ySk(tYNkxC(e#|gT8`suWMYxKLdc@X zOgo^raQE(#a&=yey;(B?QmMb#()mgQH4p#5`^N7-9T;6>NvOaE3cBZ*t2WCXrzu(qIh_np5HcPaOK5VmFSta8 zLMQxa8vHy9T1AH8c)*{3bCvO_6v};qzH?+Ij6{O$Vl1B_tSpK%qxebKVO5ySVW?ld zxA3I$!nyExNIX56M%xV?g}?8KAz)&|TUj;E%rbfaEnC^*SjL|54v>jGwtEYzL@r5@17M`idJhD{OxrgqqZiX5A zVBulz?|s2cGqg$#RPO|EIk2u7R!j@~ubpEE@KgD279RE_HkV^(-o^41a1cMolKI|e7w6I!ACu977uEM=_7^%vjPkR1i zg1MClV~p2P9X|seq~3z;msFQogwK5J3Wf~X2HIQE@h^7h{r1hA}HQ^SJZ_OtE61(QG+Xeq6fvy#l6wp zK(l8D9BNOT`CKhcK8#ki;E6h;dqFFn2GF4XoSapSDgt0)T3Qhh z+3y2OEPZ&u1Jj_?XW4rspFJ@r!*t*;k zR%TPbcTp3PRy^UtkM z`ZOi+-oiy1yI;e%RX-&DwdKConT}tgvmei0clis+8lm)rn?Lk&U^!%v;@BF>*r+cP^RFL8l4#4r7&n)3>m*Wi8qMi2`mSo8kf%hr-LN5eYbZTY>rOCMW3xsW0o|`pp-FH-8QG8#!LXP8bkn zKiW0%7L@N{up6eyG+xd?3pxZ70mE12?_C96Y>F9CX@tbXA zH{tWHB89Qw#-eVQXHQbw+ixw_o*oI`TCmltxx{~wUzu&-fz$Q71Me_JhNm3GD`Q>_ zxUG)2m`MhIBiD=4qx8<}UTHt^-GXVD8xii+%4u&XlXJHX_skwwmAHHPywtPj_Ww0H z`7({xO`E7qU6`PBe~O6tYfFxaI0M6k&<;(SL*(&W_`HWCy z!Pr^6^BnTM6v4pg=&y%$H@!EqqRJLtOTDqbij^|gG{W*))Pdtr>1rAfETA_$^t=r6 zJbvz6(XC0rrxyv~AI_{vA@J`S?5^@Ghk5I;=S{_;KMJohetT@H6g@rKum4hcyhE(t zPka41mBun8m4bER-NvHreA}rgdI1NOHKK9Lz@&L+%C(7u0>T;d>8Ye2z*c&yGP)PJ zXau{`g=O9>j!aZipiv=DELMx{zwkf-&QJmn=lXuIkg;JN`>8m{H2-IY(hs8{55qT% z$_zaJDF8020-@EZ*Fs9y61uhfO{5hODH8}z3ciHVl<+g*(k-oPiRioip_r(+i?&vb z0fB^Mz;vZrnn-c0^~D5gYjjW1`x}X6Q9YTyDB!Og@OusYqyRQCW zy)a~+d7ks!=RWtj547Y!*Mw>>*YJtRWuxcuDJqYZc{c+^twePUO_(U*$a6s|W4EfS zTs*jN9%NqS(YYeywFU*AJRJw6_uQS(kwO5hglfaS{tOCoKi3820$>JVug_fZQ0k*y z$1L_cbx?Y5Gu&SSVKcT@h;*x#EXj|tc4d|5t~VNHt1A|%gq@#9?NPV_4|b(zmkO_ulj3}$y(di<>|P8S9;NzREsN>(M`rNx zsuifTmA;di9`Ddac=8T_@Vy!bpHc~92-aY`gi0&`XtESAkO+{J=??G{U}eo|RtuG? zEP^O$1UU2Fhf*)a&W9cyC503o_Fbl(2I<4Ps2&ElFij!vkY2TfI!r(OO#`Oa#v%sOTYFaF zz6lB<%ba~atKH*h1)afw4Wpz`g^4l^g;gG#J5i#vIClejjwSSgkGT*TuVKJt%8I2 z7i#WRx2qjcJc*yd#NE`tEv617dYGd{46YCuh#|}A-kZ=B7^Nhs@+3e2iF=JjTu`ZEVl`vD1s-@7)_q$H^Hvq_d8{ zKxE3;7o~Wua7iBp$=A!Vnw}Aem9peorQLx&A`4E`<#xwVVi1A3_pmkTMlg8d$j-~W*bYmPlPA9N*t=9GjL3ar zp3@S94oCDfSHqIrPDicuaXHT*;UDEpNdn4Vq%ZWr_~;f2RI(^ku>a*s}0;>&{pVPDBSP&*cQqb25*An-1k9tvth-mJfqKPh4^7mD*;PF(u+^C`VSl4Bvmb zCM70>Xw9-wM`sz=z=Cm}!Dv2{BI^8ZoDXY2Lc&qc3O1_+9(&rP??~37`W>Ay(87u( z{Mc6bSeUM(q&Vq1k`amQV;s3G!QJ>?ZUcGvcgC{wtX6(7zujz#|cKBRQ1tv zqp+F@oj9QvVTnzLD@cqp6M%%7IW$`*bKFUDz*`t+;`X|q57?AwSSQJfsoG;Z3wxH}D}9S1b1q*-g0pIDbU76+U|0HB*ZZ1^m_^CNk9L z!>EUJB7~WxK~I=*BtA`&-Q=@gD6p7LGZLVYvwn2YjSFz-qg#$1Dy*gl{2FGV*qI&( ze-Sl;=Rke}v(s>=u*%iy8-O1u-nn(j+)!VL3|_;y&b6Vh=Md!>CqM@3BC>}4k0qHs zJ}o%M_?!XQvPAey5>f7t3C}uGWU~d($VPnP8mBzQG{QU2vaLwwM|n5htEsAEy4jh&&5tDMajIf#?l(6cx8{L|O451LNNA&vYOw;jeDM=7hNE z%F*@MQw^=$uG=SgK(_@(!mh>$Tne#A>5U$a6%}??d3^9m zCsC>KI*HMO6l5uiUN$em5d=%0EjbZhDNBvBfvIpHU#xY#F;1x{fRhKlnB6o%q0m3WI0o~ZVU7u%(> z7)0`SH1KtVBl64TV9>_>TNH2oXnUhC71p5#frcaddq0`=du@XZi}5ie*8_| z_m^&U+ z{%J>|c_Of4%bg$bhEn+GYbVt_QGM&F7yor>`K7GA@2p9F|GmGx|K863ZFn+oVZ&3> zSL`tIcAN3yrA8J`tXB>|{vf(kd`rsVhzr6qD{)25; z|MR({3(^wa+3;@BclKk8)Pdh`xcU179baT?vmJj=T87>Kefb2R^Y>S_eLebd&pTKC zGx-bu$B%E{x&F2yDeIu;)WFHPOM?eD8>mNqba9^r-|)w)WE-TtPk#9ByaO-QWPe!k z?-lK9WGU{aK6|lk{?h}g&m5N5-VnK7nlNcIUwxYM#qs!qrxm~abKQIY^Z5C|>XT`o zK8y{oINEe;O1!u2quOs!=gF@9pH~P~?u()*FRSXise2o~%^yJ@ZN{h99ok>U?{?k) z@!W;zzO)ydL%B=Sf4tyt3jO<7_q$aC*6)7$P#M{Ne6M-3_wLW19+MVTb`JdWeDFmX zbCrlEX*#v6|49qgEc)Mo5i{)X%KrVIPe;CAT`z9hb)o6lnIFq9e0JFIg7PDN?)2HV z+@cfLszyG_zP@xkR<;<}q>ro6FRBv$?}?mMfBHFdfj)cw*Z;gYx;Dx8hj}8)JO5yh z$8NvxcHEF1{`6n}{Q4{EDzfX34+cKEVd-^S7xDJO%z;)nZMX$F9^eJ3U&*~0lyex?w)j)#}@QB9MIigcgZ|45nhD++|$MHs;6& zpzs2O?MQ;{-8)QhGXc>k390GV@Tsv67V?UxVj0+u%!Z1)b#>M<@aHT6G0k&(;NvF} zv!}V5v!t?gazqZ#4Pm;6`r|Xr?w#{Q!!uhdy_d1YaxoF2zHeX#Lr5VQw^jFxCA|l_ z^_Du90Yh+bY=R4@IDG09z^nqnShf6(eJNF_vRAanyM)*Ut73dl)iIF^Mw00&jO&R9p#Mb3$S z`TkWOLaq)LR5K+;2Di&8UKbBfK};r*OV~UVet(ow6)H4OZd7sz(6#Bak{ZIiqqL$! zg#M&i*j!@Qt*SE|NBT2!mjQ-?2cCzS)(&pbl^Iu+bO~Hgj6MxR=7jUcgyQ=GE~f2h z2wY{btaf2%?MR8oHnni`0eBa7BKVN2*SEv<-%gY?*c}&N+l@eLXOvQ(qFCWg^%jr{ z-~&%-&m}McM92tr{qSlef=Yg<>`n`?-Ew_FPBWp)U$t3o(>zoJZCoIm&Ced_F$o^> zaa$lvqJNrYX6^tRFUeI!l6~N$T&&`!Y=y<%7OP~HS#v6BE(D}b+}rIWmf8%VzTTXl z+f4wl6_7Jjief>$Wdxr5Zntdy98`reJc$H zNuGN?@b)gt30@twN9R33w-lV|EV$UulG}h|p2oj{_Z($`&kY!_k%|dg~(7dwljGBcg{VCy~*ffOSVK*n~+PspgFd ztK@dx-gNP#e}6m#5^13-OPitXR3F_n2foeEkmoY&99W3J*j(63(0!&?MK5DJs93zZ zbBtZ;ba=27B2jhOe*{7@xfezRig#9pM4cJ_!5ISo9HyB?_p+oxx?BSl2AcD5v9Kts zIK(GoF!Ag!rm*Z2G|`YhhIBVJ4eo@xy5pa41aw4{d2=WlFzi^K4o24V{{Sm{;AjkK zb(v1!XG7Sk1958O1y-^8qF0-qX@}9wz;gBS3}rBQ&y;GOWfi?=%5iOM63k_g!`HmI z==ymS&)(>Cgnffc_*AnBF?#*iXsW4b9_*nYRpoJX@*H>H4M(78mQZp*btYYPNzFa% zFSr3eM8$Eddyxd_LRzTKcRm6!!|TpKM2M)Xo#)_o%%;9zM*b!on(e5;ZUhbv7&ulK zDvgN4VApNm!-T@<5W6*-F?L992OM5a z1MbvGRFEgY9-HtE$1zu-`A}hg#I|CQCp0yt%0i37WFEZVPns1o;1yv8{t31iY)h(h zt%cuBUhK^pDeq^2E{_WA%_<#KPGL2&Yp#i2dit~Z?uunNRWLdf%qgG0pH|6J9M~2! zsNuL`nhRZOmhd?9c)>;JCKqZS9_8b(s-tJ-`F&1DolfnfF2QQjH)aoTh){C+te0yz zF2izkm~qkv8Y%lg*}aBRVY&?33s%47`LE9VkliuWFY1htRgC7K4=4^b&z=+t_bikH@^bqn$ z!&Hm~nw0JZ@FuYvEH#*7$s)WG|82N#%3_u5k97f@P^HH!3_T04fRy`pNKASFdyNiu z)t^!VcZp7YTj%xeM@}_ta|MyrbP0c&5oj%^EN{p24sq`|aVK!0pwsDqrl@F)?;n5` zB?E}RgV+fA4I{TYrnXelkIn!tf__)%0VNGnS|L{XphHhlQ0_OK;KZ z;)Tc|#|dmxNwj4%Dv2=6K?F};!GhK$ zRGMkF4_Q`$@G0lkz;8=md$c}P^hfwB$=Z8D-RNgK+M29KIsJ!CcW2WmweFd$5EJ z2=^k?vy-9EHxFMiA5P0AzL3Rp9M1{@tv{g2yA~Jn+a1OWikOhKEs@+FT2!RWY^Zm2;NgM|Anv)N_{8 zV-Yv{w{i2&Y{BBjDZ$;#!&mD#?xxE*J2y{ue8;0=hc?Pij#1{1d+wG$h@BUBw)|7y zd*;+ThKccky_U_p>fH{K(fMt}AK2f$M02-bzjJH%%#M?JiZn-<;oX_Bq< zxh{pJp8Ufn9}SE)eDx|i>6(}DLiA5Be0}Jvw^E93$bLM3_OC}RM|PmZU#Z}+`l;54 zx9l^$u)U1%eN`oK`77?aUO%*Ox3zHaW_8nqvG#?UV&U7UhWCGKhNw>0v7p~k^0)uH z|01#uSDX*gy1Z?>yqL{xd@r47r|)z?4zW?O`ft$*fm zRlR0U`*!k|n-xD!T(4WQzG?5onhTb$Q=eY>Q0WafyuIF(rdo0S+;i`@ZF(v2GUEGb z?yqs4bln}nrTn7t{asU3Gu)_icY`{J&Ej+8YnAxa66COf#KU+CF~%hZUY5(v9On6@mP zygQr&H{;K}O8h({v3Vw(DmtptDoclq3wyf6QNLXWrE08|KC{*xBPaw)8N}#3xC>&c zyWA@vHs8^S5_Cv}j#va_L}I9=BL@k~>yafilmuU8f&Zm~;@2<~jut+m?s#~zL8!!1IXt+ujuw}MxM3BghMSXcET05PwI z-EmwN@6ZKRJx>Dd3Y_1uB*F}bFyOnnFlo{Q>c+yB8OH3b2c4z(Mw|?h{Js&nPYj%R zbqyBV!E^JjYxK8uquOS@!9hN;l7-vZejRXhGN7`ci^e_W@@jAM$vV)NsK^0!O@Btome^>{kIIL-6neN#sV=liofC2igV3)GRmdl= zOaV>m^w#okJ~~gUkMOP!mvBDcrS70RY@tXfE(A|)>_R4Hl;}Yn)l&n1Ta;KmeJxcB zcUzv}g!fk6Ub(Zan%tS8*XYsW$t7%%g8_yp=~C!SZPg3mABeq#U9M-{s%wEq#0}l7 z>*rrg$cOCPMxcA&Boddvt$DboS*Ca5#|z@{MnmB_pheg3bJ`Rm71Lo}I;B5X&enu; zHflV6M~-YLr)2)&tK^Kbd5a9h8R9}?9Q>AGVzV2~pwykZbxi1h+lye)sn`>YM8pWa zh&;?;T#@ivfzi=ODN2(4k<}}n%NP<3!rc>%6U0LY+5}}9mUMM>=+L_lvefxqviye` z7DKXkK<+R`>cY?NIRqJ<(OjepI>?=@>jZff8j7rVQ>@@F|LYZL(Fa@2VX)kr*_%>e zDS@8ut`7Y{kdy5!??=Btkv14gZ9lMC23d?=;K9Uza~U)M3+j&zmUapaORwll&H?eJW_jLgqi1_% zb+Ig&J`T5>pEDU{dLE{OU>8KD7qb3Nr|l2VIN^MY43ueX2^7j)=6l+noWNzgaVY10 zCyZ_>4i3T8%25bM)JA{|k8oxZCgl`eE1#q~_OmeFs0J4K{w~EWslyq|sOuI$qn-dV z4;VZI>oAs%;2;S;F^7+>ni>-|m$P#W$E!krg9*yXoDyEXHrDR9v9^cr*X<*_EQfnl zOaZn_xrS#Y9R3jXB_^Oy{c>ozkSyVq0hWi{PJl&SjwbJ*=IP@yeLIO59JlKB=`&!n z@CvKR*j8R&VFp%a+@S~(A)?5<31X=u{7v^nl~7d`vKI65!`DKsP!NcMG3p%M2}p6{ zm{8A-wruheAet+3lA3}s@E44rhj;s8%8*D8&=)@9J}rhJ9`GFIWHO3ttEkO1<~q+- zLl3;usdef?D`s2N6*Fq@h z<7|35`^CS&Yf3VY`mJu^cMjfZ-UO7B-|pqMTQ4G`1C`U{XFMn{qL<@H%a?vz2)hSA z59ux}07k_bV!*uzLieXf{ZAaOlVMWSY`H~55!?Ptbh+|8CS|0 zwR~_Pvj;FW<~%OEG(DeA08bHnkvTLa8wz(5GFZkDbbak*FF8{=E(BZBS=rbpq>|bo zd-D;|FT_j*W|DO5MBZ4Fn9(4!PWES7IYH}1KfJ_4b ze532`jBKLRyuGxs&t*1Ce^VS}Fr(gB993$mv7fock|-(=z0zF{f%eHiKRQ>zTNM^6 zLjZ#A&>`7N_-u%Q3pciv6R@r-Z$V!I@el|@2Zfi@k{K44?tVc{(tr&CCg;YgQv2Ah z45y>j%8kV@VOP3>ZgdTrFhhels-uU@28K1@kJym$yX8~fZg{=d^&JZ!K}ERjq%w>Z zW=073U+8ZJ^?|Tc_(pn0-$PX(Qq;Qcy;UX2R^B10iB~*go0~bT);K3HhTyJl8C*fs z(Rq;)G8DpgiU9jS_+m4>x)Ttakx_y%$I(o6;L#AzeQUv)T~+llp`u7+7#8$N5iy;DU6R-a^^q**)7ZMNx8%&r|=1v=`L)7 zmK?bi4yoN#c;_551kXZ5V1(Rtx)by)z*D}VR^SRV>SC%aAiWxpr7Dyd2GHm2o6P_} zXV-^ZNd1nk!|pmi-F*ddcOX4+7h0@-KY1K&lV4>dr5>N_0vBOo%VdH2;D^JTyxMG~ zD;nm6FbiyXc6hc869Z2!qXA5&_{xsLpNlNjBtV!_*aYnbc^U{|6X*oJBX#4?ybzq^}iJTLyCI z1S08*LFocc5X+q=E(#G8_qJflw+j8KCorC+X1fD+p0zgfFCe{yKn%m6QwK`4LOCeS zKLb-;4JQHD^~u97uZ^NlP1g+5b<;_&ok&MxL?2vYE!RsC5NOt{)i zHn}wy)zO|aVcf8N+J)#+bl$vm(S6rkMo`q3=(bN57}d|mLs*8VR;U*zX78-VTKwRM zlPVNeyA#DxV%F)wF~Ugm7>Y|sO>7CzGenTt^}@^{f>)S@E*Gz*b98i~N1D!mgy+x- z1weHEEc54H0VOp-ZHU~}!ANW%=AP-}dv!JyAH?6orMg_W6=LeV%UG&|$@V)^h!P>w z^sEj#In)XVFwG?X;4xM! zV$D=zlsn5a`Fte(c=VMDzO<(vqU4KrY(e-B_?1v3yoBI4z9&KzQad{f1Am-nq!!iRR->u}Tu#4=hrXQF|?$=R*#PM?}$W9G2HV=az} zL4w29&?umKx?i~~gPtOH>hTERlN>`&IJNFbK4pqLfciuM&0o%iW zwyr*{!3FCKtWUGd<2*YII$cM!6|rs_NYp!N)_ah?OUQrthoUSGr7S|dfhBoO4?v%R zJM6UG75vHr-Mb%wGDg^?MGR}+>IJL}`#!&RS6&R9JWS$z4_r=ELBj-0+4ev>A3DanbV-N`%t;h_r`%ya)1bM;hw&{%x=#nS#g@7;T6W4F2Sa`J7_|BT%E z!`;W$tlcZ``9-w(f$QP_UL9HT&gqpaMGs2f__uN8zn{Lm=J%Sndap;t{L9yu-3;bD zVi(WTT^$W~o&824Yxrka*1V>9edH^e7Z-C>$HRU0cmeQS2

n8eW7l)QRg8$@4lR@)ZSDP4@D52KAMhc(;=DOiRBjUJ9IJEa zTNipz5K%RKJ$Xx;nwugcu=JDm$?=Tk0P|4tCOb)#&{tcu0=y#4-e_nV*Es8HVTL=v(C8C!B#4WwWi2=d>WIXY z%aD)R0@}j_5x2>3y!zU-aHm>dJNbq@wulP4{)x!g&{;@?~`-gVGe#V6!+pi*uWVACNoE_?{Z$Z zsdIj$`vo(?tc^;X+uTf4AjY2$T!}GvyamK84~5o~aBR`uY!HUsBX~QWPgq5%)E(2) zfNZGmh-iYOSuhj&t(Fz63F#*q3)cx9*1Uc6L5V5mqQzR*B=LK` zwJZMZ*{(?2#`ImXsG?*798y}eG|r2tpt9w)0SpW`&oLB*!A?&IVz8g!Z$0xc%Lx$p zUVQk5aBOl(aa|+*%QhDjs)S-l^d{KOvYhwZY=l7L;qT6w+j|Bj`{u-A*#4vMPAUJ8YHcEMPy=o|5mpC7ol3yRppD8`~F*3kB5PCKn-qMPOuE>G}&sTzRY;f ztFK>yZh&B11T%3NP$wVB)?RdjGw!`;=|n0-zKdK8I>_nErKK5fZkAI!g%`WM&Li+o zs5oK{^!(N}IxG$|9n@p!jm-*$a;EeQF+;r%A<7Z5JO?Ki!FAVHKqk9h{VaItQL34s zw*DswVBbTFQ45Q<$foa}>cny5HdZUSPoMnbWpX#nGCg3QcA?tXx$GVOQjA)PD z0!hQd5P3G#-LlCV9Z6t}^&}^Y4uU;PhjM148-$X^5AtCb6bgx;-EPdGxv-Hzp|uOF z-oWf(T|C_EZKDJ{DXhA+{pO;5)*OXa9tjwF?18%mI4aWnNMt9{R&X34NMd468fX6s zc<~-xu2+vpZnKINtSe7Ju4JW09)k>KGAV8HVU=4^>Sz^KmBkqR_p$ixrS)Jt=JGb`8?l^mH%1W5Y?NXm5G}XNDNjTHaW#;oxmZk8me5HNg89 z)s+voOAi5ah`}ORrdw4pMeo$<>Uq7{b9~n@q|t9(`yl;y^yj>$1%pKfnO)NA8PW>k z#QECW>ciA~o+wBJs7`oWeby+3?l4?GnM~KBpx!o8?=apA6SIKF!8W+GBkJNAvVI1rg@-vFC)d9rmQFHv zWLNrUq4x;*!3)zttf%g}{V091mmh+~UB@&>zzZW7%YkMIk11oizqomG$$vn*ApvP+oo=umnN05g}28;*+w z9NUUCwb2qQ$pMrtu{Wjwc~(qj*U zg<3^uenR$c%7R-E`y6ICw(O9h4`KLqrs#w0oyu=DeEfK}t4kIF=wDt#?~wDoY4;4$ z8bx5pR*@?BCdgKUiKBFlsAJ<6VhbD!jkLv}SBV)pPhlQio(F6m;f0m6OQJ6101}gt z7onhNuzH|jK(b92cp64bE2dJLu6g0s*uxu1OWngtPIGcl@hEt#QX-Ahk`l?eUl;oU z6`$;7wGePiN)ML|Xxs4#k!E-#0F{Y_Q{GzTF1g=|Vi&6Z!``SxSlID`F7=nZy>mXb zdqWr-h62+65YiFvJn$NDD`-eS)x!F!WsaG?6%^$;iqB_fUQd>Y3k5mK zkSm30n(SS|3(I6=U{Kqsgt4op#gn@rt@`B3Shc8qT<&q$rowFDk~pDCeGy=B65I^y z{=AS=s>5McAd*$`8b?t%MU@C>46y6@C+0Qa4X}MgF~Ds$MC`Q~!Y3HMp{_VuuyHY* zLm$uKG<+Q1j@6O!mNiESlMom>NhauY&tf~(&=b)wjP#>VVR)Vtjs)7B2c80i4pIn+ z8`OnImPMy1Y3zd>cwc^YJ#46z{WuY4xt8TwqN+bE31vVqOX`xIbmJswF!6KIY3Xz#})+7Id*^Ed<| zOD6^p2t3G4MgIjI;Urrv{bb4;*;v8}7Lcz(b2U|;dR)~h>N<7@J{x@h=&yd5L*UK3 zd3#yO0EyW1t5rRTU}DxQvjIWFjh)TCLhP!-(Cy{Z+}l~JksyioNsEaF17>PN6BS2j zoq!{Jsod`{f;~z#Cy;AX3rM(}9l`13md%M|g^S=#gm~IG(GT2Xj#Q$Ov$4@RTt_ov z!3BwlRUud?m)$nWDxTOIH=}e1n#M(4oz*}wM}vJ}c_Hj0w?dFTb?_g3$vjioW&6F5 zW&9Uq*|0aw9JSU^zz0pl<>{`lJdqNE71UPH)MSPRXl)NsVoy;q*Fh_bYs1GQiGv|O zRW&AWmTPP2J12q31yKo}Q%T2kI%Gu3a;-Hb&J;kdM*J!RvI;T9Iy9z`UN$g`$^6Lo z6FuD*w%!uo1-Kk3=;_(4Is5X4-M#(QL#ZEJ{iy6u=FIFT8m~UnQNQ_fQR!!yM~bt5 z;1n6&`MhDdns+nEs~$S?-l|6x1D;bK;O~6BsPHLC$hf38>)f`LODmqgtUB3?)O>FF zin@Tji;n!;^1G!qPX{XBiv0BTFCR@{SF_*T{_@F@eP2AoOBs8mXlUi3#YqXJ65C7v z_Mgt3J6*YM$M@MU=ImPeYurs~e%X_r(vGJaMsjvM8#T{;=j6WbwI^5LpNu}}?fBOZ z|J!u#{l|>C`a^S;7Up&q~cJxOhb^XW>E4=N-ttDqBiatN| zx_8tyucuUS%k<)gSALEApG$Rqzk|e$_z?0-srwRapG{TPnsTUb5S905!B!|yf6S3H zR=BcFH%Weyz}*3xOCr(V#T z=>R+Llrvk|N3+polRME2ZN^nbI3Xr;7~3)9y&=N&mi*g4Mz9yq3iYvqf?B5sbsJAOPm|(eKmkLdhO&)X|tRAJIiSV z*xzN0uoYBul4A?Y$?At1f-=R*lRUnDMX9G7C(1#L%N^mVAv-VvIkHLteupElGy3aH z&=F4z6v}nQ;cGwxJ*$JuF37bkv$5H%9{X9skmrSV$}Q}2pWRS+R6eG{WYGS_>kdS9s9i78vdh38l&l=AUvud{V3Mb+s6>N&D7ndIZ)aQI<1?ecmGm6Wh{&^=dDW7&W9 zBA&Tfl*X__HODh#q#YV!yBXT_JZqUG(>E9sH7|fKM?6S(39EYfP_R-|T4|l&sAXhc zzcT363^9ylyXN|7t@Sd9)R&mTOS)C^aIb1|-Yhp1+nzQ+gmE_2p)4Iv%Dw6#G`*Qx zvk=^T3}5ys1(n9J~v%vC8=@Gs!woP6Tu(C<%lbrWL;A z*ZUbU8C78N+^PEv(Fv8fu?$$$V9SS)IPF;idIdrOv-D&bqY1eA6nQ8t;2zzXm3W($ z$H1iB@SM3ovbc`RwZjRNK9rDMNfOgjKB^j+HpwyA%k8-esy)WKr_Jyk`P<_<91D8k zo^1LHy*}}Kr&A}qQO#iJ0iUpeiz-aA8_O;+t=i2Upcinoryg&+i9LEnB>--LZ=jM51Ba@Q5n=Yx&S*+I2ow`I9A@H@jYB!;eaz}$nxfdm#HMDNUQ zt8Ln!2M^o%I?lJ+(@3O|_X)sK??&X%T7uBW+TCjQ!YlpCQeLb^raziF6nM7oQ(s*# z8mH0;zg15AL3tTth&l*$H6Y^3lqK|%s-^Z&(j?J{fzdhXq4%{@&Q{0q%Al4H1qFl^ zk?r$9tk<>e${bGzng;0^uJjKXij@!wVbf9EqpV3dtK80ifISvO)CTdDnGh%i5nhkJ z<48OQZ5)b1KOoF=pq~r68=?FijiFibk5mv_TrFe)*HC!4WwWY^e+>w+)-c24zxn8g zWgt#5y5lI0+z-zl@;=vkxtVJQyD5*3%ZVcoO;M(RmSO4{I8fUTl1>Vd3e9YD7hLYwzXWeB_LmdBsDsy;sx<4YbGR$fAVO7?THn9G} z9Rua#%#iR4pf1^5Y8Q1f^R;9-DWj9oIEK+E z0hefJXe=w33kKcS#>E#Aqs;DTkAJSZJM~O5(h9Ov{@7gCLU3~q*kB_Fv&wyaNMxgx zhg+ZvG$nv_zW5mmP1vDY4R9YeV%mQMgiGnuH0g(%CC{T9>LI~+weB)iT;U!~if!y4-X zbn^oZjvdXoG3q0)#q*3b!>F|VZa41n+K*?4UFNg*X|>3ik6G8-;B>bqgFjp`gUmNF zMdXC6f9Fmm7ot>dH&@K=gAQpzZcxk~p>P5i%XT5wmH9~yNclm0dJ;nrjg}H;DYGZly?e0?O zdxGGaA$VAgJ6j+Qe(683byn(1*2ikDdSX?*J2S({9^GUf*>Qz}0b^}Ufj=q-CW18d z7;v(F72~xK5%TIxJ9;j_paL*iDwLZY0T(G7lzX8tMq@*G+ejhOzZ`wCnmu2gONWKY zq@0GNJ#UQ(QHX&>o;NoU+Rlr}Cq#HEaL*{0GCl({1H`*6_;H?hklRR``UzKQ8HEEp<^(`4gp*51#(ujhXD&+8%Sp=>Biv z-N({9^1o@^x#Q{DiNCsHr?39BZL|Eboge;pQ$)G!$_s64%$?$yg5|9RthdOQPi&IE zQ0Q3^`_qL_|5@-?az*G<|0|X^ZxiRNV=ubig}pborZV#3UFlxYE9Wz}Qj5NO{t0)k z%KYb_P6wAZnYL+HKCs*}JyMyzx9qvmKd#R{|3&}(yUB>Pjp5qv?dgC1KkeTwI(6-{ z>mT0vW}Z1*qfRtlY`A{5=&j(Uvj;gR-~PtBvhWXM?eBiG^6Sd}$r`Tei_N<_%BxS@ zU9|OPP5Fxj>;CEy{qy<4ThhO;oH(-c;8y_B%l?}*rHs_gyh7%6P4INvWz+?KPuH{O z_OJb_%Jlm3<$0&JWwwu1X^9{5r#hGVE6)E1J@rM|)Q3IN-?x`tUHVK<;OWG7sdWPV z`|DN{lvw9pb5hf5*Y#J`y#DUlt3RG!C%*eJ(io|)|1NRCjTc~``;7I8eS6eBPro+x z*}9iZe_r!{H6dfw^<#(jmU|zHET(&n{{9z3tS?7fk)>$AQXkXpkQaaG{Uc;xJD?7^j3Q?;@5{K^%!^;{ck?qQP<17+Z-J`Sr() zrX9v%Mw00fSAe5VQPd5M3jttA>%+#7Z9<_xrp+D!sU;8y0p4A%5n`G!rjy*B1MMQz zfgYR2Yxe^8mzAVfYLX^60+<3@{as>Ow$V!6k!DB+Nag5f$bMxxNa| z^e!_-G=$O+I2Hsv|KdE|nAqG3rs&^Kyaj%3pu;+&R$mm*_otfUP8@x+Ow?Stumbw= z!~Cfh6+Lx(;%PGsloPLQvZ3PF;-F#$D`#8&Mm6{&3l#x7uzYkRw?0g=1ijkMYqXQA zXc%2anRzZCIwQ}PhnVm)VYkAtnz;fyQ9nuSk~;{!E09v?1f!A0JpCZAxZ*(-fu_=Z zPa_Fns5XFu#hjI?yF%w68+xK@;f(Tku)qYwgh<(ahRy^diHodd-vDyy0_=NZvkbr- z_aeApW&v084qItZs{+wdJ-vXIMd0^LzHYt1oWum!MgGXt<>aqdFuTw~{7$nPa_OU0 zyn2hIIZ^e=>S5k^HSWFUBC8gM7XqPjWPVJXG7t8#`sl@exZ2taZ!-rHJ5^Yrn^ltA z<1mAmA<)!B$$m3z4!0O|L88)2UUKbcnxWee!8oNJrvu2ff)EDADY+?^z>yF@ZIrhz ztD#K1U5!xxW|<`Pm+f517&2UUm`oQRW>59LOR~JPrWsyRS61k*v>MYINgX?x87AIi z=wr}UVX~~Xwv$enE_Z(~4-dtbS6icx!xEfoC_LQfALbaY2S?l`HXxYbFLU9cf3lh! zTK+U(T~9Nm%C5vb*ht}$1M7c&pANQO9RyHyy7tJLShL1Yye2?Qm77s1n0@{{K4f(J?Os0~DsATXOd^q$F&Mq~O(%vCY zq=M~#6AY;m(e5U%!<63-Q~4SMR6B_*trGYnYuHCKhzWU^!1b&T9vgx{4^E=>N!nlI zw9GbTFj5)Y6<6*Ce=Ge(?@$g$9bdPvF~YOC+63VT%8j-R@!DpXBM&2%JpZkmPSRjf z$82K_fSC48u-phdmI1UHeVca*<-|-FI-wykDylPGS{pab# z?DXr`mQg=6t(M*7S&cgYS73aYdxo4gR%em7ia2FZY zaoJ#r$vo;bDQMq1;0ti)pdlDd9M)$1rON_wt|Tcf1z8kE+_Yf`?6{2j9o-Q5Ko;V> z&K;S-pxh_Dq1u^9U6&P-0qPnK+QN1UokK{ zDkmVw861=M>*{>{S!y8I78=Ipv}^)WhF7G!4hSsq)ZETbgM7C1LQ84ds* zRmQ^wFByo_q?+VYEdnw1C4B@qg85D?aU&vO6NOV{i8<|5EOR=`2(eCly~bkcH6mu>FbuOwG2@W8v$iscwDn7}ZG7CkFM(SrjEv zOvCu{z&lE5^6VHO*W?Ni-<~&QnVfeXa;qZdeym=qQ)wNz_xamnd7em!NCWANT(2C! z6WjvXnBzdi$*S^$`+WaoujE5W4;;qthH+e%51AnvccOt58Vnamt~sE!4lzx1n!e`^ zLr%#bgDsB70+|x7dOp^tm1q`~g1&l8uarnV#J}~tLnc&;chhPF* z0BT|JZ?nd&1`FvtocX6nQ=SCk0tq>PTuU{dfvX3xR#B}E#wUr#z4*P-HsX{nLP~tZ zIFv>cggLVgT=o0Xd$BoEp(;i~_~14$a_b1qY)f^E>KF6WlDS6#O%-{YKK9bwEdJu5 zfb}tW`tbK#OZ4-bha+$6oH<8>S8aN6?_TBf3wsc{X>qfFXjBx15Z5$QghS;Q4xK*) zeAWIV@kyD~z_6T(pPM&i6PGXOxQ;}aapZB<`}myXMAntk=?~f(4papvo@l*w`|gfob}IGY#^7HWcRMz3 z$)K)H>Ikyj1=VSa`ot?5_n!49hkX3#-I$x2Cs#;2P5eGd6J1F9tk%eadA6C|nWxuZ zJbqz&z5XZGzv~vIC&l^5rff1SbIgdTGgRzJS+qT|a&^|hm9{_KMN>_qpWCxUuT+_v z{w2GRkZ^dnbivNXAN|vKNB<|`MAeI;mV<*8U#kjdEhA;jiZXw2#PK{q5+VY*!2!Q@aM|(eA z+WF*za@C`^HEmVPj)z#Z-R7EuCgP2(?WId!=!mp&SC0vKL^y>_sXeD|0g>^Xto{w< zKW;vPecoxQksN+$4|?$Dsdock#@2lyzp&?r&D7LyKy$F<3vIH`KzQuUGi)XyapmB7 zMgO;yR@1pt>AR{Jzhv#KSZO)Gti`vuu6ymqVOP(*lA$hdNOR7DFLqR1fxymPrE;mU-VwYZwI82Rwq6@-wpTdR^1)@gh{+XmBQ9|{=Niy zKyz%WgBap$pA|u30G33WqLRl=3(`uMY8d207D28APRxfEWpi@#1-U#)>^eL@*-V#K z_04sfpx1jK)_pXDer8uzz24A(y2IeKQ9WKAi16=fn0XB$)(SyfwV{*2xKs8~i0Bwm9 zixAg>9|36iwHVK0HzNX?@)F*|8FZP>g1TW9VYP6WZB@J`APLmy(`E9MO z{8g`psmB6O7pK{r3BYC}a0~S;J#(_VIpSNK3xsMU6t+O%`mc=xElco$dtmLQc^2Az zle&lBrO@$!q4ORgh1ColJ++g43UF+N)|cT4V}oO1Sj<%G<8NecmiZ&;ErCa$lL=EZ zCcIk|LeW;!>Xd<*UYaY@g5MjSL`q!(%;J%*(yHY3$o{kj;`jMKgJ`eD^|!}HoYZY1 z52F}x;BjObF|i6>MdO-Q@F5&k3(6OZi`uk3GUzk0KX}OjZ>=LX?SmP5IEC;>&}{Va(mS0JBb{-W-0EZ**Lo04 zz*na$PQw!YW+l@?g&J}c(*Zp^JjVb~zT*k_Fo%cDptKq=j>T{GPc@vj1ewDy+GXzi zWhHj0c@*>4-lO|Ov~49Ab$q?9o#Sx-uNS!D&8yYL=AOmSggxpL3WwHycsCw~fGDrQ z(8h734J%=HDiI0DQAwp0!3zzJUtst(Q?JoE$T=A^=1J7`wEH$!#NQsnU-AhJY>gsJ z)o#TKfS?v$9qD)p?<5C--$8sN2qwqki(F$~H6Jr|xTvaBs}^if0UZ-X6$`*OgTthI z5*FYjw{M;4bklz)x6)BrfL1aF9{}LjyuDflz*MDcCVO6LXM4O-!OP7Wgom&j8-|wv zIt{CaTMI!W?A(0p4^myOLRC+vvZJhU)AVIU#6eWve7=5tICbc6L5If(9M#a_1Bz z)&~a8V3#@4g6=%A9XdFAxpg=v?VrZY@stdOb2-O%FAooD+!qGddkS*ZRXW3+g zADtU&0cjtM{PLm%Hg`9<>;P`iNbl;U{-YvKf>~{L-52#GoC0&|Y){~h5f~h+UN4Nl zY;D9bf9=}<_FMIlNfau@Wn>rOL2G69fwb|+-w4}#18ea?u+mIuYtz+IhUge~>k5p8 zR+1TS!@03Al&!c3;LutpN1b1y3iMLfEy8WWgOirNF{WqzvD8qNMPI^n>Op>eT@Z=| z$?s(XA@_{cZRx6HZbn}^UU~`4PA;kA_`D&qz*_KeH)A6I4M@19pJ>El`GPb05+L@U`of9iCJ;8FL zc9)gXXcK10Xp>zMxb#Q^ylQ(mE^&a#)nm~1a4D)Edyz32*mTWnAxnR&MGUB1_6aU$ zRDU9dIv<)bGLnejf~dB#ui*PMQ5Y0Jx@-`*BMux#<@;mZA*UVbG*13gS7a#;7IlCr zIm6MITz8(L^6GHYE8NXof_?`U2p3D-tu?s;_4zvgWDn$Utln!*clabNQpY`mJ4wXV z_KZ>Ug{|$`bMcSV0Aor@ljY2Op~!{Rqmz;v(^}%pfll>KdF6 zSAF3y)E!asSvM^jtkPjG6C75I%Z_RWErtE#UP8S}FJi-x6YNAz11jb;j)H~mGQV8= zsYe6(V&r8~X?U6qba7^J6V-A#Btg_yc!2=9BvCt25JgCNmdAqsO(#GPS}wEu_T~>S zSrUOrxE>5RD->mo5(Q*!jJ0Z$*+*O?hdL##C3k&5WMTfbX-E-J^^B{iiDg=<)^FB| z)GRtGl^X}$9svGyy7H_lI|g0XHXtLZaVc&pWOlq?3niq*dME|FckjVhjWlixv1)oL8ls;$8hf!a(Xm^ z7=OINTixUfde~c@?u$67_564(1Sf4)0PG=P(CaL07-Ac#yZC4#RA=ZpL6G4`l z#>BpiCUPEW_Fu+tAE{<`+d1nB{*afHO{}|J%{oxjL0x_0+3XQnW#qt(Rqe$W+CJX- z^Hk?E|K;U4fLJZ4DQ_kYRcAlmTXD2?LByltf4ap4&uE=;=Ec4Nw}3!c@MZtTWjhnO l9q6uy=&tw|%XSPuju!3MJm0{>$WVl8nhnd^Ir-ei$YIzt?Ut}@3 z7lpVU&%tx+(lt%wtq+sb_rJnaREX(+WFv`UVi0er@AF-aygWg=bSo$3c`h=t>-1M} zuFF^xW~CSVWn6x>bT6Z-pS11b)g*P1`(lWzMfaFs3(q@I-+wI$C_cT+?g?GHSY>z1 z=bViIItr7OYf#6o3{RE8X7pwj*a zkt&es9q9TKEtC{A!4KWhFnOX5eX51p`mSC13|+hm-MNo^$qf+)Lyvy2u?0XcQlaar zyC$+byye$cd4Q%;Kg-s$OQ}3HzsT=JYGNY5#MP%k%X?k?G2!DhMS*XDsW*k6ic&1> z^*~T|JT=(u-g!VDd3j%-cuWnsHUD}m369mqW)ZvGU*f3L(|cmzE|pQTNOrcbSA@9llw&nVh>G zhsmB{4i;L_>`#R)pQ;fbEqv?Q*Uo3?e|zbL&CE)y+F9)t+!^CAD@wzr-jwJ1;(bc5 z80EA#d&2pw5%=D5cibMr*`eq8PKo5_#h_2l@&v*0{DqdbM2A|O*G%DUXbc4HHhO#= z;krnKaD4u&-ygTFaIThp8$vwMchY~9B!Nw&DO=1%+SHdvx4xA&#DzKrY>X< zX~bfz&bTY*O(^x+LbV}Y<_9GF?Ce#Ono#1?&-djvGD$QxsQLz2R`v|3*cM_Q#vUQ8zn{?nnr2q^zb=qe z^3?EzP{(&&ey914;~hPZpixor$Ktu-E5>`q-A1uRR)(SFs>ULQi$#}4l1hw=GxRqM z=?xu}U z_D+WQ@ieBKGd4!a6&HPwQWDV=F{v`xOMIe0x|rg1^d7EzX_c!Wc`qz-?)o-2nw$Qk zsCK=Oy@gA0QgV`MiF(QX619zH@$$`rjE~JKjSo+slHcvr#i6CMuCtY9pi}>m`=gAujCN;lPj61|SgKgMoY1)NYWiyWc=~+pBeMWAzM8_C zI(v=JOJ*M*Zq+oozciD2m~U!qW?7|LmQi+ltg)=I09H`1o1j~gIp)y*X{Y9AO;PR5 zPsshxzvb;b#{rA})%}bi_ z124;8K|==_=~e09HVdaKw#2ubwqDO<^@wJ1XFe418EF5Zv~YiUP~l3}yE`uPrD1wX zdQTm`tg;E(3dWn1jen}m_b?Z7#y%^1w*0m1 zmgA2qKt0{f)eNN;r^}~LT4Uj%wc^uUqc9rwx>z5|46kCf|MK|cRR+C0bwp(O^=aB<>hKA!nSf>b*B)K1sWXYyMJ1?uyZ$FbPu5oE_%qGP zlZum9lF8l4Ca0>&<{wmV9vrGn3nuq+O*cNTQL4{vm91;CFZkKlE2ChPXS8p0VkEvb zH2dZ8_>ueI7JYEjq3EB{Y4aw`x%|(TX=4IoozW+w_NN-BRTzcxh~l-Qq*FJ`GF>;X z%}$~rqH|I<@|yAbkx|AWIU|GEG2RU|@=oR!Y{s@fKbbh0arFD|Xf{vfz@;_JrFje! zne>$3o8Z!4q{Ga9j1G)~&iB%G(^S(9(@xE8%p3H2)Z8=r z=`^+WY&gMTxBpGXyNu8XQ4tG0df&J-To4cFkmhE#A-t1?Y8eHOcQ@ZHbT z%Ty+HCTSJY)^6+Yby;k}uwG~5`^L2LdJC8Ot)S*F!A~%2^qCTUv-{0~J2bel(M&11 z+2*|<4@?KBc;buYtj+iKA?`&Hv@foNqZ^Bhf;f5Yh;Qo)j?V-DN9yazY8g7pr><#Q6 z+XZ_4w3me-B0nc1Q@E*)wzRE>o4{lI7=ZvcPcR#TWEBEDAKSXv!&z+X9h}_dShpKn zSy`OyNCO6L_VC9n0dB7DKGFel ztpE5*gJ(Qhkd@`%5V(sR>wgJls-w@MyP5T2Rp6-(SFAM8Lz_ zK~P9aN=opKu%NIoKN!L96X*_q9Ki4H!}i}Clj?VuucK7*@qJYW-10H({3JKg1baTV+>)&V}xPkruEyn*k+Q%r+(_YZP-p9k& z+ZNd43EO{92D+5Fk4%bkYV+Fqm*g4rrKbEkyePU}b z!Y?c#B+M^tCo04*`B+Sh|B0QQ*d2TOJGLTXPyUoVbo}{qy9p$@1LMnHq zR7CHnh)bvdc6UVXs!0C#Tn%?0_+xil`~P0s39S8}xkCTPxzbAB_K)En-bNlCuK$e! zeMb+thmWI&Ckr?O0jo>0aG5x{+j;o=aO2JNU%OVe_jdBLw^Q}@aAWzWXKAPZMFx9O z8#_s1Nhy8_vB$RjHe#Y8{EvmjB>AQ6Z0&8trNks8#DrM?GvDt2ul@vqP=a`{{6E0+ z-z0!Y{Nw+)0(ki!XR>z(9^?&N1?|wQ20j$!hM;?1djQT8=vCF=1#3QPRCCkBnyVwS`XYw zixRJK%#9TP?5IROKytlIZII;4nZI1rnAQy$BsxC=G0fOSPtag4WHQseQ^Dq=%=*W??t{zn} zH?Ce*F`s;^u1JWGzLVo966t3!__4N{Tg8Qv4y^P}wWhkhbsytTvzeO1@8YCKVcC9HgP%Y)L}3G5vZAE&TP3 z*p0vjs>qZ$7O2!qFaypa(JoG{W4q(qG@IC*SO;c!u-k8LR5_NI&z$j*Ib7_MKA4EUu}}C_mLil`{|-i+SXJoLOjT zsSpo~KXoyma{0zaFyJ_JKiGt3b3G@6aTyy1L5P_=()X*?)gCmP@j2(VgJCz8H3`_E z&xtWhb;XWZZh?EjLlh7s`nFspeSQdQKDfm&H~D>vOw3mvEWT7G%%01$$0~47`KX+(-e-CaesBA= zHZNQoRBm4`W}?mxNl&Y&G|F`4^AxpZIb*>Bn+4|G78}2EW`~7Il?bzyEX}IHhk{W zU}XSIGX#2j-Q7}4dTGfoA=tz!9mkdH=j}e=lh8a*`AyB}6)!?`X|66`6D1og;SX5)j5-^h?ijCifJr`AUE~bQVb! zd8jyuZE#e(gcsF5ns3VAY$bs6@@wKY(zK|N!d%db2u5 z?tV4yTGA=l#8P4KAl7#F;pr?1<88{DEik5ou`?TX4?aR3c;^Hr< zG%9p8V`rPj0Y^HkGB8cQSH{Wo53m@ zt8!$(b_97+i~doEn_RJx;MX_}mEcc~)_>(eiz)kE3&U~}qLLCC^}G+<#qAYF0BF|@ z?mWoEJ0(R49q=-){`H9RvmGP}>IX7=ro5sC_Bp@XZDB~59kb6jg^4;;8#Gm;2S4i5 zuO%XI7S+tvJyN%!^|rq`v&PlddsxuY%FYOFunF1fD>bIxdWn zwF1g+KHlqL$;g`75G#{fY;5R>c2{9il zEyn~_hNcD`%vRdSQX$C#$M7XNKv8^tl$%uVsdO9qt{ljIPvRVCQStfjF=1M!VXjLE zqy25p4`>jqp=i$DmlaN_^bT3j(Qr;iaX;Yas9#Xs6J4bXg|s+YkBx&-qIH6`J@HlA z5QBBK!eA$${B2QiOXYQV2dM|s8+>@)azYD;bK?c}dfY@K80Z!JKS zEc8-2?KjqefJ>Pi+ya#9u5q)Kp?8{4-sM;Gm$h&}+-!cIeGipr-3x`I#OL$WZjmhj z8wl~#A>o2@Wx|CQIpl)h`_)emQlO*uoahm})&>M#(QYb?m=iv_HyEZh4=9R_ zC!0x9{wDWQPnMKa1U<0+hmtST&jJGaj+TZMYIaK*;_W6R;JU zcL{MNszx8rSWyQbMg0MCwFa@d@_>RM-(faiK{IATb#;yfNcw{dVptXRf2`FkXV7*IYu#1hr zJRLfEi+3SK%M;Du+fWegrXd=Sf8VwBoC7DI8Do_V!Av~IQ)2H}FU5dKy3Xyg|M6ch6x^EPOK zLhuHWDDg8-O2|ZYBa#>h0A&ce{lXpnVu#8pW$+9W^{T}P?qoX_M9_m*Bh9pKjGGqW z!WkFuMf~v5L8EG)>9@3Bq8ivLr=ACGbqoG*> zBxzlWA3G%Au0#0fgCtPCVtz(oA+h2VPQm*9zn@lWdv+*NpcJ#}uV^4P^iI6aJ|?`4 z7*T)&Z*i}WNwpxpYs}#J$2UT}q9Dfw;xsN#XjbpoFL~9ScBU;hi;GIaAPs zw5joM{V_BW%K>pjfRqW@ISr{%K~x<8Akb&go!m+FkL}5ogV>Hr5O}3Qaax4gjsHb%C?Hm(01a?3 zmv3jI4f)6KX-6h-1q-(jUjc?yR){b-E4PGWmJMsn{%4YvD!b0 zAVpvzo{}Op6!Iyoos>G^HvuzNJK_A+d3Si`!9tF?*0bFCuej!nMpp4^cA~kN>y=@P zuNCG43eHyl=@(usph9n;y&g-);I%)1UX8OEQYdsKIzj5WAMf7 zUgb1XS8i=0$OQPM};elvZ+TP zeCb)OLV3~42e68!hwdT}#126VaSeXloEY2J$^1G;!~N9~Sts$7f{Ut&o4E#MPrq!i zS%p<;U(TC1eEX_hETVICdPte9`WsXIav^v6qPPby6+wx0Q~-8# zca{7CDM1{7l=I1>?SQnudOTqB;|C&ET`rEZ;TUd?bCr!zJ`Q+G zVt}R!yI~{T9aX~!8uNelTaRK|6*aQyco)pK23Zrq9hMdeMHSBJ* zrY9k&gpzJ5lEW=3HoT=+($ZOVZhXrE%Dnbi6KhdA}{+5-wuP1Fb z8g`_piO6T;Gd%rM59@C>E5B;m#DmW0MHAsSMm4zV~Bz@S)Q#kT41`M zpT~qmc2_&~+Qete5WGRMV?+;-DN?s=`Vx01TDE3U#N-k;?*zI|4s{`xU09hyInWWK zFd6@df4hPYDc|O|mfw6~v#U^9xvfL>o1_2{W* z59gt#?e|y(_^0+Nlx3?~Z3erLZZaqm2*gnG;TQK|4w=`zoP~}(ygLyMZz;VJRFgNy z`*;!{j68MaiC85bmWT)HdZ)v?*q5BDZ^DT;cHh$f>?B43i{-_$uc zJrrcg-~w*=nGnh*h-P5$I_&veXl=GjA^NKN_QKZ!wk;Tf>+xE;u*y?pR09_d-!SEnDV!XOY(t;DU5dHidST@oKQhg4nAXadC z!$WPRk{$hZ87AWwL8dr1kE;QPG$+NZU2f~C`T2r^0Eo2KJ{UEt#kOTZS?LrN04@Ev z3?X{n&{2AQErRWRq_N(eMG-k>Byu$Y4|v&u>1^j^bvI|&nIiGRJA3w)Hj_E|OaZe? zxPm9~^LBSwfnKa+nPayVvd-5F)%68Uh?lNl-JoaRL6{~Nl_-O_4+2tw)+sh z0h5rY+(G$VCLzRI^Fsp-+umdXn*cWlR*iz1BD==m*^a+F&Ca?xOhS&b($OAel?oxc z?h{|jzBe>9Q(cP#9>iv}Pb&SBo}SG;th$u?Q*dkmWb}lOn;1H%CxdU7n2^{Eko)C;AB*vZnskdi*Tg|$V z$ys*sAJluPaKpODI#(-Hb{Lvqr1ohjTiE$~()ba44GVw!EIafXxaD8Jrbahy8%mF-Khh>#-2&bVzI- z7bsf@bLP}*$U<)uFUq;7qRxtdedxSSZGp2#;kT!FA-}+)sz5me{RVmKyyN-Qbd`k7 zbj;`5!5He+ZP(-GBZq1Ku%qqUvt|!+_MLg=DwvO(UApHILB-IVUS*%Y=2Z+*z(Q4P9<76`E~OFKkoY{qgrfz8Pq!z{=C;O z>R+*JIU+0gOjw;PdR%|fgRD2yK}gn#J`Uf@Kpv<}|8Aoe(FLp~V)+F~b|(8fZQ@p7EBhh*5ps%AWO+@?Z=drI5F0;62ro$@brQzw(LK zpHZ>uN|l#Vcy6F~Loc+!!dlG;AWyrGv9U)zQlMaoP+<#pF+}ltsFqqX?|AR*Eu&Y{ zJLY|o-4@&OQjW>!uL%X2q9%U9Yz=tBn57k6=_XI2Vd4G`s9iA|e83&JG!!;k-LJst zpt7j0cgs4o#6G7L+pd8dW3(~Ua_Vj){fQ9bk9eB<+LV95ktw_e$nt6QHpGxJ&7o-C zD%tq1^TbkIFsJ@?z!IPFpkDW(wW&$L6hvZ|7Co511<5MJXrKXc5c{gXj@Yuw2fNqnrJm*4?q-I6aqO_e zO`5P;g`BtN?iIeu)PXIkscO?%R_AsnNCp*m$LAYaFP{1uqvyJyS?(LDi;etN4~zr`oj4>$a+iC4mO%0dVC6viNt& zx})k}2n>WFJX*!Iy3bkz?$#%!IBV+dSqI6X*OI$9&z+ob<+JE-uMJ>dtBoIZO$gue z?D^q63XLY#5QS_X?iT9cg(ojEA4f(#Nmjuc-KfZfGt7S$>&U}(Am6zduNJrsX=YU$ zFTC)A4af59oo1VX_YEe#C}N(8OTd_(ii@hsAv-y{g+j%*#4 zGc(4xw*(@bs@lxVgG)CC8j>GCGy9H#uGwrv1Yow!pT9^!>pw-|%~~ogN%Gd(Cs~45 zjy9{4vvdnZ@+bh2So7~5rUVuH2Sqnd_M|SXb zpP$A2&SlDXBQT7KND+}jFD^dD|%)%sd-J>cWKh=tw7j2gF`w?Hjjg4p?SG zGas63pO_@-oz+T}$G*v@BX9~<)Ffe0Xt;rp(#aMm4dX|fOQ@8FtMTDs;QC%(4n5v4 zko9A*en|23slAFh(@x)$o$Q^f>-0h%W+>p?F?4)P8E&V2$ktX~G}hjR0EBKMv!M0E zmsh$pXW^Ofvj;pY{y4*B!*G8lE=Gw4ZT(E|_r&%NTD7<;UHxlc9LaZofrz8QW>}+N6e-ZZe(g}$ zRE6bAKx^NpCze8M)-*dmMC>UcN#R~O)+c%~k{~hE#iIuYhrFJKdnutBYC8x)%}^-g z#JuUy7vZ>mi-z&`=B70$JY#O#6GDa2)%+}F&YIK24gOTIF`s=*P?&8amTUMq^iJD< zR{Nt;WQ_TwyT13rFnrNeQ&#ZvkE;u<&3EmlPq>x#;3MiXS@1NSnFiLF~0L3**Fa@m@&e)YE>Z3b21T|wF+ z=x%fo4!Dg@!4Ca7k;$P4;9 zuX+`i^W?BuGJ-Z((aOU7YRtjcf^JUihD0RkNJ(OfmfKP`a!)tH^o|aHqM62})&4AI zAul7;{M`L8Jwl@hYS8=0%g46**7M-LRD;UQQZMo4`P?)QlfKw_u-f}@P1K|aTab8! zT3KEh6zEKEucJId$DGwYyp(UNR_6n6VUxTZTc1q5tQ^a^?&)*` z8+uwojW5*dA1wU_zi6S13)Cz`3yy{;WBf2TFSTyuv)MJREbKtxUcF{x3Nlj(cO(Xu?~~<5f18ZC zR{HXt3mf)~#Jm9S1nu5ENMv}BJ!&D$W-xOuq#)%;!9e#6lXj%kuJQ7ZZWfc*;2(Uc zkSo`GZiSMl@G@e-`#6UWC?bA+LvlF0tKLB2PQXf5kI@v$@NF6)4`)=q58ErU>#>J# zbxDpk%-NVMxoJT4(RO!odmbz99#i-01M)Qa;X1`11(@g5KC*jN#S;O4G% z?>UvYy;2u9YqXrOdE&Jjct%>}aOiyxL@4*ijJ0e;H!R%mZ_ z1Hw~KbLPHQIjf*&tJ%Cpm95*71zK3^Uw?dswFcWCC$LokCn}3onQ58u3R9fUHzev) z5JP`6WKBy)Evh$T{lM<{!|??#na5Nea=xMI23$O>K&wQ}LNH_+Di9=0>-b5$UAGuszYC zjADy_TMcr1{VX9cmLpfu#Qdm(>ih6WQ-+Aq3YD|pb4Ukk*p=)Wj%b0FT3S_nSW`nE zcCv;A#G(=S1z3hMhbpY-glwOgGL(~TC+VHh${9XLC;1)s)OPTRUc?dVCcdWb{AJeA zz(-!EltBX)`Z1Xu25a><24#kgm!yFh&YV_d=B%&_tGMd4ZpAbnH27!Nf69IH1c~#~ zL4C)d@X7Wd!+92O%U?BD}*77?&R zhWAdy8*OIm2Pgh{M$`EP%HiQAsN&=f!a}{y=$NAepVBR91}Az&>06H`>Hdwr$|rdX z9YtHXKmWkoU)chqh_ck`ULS-G_(D6gA1A_;LgVZowfF9~2KbpWuNz-VqlHF#f7^#CWh9cRRICr zYmp6&kKWV?F~_Gp^)QFtYf&`;Zc3>6Sy-ianJGx~l*!?NhN#ePR(bOoQdKfo!kGHc zwsJvh zxzEQ;(VQ<(04?YNpSl7ZW~5$Tu3HnA5JM9+rm1(@>K_c6P920lhLLw+Sqchxk990t zwTd`e`2sVqiMoKF@_`_f6+1c#14pi?G4h zcM@#ajo6XrAl)ORMO+^V9pmhd6O@AC_JP&&jU>K`&)4QT(c^uQDIzL-X13=tFx>KM zn1>tX6@ZRHqP2+dpxvwokf-MwcOS+*%Cy0Z5Aj{x)~24ntvS~h6O%|BaKK*)#k?`B zf6C_l=ROR#GJbWzZ1F<@8@7Kt<&213D@(AIirMNG&Fi;Ym1|b%TlFA`DHfyzX`{BS z-2_)ZRDB+ny5rX z$Jabg^UM<>hWDdTS;AI5z;7T034Rc&R0Gz!SGgPFaOkmDgH$+oI=1UJ3`Z!PJ`!uo zva}9+{W)B&AsMp(7sQWuULRRxYYD6WiTlcDPPMa*lSc12bP#5jF_{~Oy%w-$qal5} z^>xka{nk&&?F4&`F#F4jPV~`k2h6e&*@68tL%q`;%(fNA`fY~?dM!9gbhNDiQs@)Z z=oPlKAmmTM4FIu{|cSugUY-qZ+UlUqb0AZ2b@#`g+bzR$1c=%8rj-u6Jmtr8^AbwQg z%pDb(j6&nr*~aT{$_`tN6tptE%GHAn|2o$UQ)m%Hx1QJW8C+28)SPd|9jL(+>RZor zSJ;S71(us-s5kMpG_&tpLJC^i_2aN-3+2dkX8z=dgacAT{(p61mHEuLX->5W^V}$_ zIR8PN;hwbN5pOcs`HvZH8%Uqx6$RhcLymet0Mv^QuW1AQrM|egpF}t#l+5#j&lGUVf&HXlO%kyXeE@XE!N!MtQ_ekqk%rez2!DH; zOuq6pJ=uSAWMYzx3B!l{JI_y5&b}6~o*d9bwflAuYUvY54}p`8u0HbM(}CdDF|MHw zL$S_D1KeNqO&AHZX)_Xsl#01P{QJ(@nt~dK9Hh=mAp5UECjdRZqvjGm0#`wk9>Es% z&;&xzZ+zxES-`*u1~&UAkCW4< zAX16{D&sY;6Sx;t`18>ht-yVrFYym5A6gOs$5-u3gL&;RcopV%uc*McImn?+{@WFX zgT~IB(Xb&?e20q19W*ieGkM9sBuceiM?Lj5m!1(r`c6e{{U(CG z4?@-I?c9|O{lO4Hr(ol$Cn}`cm#<$Y0nXMiBorQVv}Q_lqWoUYkO7)f(k%SAX$*hV zqaeu>kZlT#sDHCLjV)|75(z4%oLoyu8PFeLfMP}_t5``6sb9w=eJ2Oe#G4PF8+-*e zleHzb2HR0NBKv|Qx~qMZqzJab5^gkl5dNibn_IM8LY8DUq!6U3_ z=f&qhx@28>0ra8+QmI*8ufl*8Leywz;ew0u4J3vpSfhpT5k;3lgcZ$8t0uWw5thdf z(FQ!bFu<{$^)V+#(^A7WO7!~;84EuAdQo48wyoCcT7%$oe4Ij1wTkqiAR|sK^mrkl zO>_mHp>=ofcHr)wqjH$?7a>7|4!UgPSL8^^MP;u-6Q|N&cKD8(^x$e=RLUJqhV{uw z5m_Mu$7tS_bc?Y@(Uqg$dmih6xS@NP%TjyH88vz${-f)ISo+@^qW%O_j%AwjlT$RW3a%RAZd@owc=$ ziv>SoZ_yfqf7V}tEfP#AY!POM-v z3^ZVGhOW_MoK#+zn^v?6ATemhLxI+MzD? zm<-m4`Gd={#w}EEkQDRrhcgyDq8xZM6v|&q>}XbB<9Ck5J!~jASMl-)K799meNpt) zeF{8wAE*bfw!rVB;;_*^y-o}Jy)JBiThf19tF|^ji!17$pH&Vw%|HF_4UQAPi1z9; zn}gZPgBKQXx(&7Gu`cBA*?-)pYY*AEcYwc#lFakbi%F5H^eXp1|Bl3+eF#zNq;7)oTh1&g{sKOjKSo zj@#iZ9&+id0+|WpVzZ}qDD(8G!}+{ms|L)MC!^-%Ln$j8$+WibIkNB}Hteg%ds-pa zN46F&QxwPZ;T8`t9wlVksxufPs~yMcVJ5_PpRH0Pwt251cJ}DUuk+fqxnyTThSDt^ zU4!1&{qHwK@X+kfXNxy*Auf80v!1!J^R1yB7d~TjwZU(*kCVgcf}+_aC@$BC44c!_ z_o{U-0(7LwajkjQUmUwiq!{W6TdCR8~3PDS_EV!UH2BjMRK$?7Obq@$K@PoNc0ESxv=jq;P zuV$wY;+TEkhd&lC`Gu$zW z0D6vI|27HhjCFeB5(*qmZ_A|>H{WR9bvs4sc*3bqn`GB}Z3f(eA6xW;GiR;BSPQNn z?xBtOp$cx#P!|eLEbwJPc4d3irTJ&y>&C#TEo5~Jc{sNo0P3|(nZ1Z%5J5yZk6oca zb@Lf;Nn;^G6h z4x-$v>fDPQr@q1$OT6oOeAcw(Q-tlY6f+A<+KOMZL%{ocEQ9p&g!JjIfK)qhO}_pP zs1eR8M5r}Sa8U%k!R9U)hrIk0a}jC1K+q>LjM=+MP>gSITo~SM_(;zjGx4yU%5kV! zcvhr#^9Sxc{<~t9>2Dvh3YhZfd+oc`F^+5@dO45Y1?BJt^<}}upfXBAigHETj zRAj4aY_X-_TCA3630-&#=JWBW2^tlB5`Ze|T=mr%m%CBv;L&;ZaBc3`pUhMC5#5!1 zq5E|7V1IG>dRdkEtFHr=dDoNsvmH=22C{YU}RXOq3ZH5P)Flx;t+Qp9qA`*WdN6)p{j zPm#^1(%60-%utM(#(3(`1XpxCNWMQ*D^`$#7I8S=kLw+vS+;sL(eDpWtV7pN`#rkF zyo)T%CK;LI2Tez+sJ9L>tNpr|A%)f!Azc!6+dR<+pxMQ8B}<;yM!&VGLWsW|mo@IY zWpx&uq}o&^m6bvc3aBY~7IQY;$2a`uy5-FZHrAZj#y;EfNNZqQk+0|W{!r?X%b=>qY&cQmuwC3ZUwOT`M*y&22 zjxzj(=mSk#4iN5mN*oO9OZhRyI0@P7mHWph0sKXtL$CbzBHV&_KL1tDx}Dw9n_{|! z>;EZ+8Si%qL?7>3rB~sne|%Cv2taRS97Ojvcoeq}UpkSdOU$cE@CcEtxM3|UkyG@# zpGv=gs@7)3Z~58TmKz8PavGSaAk%n#EvFv%sFS=QKs&W4wh&q6uo4>W;TCz+O)pdM zd;Y8JCs}l_|8B${LcSx|=~e%A{j4X<%tB8B@L9!ae9k(&f_K(sSWaR#*vGH06m$eb z%fWVv_rLPUKeU!?Jxbk~!hvr;uuBa{{^^bFFPoF}UZGFGCuC`s?%V{0wWqV4!ofD_ z#n^&%+yU3D&v3KE?DMKnJzwrxLb#X~!6m3L@`~=y4W}R2v)K%o%lP>A2FRtt>*AxwYlw*%J%Nc>tJ`j_&X-vmDSK_ zjQq`=w$IYcsLkjjrzaN@1SChLekz{-p5sUF_H6lsJ}789oVWIoCMRRi@AE51K0TFp zz;oD=0RK1V(KNmXk1cm@8dKqw!8v|A94T->9cLmTUvy8xE)P7tCe{-3$k%Fne%^8> zVZH}*{_eX$t5mS@TKX8t$`)iaXk?oTa?5&KGKeo`*be-4#imu#<4BnkTH{6=zO@F@-SsG=tDnL>vZS(o^32%lZ?kTPvDz%IIJX=c?TgRm`n=on zXI7Y9C1(fUFXZhx>t$tbALNJbE7X-VRN#J&!d%9dhnahImMalZ#;s7?(!R1EXw0WG zl^u%Z1;cg4Ji;cwC3IEd&rTWTTFKyaVUF#&Z$@*xI&N~>^Q-#u!c>nl!Fw?g(1*`b z$hJM`|EoSU%^Wq+REEZ^8&PE66AL1DC_PB^iOiCJhUdaBcdT$&7*es#yj}i1Uj6mw z5FM0H#mcat&Mcci>c$=^yfkW6dEXTvqsBG1ZnILh{B{|1^h@rz1p`8hq+3Hjs7@6* z*Js~jTB`F)*tQ;~^&eQIKjcTiiN_bhB&6v4vP&rC89wncKAEdV zE~>5ux)mV@Vz+u5aYGT1l-$i!>n3J3^4)r3=f&S2Kw?<()lmrLvcY6Foo;qwmV-qf z(LL|YSg*PS(i1^i(31I)AlWMr2eHp{#5Q($-X>;tS<25lP=QN|Rq29U_wi=NoxhQ1 zr*7k0-n?y@&4E_)o&8*$c0iFMBNqx1-^KaB&y|3qOQyFkY8A;<-8~d}kiQ@0;?I6(xtVPRK@JIg~nz-uNymb$9yKymtX>cZS-nY3` z`!A@_Pw7e&DuVCWjOB$S)ns~ypuQ!r*0^IHUWl1#Yk>`a2es$;OqPf58IguL)M7ca zi2Liayi+NqVf$HBTuY4^pR>!qUyU;Lyq7tiM564ZXP2wd5l>UrQ&4BzWgCJG$udTq z2VzH&1y+tdE_#?octz_;&sjNtbZ^*U0JxS8idAx%AcV^Hi>h{I4?PZCmZPigpYMPD zK6&Nxz>gu~y7*bFX<&c9yRhM#UU}b-7zu!98R?w~WKrjmzh%)>xS9C4qZUqK{UAE} zJ{ethyxh4BswV3qKBw5Ev8Zv`Jtth9dBp55v1(JI+oO7Hr1n3Mmrv5dn`n2}SZwFvc?ZdL-i$(GPV zEbcR=7B`!;df3{%LTxK?yASvV`M8wGo~*Sv^||?81NOY|Uwxbi)>s;RxBS^ZY%t9? zkOpEJkwE`>cmgV$g**GsF?9jDVdG!08OV)4FJ~&MFF#s!_kw=hmHxHdK-%$3(ZKSB zD94Z9+df@F3_vV5Z*YSmF9*cho`+T1CSzx_{KeH~nvEDBZ%^E3n`e#p8OZHc%e}SZ z(nb9m{~DcN0d^(9Uo821gLMLoQJ=+5Fpt~=jh+!_ulsEZ=r#OW7)oJ@Ci71C?&-uw z3T#qh0WxvDn$>uU&fqF=? zkatB5zMV8KR%W?fi0!h=%l46wD3ES8@)9ZrqBd_I~@_TZ(DNbO{<#W!BEdUP(S@>@&K_sds4zO$79>HTnHH?ZS1 zYn5I{vz|)RC*Ap)(J@AFfr(fLA1@uB>rCfYehcjuPX7((@ALymIg5;c4lXwPJSfu_ zTUuhgJKrLEr%?pim*-|}PRHUKRR$jsGU4`=wR74zr0tZNa^ zE`QQnLZffdv69~p)boYfeN*Km)omNKR(_iUCB@zlzhg5u(p0`STFbg+R_qZwlA)KV z_YNwwUi;As-)B}6h-Msf`>~N`5LzHQMg%Yt$}RF96lCFbGB(>*p}~26Tak5Z_d%!3 zVO-&QWpJ!y^=nbTqpy~!Isu^R0YqvWAb?%b1uT+eX?OOcPHLL-3N+W=+d=F7;QJ{i zQvvc#?&w=XrmUP!)NOIt6B>5NF@Ux|=6BK{=i~9M-8F?x`r&jYVC*3H?DGdrqxa~v zma2=vY0{?0ff{rH2PQ}kq9omdtj71NI@#u?@;s)eL-itf6`KQ(dyy)<9Uo|hHwU*>zuet{W zzyf5hido2Ey`GJ<@^DF;Y28qBUZ>c#6MtX?rlwBp5>`kjRVe$@(UTJRpRaG(a#e>HxclMq%r?8*1YF|3v}N4qOQiuy=*)*14Sd z$nSA$puEwaW)e-3z9R@`x()KMPrjaDrjs%NoEWWSwOVhB_{V;Q4AK7=R2(&IqQ!py z_kf8=C?nVMJ%o50PtgI+bb)PmVn5xO-r{Ao87hr1nuedR^78Il`P22)c>X{0=NcAa zIj{|R`n9Gds{L82alxaS-uH8AJm67g4T*m5>sy)i7F` z&EoyQZoY^W6Ei&4%AE9}xn}9lz)Wi|NQvwStL&dCHei6`>?l9y z#1IllrayiCicP#7NNoQi7Z^bumqS$A;0y!MGjGFp`Jll~z3bginqw}5<*evqEI`h_ zF3V>t`E^eXvhK(Bj#V?>Qx*iUFzm`lvxnNFS2Ty>Ii8mz3M@EWp z0^|3DF>z=pv}6k}_-=;}(p5x_ai!1^pi(`4-G=$0|9kwJ-3xZ(s{l#~23}ERN}p`M zm4}?ab^fbfb{2qCE_w(y@86#+-%^Aq-6{zY-h45SP{!P3j;mwMCfQ&&BzYd~L=>+1 zoAv^j4~W?&L#j~QK5Bo1=tbC@~yFIFmTn&|9|F%X;T3pM3+Q*RNxCG z!rYsI@Wn6)%gfclQ=o!a{-jdJ(GtKu{1yZ~5Gp?1I}w|zkwiFw7!$*mD^oXARc$#E~0l|bptQE#$k0P0A>kPH#w*V|BGekBv5jlY?6v2RyuzH*KKXv zeHHqW*qc!C;elnFN+@9mS)D9N&YFBHPxk1$IvAAZ?S>kQjN3i6J*fE&_1sN$Zzf;RR9b;Uh5lX1bJQV|#&(a+>5xIG`V|Ux~`3?C`P>bm46 zQk?Kd;)6{(%dhmpbGio$G`lkR04oRB{$v{&$u06+20+}AtoM=X2fodTwGu*S|QzuO!bL|DVLc#d6;ZF16`4S~&}2 z%FeuD^Nb5P1yAG~YTH%#%g1f@f3W%azo30}h0(q6MsUW;wsT%!#bZJlmlx=ffQ?k;CoE5KF_HYi| zU!5#a#2Ra5oe&I?>rsZYL=nWwma@D9`r;M;ICfxOW-U;|616FJNR(6kSNBqt<`^mP zE?zE#9IrWzEdugfAfjUHQ3u-4KJ6BSFAF(Bvdk6O$NP2M7^b< zlmKaWi9KH!Xj+==VZ#fo!6@17IE6f6f@PMeXb5{h?(;9skDjFlz&Rp>(Z6A=e;;~> z8_HA`(UlnvH0wpii}0xd$O!v1@2{?hI4%%fZ3I(>L-Ue0`n9v6euA*52Me=~2i62H zuiZ+{@SpY2;I%s3mDd@6Z}VuFJto^5g@Ywjr$4juyR5ka>K4me42=$QjJ@rq@Bf&)^y${-JxT>P5gDT7Fk!YvDv z==b~~ls$2g%TwhrZ+twzHAJ}4ht?|`YjmO4v6>Kq+Qm=Odbez}?X8%KyvM6Hpr;dk zkv)cZCbrETc4)@v*3TI+#7DYaPT*RF^gNQV^g2*}o*SE4fiS_0+Ug`XskCWJ>5;13 zVwEXud@jcen;OUDr9%;+JNUPs52LS6(79k58PJ)KrBT7i5DeAZZ&Tr&nR-d)fX~5j!i%SMrkyWYxJyH`D>fg2#082y_Lj0cCa1(hO zkT(Z9*LGm8^MLctXeLvf^9C%C+ugeK7}EIIsx^!%%&CgxJ4FVVyqlm^Y|zi9SO^@} z!0#AXp5Z~H^+#e^b>;B@j|f!ic&sh*jM(uKs30Y=^=iP*t3tA1&N59$p_019^2rB? zjK6fnp=(&mhED*Nk0Fydm$fb?3R7b-7zf(O3fHU=Nc{@R6$Wt31yjzVH!50)_PH;& z9~DBJqfp@aGk3ZGsn7KI+A!GTjl58|!SQaTAD{Jr#pwmGVNk{^A8SY3NWJ0Fm6r`$ zICsUC&R(tiRaRg@M7xkg5jF_YT`Gxfw#bmE~2=EyPMm{}lH4 zyKCrTQLuyvSS>e;@WPdGeh$?k#0b-|M$Jo1>P(MYw+fMhYEXQIdS2P-QHt3awNfkf zS@cgK{H`=E!78zv49#_gZ0Ndf12+BYoIkM`UzB$3vv99h`bt}1a^U} zKk=(0&>y8vX2maalAOJGf*c!KsQG)&`-)OO!kMwWo$Is^&Ah;w-NCBB5e;Hxc}VM0 z@p9@v0~?EY&}FK3ea?g4f*^kHlfj|6Da54XOAhfn%?ARMQt8@1#X81qA8!gWT1f1R z{z;{;r?+K0++)hR)JRcD_{=SeQCy$>27wY0v%{ex1XXB3`a!D(yAwvhger%UE9{pl z5JR{3oLG55^rEC(_CkEbxBh-PrkI)_C(p%`*ts(h0Kt-Rqrs;=(SzY2T`G2Oo12of z_XDihuEZ*r9*+|-88JNgued7sI7-Ag%!nYGt&oNn5L7&*%$e3?w7+Y1reh$!Peb&~ zwl%E_;Z(N8SZ)>oNjy9!tn}y%KMKI}kXI04&RiJO!$%CX1+={vZ=B($0&iFZD69DX#pz{!tGRBTSpO3nnClp7uUXpf**T%aCK9q<#i>H{YjM^{1{R$J3cb1 z91e%{A6G7}wC&XpQYSE2R<1eg*vz=uTY+_`sZf^eF<_YBMpYYRXMA^uK?u!TV1-PQ z;_#XP2b5D<8bmx^$9fc}mt+L}y?s>$2-wyotbGSmH2pmD6kNQLa|sPb^O_lTgDczU zLHz=GTMe4gtnAj?#RoT4&Em?RU*|ujx=WZ->Z9Ib}1^8XELW>wAwaR{vH!IM~gJ zEg(d=yQ0GHua-T(e!&dNLGG3=^SAKxT9m}>uHSd5*!V%CS_XI1fy*Os3zEC+?4>If zBUyb%R7^4ix{Te zas-89#x-tuH;uQ?HrBUTDy@6Ts~99@9xw{?SgG%yIM@4c#3J3 zoU5fgil;X4CQ&jV!z&#Jos}JRd2CCZ_EZMoDy*XoXTP=Nk^WN#43j3%ot@XVz%U{` z>lN~k$PuMNc#?_PZOd8WnMK@DoMlqCy?e`(Sz-iinc}?(bH15q^FkZFrA_SO@&v2a z1J}j!UjoZBfkBtz|8tL)coBc5Oo+&!gTO9*idSrR(R`4tQqUM`iH34Sz-)x37|n#r`$#hu-masfDSO=h9JM>KmPd5Y#Ox-FUJUx-=~KeFOf1cx8S5K{JK0Q z#jqM_L-sX}Ob)eLTRP~_;X?HzoixAiqSJIP(S2fp>+)~9Xf$bQIZm_DWUmMam@4!4 zGnS4UKQGa$2RsQLXvFMGFEwU+uG!ofCxyE7nB(Z62QCC1BnLqnbl`j%QmQhw*SLng zBy^$2Dh{J!C(aq7#8T_Dw(g*K@3N9PV!#YaD`=L!1By>yvCErie8QcQjhiA}<56;1 z(RFUxCkUyn!}`$th=bf0VX7zcX@B;m?*QD%-Ra4_=O^s^nvh=$ODza?IFcu950A&G z<0E<=90ci$hCv`szq>N{6El$Ii#V7KQpi@HY9iSrnk%j-B1g>Wm8?o_DyM>*Jt`vD z)gTU~aW)4@btvbK!XMZjcj*Msh5id2qjl#PA%@Igg%dqdL(UWL@@SV*-E9Am~`9ReHTL z@*6YIw$HKIS@0h2UPq*x;^?3&P}hS4^9#4re~>B>cBBw@T%QZCT5>7>Nkk64NrE;G z3hTm8@eL8DY?aV|vt!peBwRv0RGPB0r}n%b6F~-#W;Qi0|8L2t{&`}E1o9A35Z2s1 zbmc%CoJ`{s%pTpnba^jzQs~_QAV>|moyvhdJgLilEIS84fE!O)><<;KH=a25T!mHS zCR0%pXHSs6&*ZxNbaCJ@b#va0;1A>aKYwz)Rbug4pILVh=C~Zk|K(dtTh`>rm&SBa zA`mvpXQzmn@O(4~Z(s~Oz^rd>>bnp@bGc@9?b*T9MVmRLHZQ~+K^(`AxPqhv7LO)E zf(`S_?;oOc!~ciXpS>>X3r|dK+7pADrDMoMJ~r2aoCdc4gH?OTbsB?@E`H`WQA>7T zq0&On=4aoQHlyQ+p}9N0;EH2f=mNOD>D66gtKMxte}15SK~r*Pne2k^sTeLR>t_y> zZ3ShC0+bn$9CCIWU6LW;=6@UUeD~Mpe)ZDk9y{o$poKOx&9dtu7M_p`vII|iUp4EJ zK^IK3`_Dr5!2KV(S_7j7#v3`a~GV2oUyS+UZ>%gU8`1R4pqdj1$WVm z&Ts#a10IDOBF;7NR8;gG5@}~&(H%(CkHhHgu01?K=#FpUuf!?h_Xw>cn0{e?ros#y z({^Z(Ed6( zq~9qNmr_#a%vbvh2q)sm3oHn2;bw{X`%2netJW4Sd3HFMuqo=Z~;o# zUYHTn-aW4G+Y0RxA&4K1hV?>jaog-c9h4(ex6r&$+O~BlcpdR`{46v(h0eW~_ieEi z;Y@LRcBTxxA8DaWY#Ru{$GeBixdc-Y*J;wuvhbh5e(m;@0!*yprUn`znw=u@hzJ^8 z*nTnk8CS4)tqY(%I^^jIxFETZ$WEA-h(9etgrKEYfB3gNVDyJ8C6-3k7v6kJKHLAf zxxbB$D&_p%by+;46Li#qP~h#X=j9Gy*LAhpgpEM%M?q&yhym;R#-F&;VbG+?7p>^qzXI;SGE_I!y{&Qg+ zlqUg0^m-MqO8Mb~M)Ush@uBC08qSnfm4os39T(krkvZ25rQ+~Rfu*VVX;mae;3s_b5mMO40BJZg893(3BXB67Fc8vdO9(zuMj`+UcA?gv(`>-eqJTH>-SZ$RMI(gwA+O8N1o_nvP z;7;(Y|6GYuB!zXVQ}#9%J?VY9$T0t)n!bbpU$8#mRbpyP9KL!155)S(?+I}{Z2l1G zMyJT|P)$Op7RiIKE4Lw|QSD&p4A8)8ow#+DR&-sC^!zf3VUPj$m4K~Q^09~jl<4jg7r`1{V;(`SjGTnlbW4)yj$x3VU-5!sA{+(m)0+(#y zvAZf15Zpd_kLA7J_pE*_aIvrmkF5*Tux&ih&j@x}n?5RRmwG$;b}9Au2!yR_ECo{H@gF(|Oi@4J#UIaiqwu7Hj8#O*bJ#S$ou zkYpQqf1v>Hc4)o(O2}qf_X98SkWqu>r7it8G=6lbGZgD#O}_X)qR*ylP$#FWTu{7P zFHtekU~TIM^m}8%AKiw_(bPHGJqa;gwBDUd2ANj~i2?h#GXdi5{j1lgSVBBn#Dft@ zoDjo0IzG9*{jFCZzaTw=J9RirECtr1_yGY3*w*`IEno2x#;nk^3iQJc^&F3`@<{Q@ zPc{A&OAE0v`1GF}pbhoMAdd*GxrrcFGPQBMQ41mRhs4cRrpEC;Z{j&fJe!*0r{BPa zt-(>mxI#N{%?yAsu&9-k*`IE7PbL)a=~ti8~&}BTXbCBr7P~e5Ye?c~TeM zZtovg-xy{(S@4Ex&=leG6Dg$fR5itzC*en8v{QCGn>NCBxVc)4OES97ML6E)3eDq@ zNwog#;iGmJ?UXremr%^P z5{<~qT4O8MA{}x|ZHVtEt zd`U%OFkwAa%Xb&whx?`8oieNHXT8W675Lengfjl74XN7Hmrlol=z^{*yFH7~F)@oT zlmk%=z}Stvv&V*no=FJiSL!6WUHi9=65&#mr4Y!MN6LHVd%TVm&^0qO7tMDSPxpCz zLcQC$=u&SnyZF2L8g zAaR;M8q!0TSFL#}J*jR?>l;__FG%k^{GZhqqY?PF6GyGl$cnwlHT^XY^@(z}rpT_) z3oSKAG4etF03*kfvBx6lfzCuU*?NklmyKso0=hY_(|vKD=G9`nXUVZSZNg$0$P<_F zVuHpfhsT9pOKr3rhr@5ube)X8cz+U(X9O3ul7v~+V$Yl>rGG&}xKb;3RT%XnC(gVNeO3;Pt0!tQe zTR!%YRkYJgo9mvxm{~~RBV*SuQNNOjq377mzn>$mY8^+fI_`&9zw2U>9qeoUat8}v zb}DjobXEzmboU+=16x@mpm^2h;|3 zkpK7`j7p&Fx?20EF>{BSx}nj4g;ii)7B-4%8F8n`9~rE4&w6qQ#5ec8Z5R@aed$wd zeDu>rBZ$Dprt3}aZ0)~V|21MLN8-rayNutg=it8uPL^C?yElHk}tac$HHC_7j5yaMdR{Op%3 zj&eMl#J)DGH-(4=zg!7)zUx;8{aQFJ*nAx+JcoPy_*+o*;Y3hLOUA*c#m}r*inB*p zjB62Syy;+0-(DuNarbqJD|({;`GNPFCW@K7@a!LY+RWC`eoUeqEv5MG>9YZg2SJav z4^f$P`DCAC*tAn`i@ zyX+T|MO@VMJN;hqS>@p~my)d$@h-+u2hUIKO_>!|OA~49izpy=Kf7tCqZ#wgz~(sw z)^UfVv^$pgmK>8k`ZH5^KJ}(YPm-RScB*TjN1gs%Y^Z)>Uzm%wSPMh2$LGUexnOH3 zd}&44@h*pZQZDnH;->WLAB>K#kI`p4T(n7w<@hlLA?23J)Y{^e%`09AkUN44H}L2|xER zH2!zE-|1?3Y`8YY%df~OR)@jAs}FC+Ie)+ExGOOiU0N+2*B9J`+$z(PaHyLX1JLb_ z-?KNc1&uqMVP3An!Sfb;0*P%M-vy^RD#qE|j$N)TxBj7VAQt1oPQ})g!1{=xq;5I(^8HINU85 z*=sEe30bSY+_^jBEzXv@s@)3(*+0O$HQt!qOJYs2NY%=CBrZ{Zc%(1+=k9__tc&Nu z3koN|=X=QY_#KR}Ca*S%fx+6u!-;T4&*DIdpSxPa^~$eiBJ?o7vD{L+Z*d++-B5~w)ny5P4eEfTephrvLjpK!)3{GaCUQ854s zkT=H|O5p^2HO4C z#8k5e?W0PD0@VD@_pq^#%a*OZ^27v5AKTO>YK2e8_>NhtZjiP~Wj0W>X7!4$tM};8 zxSIoD+5X07{o{6y^o#ga633x{BLG{cX(&j~4?UFE%oHkARmE!hzB#>0E)EO;Tl&?r zakQcQX|HemCFQN^z}l&5WlYl-pXQpUteYyMA=DBncNg~9KAat@J09Afk41;xDsaae z2KcHUP>YC<*1y{^%8q9$LNQ2Tjxte`2D9~|lHs7$r=lMUf1V!O|LrH-iU>tI$9e|a@6q`pzLjr~_Z zt~@t1&0E-P5ZDnmDLvF@@VqWFFs~73gQ^xSxD(~@3b?^G)}ffKWAHDjQOG7r)a_dD zOw{&x?*^vrT6XDVo#0|+2|0o^Uybi3sZk3<15JARq}baKDQA~h(xpF3 z&EcUIF2LVDCpVm(G$cA1P8=bX`a_ghFx!eH%W&1n-9cp>)c8L2^_?_TVM40P>!j&T zrsKRqp3=Mc3G=0J>AZF_KW-RZ81VgUw=J;Y| zh65I@IQ-f)@Qws3cZkcdN9BgmLa1$Y#2IZ8GCPw@+>O4%bCE?eoCLzyw&FXuhnBZvo zG7tiCWw0_l^CnomW!*r=F3a5N!5{omw0wE6aB9=Zv-csEd0(CLm?o6#Kmo0B^qWYp zQhU>BpIsrIf{HdYV_=b`{GMEAEb{DZUT-=C-ZlssD-yy`{AV=nQ}>&5{X7NK7$wD- z=q(B?zLl*VqZ&YmtyH)^^;{Z5z_oUEv=6e?@KpKbF%%yAE>e--!INr*rZLgi1wFMs z9W}rwcR_U}f-g?)o@9q)^PYOIM5EJ8ot$WYQ(YWsb|UKSlOW-lE3Anc8U?xX^P_7Y zt~lyam$)X^ybw^0{Iu9j?L%G=z2jGl-V?&_n3ObpScm!@R8OCTUORm%pojDQ^5SAJ zfg%zFmtW+KFrm@gk$tRmQfxF1=}4}&_85V1HB5_+)9|Zxf>LQdjrWBXg28*;er}Zk z)=f3|+ZZCi0Y-^G5zV9M{B`-Om5+UanAQ0AlII*k<1JF@*R3B&IG#@S>80!i@y?8` z&q}(hk;QdapEj}u3f)|9aM?;$~_;BX}>9Pa1nIMV!gOfg%{r%tf zu$I|LvB?{mz+LBjW%si9C~$gG;P;2*Kefa*zvd6)AJ&Ok((_MN#Elp@K2v*z${IAe zvd|fsn`4AfoYakiTps#<`T;IX=fqwyeBR(_8g$&TqI0?@hy@LxtU7Rrs{z7V{7Jso zj2if@Um1TQD7QKjU5lRj0U=rce!_gi%|E%3}q` z4|{5f%D(wy#CFVzz?7Us8xB)rcJvkKD?uB4#f9HjCxVlucboFPW68A>%Gx~=K@2lv zo$cHNQcMG^oA%V9$}h0*8jwviby_RJ?wsVd`)~06G4g#<*?p{Me@P`%BJvKM3)mF} zS%nsx5w{CsQ@8%(^dh=v>zPJxmOsy1Krl5g887a*N?~SVu#_mbb9c?J5=DoaVcQ9# z?_-hGb;6)rDa7^g)!g&2Q2 zz*!4)RWELy>9;`0_f2q0B>2gBoTrWKxx~7Us*JajrsWte$E?n4fd;FlzH_^)vH$KD zLi@en_(BoA0J@`2x#Ko5UvXf&gPo$pY8*}`T!mw@0*nHZ1VsQ#-dOcm7%>j+eV5dZ zF+vA=#cy5A3r`OYqMo^hzD2ptZD)sK=w_q9O+OU~E02FR>CFA+Mg`LAAN|^F_M1P~ zF8)^6Y1dSo3992?=_lWG-j7T~RazDS(DrL4D1s7AwK42aFo!y*J&$2==^8wh! z&=w9>tI&B9m)>8#3WD-Mug&C%LQU>1g=Z(ZF)z^)JomvRhHMuGqRE3Y`YyAj(GF~G zI1Kqoxl>{Yy2u0|8UeCcHG%s3iJfhmrW8(PY^$^OzcnZnz9R3BEz0e87hNuyQPfa> z-{c$5L+N??r9w%@KOtl@Y-;K3#1Q*-NUz%KXntPf6XrxG%PQ<*zk~Q|km;wV;*N#+ z63d#17!R6NZ(Zx?TD4lGNo>Kx~ zJQ<}-ZwOA$BtRYknj_VTHQYMK4z^ zT{NUv)hy81F<0ocmN>+%I0i?)nxw$ZD_;mGNz|D()p&~y_bolQT|ZWvG+5r zZ1bO`6)1d*%8+8lzzcgr;ZCQlF6=B`6*!COkU7x73_?9;?xF;!)8+$lRl%3=sB!8j zQ5Tcuiim5Yyhp6IgX}5R;)DT`+T?K4v0g^OoYE z%81`<@ybZzFYd~pUGt@92-j{sT$*K%*JC>q8K&>3appUn3f}Z5a-zP4Im`rSj;kIj zJ_5iiexc3bp@`F{HdOO8Y)m33me#Bq`&qvEx&YMZIFk>I)|>tAAAO};6MjA&+*Z3Y z6+Y+5l)&nLoL7`TB?s=F0r!rQKF}oWTDY_k(+tO~szh@xPbQkVl*|pgMo46>J*J(o zowc85t_bz9Z5{h0sq7~Ttq<&17P@Fg$*+!40GK3ZTr$sJd%b`2S!Kmm4TgvW4^rw5 zl5r0`%WVGIXIJC)6y%iyoUeQIjJx{0N1Vo-&EUC-1V2Tdh{q{g#5z#yl}ouoA8ogK&no+C6@(gcIIE%-P|Rf$cx zx7SaSxqGFu=}AEP?ItZj+c|yD}`b+*?(Oi9K4`fL}t#v3B{}t!i)Rcnh*y zXD9*)lYTgI%5TNX9*G|`_IVf)*-TN*fxZq9a4AV*HHSKNOfQlCq^zT#QRja!AH;dw zpfSWnKwDXJD=lN~!*7?A-ztA%U)`>sujzZ?et7KV5sDjA;7Sg5KRdQN&jT1zH?mES zFh!nnA=LQ8PiEfm#nZZiK6g48+~QOTN>z*0*9Ey3rLqP4&fb|#y>K0|x;N8MBX2p; zqB@br>-uBAQq93o)VDmf;?tM*x+HKJezB}XVk-)$DyER1d=_fFRrhj3*nQZtdHOi~-@U8CEKn;5*yV>|elJa@ zSY+$`dil=rAp^v)|CPdsW&>1^>WBAcL!7>tNswhYf0d~x?C7`VCD#o_<&g)*QLV`s zd6dX5_EB6ko$HTn;*UCO{zSXqK8~@mbF=#zxwUMC{KkExaF(tkP2XEMgwGzivX2=b zEqCbKKoPpz)Rehn%3mwEbskb|AWviR<<(_$LuuPxbV@od|1{`d2|%NKKU+0NL5)5Al}(_$8=&6z`F zarf!VUO(zDvX=2lQpinYzb-}kcvKhEY!jPS&87}jq*BxpwdG!dz5lH_hCp_VIb{;T^5s{KUa zNbC6vV%?&jv6_m3UtPZv2z~E%6Ify18mg#cT4bnv)6P!^2Qfph<3@=unBd(|sRUh2 z4E4_0J32ZI^H_*0D|2}xG%Lx_C0AHiT*7DnACnJr#SD8pIjq8!F4q=o9$3|Hu9Zz~ zKJEBECgO$P$*&3F4JP19sQ8RDkVy6-E&WD;*UG$dcJgjs7}PVAUi$^St#NX0z*WCO zNXA_6ZxAaZc`8n@TC4=sI+Qtw97ut}gS@1QjZg2d=jeKF;S>5)*k44Bv(;F(txO}{ zt~B-L*O_!NrP!+yo$(*Zx7_Y!H6YEgzlC%ubE0AalzK}TT85f{DXc^Bhk9e;slW~) z$YPV#@bnvv%Z@PxvOF{n`Z4kc?RSihzW1{95|6xL-E`=2F%9#~ky*>QDelN(k6sPy z9kBEXONE8QH2FIS`@{E}D`xDao|`IMs&QIS42Ys5MDQ!le9(;3NeS7n^ZJr;rnLKa z@y(Nl{g3#_+Z+<6usfkRoHB_FT;@%-~ zQcwvG@LC7GU+9aG=daz{TjW_+N_G7={D5gZoG~weie6pOU*?2P6p{AjMyR5nxoLG~ zn^Ir&Ds#+GW~U3fO&O$f>d`Ql6ZmC?PPdYtUmP(OM1b>;Yoj*3A3++lQ}$=lofskN zUc1xDoB!%Hm{;n3T=!oci)(9RR$PWo=>*6p0(nh58eViY~7jL6|j{QnJ_(fFu&I8wS zdr}%zAD42#;?c906II9qy7_M|>8xRg-9gr%gagT0spg(8Qr6?8#c-w?bm6o%BN?tl z2UBJ!VT<<~KbNVy-f@T5ujR7q21;B-r?N1m%bpJWa}$CM=}b)LcOi0`ImqW9y`CwZ zb@asH^9uA;aH}R8^J~{zR6}|0s-DF+{x?sJ^}C(B2+d40dyT}mmo0%@U&VZtxEgN% zo5Jyj%G^bmmc5Zn^-H2+lIB7M;ymEXCL_Gefv%URV)~L+yBLAjfht)AJRQc~*3oxN z%b82RIUs~|vt3px!65;5LVY9*z5?m4ajRB(FKM{!sr*gXN-INIvH5baXBqRgQf~{eC2pH36ax@GTZZlb6lYB>cPB2cDmNBLv_PCUb9K8$VjrmKgEEAc~8i8)%t5 z1}QJ|cC^r8I+2Qj&J6IHhDbC;o!K{Rlm{H1LAsKK#1h?~F?@ZdcgrP2 zfp3n(8y0##&hR)l#>bp&TyDCoZU2>Z6N0}iK*Nl_IH`fq&Cgd$RHZcnmJgi%GTSI` zetjWH2CpX~lfl06hE#6qZDXfoZF2%hjhOi{?gscfBTDkPQJU4AjyeHp zVj;IZNFa{OpQG8%hST2+XEEf3<2kRK!5N>2giT3J(d~>qbJ2Sm*8x^zBuenO-QG_M z_X925+WesbmPD$o3EOWZg4I-$D3Asa~(Cr%&nKKR5PxKvc)x(2T{tA8|cHm-lrzj~^+K%2?(%Me1Ur>{G(gb+?QKaC}^az$`;4 zJ1Z@>X`zo=Pw3}K{zdS8^K2LsbgvcQJ{ovZ4F{hXA-(K=Jr$W?{b91RibK>9E2=4T z2(!%3S71p)-5J=39QLIzTD$`v85I+jkyO2S7nr({DQE|<5rgBlzJV{BEwY6R^3|S9 zXrA7>M)RaqRiYD$P~b*AVF<)8$)+Pug8Oc{?0Buw<0Z>3y%_6K!ZYd~z$mw)xz&}jKtBJrO6 zx*D>1)#~iI7pv3_oa`-};+0eRzh}WG#7L4-dBZ*GJXUw%8_DqK;$OTH^>uIB)$cX4 z5;XzjTrribbZ5vh2}4PaD>YtFo13WonQ;JJiDTNxts~#zWej$xeONnYD@KoBSmPP> z&i9`F6NkX(iav5pKPN-oLv`>Dfn$n#b5T14YPXm*e37xp-6ac9!3Kv~O{FMkaV5CP1uj||*fQqAC zleRM}w$hu^jKO{cdo(lj^s5FQZKcWV8p#RvMrYmDo2rx0ZoQJ|BX)RYwGL>AU(WKe zgC=wME?6uSG&z`cCX5%3TfDh0$a%hca;vZoLt_3lWCebn0iauoF5z>!3~UwQs&3jpLmH&t9Mxlpv~Xy z&3M<;_P0{!Tqz0rm!FumUducfBSi?!_3a}E7jInreOVPAUB|!UR_6n0!a*Y zCC0pLW%rqBvA~;UsQ@b5K zC=d>>>-#>^eO?H(1_83gA_}q`W&*u$yaiU88&H{6VGUL@*ixS;;2IO#mCo z!P{F@YR6QE$A_{t@9(73szOR~W2p`{*_AH+?=98NXJU#T=pmT64#}5*&rC&-2Oh6) z6G)ZS(JBK5LZtJi+Hb+1Ur%QOw48Gt9sF0sTh{3M!(f)Daj{)A5DoQ|?7{K4z^BIU z6;~LK2<6-HTo;gs2-_Eb{32)DC_4X|BClw)v-c&pg zm0UcGI>p1xQ@74s3fyX{;{|K0I#l@WI{DxdERBS3Z=dPzHC#f#8x{b)I7(c9a=tx( zBX>Eq#-Y7EyZs_?GEgorB&Y4O&i5hq%KwPXM|wym0`HQLH1K0h>lPl)1=YR~BYIwY zf_e(SFKD*Oaf$vn32?q0Zq^q7*W&f-7LJd{nTs@}U19nkw(&MeCY*m8OHD|2U)_!u zENuih`!_$AD%>RM$6B))VO``(+Ir!*WD%;U$P0dar3LwA{GDzc=o5iO5pNqbO*#m$ zN<`3`lI9+p$=KE|YQQWGzC(Z#thez}*0>JV+`)t9bBo>{1whtwQZmR9!2rg&Bi1g! zMFi=7?8i+pE|sx@*kgfG|F_W-+ zF*f%1kOEQDjrvca>oPP`WYzi!Sx$cb8#MBo^SfS1F2Rx92W^mIivFJo36F(N*vN zi9=2kTHR=;qwz#!5nzwub=5csr+gq(l&yFs^zZ!2&D!Q}>=P zT3xg-Rhs{N)qqC2y~Y)__}@Bz3( zBXY`VQeAkTv5eU+^*M5w)fF_!TjR`0%)-3D2LJWKsqs~idy>ME6ssy=E{K9AJQkjo z74A&kaRd_Tn{L-rTZRZV!KN~yajQwqmQ%SuZ7A=;C%i!h@ab6 z0PV95APR4W%;%H z=wV%;L7avcRQOxf*iCYjm`R9`fDgs4{zm1`g1=~Hr3=8mmV;*d_nV>E4_C0$&Jny& zj@6X>BMnMh9{EtpP1r+S_zBK#wzh6hpxVpCn%LnnqVLM*KML-A_O6d|v6A~ddb=yF z&s8yTRXcF4nJ2om7lPWyO2qapnY9C5+@3c?G{Ad-*x`57^9fXGqu0Ix2t9S%KeG!i z)L6Nl?>(-1+dQutE)ZUeKU_hFHGn?yaQd_6UGRpDCt*7CIjKs#+8WhHAb9?;eDrH~ z%})t7+o(Hy5DFQ@@vx>z8N{^m5SWs`4_86gNRy8l~~v_?_B_G_iWP5Ydtjy_|iv6x#Aj!ydYhQ&Y* zqIRq72;Z3AX?o=DcMN+E8al%b2mEZ+#7JAx4wettk$B_!xRd}dIP)UQIe>uw&X~{MZYQ4mKvd@!~MP20(Gmr1YVRjjZZi`%5>XAoy4yhsh$H!R>kuUtYd?XQT*}Vq4 zAuDJs>vY8sB~HDef)MYpA30AC1!vvZtC1n=cjw^LoF=f6w1uLB=Y>RWbtEhJIwf*K z#ImWAK7sNwu%h6B4b{Uit4hKu@=UE&nHrwo5Td&F*9UO?JMzh-!L>$Yx;p??f*DTX z{^Z!~3-!Sg$m1jZ67P%Fpx1jfwY|L&T>)K4ior>A6TwCx)Yjl7<_WD2Gj0}>00GRX zI~36zEru2FRev%OKBdi!E;*rwx6$_4SqI2z(a+FOn}h-AFPVmDjIcwU_>}ca?F!K` z*ws@qSdIlzvFeor)a{wluKDhhpg|Xk;0)Y$4?H{eB5$wo8L5oHojZzxLcxSR)+kll zne=@P*Xjsqs4EP2h(`y`ZEjfVE_ZvKFXL6Y@!(_8xgkS=qn*Cv{8-lrS?EoF=_y)X zQIehpFgmS+{44df=AZR%rYpWV2z(PrODot z&`NCc3J0k#k_@4HX?=mV#Y5(Bp^tiskqX{S`n{T-=9hCD)MC~mvRfZDEv+msrrtXt z=x}(fqHcMR|6!U-!L?50c%iY24Q9LeQxbyE<2wDz)jpWprbqu|Cm%fm=0Hq4iLLE! z(|Vd8x2J1)od~+y?VMtj-)<@Pl@XTB;d>w2c1sRcuaO{V#`N%&Q=D3iwC!~RrnB8H z=T91Dh3LrWUupO8brJ|ZzMFChn9O>GOmN;TbA;v&aRrxzecV5wf}iCe0HVSl+n>}C zrv54fCyyW2(io?1H`)*?>3umpGhD6o-ae?E>b7Ujb1f%5kK?UDef4x<)1}$Q&x){?|ybZer{IQb)4)K%-%lk2B`RpNu{iV*7cg} zL#+qL)S8^fUG>xebCZ?!)%V;VdCwSs+`(Ibf(AG)7EDvOY}5>xF$K;717OPTT1=Yz zs{1p-s{3=vA2)Gi%>8WH;c8hg%wrj}+;D5BQ_7p_Y0 zpweQY7l~f!f{IGh07{eIK?orct_2Y=RFxtE5s@k)y;(t!7Mhd*7LY&)sG$XtyglK& zKi~V_{7KH9Ia_9DXJ>b2b_D|#Ol^Iho0v2U0cYQOHw*S!u6jg4!~V913GX!(Ib0t) zH&`dG;Tkk*IvI%q26J96M6T6=lD>Y{?hFg|(xIYYJ%&qHnAW~6?Cx|4)~}0{fFsx| zMumP-ixZ|VM1h)AZh^`0Y5JiA_THFRTo%h66IR3YVQv^WrWd?6Tz(9p)0IwS{jGi? zJ5u8nAo!ouE9{UM4XxX(!%_k4wE%Gyto+&d63WM>&-3a6Q%T3fcqp4+)X@U zK*#VmsM<6x8-62>_)&TBkGy~Z;8}w0j44^qR4%fAf8i@&qv|4)@_?X!%Dhbx0%t?o zbP+eo2*#`V$nICyxi?sd0pPs@R(T6hMLuFxJQvxm@w}Y=w#U52QHDtHvpn{Oq(BM}`tNU4|v#4i~*_Rz!cfpX`)nSj7CEMp~6hH(q&S2u)osOd*D!zEA3( z<^Ny@g~o+jLxQsYE%e_R#Pad!MDI5vqczFR0S#aQHnz_hhmh`$3)S_XZjH~Udcd}eifLeW+k zm`G#wK5r3&si32+Mk73H&##cyUV}Xw;_!^wO%uv~2zbLPkOd9aoJ7d;))7nP$wV=- z9UNo<$s3HlT#L6QpSw<7D0!2heGynL)vw%953Zwsh!O;cAZL)x>pkxQb+4i4iI*ld z#O0cf0!LI&#RJ23iy;!25P=5>-Q=Qr9IZXY#N3uYWu_!~V)N|i-w8lBdx2>N28_2@>6i zl$>DA+j$ZpA6KPFs=YybZCI$vJa_)~-Elil7e$VK{3_-og?&mW6S$T;sOKAc<>73@ z7Yq(sI;nIy$fTwAAt6!Y`5DqHIkFcB7NeW^iXTdpWIYaZQQ)Xl|DZQ63r=~Tf2cBa zOCmpXQiHT$YaVQC1~xSHR!B&2oKd+|nN3{j>AXDLf`n?I%QqU6&I_{~mka-MHlxIX z%eA0i>J@=7W3{Kk`>k5WcDo8I-RPKR#C2^x9OrJoq8EuyO=Fc#->#T#jE=#RE6YU=oleE-B;e*BNwF%*7yT3 zo9Dv!NQM?q{o2#JpQF-*jr`LNE{pq_V%<_kH^E+e zq?kbaQ6_YNd>8*-Y+MuJwGH}mjeJ>jw9|mjKdY$m)e_fqspfCS$WH6PLs&SF9Ey6U zXv}70(d#nD*GbRXZb)lHqGl;&zvc@P8o;KPrWx-|I{#D(2pKftTYWlN%?jxX+so`b zyss=Jdijw>6-S1z36G_);%y5siKfG7W1RXw#(gO#C)H?`vN7pUMJZQUDOo1%+$jN5 zUHgZ$g=W=xsiA(Rhk7IMv+Zd-kY>9@P!!Q8k3O)=^9+4zy~x|XY_zxXlErX!n8{9u z827hoHR#r|h4s@uH*PtbM306QvB=}GxWcf;=`+s*OD;!lN>G}JTa0*CK{K$D>jo|& zGnHV4laEzQAd49{03Y|7nnATo5*5Ma7fzgnOtqD#MrvMSJ}*i!S@muWgSw{26^NuB zr*s=%A`%`8c&`^bz%@jayWH+Id4|aeO*h3y+R%kUTw-D7V&M%fmsTnk_deTEJoI?% z90-VNnqGYP_6YWP#W!Zj=gBhce<~xVNno&CNI(1ux4x64KIRBiym1K=0l~ZVZ3Qt0B8pARMtsmyyT&2*Xz^md3y)&~p<~g2wjDM4?yA(F*k=`5Sn?rx2QjLP;3KW;= zY9v%_7&SE^%cfY;#4&4ab2_`UFV^n5lYb6N=4Gd)nzcleB{Khjnx%j2YE{@G4i|7uFu0e* z!8P&Md(yA4mdt=&U>%_YBkU48@A&B32VqGT;vYP?^E~EZL6i1a_WRAcOd{2W4s5$K z)EjJ^V}|C!QzZ0HER1qh=+)w;Riytzy~iRPL%_EtVxQfwgZymh&D%d9==CAh6iMtQ z2jIp0Y1z6V9po}aT9HTw-b%`ccS15(dBKKd>4YM714j(sXR%j>4}vb^!C7os5VVFi+hdSwCgS48pEA1t)#aDHNI`qTq_~aRy5oYy7Q`1 zh~)jdK zRrN9wee7iY@*hR^x=b$UV@d6WNVhUNO^~v-gTW08P?W}Jo?oTBB)(3fm|Diud#OMt z0qmh@)9E&PmD0tJ1|`DH_xhxmTAdX#Doc6VNi>twJ_59xM;BLWYMB0~_*o`*Dg3Z7 zg?6|Koi3JV&Tvs?UXTXg=4D<}0_84)@J&jS8%*-Qjp%$Fdh5Chbsv}{0BZ@_a8!Yd zl-Y{}H>3Czu`!)wYn1&>w(6x;8x)ow?NV$81gr`}{B?_1- zd58D%?e=}E#*iLKwKeswHVd`|BmglkLLBC(mCw}fv7atWe@L2*_RB=|h%=r(0rCz6 z0^Pn<9hgyE)R%f*Lo|yi=@Y?@2`$s)=5$-`EuWLVCaxoC`aM!|HkI+ z=Cm)}DDU&iKIMwq5EuHC6dGec0pD%{K_5F6ss5?~w(jSFNEBJI4`O*gWXIFz35pAJ+K8{bfq6wY=Ir0*iM&OcnQtY9?PcS4kO9;iM{ zy_?`B*{i%iBs06m*siWeB0?U4AVcGnM;93R=2)9AiQ=znHkE5?akfj-oJA?VLXmlC zrFMQ=$4>*rE+e(lKzGvqL0q7XJoH1VC#Srhsaqvt4)lR|72Z?BJ}EXPKntdoZc$BI zk&1ABU37Qisc*W)wy0ErSw-OAYVyJ6%;`&~4CNcZSZmU)JAY&n#w^ z@L-(!3xld~8KfT7@g;%XwX-Y+8fp z^OR}Y0KandwG6E7&Llw$hviWcX5K2H^U}+o2toP9wjr;)MU2O0%G08M-wN5}30ygs zGTX3TsCDzDg!80~=lPtfh??RrFASWNzBPcwG@=^xo!2`_lvT?O{jPMU@I~p+&M;hq z32v+=Jxa%?^*Pg!-8^>2Ds0>-y>|V5XCL?PYn1LCtgJoGlXWp~W)Ur@(RADl5MZYf zP~2-U4WhC;OjGLJ8&tW&LjA+pX=-FdGn#1+-_`tz6SGREn*!I(z`#@Z7*=OfAOS^9Dm1K;F}#Wq(ttNJrz zv#FWqdA`;X1hXdygq*Pwktil|^zNH~WU%J6?{g7YMFC+G-_U5y`bugY7)V z_RC0nFg?DK9{O>cXSY)LDbcTQ6YIpaOhrf9_U6?Y$M$;Xz-acE1H1qFrET|713h{@?8zf|FBI;4G4i&I&FXs+BWKh9t2 zYepd5*l;VoN+=yVNR;9{Y&S#%BuD=TNy-Sp z0S`(4K5UF^(GIn?$BxU{kjeQL)w=>tOo0Kv^zR?xwQIbsdl;O4!RIbi@wA5h``}x{ zgYpd73sxyG@O;c!w-C!_@MnVQ6^0mk-!V3Yr&SS1e*k!CU&eJVXE~s@0zlo@Ooo3! zmq&>m&w=cWz#I-hpkPqy3{;X(mI8zl3?~j5E`MUT@u18?e4jXRlD2ouobTDhorWH` z(RXek*+(;^z;`Ode=(9f1R)EcHo*{6SzF1|D$C%7AMi^;5GK!C4$G+&Nx*g zaCYzCA|=n45|7PbAt-oO3Py)w4*viqeBhq|gTSr$GRRH>%{ME@d2S4w8aT${1;=q+ z72_m8&6$`v5q8WD=vYcLhr+Gi$GVwFa5UBF{Kp)WrBShqW{^r!Srh|E830J%VVw;& zG8L*Y;OeI!IcbgbNH?}y{?1LQmeV*6!KR2c&r_fZ_P1|z5e|yu3y*cmpcy27x6Gct zRXUuM50V}j_WE;hu20wPWb*H~fEoqR({!-=4!}`c1l=<%kEl?tpXtYKp?ztZ?I<_n zYTd-G(2if|sZ0dEbLf-o?Xj{-hwe-~AyvFvolsOb!oGIWvPkhzej4vNOY$zIV?UC4 ztu!M8`=9!pFjsZU8+7kK_T^oo>a~1goorXvXgtPX%&Nt^N8`C~S8&en#_`o)-0`Jp zYEp1m&PF)8N2+Bqf;R711oPzCorTmdZO0((5@13Hmkv_s?2QA*pzCVCyhDL(z?)k% zZLECU1tm|*5h1y91Eq#jo(dhD$)S&>F-C|8IGVKymP=f4`GkAWJ`I4LrZ5}?Yclm=N4Kc zo9i>U@!vD&_JH>WX^}r)IPyc12ctOL5;+}Sx8J|hbsOaQH6R}zS*SCglt(w`*{*z$ zS^c7ODO?D?%;8d1#3HT`w0?OA=AU{mQd2k}#@~d;_VAdQy}J>#NM1#tg3#Y{H2?-a z(Y$FT%WBgkTNLt%8@~diG?bf9Yc~jY1DVvwj+MaG4S82R?j3&W03W0$>-6$CNa_7E zIH(+52QmupyAcZ$I`@mUe^W^c`${1nTGFom2LZLRDudMwr#bwu_~jbg8J5|J8{<~Z-6DLwEWI#b{VDWiV7X((9t8t%|u0ZJf_e|0`1 z1KYgDOTbX!{@ZqW4(q@0W9RHD7@^yc^{E#Tfo9lohAXV;}J$p+{n5xhFk@+`*WtxQiRl{w!Q4{fpB6vICIy?4_c@jnlNB zno743tse`xWztP1_N`mFK896=fe+2&ox~j4ft#_DyP*$X-nTcl>&Yso!ff!%W=7J_ zkw!TTJ-A;=5HXr}kxNnn4MR;AI4-+dHx5FE8q-R1I4>=FvMvio`1jQtOz{!2I{uzUEs zvi%{Uh`?{8b~mf+6d=}ns+t3C+9^eheIS0Qjd=ue&LWAq%m2U_&1d05WM^&?g5!sF zJoLYy2>P$B+W6Mpp(ogRSuyYvEe!R_P*AP;r$1s`%vp8)3t*S@SxFOtdwr7K z;RL!F^V>;VZS40jz3p9#2}^XO{GYBRe+0OgAm#IyCgT^dLIRl?S)D37=^XPvD}hv9 diff --git a/dist/public/uploads/.gitkeep b/dist/public/uploads/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/dist/src/builtin/ml.js b/dist/src/builtin/ml.js index 76ca80ed5..ab06075e2 100644 --- a/dist/src/builtin/ml.js +++ b/dist/src/builtin/ml.js @@ -124,6 +124,10 @@ function init() { return; } let host_name = config.host_name; + if (!host_name) { + (0, ml_1.mlBotResponse)('no host_name!', message); + return; + } if (!host_name.startsWith('http')) { host_name = `https://${host_name}`; } @@ -150,6 +154,7 @@ function init() { (0, ml_1.mlBotResponse)('failed to process message', message); return; } + console.log('ML req sent!', j.body); exports.CALLBACKS[process_id] = function (msg) { const embed = new Sphinx.MessageEmbed() .setAuthor(exports.ML_BOTNAME) diff --git a/dist/src/builtin/ml.js.map b/dist/src/builtin/ml.js.map index 2bf73cee2..cb6350442 100644 --- a/dist/src/builtin/ml.js.map +++ b/dist/src/builtin/ml.js.map @@ -1 +1 @@ -{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ml.js","sourceRoot":"","sources":["../../../src/builtin/ml.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/ml.ts b/src/builtin/ml.ts index 777ed1f35..497f45df5 100644 --- a/src/builtin/ml.ts +++ b/src/builtin/ml.ts @@ -153,6 +153,10 @@ export function init() { } let host_name = config.host_name + if (!host_name) { + mlBotResponse('no host_name!', message) + return + } if (!host_name.startsWith('http')) { host_name = `https://${host_name}` } @@ -182,6 +186,7 @@ export function init() { return } + console.log('ML req sent!', j.body) CALLBACKS[process_id] = function (msg: string) { const embed = new Sphinx.MessageEmbed() .setAuthor(ML_BOTNAME)