From 18eedca1e95f29d6f253076832e5590ea44c97f6 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Mon, 7 Dec 2020 02:14:52 +0000 Subject: [PATCH] constructNewRavenBlob fix --- index.js | 15 ++++++++++----- package.json | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 94dad99..e9c1c16 100644 --- a/index.js +++ b/index.js @@ -146,22 +146,27 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) { }; }; -module.exports.convertRavenBlob = function(blobBuffer) { - let header = blobBuffer.slice(0, 80); // header +function update_merkle_root_hash(blob_in, blob_out) { let offset = 80 + 8 + 32; - const nTransactions = varuint.decode(blobBuffer, offset); + const nTransactions = varuint.decode(blob_in, offset); offset += varuint.decode.bytes; let transactions = []; for (let i = 0; i < nTransactions; ++i) { - const tx = bitcoin.Transaction.fromBuffer(blobBuffer.slice(offset), true); + const tx = bitcoin.Transaction.fromBuffer(blob_in.slice(offset), true); transactions.push(tx); offset += tx.byteLength(); } - getMerkleRoot2(transactions).copy(header, 4 + 32); + getMerkleRoot2(transactions).copy(blob_out, 4 + 32); +}; + +module.exports.convertRavenBlob = function(blobBuffer) { + let header = blobBuffer.slice(0, 80); + update_merkle_root_hash(blobBuffer, header); return reverseBuffer(crypto.createHash('sha256').update(header).digest()); }; module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhashBuff) { + update_merkle_root_hash(blockTemplate, blockTemplate); nonceBuff.copy (blockTemplate, 80, 0, 8); mixhashBuff.copy(blockTemplate, 88, 0, 32); return blockTemplate; diff --git a/package.json b/package.json index 2cd67b3..085581a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cryptoforknote-util", - "version": "9.0.4", + "version": "9.0.5", "main": "cryptoforknote-util", "author": { "name": "LucasJones",