Merge pull request #15 from dashevo/develop

Release v1.0.1

Author: nmarley

README.md

@@ -1,2 +1,9 @@
-/libs/spv-dash/node_modules/buffers/index.js
-apply this fix https://github.com/vlocityinc/node-buffers/commit/eb663888b693bcca3ce715eaadef8748d3e0f835
+# dash-spv
+
+> Temporary repo until spv functions moved into dashcore-lib
+
+No new features should be added to this repo.
+
+## License
+
+[MIT](LICENSE) © Dash Core Group, Inc.

config/config.js

@@ -1,5 +1,5 @@
+const DashUtil = require('@dashevo/dash-util');
 const utils = require('../lib/utils');
-const DashUtil = require('dash-util');
 
 module.exports = {
   getLowDiffGenesis() {

index.js

@@ -1,5 +1,5 @@
 const spvChain = require('./lib/spvchain');
-const merkleProof = require('./lib/merkleproof');
+const merkleProof = require('./lib/merkleproofs');
 
 module.exports = {
   SpvChain: spvChain,

lib/blockstore.js

@@ -1,37 +1,23 @@
-// In memory storage of header chain
 const levelup = require('levelup');
-const utils = require('./utils');
 const memdown = require('memdown');
-const bitcore = require('bitcore-lib-dash');
+const dashcore = require('@dashevo/dashcore-lib');
 
-const DGWBlockCount = 25;
-
-
-const BlockStore = class {
-  constructor(tipHash) {
+class BlockStore {
+  constructor() {
     this.db = levelup(memdown(), {
       keyAsBuffer: false,
       valueAsBuffer: false,
       valueEncoding: 'json',
     });
-    this.block = bitcore.BlockHeader;
-    this.tipHash = tipHash;
-    this.dgwCache = [];
+    this.block = dashcore.BlockHeader;
   }
 
   put(header) {
-    /* eslint no-underscore-dangle: ["error", { "allow": ["_getHash"] }] */
-    this.tipHash = utils.getCorrectedHash(header._getHash());
-
-    const self = this;
-
     return new Promise((resolve, reject) => {
-      this.db.put(self.tipHash, JSON.stringify(header.toObject()), (err) => {
+      this.db.put(header.hash, JSON.stringify(header.toObject()), (err) => {
         if (!err) {
-          this.pushDgwCache(header);
-          resolve(self.tipHash);
+          resolve(header.hash);
         } else {
-          // Todo update tiphash now incorrect
           reject(err);
         }
       });
@@ -54,19 +40,6 @@ const BlockStore = class {
     });
   }
 
-  pushDgwCache(header) {
-    if (this.dgwCache.length > DGWBlockCount) { this.dgwCache.shift(); }
-    this.dgwCache.push(header);
-  }
-
-  getDgwCache() {
-    return this.dgwCache;
-  }
-
-  getTipHash() {
-    return this.tipHash;
-  }
-
   close() {
     this.db.close();
   }
@@ -78,7 +51,7 @@ const BlockStore = class {
   isOpen() {
     return this.db.isOpen();
   }
-};
+}
 
 
 module.exports = BlockStore;

lib/consensus.js

@@ -1,12 +1,11 @@
-const dgwTarget = require('dark-gravity-wave-js').getTarget;
+const { isValidTarget } = require('@dashevo/dark-gravity-wave');
 const utils = require('./utils');
 
 module.exports = {
 
   isValidBlockHeader(dgwHeaders, newHeader) {
-    return newHeader.validProofOfWork() &&
-      newHeader.validTimestamp() &&
-      newHeader.bits <= dgwTarget(dgwHeaders.map(h => utils.getDgwBlock(h)));
+    return newHeader.validProofOfWork()
+      && newHeader.validTimestamp()
+      && isValidTarget(newHeader.bits, dgwHeaders.map(h => utils.getDgwBlock(h)));
   },
-
 };

lib/forkedchain.js

@@ -0,0 +1,26 @@
+const dashcore = require('@dashevo/dashcore-lib');
+const calculateMnListMerkleRoot = require('./mnlistmerkleroot');
+
+const merkleproofs = {
+
+  validateTxProofs: (merkleBlock, transactions) => merkleBlock.validMerkleTree()
+    && transactions.filter(t => merkleBlock.hasTransaction(t)).length === transactions.length,
+
+  validateMnProofs(header, flags, hashes, numTransactions, cbTxHash) {
+    const merkleBlock = new dashcore.MerkleBlock({
+      header,
+      numTransactions,
+      hashes,
+      flags,
+    });
+
+    return merkleBlock.validMerkleTree() && merkleBlock.hasTransaction(cbTxHash);
+  },
+
+  validateMnListMerkleRoot(mnListMerkleRoot, mnList) {
+    return calculateMnListMerkleRoot(mnList) === mnListMerkleRoot;
+  },
+
+};
+
+module.exports = merkleproofs;

lib/merkleproof.js

@@ -0,0 +1,25 @@
+const dashcore = require('@dashevo/dashcore-lib');
+
+// from dashcore/lib/block/block.js
+function getMerkleTree(tree) {
+  let j = 0;
+  for (let size = tree.length; size > 1; size = Math.floor((size + 1) / 2)) {
+    for (let i = 0; i < size; i += 2) {
+      const i2 = Math.min(i + 1, size - 1);
+      const buf = Buffer.concat([tree[j + i], tree[j + i2]]);
+      tree.push(dashcore.crypto.Hash.sha256sha256(buf));
+    }
+    j += size;
+  }
+
+  return tree;
+}
+
+function calculateMnListMerkleRoot(mnList) {
+  return getMerkleTree(mnList.sort((m1, m2) => m1.proRegTxHash > m2.proRegTxHash)
+    .map(m => new dashcore.SimplifiedMNListEntry(m).getHash()))
+    .slice(-1)[0]
+    .toString('hex');
+}
+
+module.exports = calculateMnListMerkleRoot;