aboutsummaryrefslogtreecommitdiffstats
path: root/routes/liquid
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2022-09-14 12:31:24 -0700
committerAdam Soltys <[email protected]>2022-09-14 12:31:24 -0700
commited261ce59cae16c71868224455a4f8ca522d3212 (patch)
tree4cb95d14ec9edb3f1cba7e3a59f3f42ece3022cd /routes/liquid
parentaa6ce918b043f37bed35b6f5c3106e5251e626b7 (diff)
parent59d7dcd4f97a63c2d572f41c908b342114701dc4 (diff)
downloadcoinos-server-ed261ce59cae16c71868224455a4f8ca522d3212.tar.gz
coinos-server-ed261ce59cae16c71868224455a4f8ca522d3212.zip
Merge branch 'master' into prod
Diffstat (limited to 'routes/liquid')
-rw-r--r--routes/liquid/receive.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 9c2b490b..480677de 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -11,18 +11,16 @@ import zmq from "zeromq/v5-compat";
import { Op } from "@sequelize/core";
import { fromBase58 } from "bip32";
import bitcoin from "bitcoinjs-lib";
-// import liquidJs from "liquidjs-lib";
+import liquidJs from "liquidjs-lib";
import { l, err, warn } from "$lib/logging";
import lq from "$lib/liquid";
-// const { Block, networks, Transaction } = liquidJs;
+const { Block, networks, Transaction } = liquidJs;
-/*
const network =
networks[
config.liquid.network === "mainnet" ? "liquid" : config.liquid.network
];
- */
import { computeConversionFee } from "./conversionFee";