diff options
| author | Adam Soltys <[email protected]> | 2022-09-06 16:25:30 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-09-06 16:25:30 -0700 |
| commit | 86cca84229ff86b7a2e7c3b525c497f8f58099ad (patch) | |
| tree | 1a22323c28e386d0046b87bbbd7b1640216fdb8f /routes | |
| parent | 864304bb422d00f0eb404fa875514fcc72e8bc0a (diff) | |
| download | coinos-server-86cca84229ff86b7a2e7c3b525c497f8f58099ad.tar.gz coinos-server-86cca84229ff86b7a2e7c3b525c497f8f58099ad.zip | |
get block height helper
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/assets.js | 3 | ||||
| -rw-r--r-- | routes/liquid/receive.js | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/routes/assets.js b/routes/assets.js index 22bf71d0..8140b179 100644 --- a/routes/assets.js +++ b/routes/assets.js @@ -7,6 +7,9 @@ import { auth } from "$lib/passport"; import axios from "axios"; import crypto from "crypto"; import fs from "fs"; +import { err, l } from "$lib/logging"; +import lq from "$lib/liquid"; +import { SATS } from "$lib/utils"; let fetchAssets; (fetchAssets = async () => { diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js index f3b8397f..480677de 100644 --- a/routes/liquid/receive.js +++ b/routes/liquid/receive.js @@ -1,6 +1,6 @@ import db from "$db"; import config from "$config"; -import { toSats } from "$lib/utils"; +import { getBlockHeight, getUser, toSats } from "$lib/utils"; import { emit } from "$lib/sockets"; import store from "$lib/store"; import { sendLiquid } from "$routes/liquid/send"; @@ -14,7 +14,6 @@ import bitcoin from "bitcoinjs-lib"; import liquidJs from "liquidjs-lib"; import { l, err, warn } from "$lib/logging"; import lq from "$lib/liquid"; -import { getUser } from "$lib/utils"; const { Block, networks, Transaction } = liquidJs; @@ -224,11 +223,9 @@ zmqRawBlock.on("message", async (topic, message, sequence) => { where: { confirmed: 0 } }); - const block = Block.fromHex(message.toString("hex"), true); - let hash, json; - hash = await lq.getBlockHash(block.blockHeight); + hash = await lq.getBlockHash(getBlockHeight(message)); json = await lq.getBlock(hash, 2); json.tx.map(async tx => { |
