Fixed raven block processing

index.js

@@ -5,7 +5,6 @@ const bignum  = require('bignum');
 const bitcoin = require('bitcoinjs-lib');
 const varuint = require('varuint-bitcoin');
 const crypto  = require('crypto');
-const fastMerkleRoot = require('merkle-lib/fastRoot');
 const promise = require('promise');
 const merklebitcoin = promise.denodeify(require('merkle-bitcoin'));
 
@@ -25,15 +24,6 @@ function reverseBuffer(buff) {
   return reversed;
 }
 
-function getMerkleRoot(rpcData, generateTxRaw) {
-  hashes = [ reverseBuffer(new Buffer(generateTxRaw, 'hex')).toString('hex') ];
-  rpcData.transactions.forEach(function (value) {
-    hashes.push(value.txid ? value.txid : value.hash);
-  });
-  if (hashes.length === 1) return hashes[0];
-  return Object.values(merklebitcoin(hashes))[2].root;
-}
-
 function txesHaveWitnessCommit(transactions) {
   return (
     transactions instanceof Array &&
@@ -47,13 +37,18 @@ function txesHaveWitnessCommit(transactions) {
   );
 }
 
-function getMerkleRoot2(transactions) {
+function hash256(buffer) {
+  return crypto.createHash('sha256').update(buffer).digest();
+};
+
+function getMerkleRoot(transactions) {
   if (transactions.length === 0) return null;
-  const forWitness = txesHaveWitnessCommit(transactions);
-  const hashes = transactions.map(transaction => transaction.getHash(forWitness));
-  const hash256 = function (buffer) { return crypto.createHash('sha256').update(buffer).digest(); };
-  const rootHash = fastMerkleRoot(hashes, hash256);
-  return forWitness ? hash256(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash;
+  if (transactions.length === 1) return transactions[0].getHash();
+  let hashes = [ reverseBuffer(transactions[0].getHash()).toString('hex') ];
+  transactions.split(1).forEach(function (value) {
+    hashes.push(value.hash);
+  });
+  return reverseBuffer(new Buffer(Object.values(merklebitcoin(hashes))[2].root, 'hex'));
 }
 
 let last_epoch_number;
@@ -62,6 +57,7 @@ const diff1 = 0x00000000ff000000000000000000000000000000000000000000000000000000
 
 module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
   const poolAddrHash = bitcoin.address.fromBase58Check(poolAddress).hash;
+
   let txCoinbase = new bitcoin.Transaction();
   let bytesHeight;
   { // input for coinbase tx
@@ -90,14 +86,13 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
       txCoinbase.addOutput(new Buffer(rpcData.default_witness_commitment, 'hex'), 0);
     }
   }
-  const merkleRoot = getMerkleRoot(rpcData, txCoinbase.getHash().toString('hex'));
 
   let header = new Buffer(80);
   { let position = 0;
     header.writeUInt32BE(rpcData.height, position, 4);                  // height         42-46
     header.write(rpcData.bits, position += 4, 4, 'hex');                // bits           47-50
     header.writeUInt32BE(rpcData.curtime, position += 4, 4, 'hex');     // nTime          51-54
-    header.write(merkleRoot, position += 4, 32, 'hex');                 // merkelRoot     55-87
+    header.write('DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD', position += 4, 32, 'hex');                 // merkelRoot     55-87
     header.write(rpcData.previousblockhash, position += 32, 32, 'hex'); // prevblockhash  88-120
     header.writeUInt32BE(rpcData.version, position += 32, 4);           // version        121-153
     header = reverseBuffer(header);
@@ -146,22 +141,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);
-  return reverseBuffer(crypto.createHash('sha256').update(header).digest());
+  getMerkleRoot(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(hash256(hash256(header)));
 };
 
 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;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoforknote-util",
-  "version": "9.0.3",
+  "version": "9.0.15",
   "main": "cryptoforknote-util",
   "author": {
     "name": "LucasJones",
@@ -18,7 +18,7 @@
     "sha3":     "*",
     "varuint-bitcoin": "^1.0.4",
     "bitcoinjs-lib":   "git+https://github.com/bitcoinjs/bitcoinjs-lib.git#533d6c2e6d0aa4111f7948b1c12003cf6ef83137",
-    "merkle-bitcoin":  "git+https://github.com/joshuayabut/merkle-bitcoin.git#ec00ae20ba60d444e150ead03c747695ddaa83a1"
+    "merkle-bitcoin":  "git+https://github.com/CloudMining/merkle-bitcoin.git#ec00ae20ba60d444e150ead03c747695ddaa83a1"
   },
   "keywords": [
     "cryptonight",