From 4f3e73c407c949461ac101e2f79caaf670d76818 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Wed, 16 Dec 2020 12:37:18 -0800 Subject: [PATCH] accountings --- dist/src/controllers/queries.js | 7 ++++++- dist/src/controllers/queries.js.map | 2 +- dist/src/utils/json.js | 2 ++ dist/src/utils/json.js.map | 2 +- dist/src/utils/wallet.js | 4 ++-- dist/src/utils/wallet.js.map | 2 +- src/controllers/queries.ts | 7 ++++++- src/utils/json.ts | 3 +++ src/utils/wallet.ts | 4 ++-- 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dist/src/controllers/queries.js b/dist/src/controllers/queries.js index 0628bf6..87c57e8 100644 --- a/dist/src/controllers/queries.js +++ b/dist/src/controllers/queries.js @@ -16,13 +16,18 @@ const constants_1 = require("../constants"); const short = require("short-uuid"); const lightning = require("../utils/lightning"); const wallet_1 = require("../utils/wallet"); +const jsonUtils = require("../utils/json"); let queries = {}; const hub_pubkey = '023d70f2f76d283c6c4e58109ee3a2816eb9d8feb40b23d62469060a2b2867b77f'; function listUTXOs(req, res) { return __awaiter(this, void 0, void 0, function* () { try { const utxos = yield wallet_1.listUnspent(); - res_1.success(res, utxos); + const accountings = yield models_1.models.Accounting.findAll(); + res_1.success(res, { + utxos, + accountings: accountings.map(acc => jsonUtils.accountingToJson(acc)) + }); } catch (e) { res_1.failure(res, e); diff --git a/dist/src/controllers/queries.js.map b/dist/src/controllers/queries.js.map index e3e86b8..153b591 100644 --- a/dist/src/controllers/queries.js.map +++ b/dist/src/controllers/queries.js.map @@ -1 +1 @@ -{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAA+C;AAC/C,sCAAkC;AAClC,sCAAqC;AACrC,4CAAoC;AACpC,oCAAmC;AACnC,gDAA+C;AAC/C,4CAA2C;AAC3C,2CAA0C;AAU1C,IAAI,OAAO,GAA2B,EAAE,CAAA;AAExC,MAAM,UAAU,GAAG,oEAAoE,CAAA;AAEvF,SAAsB,SAAS,CAAC,GAAG,EAAE,GAAG;;QACtC,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,oBAAW,EAAE,CAAA;YACjC,MAAM,WAAW,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;YACrD,aAAO,CAAC,GAAG,EAAE;gBACX,KAAK;gBACL,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAA,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;aACpE,CAAC,CAAA;SACH;QAAC,OAAM,CAAC,EAAE;YACT,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAXD,8BAWC;AAED,SAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG;;QAChD,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QACxE,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;QAE1B,MAAM,KAAK,GAAS;YAClB,IAAI,EAAC,iBAAiB;YACtB,IAAI;YACJ,GAAG;SACJ,CAAA;QAEF,MAAM,IAAI,GAAG;YACZ,GAAG,EAAE,mBAAS,CAAC,cAAc;YAC7B,IAAI,EAAE,UAAU;YAChB,IAAI,EAAe;gBAClB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,KAAK;gBACnC,OAAO,EAAE;oBACJ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;iBAClC;gBACD,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE;aACpC;SACD,CAAA;QACD,IAAI;YACH,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;SAC/B;QAAC,OAAO,CAAC,EAAE;YACX,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YACf,OAAM;SACN;QAED,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,IAAI,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,IAAI,EAAE,EAAE;gBACZ,aAAa,CAAC,QAAQ,CAAC,CAAA;gBACvB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;gBACpB,aAAO,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAA;gBACpC,OAAM;aACN;YACD,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;gBAClB,aAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;gBAClC,aAAa,CAAC,QAAQ,CAAC,CAAA;gBACvB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;gBACpB,OAAM;aACN;YACD,CAAC,EAAE,CAAA;QACJ,CAAC,EAAE,IAAI,CAAC,CAAA;IACT,CAAC;CAAA;AA9CD,kDA8CC;AAEY,QAAA,YAAY,GAAG,CAAO,OAAO,EAAE,EAAE;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAA;IACtC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAA;IACzC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAA;IACnC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAExE,IAAG,CAAC,cAAc,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE;QACxC,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;KAC5C;IACD,IAAI,CAAO,CAAA;IACX,IAAI;QACF,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;KACxB;IAAC,OAAM,CAAC,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAC,CAAC,CAAC,CAAA;QACvC,OAAM;KACP;IACD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAA;IACnC,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,QAAQ,CAAC,CAAC,IAAI,EAAE;QACd,KAAK,iBAAiB;YACpB,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;YACrE,MAAM,GAAG,GAAG;gBACV,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,MAAM,EAAE,cAAc;gBACtB,cAAc,EAAE,IAAI;gBACpB,MAAM,EAAE,CAAC;gBACT,SAAS,EAAE,CAAC,CAAC,GAAG;gBAChB,MAAM,EAAC,mBAAS,CAAC,QAAQ,CAAC,OAAO;gBACjC,KAAK,EAAC,EAAE;aACT,CAAA;YACD,MAAM,eAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,GAAG,IAAI,CAAA;KAChB;IACD,MAAM,GAAG,GAAS;QAChB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM;KACP,CAAA;IACD,MAAM,IAAI,GAAG;QACb,GAAG,EAAE,mBAAS,CAAC,cAAc;QAC7B,IAAI,EAAE,cAAc;QACpB,IAAI,EAAe;YAClB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;YAC5C,OAAO,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;aAChC;YACD,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE;SACpC;KACD,CAAA;IACD,IAAI;QACH,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;KAC/B;IAAC,OAAO,CAAC,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;QAC5C,OAAM;KACN;AACF,CAAC,CAAA,CAAA;AAEY,QAAA,oBAAoB,GAAG,CAAO,OAAO,EAAE,EAAE;IACpD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAA;IACtC,4CAA4C;IAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAA;IACnC,IAAI;QACF,MAAM,CAAC,GAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACnC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KACpB;IAAC,OAAM,CAAC,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAC,CAAC,CAAC,CAAA;KAChD;AACH,CAAC,CAAA,CAAA"} \ No newline at end of file diff --git a/dist/src/utils/json.js b/dist/src/utils/json.js index 43477b7..c6edad9 100644 --- a/dist/src/utils/json.js +++ b/dist/src/utils/json.js @@ -36,6 +36,8 @@ const inviteToJson = (invite) => case_1.toSnake(invite.dataValues || invite); exports.inviteToJson = inviteToJson; const botToJson = (bot) => case_1.toSnake(bot.dataValues || bot); exports.botToJson = botToJson; +const accountingToJson = (acc) => case_1.toSnake(acc.dataValues || acc); +exports.accountingToJson = accountingToJson; const jsonToContact = (json) => case_1.toCamel(json); exports.jsonToContact = jsonToContact; function subscriptionToJson(subscription, chat) { diff --git a/dist/src/utils/json.js.map b/dist/src/utils/json.js.map index e8b15a2..ba820bf 100644 --- a/dist/src/utils/json.js.map +++ b/dist/src/utils/json.js.map @@ -1 +1 @@ -{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/utils/json.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/utils/json.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/wallet.js b/dist/src/utils/wallet.js index 1046c9e..bcf9059 100644 --- a/dist/src/utils/wallet.js +++ b/dist/src/utils/wallet.js @@ -38,11 +38,11 @@ exports.listUnspent = () => { try { const opts = { min_confs: 1, max_confs: 100 }; walletkit.listUnspent(opts, function (err, res) { - if (err) { + if (err || !(res && res.utxos)) { reject(err); } else { - resolve(res); + resolve(res.utxos); } }); } diff --git a/dist/src/utils/wallet.js.map b/dist/src/utils/wallet.js.map index 8202b95..fa5a025 100644 --- a/dist/src/utils/wallet.js.map +++ b/dist/src/utils/wallet.js.map @@ -1 +1 @@ -{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../src/utils/wallet.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,6BAA4B;AAC5B,2CAA6C;AAC7C,qCAAmC;AAEnC,MAAM,MAAM,GAAG,mBAAU,EAAE,CAAA;AAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,WAAW,CAAA;AAE3C,IAAI,YAAY,CAAA;AAEH,QAAA,aAAa,GAAG,GAAG,EAAE;IAChC,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAA;KACpB;SAAM;QACL,IAAI;YACF,IAAI,WAAW,GAAG,2BAAe,EAAE,CAAA;YACnC,IAAI,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACzD,IAAI,SAAS,GAAQ,eAAe,CAAC,SAAS,CAAA;YAC9C,YAAY,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACpF,OAAO,YAAY,CAAA;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACR;KACF;AACH,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,SAAS,GAAG,MAAM,qBAAa,EAAE,CAAA;QACrC,IAAI;YACF,MAAM,IAAI,GAAG,EAAC,SAAS,EAAC,CAAC,EAAC,SAAS,EAAC,GAAG,EAAC,CAAA;YACxC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,UAAS,GAAG,EAAE,GAAG;gBAC3C,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAA;iBACZ;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;SACH;QAAC,OAAM,CAAC,EAAE;YACT,MAAM,CAAC,CAAC,CAAC,CAAA;SACV;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../src/utils/wallet.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,6BAA4B;AAC5B,2CAA6C;AAC7C,qCAAmC;AAEnC,MAAM,MAAM,GAAG,mBAAU,EAAE,CAAA;AAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,WAAW,CAAA;AAE3C,IAAI,YAAY,CAAA;AAEH,QAAA,aAAa,GAAG,GAAG,EAAE;IAChC,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAA;KACpB;SAAM;QACL,IAAI;YACF,IAAI,WAAW,GAAG,2BAAe,EAAE,CAAA;YACnC,IAAI,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACzD,IAAI,SAAS,GAAQ,eAAe,CAAC,SAAS,CAAA;YAC9C,YAAY,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACpF,OAAO,YAAY,CAAA;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACR;KACF;AACH,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,SAAS,GAAG,MAAM,qBAAa,EAAE,CAAA;QACrC,IAAI;YACF,MAAM,IAAI,GAAG,EAAC,SAAS,EAAC,CAAC,EAAC,SAAS,EAAC,GAAG,EAAC,CAAA;YACxC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,UAAS,GAAG,EAAE,GAAG;gBAC3C,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAAE,GAAG,CAAC,KAAK,CAAC,EAAE;oBAC5B,MAAM,CAAC,GAAG,CAAC,CAAA;iBACZ;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;iBACnB;YACH,CAAC,CAAC,CAAA;SACH;QAAC,OAAM,CAAC,EAAE;YACT,MAAM,CAAC,CAAC,CAAC,CAAA;SACV;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAA"} \ No newline at end of file diff --git a/src/controllers/queries.ts b/src/controllers/queries.ts index c93825f..43355a6 100644 --- a/src/controllers/queries.ts +++ b/src/controllers/queries.ts @@ -5,6 +5,7 @@ import constants from '../constants' import * as short from 'short-uuid' import * as lightning from '../utils/lightning' import {listUnspent} from '../utils/wallet' +import * as jsonUtils from '../utils/json' type QueryType = 'onchain_address' export interface Query { @@ -21,7 +22,11 @@ const hub_pubkey = '023d70f2f76d283c6c4e58109ee3a2816eb9d8feb40b23d62469060a2b28 export async function listUTXOs(req, res) { try { const utxos = await listUnspent() - success(res, utxos) + const accountings = await models.Accounting.findAll() + success(res, { + utxos, + accountings: accountings.map(acc=> jsonUtils.accountingToJson(acc)) + }) } catch(e) { failure(res, e) } diff --git a/src/utils/json.ts b/src/utils/json.ts index c7d0983..ffbdf8d 100644 --- a/src/utils/json.ts +++ b/src/utils/json.ts @@ -42,6 +42,8 @@ const inviteToJson = (invite) => toSnake(invite.dataValues || invite) const botToJson = (bot) => toSnake(bot.dataValues || bot) +const accountingToJson = (acc) => toSnake(acc.dataValues || acc) + const jsonToContact = (json) => toCamel(json) function subscriptionToJson(subscription, chat) { @@ -63,4 +65,5 @@ export { chatToJson, subscriptionToJson, botToJson, + accountingToJson } diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts index 7f266b0..7a5e7e3 100644 --- a/src/utils/wallet.ts +++ b/src/utils/wallet.ts @@ -31,10 +31,10 @@ export const listUnspent = () => { try { const opts = {min_confs:1,max_confs:100} walletkit.listUnspent(opts, function(err, res){ - if (err) { + if (err || !(res&&res.utxos)) { reject(err) } else { - resolve(res) + resolve(res.utxos) } }) } catch(e) {