diff --git a/dist/src/constants.js b/dist/src/constants.js index eabef91..30db15d 100644 --- a/dist/src/constants.js +++ b/dist/src/constants.js @@ -56,7 +56,8 @@ const constants = { "bot_cmd": 24, "bot_res": 25, "heartbeat": 26, - "heartbeat_confirmation": 27 + "heartbeat_confirmation": 27, + "keysend": 28, }, payment_errors: { "timeout": "Timed Out", diff --git a/dist/src/constants.js.map b/dist/src/constants.js.map index ea0280b..95c17db 100644 --- a/dist/src/constants.js.map +++ b/dist/src/constants.js.map @@ -1 +1 @@ -{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG;IAChB,cAAc,EAAE,CAAC;IACjB,eAAe,EAAE;QACf,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,CAAC;QACd,aAAa,EAAE,CAAC;QAChB,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;KACrB;IACD,gBAAgB,EAAE;QAChB,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;KACf;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE,CAAC;KACb;IACD,aAAa,EAAE;QACb,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;KACd;IACD,aAAa,EAAE;QACb,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC;QACnB,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,CAAC;QACb,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;QAClB,aAAa,EAAE,EAAE;QACjB,0BAA0B,EAAE,EAAE;QAC9B,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,EAAE;QACf,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,EAAE;QAClB,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,wBAAwB,EAAE,EAAE;KAC7B;IACD,cAAc,EAAE;QACd,SAAS,EAAE,WAAW;QACtB,UAAU,EAAE,sBAAsB;QAClC,OAAO,EAAE,OAAO;QAChB,2BAA2B,EAAE,2BAA2B;QACxD,SAAS,EAAE,SAAS;KACrB;IACD,UAAU,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,SAAS,EAAE;QACT,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACZ;IACD,UAAU,EAAE;QACV,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;KACZ;CACF,CAAA;AAED,kBAAe,SAAS,CAAA"} \ No newline at end of file +{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG;IAChB,cAAc,EAAE,CAAC;IACjB,eAAe,EAAE;QACf,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,CAAC;QACd,aAAa,EAAE,CAAC;QAChB,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;KACrB;IACD,gBAAgB,EAAE;QAChB,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;KACf;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE,CAAC;KACb;IACD,aAAa,EAAE;QACb,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;KACd;IACD,aAAa,EAAE;QACb,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC;QACnB,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,CAAC;QACb,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;QAClB,aAAa,EAAE,EAAE;QACjB,0BAA0B,EAAE,EAAE;QAC9B,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,EAAE;QACf,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,EAAE;QAClB,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,wBAAwB,EAAE,EAAE;QAC5B,SAAS,EAAE,EAAE;KACd;IACD,cAAc,EAAE;QACd,SAAS,EAAE,WAAW;QACtB,UAAU,EAAE,sBAAsB;QAClC,OAAO,EAAE,OAAO;QAChB,2BAA2B,EAAE,2BAA2B;QACxD,SAAS,EAAE,SAAS;KACrB;IACD,UAAU,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,SAAS,EAAE;QACT,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACZ;IACD,UAAU,EAAE;QACV,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;KACZ;CACF,CAAA;AAED,kBAAe,SAAS,CAAA"} \ No newline at end of file diff --git a/dist/src/controllers/payment.js b/dist/src/controllers/payment.js index 7ae074e..3cc0354 100644 --- a/dist/src/controllers/payment.js +++ b/dist/src/controllers/payment.js @@ -25,11 +25,16 @@ exports.sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function* console.log('[send payment]', req.body); const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); if (destination_key && !contact_id && !chat_id) { + const msg = { + type: constants_1.default.message_types.keysend, + }; + if (text) + msg.message = { content: text }; return helpers.performKeysendMessage({ sender: owner, destination_key, amount, - msg: {}, + msg, success: () => { console.log('payment sent!'); res_1.success(res, { destination_key, amount }); diff --git a/dist/src/controllers/payment.js.map b/dist/src/controllers/payment.js.map index d4d81f7..2aa7d2c 100644 --- a/dist/src/controllers/payment.js.map +++ b/dist/src/controllers/payment.js.map @@ -1 +1 @@ -{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,gCAAyC;AACzC,0CAAyC;AACzC,2CAA0C;AAC1C,sCAAqC;AACrC,sCAA+C;AAC/C,wCAA4C;AAC5C,sCAAqC;AACrC,oCAAmC;AACnC,4CAAoC;AACpC,yCAA8B;AAEjB,QAAA,WAAW,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,EACJ,MAAM,EACN,OAAO,EACP,UAAU,EACV,eAAe,EACf,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,UAAU,EACV,eAAe,EACf,WAAW,EACX,UAAU,GACX,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAEvC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IAEvE,IAAI,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE;QAC9C,OAAO,OAAO,CAAC,qBAAqB,CAAC;YACnC,MAAM,EAAC,KAAK;YACZ,eAAe;YACf,MAAM;YACN,GAAG,EAAC,EAAE;YACN,OAAO,EAAE,GAAG,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBAC5B,aAAO,CAAC,GAAG,EAAE,EAAC,eAAe,EAAE,MAAM,EAAC,CAAC,CAAA;YACzC,CAAC;YACD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpC,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC;SACF,CAAC,CAAA;KACH;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC;QAC1C,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,UAAU;KACzB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;QACtB,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,IAAI;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;IAClC,IAAG,WAAW;QAAE,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAA;IACtD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAC,UAAU,CAAA;IAEvC,IAAG,IAAI,EAAC;QACN,MAAM,YAAY,GAAG,MAAM,qBAAc,CAAC;YACxC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAE,IAAI,EAAC,EAAE;YAC9B,IAAI,EAAE,GAAG,EAAC,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,SAAS;SACxB,CAAC,CAAA;QACF,GAAG,CAAC,UAAU,GAAG,YAAY,CAAA;QAC7B,GAAG,CAAC,SAAS,GAAG,UAAU,IAAI,EAAE,CAAA;KACjC;IAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAqB;QAClC,EAAE,EAAC,OAAO,CAAC,EAAE;QACb,IAAI,EAAC,OAAO,CAAC,IAAI;QACjB,MAAM;KACP,CAAA;IACD,IAAG,IAAI,EAAE;QACP,SAAS,CAAC,SAAS,GAAG,UAAU,IAAE,YAAY,CAAA;QAC9C,SAAS,CAAC,UAAU,GAAG,EAAC,IAAI,EAAC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAC,CAAA;KACpD;IACD,IAAG,WAAW;QAAE,SAAS,CAAC,OAAO,GAAG,WAAW,CAAA;IAC/C,IAAG,UAAU;QAAE,SAAS,CAAC,SAAS,GAAC,UAAU,CAAA;IAE7C,+CAA+C;IAC/C,kCAAkC;IAClC,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAG,WAAW,EAAC;QACb,OAAO,mCAAO,IAAI,CAAC,UAAU,KAAE,UAAU,EAAC,WAAW,GAAC,CAAA;QACtD,IAAG,eAAe;YAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAA;KACxD;IACD,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;YACtB,wCAAwC;YACxC,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC,CAAA;QACD,OAAO,EAAE,CAAO,KAAK,EAAE,EAAE;YACvB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aACjD,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAA;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAG,CAAO,OAAO,EAAE,EAAE;IAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAE5C,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC9J,IAAG,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;KACxC;IAED,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,OAAO;QAAE,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA;IACxC,IAAG,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IACvC,IAAG,UAAU;QAAE,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC1C,IAAG,SAAS,KAAG,mBAAS,CAAC,UAAU,CAAC,KAAK,EAAE;QAC3C,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;KAC7B;IACD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,mDAAmD;IAEnD,MAAM,CAAC,QAAQ,CAAC;QACd,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,CAAC,CAAA;IAEF,sBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAClE,CAAC,CAAA,CAAA;AAEY,QAAA,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAA;IACnE,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpE,MAAM,OAAO,GAAC,mBAAS,CAAC,cAAc,CAAA;IACtC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACxC,KAAK,EAAC;gBACJ,IAAI,EAAE,EAAC,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;wBACd,mBAAS,CAAC,aAAa,CAAC,OAAO;wBAC/B,mBAAS,CAAC,aAAa,CAAC,cAAc;qBACvC,EAAC;gBACF,MAAM,EAAE;oBACN,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,eAAe;iBACjC;aACF;YACD,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC9B,KAAK;YACL,MAAM;SACP,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,IAAI,IAAE,EAAE,CAAA;QACpB,aAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAA,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;KACxE;IAAC,OAAM,CAAC,EAAE;QACT,aAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;KACnC;AACH,CAAC,CAAA,CAAC"} \ No newline at end of file +{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/network/receive.js b/dist/src/network/receive.js index d5ff6ba..3faa683 100644 --- a/dist/src/network/receive.js +++ b/dist/src/network/receive.js @@ -276,18 +276,18 @@ function parseAndVerifyPayload(data) { } }); } -function saveAnonymousKeysend(response) { +function saveAnonymousKeysend(response, memo) { return __awaiter(this, void 0, void 0, function* () { let settleDate = parseInt(response['settle_date'] + '000'); yield models_1.models.Message.create({ chatId: 0, - type: constants_1.default.message_types.direct_payment, + type: constants_1.default.message_types.keysend, sender: 0, amount: response['amt_paid_sat'], amountMsat: response['amt_paid_msat'], paymentHash: '', date: new Date(settleDate), - messageContent: response['memo'], + messageContent: memo, status: constants_1.default.statuses.confirmed, createdAt: new Date(settleDate), updatedAt: new Date(settleDate) @@ -300,13 +300,30 @@ function parseKeysendInvoice(i) { const buf = recs && recs[lightning_2.SPHINX_CUSTOM_RECORD_KEY]; const data = buf && buf.toString(); const value = i && i.value && parseInt(i.value); - if (!data || (data && data.startsWith('{}'))) { + let isAnonymous = false; + let memo = ''; + if (data) { + try { + const payload = JSON.parse(data); + if (payload.type === constants_1.default.message_types.keysend) { + isAnonymous = true; + memo = payload.message.content; + } + } + catch (e) { + isAnonymous = true; + } + } + else { + isAnonymous = true; + } + if (isAnonymous) { socket.sendJson({ type: 'keysend', response: { amount: value || 0 } }); hub_1.sendNotification(-1, '', 'keysend', value || 0); - saveAnonymousKeysend(i); + saveAnonymousKeysend(i, memo); return; } let payload; diff --git a/dist/src/network/receive.js.map b/dist/src/network/receive.js.map index 866c875..49d4e93 100644 --- a/dist/src/network/receive.js.map +++ b/dist/src/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/constants.ts b/src/constants.ts index d484c9d..f24bb37 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -54,7 +54,8 @@ const constants = { "bot_cmd": 24, "bot_res": 25, "heartbeat": 26, - "heartbeat_confirmation": 27 + "heartbeat_confirmation": 27, + "keysend": 28, // no e2e }, payment_errors: { "timeout": "Timed Out", diff --git a/src/controllers/payment.ts b/src/controllers/payment.ts index 5bd085a..369fda2 100644 --- a/src/controllers/payment.ts +++ b/src/controllers/payment.ts @@ -31,11 +31,15 @@ export const sendPayment = async (req, res) => { const owner = await models.Contact.findOne({ where: { isOwner: true }}) if (destination_key && !contact_id && !chat_id) { + const msg:{[k:string]:any} = { + type:constants.message_types.keysend, + } + if(text) msg.message = {content:text} return helpers.performKeysendMessage({ sender:owner, destination_key, amount, - msg:{}, + msg, success: () => { console.log('payment sent!') success(res, {destination_key, amount}) diff --git a/src/network/receive.ts b/src/network/receive.ts index 4b8fc3d..ff6700c 100644 --- a/src/network/receive.ts +++ b/src/network/receive.ts @@ -249,17 +249,17 @@ async function parseAndVerifyPayload(data){ } } -async function saveAnonymousKeysend(response) { +async function saveAnonymousKeysend(response, memo) { let settleDate = parseInt(response['settle_date'] + '000'); await models.Message.create({ chatId: 0, - type: constants.message_types.direct_payment, + type: constants.message_types.keysend, sender: 0, amount: response['amt_paid_sat'], amountMsat: response['amt_paid_msat'], paymentHash: '', date: new Date(settleDate), - messageContent: response['memo'], + messageContent: memo, status: constants.statuses.confirmed, createdAt: new Date(settleDate), updatedAt: new Date(settleDate) @@ -271,13 +271,29 @@ export async function parseKeysendInvoice(i){ const buf = recs && recs[SPHINX_CUSTOM_RECORD_KEY] const data = buf && buf.toString() const value = i && i.value && parseInt(i.value) - if(!data || (data&&data.startsWith('{}'))) { + + let isAnonymous = false + let memo = '' + if(data){ + try { + const payload = JSON.parse(data) + if(payload.type===constants.message_types.keysend) { + isAnonymous = true + memo = payload.message.content + } + } catch(e) { + isAnonymous = true + } + } else { + isAnonymous = true + } + if(isAnonymous) { socket.sendJson({ type:'keysend', response: {amount:value||0} }) sendNotification(-1, '', 'keysend', value||0) - saveAnonymousKeysend(i) + saveAnonymousKeysend(i, memo) return }