Merge pull request bitpay#2339 from msalcala11/fix/p2p-transaction-ev…

…ents Ensure all incoming p2p transactions are broadcasted to socket clients
Ray5254 · Aug 21, 2019 · 0cfddf9 · 0cfddf9
2 parents 33d11f7 + 3df964a
commit 0cfddf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/bitcore-node/src/services/p2p.ts b/packages/bitcore-node/src/services/p2p.ts
@@ -39,7 +39,7 @@ export class P2pManager {
     for (let chainNetwork of Config.chainNetworks()) {
       const { chain, network } = chainNetwork;
       const chainConfig = Config.chainConfig(chainNetwork);
-      if (chainConfig.chainSource && chainConfig.chainSource !== 'p2p' || chainConfig.disabled) {
+      if ((chainConfig.chainSource && chainConfig.chainSource !== 'p2p') || chainConfig.disabled) {
         continue;
       }
       const p2pWorker = new P2pWorker({
@@ -195,7 +195,7 @@ export class P2pWorker {
     });
 
     this.pool.on('peerinv', (peer, message) => {
-      if (this.isSyncingNode && !this.isSyncing) {
+      if (this.isSyncingNode) {
         const filtered = message.inventory.filter(inv => {
           const hash = this.bitcoreLib.encoding
             .BufferReader(inv.hash)

diff --git a/packages/bitcore-node/src/services/socket.ts b/packages/bitcore-node/src/services/socket.ts
@@ -75,14 +75,14 @@ export class SocketService {
       if (this.io) {
         const { chain, network } = tx;
         const sanitizedTx = SanitizeWallet(tx);
-        this.io.volatile.sockets.in(`/${chain}/${network}/inv`).emit('tx', sanitizedTx);
+        this.io.sockets.in(`/${chain}/${network}/inv`).emit('tx', sanitizedTx);
       }
     });
 
     this.eventService.blockEvent.on('block', (block: IEvent.BlockEvent) => {
       if (this.io) {
         const { chain, network } = block;
-        this.io.volatile.sockets.in(`/${chain}/${network}/inv`).emit('block', block);
+        this.io.sockets.in(`/${chain}/${network}/inv`).emit('block', block);
       }
     });
 
@@ -91,8 +91,8 @@ export class SocketService {
         const { coin, address } = addressCoin;
         const { chain, network } = coin;
         const sanitizedCoin = SanitizeWallet(coin);
-        this.io.volatile.sockets.in(`/${chain}/${network}/address`).emit(address, sanitizedCoin);
-        this.io.volatile.sockets.in(`/${chain}/${network}/inv`).emit('coin', sanitizedCoin);
+        this.io.sockets.in(`/${chain}/${network}/address`).emit(address, sanitizedCoin);
+        this.io.sockets.in(`/${chain}/${network}/inv`).emit('coin', sanitizedCoin);
       }
     });
   }