add txcache check when the new tx come from the network

aionnetwork · Mar 29, 2018 · a48b98f · a48b98f
1 parent dc827a0
commit a48b98f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
@@ -260,6 +260,11 @@ public synchronized List<AionTransaction> addPendingTransactions(List<AionTransa
             BigInteger bestNonce = bestNonce(tx.getFrom());
 
             if (txNonce.compareTo(bestNonce) > 0) {
+
+                if (!isInTxCache(tx.getFrom(), tx.getNonceBI())) {
+                    AionImpl.inst().broadcastTransactions(Collections.singletonList(tx));
+                }
+
                 addToTxCache(tx);
 
                 LOG.debug("Adding transaction to cache: from = {}, nonce = {}", tx.getFrom(), txNonce);
@@ -709,6 +714,10 @@ private List<AionTransaction> addToTxCache(AionTransaction tx) {
         return this.pendingTxCache.addCacheTx(tx);
     }
 
+    private boolean isInTxCache(Address addr, BigInteger nonce) {
+        return this.pendingTxCache.isInCache(addr, nonce);
+    }
+
     @Override
     public void shutDown() {
         ees.shutdown();

diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java b/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java
@@ -202,6 +202,13 @@ public List<AionTransaction> flush(Map<Address, BigInteger> nonceMap) {
 
         return processableTx;
     }
+    public boolean isInCache(Address addr , BigInteger nonce) {
+        if (this.cacheTxMap.get(addr) != null) {
+            return (this.cacheTxMap.get(addr).get(nonce) != null);
+        }
+
+        return false;
+    }
 
     Set<Address> getCacheTxAccount() {
         return new HashSet<>(this.cacheTxMap.keySet());