Merge pull request #201 from jtoomim/bip34cscriptfix

Correct BIP34 height encodings for heights 1-16
This commit is contained in:
pooler 2020-09-07 14:16:46 +00:00 committed by GitHub
commit 173a497e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -468,12 +468,18 @@ static bool gbt_work_decode(const json_t *val, struct work *work)
le32enc((uint32_t *)(cbtx+37), 0xffffffff); /* prev txout index */ le32enc((uint32_t *)(cbtx+37), 0xffffffff); /* prev txout index */
cbtx_size = 43; cbtx_size = 43;
/* BIP 34: height in coinbase */ /* BIP 34: height in coinbase */
if (work->height >= 1 && work->height <= 16) {
/* Use OP_1-OP_16 to conform to Bitcoin's implementation. */
cbtx[42] = work->height + 0x50;
cbtx[cbtx_size++] = 0x00; /* OP_0; pads to 2 bytes */
} else {
for (n = work->height; n; n >>= 8) { for (n = work->height; n; n >>= 8) {
cbtx[cbtx_size++] = n & 0xff; cbtx[cbtx_size++] = n & 0xff;
if (n < 0x100 && n >= 0x80) if (n < 0x100 && n >= 0x80)
cbtx[cbtx_size++] = 0; cbtx[cbtx_size++] = 0;
} }
cbtx[42] = cbtx_size - 43; cbtx[42] = cbtx_size - 43;
}
cbtx[41] = cbtx_size - 42; /* scriptsig length */ cbtx[41] = cbtx_size - 42; /* scriptsig length */
le32enc((uint32_t *)(cbtx+cbtx_size), 0xffffffff); /* sequence */ le32enc((uint32_t *)(cbtx+cbtx_size), 0xffffffff); /* sequence */
cbtx_size += 4; cbtx_size += 4;