Fixed raven block processing

index.js

@@ -6,7 +6,6 @@ const bitcoin = require('bitcoinjs-lib');
 const varuint = require('varuint-bitcoin');
 const crypto  = require('crypto');
 const fastMerkleRoot = require('merkle-lib/fastRoot');
-const promise = require('promise');
 
 function scriptCompile(addrHash) {
   return bitcoin.script.compile([
@@ -37,15 +36,20 @@ function txesHaveWitnessCommit(transactions) {
   );
 }
 
-function hash256(buffer) {
+function sha256(buffer) {
   return crypto.createHash('sha256').update(buffer).digest();
 };
 
+function hash256(buffer) {
+  return sha256(sha256(buffer));
+};
+
 function getMerkleRoot(transactions) {
-  if (transactions.length === 0) return null;
+  if (transactions.length === 0) return new Buffer('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
   const forWitness = txesHaveWitnessCommit(transactions);
   const hashes = transactions.map(transaction => transaction.getHash(forWitness));
   const rootHash = fastMerkleRoot(hashes, hash256);
+  console.log(forWitness);
   return forWitness ? hash256(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash;
 }
 
@@ -84,14 +88,13 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
       txCoinbase.addOutput(new Buffer(rpcData.default_witness_commitment, 'hex'), 0);
     }
   }
-  const merkleRoot = new Buffer('DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD', 'hex'); // 32 bytes
 
   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);
@@ -150,13 +153,13 @@ function update_merkle_root_hash(blob_in, blob_out) {
     transactions.push(tx);
     offset += tx.byteLength();
   }
-  reverseBuffer(getMerkleRoot(transactions)).copy(blob_out, 4 + 32);
+  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)));
+  return reverseBuffer(hash256(header));
 };
 
 module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhashBuff) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoforknote-util",
-  "version": "9.0.10",
+  "version": "9.0.17",
   "main": "cryptoforknote-util",
   "author": {
     "name": "LucasJones",
@@ -17,7 +17,7 @@
     "bignum":   "^0.13.1",
     "sha3":     "*",
     "varuint-bitcoin": "^1.0.4",
-    "bitcoinjs-lib":   "git+https://github.com/bitcoinjs/bitcoinjs-lib.git#533d6c2e6d0aa4111f7948b1c12003cf6ef83137",
+    "bitcoinjs-lib":   "git+https://github.com/bitcoinjs/bitcoinjs-lib.git#533d6c2e6d0aa4111f7948b1c12003cf6ef83137"
   },
   "keywords": [
     "cryptonight",