diff options
| author | Adam Soltys <[email protected]> | 2020-07-27 13:03:41 -0400 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2020-07-27 13:03:41 -0400 |
| commit | 768bcc0107c98d145d4a663e8562a13666570941 (patch) | |
| tree | 621a5a2708b5a0ec34f4c46c9e144c237aec6d83 | |
| parent | 685a5cb9c421ee03b7a6e79ee5d98998987deddb (diff) | |
| download | coinos-server-768bcc0107c98d145d4a663e8562a13666570941.tar.gz coinos-server-768bcc0107c98d145d4a663e8562a13666570941.zip | |
fix payment emit bug
| -rw-r--r-- | routes/bitcoin/receive.js | 3 | ||||
| -rw-r--r-- | routes/liquid/receive.js | 1 | ||||
| -rw-r--r-- | routes/swaps.js | 12 |
3 files changed, 7 insertions, 9 deletions
diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js index d0ac0ce5..1ee9f323 100644 --- a/routes/bitcoin/receive.js +++ b/routes/bitcoin/receive.js @@ -164,8 +164,7 @@ setInterval(async () => { await p.account.save({ transaction }); await p.save({ transaction }); - let p = p.get({ plain: true }); - p.account = p.account.get({ plain: true }); + p = p.get({ plain: true }); emit(user.username, "account", p.account); emit(user.username, "payment", p); diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js index 77693cb6..690f1b2c 100644 --- a/routes/liquid/receive.js +++ b/routes/liquid/receive.js @@ -253,7 +253,6 @@ setInterval(async () => { await p.save({ transaction }); p = p.get({ plain: true }); - p.account = p.account.get({ plain: true }); emit(user.username, "account", p.account); emit(user.username, "payment", p); diff --git a/routes/swaps.js b/routes/swaps.js index 7a7f6592..69bcd75c 100644 --- a/routes/swaps.js +++ b/routes/swaps.js @@ -47,12 +47,12 @@ const createProposal = (a1, v1, a2, v2) => proc.on("close", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process closed unexpectedly while creating proposal: ${msg}")); + reject(new Error(`Liquid swap tool process closed unexpectedly: ${msg}`)); }); proc.on("exit", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process exited unexpectedly while creating proposal: ${msg}")); + reject(new Error(`Liquid swap tool process exited unexpectedly: ${msg}`)); }); setTimeout(() => reject(new Error("Liquid swap tool timed out"), proc), timeout); @@ -73,12 +73,12 @@ const getInfo = (filename) => proc.on("close", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process closed unexpectedly: ${msg}")); + reject(new Error(`Liquid swap tool process closed unexpectedly: ${msg}`)); }); proc.on("exit", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process exited unexpectedly")); + reject(new Error(`Liquid swap tool process exited unexpectedly: ${msg}`)); }); setTimeout(() => reject(new Error("Liquid swap tool timed out"), proc), timeout); @@ -494,12 +494,12 @@ const finalize = (filename = "finalized.txt", text) => { proc.on("close", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process closed unexpectedly: ${msg}")); + reject(new Error(`Liquid swap tool process closed unexpectedly: ${msg}`)); }); proc.on("exit", (code, signal) => { let msg = (code && code.toString()) || (signal && signal.toString()); - reject(new Error("Liquid swap tool process exited unexpectedly")); + reject(new Error(`Liquid swap tool process exited unexpectedly: ${msg}`)); }); setTimeout(() => reject(new Error("Liquid swap tool timed out"), proc), timeout); |
