Eth draft support

index.js

@@ -6,8 +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');
-const merklebitcoin = promise.denodeify(require('merkle-bitcoin'));
 
 function scriptCompile(addrHash) {
   return bitcoin.script.compile([
@@ -25,15 +23,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,18 +36,32 @@ function txesHaveWitnessCommit(transactions) {
   );
 }
 
-function getMerkleRoot2(transactions) {
+function sha256(buffer) {
-  if (transactions.length === 0) return null;
+  return crypto.createHash('sha256').update(buffer).digest();
+};
+
+function hash256(buffer) {
+  return sha256(sha256(buffer));
+};
+
+function getMerkleRoot(transactions) {
+  if (transactions.length === 0) return new Buffer('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
   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;
 }
 
 let last_epoch_number;
 let last_seed_hash;
-const diff1 = 0x00000000ff000000000000000000000000000000000000000000000000000000;
+
+module.exports.baseRavenDiff = function() {
+  return parseInt('0x00000000ff000000000000000000000000000000000000000000000000000000');
+};
+
+module.exports.baseEthDiff = function() {
+  return parseInt('0x00000000ffff0000000000000000000000000000000000000000000000000000');
+};
 
 module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
   const poolAddrHash = bitcoin.address.fromBase58Check(poolAddress).hash;
@@ -91,14 +94,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);
@@ -133,7 +135,7 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
     last_epoch_number = epoch_number;
   }
 
-  const difficulty = parseFloat((diff1 / bignum(rpcData.target, 16).toNumber()).toFixed(9));
+  const difficulty = parseFloat((module.exports.baseRavenDiff() / bignum(rpcData.target, 16).toNumber()).toFixed(9));
 
   return {
     blocktemplate_blob: blob.toString('hex'),
@@ -144,6 +146,7 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
     difficulty:         difficulty,
     height:             rpcData.height,
     bits:               rpcData.bits,
+    prev_hash:          rpcData.previousblockhash,
   };
 };
 
@@ -157,15 +160,13 @@ function update_merkle_root_hash(blob_in, blob_out) {
     transactions.push(tx);
     offset += tx.byteLength();
   }
-  const rpcData = { transactions: transactions.slice(1) };
+  getMerkleRoot(transactions).copy(blob_out, 4 + 32);
-  reverseBuffer(new Buffer(getMerkleRoot(rpcData, transactions[0].getHash().toString('hex')), 'hex')).copy(blob_out, 4 + 32);
 };
 
 module.exports.convertRavenBlob = function(blobBuffer) {
   let header = blobBuffer.slice(0, 80);
   update_merkle_root_hash(blobBuffer, header);
-  const hash256 = function (buffer) { return crypto.createHash('sha256').update(buffer).digest(); };
+  return reverseBuffer(hash256(header));
-  return reverseBuffer(hash256(crypto.createHash('sha256').update(header).digest()));
 };
 
 module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhashBuff) {
@@ -178,4 +179,13 @@ module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhas
 module.exports.constructNewDeroBlob = function(blockTemplate, nonceBuff) {
   nonceBuff.copy(blockTemplate, 39, 0, 4);
   return blockTemplate;
+};
+
+module.exports.EthBlockTemplate = function(rpcData) {
+  const difficulty = parseFloat((module.exports.baseEthDiff() / bignum(rpcData[2].lstrip("0x"), 16).toNumber()).toFixed(19));
+  return {
+    hash:               rpcData[0].lstrip("0x"),
+    seed_hash:          rpcData[1].lstrip("0x"),
+    difficulty:         difficulty
+  };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoforknote-util",
-  "version": "9.0.10",
+  "version": "9.1.1",
   "main": "cryptoforknote-util",
   "author": {
     "name": "LucasJones",
@@ -17,8 +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"
-    "merkle-bitcoin":  "git+https://github.com/CloudMining/merkle-bitcoin.git#ec00ae20ba60d444e150ead03c747695ddaa83a1"
   },
   "keywords": [
     "cryptonight",