diff options
| author | Adam Soltys <[email protected]> | 2021-08-12 13:27:47 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2021-08-12 13:27:47 -0700 |
| commit | 683cb1c1c8e5ed0fa5e9fdc9aafb3cf1bd086860 (patch) | |
| tree | 65a9c9466e23a450e5fb07807b3073018afb7803 /routes | |
| parent | da864d3ae0f6ad2c81e6b676735e5381f6df815c (diff) | |
| parent | 30598010bf13159b62ef77fde9c3338bb405f270 (diff) | |
| download | coinos-server-683cb1c1c8e5ed0fa5e9fdc9aafb3cf1bd086860.tar.gz coinos-server-683cb1c1c8e5ed0fa5e9fdc9aafb3cf1bd086860.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/liquid/receive.js | 3 | ||||
| -rw-r--r-- | routes/liquid/taxi.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js index 2396755f..af7e40ec 100644 --- a/routes/liquid/receive.js +++ b/routes/liquid/receive.js @@ -309,7 +309,8 @@ setInterval(async () => { transaction, }); - ({ account, address, user } = p); + if (p && p.address) address = p.address; + if (p && p.user) user = p.user; if (p && p.account) { total = p.amount + p.tip; diff --git a/routes/liquid/taxi.js b/routes/liquid/taxi.js index 14da9411..4e4af372 100644 --- a/routes/liquid/taxi.js +++ b/routes/liquid/taxi.js @@ -12,7 +12,7 @@ const url = prod ? "https://blockstream.info/liquid/api" : "http://electrs-liquid:3002"; const electrs = wretch().url(url); -const network = networks.regtest; +const network = prod ? networks.liquid : networks.regtest; const key = ECPair.fromPrivateKey(Buffer.from(config.taxi, "hex")); |