Eth draft support

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,12 +36,16 @@ 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);
@@ -51,7 +54,14 @@ function getMerkleRoot(transactions) {
 
 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;
@@ -84,14 +94,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);
@@ -126,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'),
@@ -137,6 +146,7 @@ module.exports.RavenBlockTemplate = function(rpcData, poolAddress) {
     difficulty:         difficulty,
     height:             rpcData.height,
     bits:               rpcData.bits,
+    prev_hash:          rpcData.previousblockhash,
   };
 };
 
@@ -150,13 +160,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) {
@@ -169,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].substr(2), 16).toNumber()).toFixed(19));
+  return {
+    hash:               rpcData[0].substr(2),
+    seed_hash:          rpcData[1].substr(2),
+    difficulty:         difficulty
+  };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoforknote-util",
-  "version": "9.0.11",
+  "version": "9.1.2",
   "main": "cryptoforknote-util",
   "author": {
     "name": "LucasJones",