Merge pull request #352 from braydonf/mem

Optimized address service mempool index size

Author: pnagurny

docs/services/bitcoind.md

@@ -101,7 +101,11 @@ node.services.bitcoind.on('tip', function(blockHash) {
 });
 
 node.services.bitcoind.on('tx', function(txInfo) {
-  // a new transaction has been broadcast in the network
+  // a new transaction has entered the mempool
+});
+
+node.services.bitcoind.on('txleave', function(txLeaveInfo) {
+  // a new transaction has left the mempool
 });
 ```
 
@@ -110,7 +114,16 @@ The `txInfo` object will have the format:
 ```js
 {
   buffer: <Buffer...>,
-  mempool: true,
+  mempool: true, // will currently always be true
+  hash: '7426c707d0e9705bdd8158e60983e37d0f5d63529086d6672b07d9238d5aa623'
+}
+```
+
+The `txLeaveInfo` object will have the format:
+
+```js
+{
+  buffer: <Buffer...>,
   hash: '7426c707d0e9705bdd8158e60983e37d0f5d63529086d6672b07d9238d5aa623'
 }
 ```

docs/services/db.md

@@ -19,16 +19,6 @@ CustomService.prototype.blockHandler = function(block, add, callback) {
 
 Take a look at the Address Service implementation for more details about how to encode the key, value for the best efficiency and ways to format the keys for streaming reads.
 
-Additionally the mempool can have an index, the mempool index will be updated once bitcoind and the db have both fully synced. A service can implement a `resetMempoolIndex` method that will be run during this time, and the "synced" event will wait until this task has been finished:
-
-```js
-CustomService.prototype.resetMempoolIndex = function(callback) {
-  var transactionBuffers = this.node.services.bitcoind.getMempoolTransactions();
-  // interact over the transactions asynchronously here
-  callback();
-};
-```
-
 ## API Documentation
 These methods are exposed over the JSON-RPC interface and can be called directly from a node via:
 

etc/bitcoin.patch

@@ -367,14 +367,27 @@ index f94771a..72ee00e 100644
 
 
 diff --git a/src/net.h b/src/net.h
-index 17502b9..e181d68 100644
+index 17502b9..c9ae1b2 100644
 --- a/src/net.h
 +++ b/src/net.h
-@@ -99,6 +99,7 @@ struct CNodeSignals
+@@ -99,6 +99,8 @@ struct CNodeSignals
  {
      boost::signals2::signal<int ()> GetHeight;
      boost::signals2::signal<bool (CNode*), CombinerAll> ProcessMessages;
 +    boost::signals2::signal<bool (const CTransaction&)> TxToMemPool;
++    boost::signals2::signal<bool (const CTransaction&)> TxLeaveMemPool;
      boost::signals2::signal<bool (CNode*, bool), CombinerAll> SendMessages;
      boost::signals2::signal<void (NodeId, const CNode*)> InitializeNode;
      boost::signals2::signal<void (NodeId)> FinalizeNode;
+diff --git a/src/txmempool.cpp b/src/txmempool.cpp
+index c3d1b60..03e265d 100644
+--- a/src/txmempool.cpp
++++ b/src/txmempool.cpp
+@@ -133,6 +133,7 @@ void CTxMemPool::remove(const CTransaction &origTx, std::list<CTransaction>& rem
+             if (!mapTx.count(hash))
+                 continue;
+             const CTransaction& tx = mapTx[hash].GetTx();
++            GetNodeSignals().TxLeaveMemPool(tx);
+             if (fRecursive) {
+                 for (unsigned int i = 0; i < tx.vout.size(); i++) {
+                     std::map<COutPoint, CInPoint>::iterator it = mapNextTx.find(COutPoint(hash, i));

integration/regtest-node.js

@@ -726,12 +726,15 @@ describe('Node Functionality', function() {
         node.services.bitcoind.sendTransaction(tx.serialize());
 
         setImmediate(function() {
-          var length = node.services.address.mempoolOutputIndex[address].length;
-          length.should.equal(1);
-          should.exist(node.services.address.mempoolOutputIndex[address]);
-          done();
+          var hashBuffer = bitcore.Address(address).hashBuffer;
+          node.services.address._getOutputsMempool(address, hashBuffer, function(err, outs) {
+            if (err) {
+              throw err;
+            }
+            outs.length.should.equal(1);
+            done();
+          });
         });
-
       });
 
     });

integration/regtest.js

@@ -360,6 +360,30 @@ describe('Daemon Binding Functionality', function() {
     });
   });
 
+  describe('transactions leaving the mempool', function() {
+    it('receive event when transaction leaves', function(done) {
+
+      // add transaction to build a new block
+      var tx = bitcore.Transaction();
+      tx.from(utxos[4]);
+      tx.change(privateKey.toAddress());
+      tx.to(destKey.toAddress(), utxos[4].amount * 1e8 - 1000);
+      tx.sign(bitcore.PrivateKey.fromWIF(utxos[4].privateKeyWIF));
+      bitcoind.sendTransaction(tx.serialize());
+
+      bitcoind.once('txleave', function(txInfo) {
+        txInfo.hash.should.equal(tx.hash);
+        done();
+      });
+
+      client.generate(1, function(err, response) {
+        if (err) {
+          throw err;
+        }
+      });
+    });
+  });
+
   describe('mempool functionality', function() {
 
     var fromAddress = 'mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1';