Compare commits

...

4 Commits

Author SHA1 Message Date
wiz
53b0bc0e48 Merge pull request #980 from knorrium/docker_node_16_10_0
Set Dockerfiles to use Node v16.10.0
2021-12-07 08:04:53 +00:00
Felipe Knorr Kuhn
e00234dfb9 Set Dockerfiles to use Node v16.10.0 2021-12-06 23:52:23 -08:00
wiz
8412e28073 Merge pull request #974 from mempool/simon/taproot-display-missing-script
Display missing taproot inner script
2021-12-07 07:26:29 +00:00
softsimon
10a110e682 Display missing taproot inner script
fixes #973
2021-12-06 00:27:14 +04:00
3 changed files with 8 additions and 3 deletions

View File

@@ -299,6 +299,11 @@ class BitcoinApi implements AbstractBitcoinApi {
const witnessScript = vin.witness[vin.witness.length - 1]; const witnessScript = vin.witness[vin.witness.length - 1];
vin.inner_witnessscript_asm = this.convertScriptSigAsm(bitcoinjs.script.toASM(Buffer.from(witnessScript, 'hex'))); vin.inner_witnessscript_asm = this.convertScriptSigAsm(bitcoinjs.script.toASM(Buffer.from(witnessScript, 'hex')));
} }
if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness && vin.witness.length > 1) {
const witnessScript = vin.witness[vin.witness.length - 2];
vin.inner_witnessscript_asm = this.convertScriptSigAsm(bitcoinjs.script.toASM(Buffer.from(witnessScript, 'hex')));
}
} }
} }

View File

@@ -1,4 +1,4 @@
FROM node:12-buster-slim AS builder FROM node:16.10.0-buster-slim AS builder
WORKDIR /build WORKDIR /build
COPY . . COPY . .
@@ -8,7 +8,7 @@ RUN apt-get install -y build-essential python3 pkg-config
RUN npm install RUN npm install
RUN npm run build RUN npm run build
FROM node:12-buster-slim FROM node:16.10.0-buster-slim
WORKDIR /backend WORKDIR /backend

View File

@@ -1,4 +1,4 @@
FROM node:12-buster-slim AS builder FROM node:16.10.0-buster-slim AS builder
ARG commitHash ARG commitHash
ENV DOCKER_COMMIT_HASH=${commitHash} ENV DOCKER_COMMIT_HASH=${commitHash}