Merge commit '9a75a2b3ebbcd1bca66d5496286d14a96247ffa4'

dtube · May 20, 2021 · aaddfaa · aaddfaa
2 parents 156ca96 + 9a75a2b
commit aaddfaa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/p2p.js b/src/p2p.js
@@ -262,6 +262,10 @@ var p2p = {
                 if (p2p.recovering) return
                 var tx = message.d
 
+                // if the pool is already full, do nothing at all
+                if (transaction.isPoolFull())
+                    break
+
                 // if its already in the mempool, it means we already handled it
                 if (transaction.isInPool(tx))
                     break

diff --git a/src/transaction.js b/src/transaction.js
@@ -11,10 +11,9 @@ transaction = {
     pool: [], // the pool holds temporary txs that havent been published on chain yet
     eventConfirmation: new EventEmitter(),
     addToPool: (txs) => {
-        if (transaction.pool.length >= max_mempool) {
-            logr.warn('Mempool is full ('+transaction.pool.length+'/'+max_mempool+' txs), ignoring tx')
+        if (transaction.isPoolFull())
             return
-        }
+
         for (let y = 0; y < txs.length; y++) {
             var exists = false
             for (let i = 0; i < transaction.pool.length; i++)
@@ -26,6 +25,13 @@ transaction = {
         }
 
     },
+    isPoolFull: () => {
+        if (transaction.pool.length >= max_mempool) {
+            logr.warn('Mempool is full ('+transaction.pool.length+'/'+max_mempool+' txs), ignoring tx')
+            return true
+        }
+        return false
+    },
     removeFromPool: (txs) => {
         for (let y = 0; y < txs.length; y++)
             for (let i = 0; i < transaction.pool.length; i++)