AKI-603 Redesigned AionPendingStateImpl and Transaction pool

Jenkinsfile

@@ -25,7 +25,7 @@ pipeline {
         '''.stripIndent()).trim()
     }
 
-    triggers { cron('0 2 * * 6') }
+    triggers { cron('0 3 * * 6') }
 
     stages {
         stage('Build') {
@@ -133,7 +133,7 @@ pipeline {
                 timeout(time: 12, unit: 'HOURS') {
                     dir('pack') {
                         echo "Start mainnet sync test..."
-                        sh('./oan/aion.sh e port=${P2P_PORT} log GEN=ERROR SYNC=ERROR CONS=ERROR DB=ERROR API=ERROR dev xs=5371168')
+                        sh('./oan/aion.sh e port=${P2P_PORT} log GEN=ERROR SYNC=ERROR CONS=ERROR DB=ERROR API=ERROR dev fs')
                         echo "finished mainnet sync test..."
                         sh('rm -rf ./oan')
                     }

modAionImpl/src/org/aion/zero/impl/Version.java

@@ -1,7 +1,7 @@
 package org.aion.zero.impl;
 
 public class Version {
-    public static final String KERNEL_VERSION = "1.3";
+    public static final String KERNEL_VERSION = "1.4";
     public static final String REPO_VERSION = "0.1.0";
     public static final boolean FORK = true;
 }

modAionImpl/src/org/aion/zero/impl/blockchain/AionHub.java

@@ -144,7 +144,6 @@ private void initializeHub(
                         blockchain,
                         cfg.getConsensus().getEnergyStrategy().getUpperBound(),
                         cfg.getTx().getTxPendingTimeout(),
-                        cfg.getTx().getCacheMax(),
                         cfg.getTx().getPoolBackup(),
                         cfg.getTx().isSeedMode(),
                         cfg.getTx().getPoolDump(),

modAionImpl/src/org/aion/zero/impl/db/AionRepositoryCache.java

@@ -8,9 +8,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import org.aion.log.AionLoggerFactory;
@@ -588,18 +586,6 @@ public void syncToRoot(byte[] root) {
                 "The tracking cache cannot sync to root. \'Sync to root\' should be called on the tracked repository.");
     }
 
-    @Override
-    public void addTxBatch(Map<byte[], byte[]> pendingTx, boolean isPool) {
-        throw new UnsupportedOperationException(
-                "addTxBatch should be called on the tracked repository.");
-    }
-
-    @Override
-    public void removeTxBatch(Set<byte[]> pendingTx, boolean isPool) {
-        throw new UnsupportedOperationException(
-                "removeTxBatch should be called on the tracked repository.");
-    }
-
     @Override
     public boolean isValidRoot(byte[] root) {
         return this.repository.isValidRoot(root);
@@ -610,18 +596,6 @@ public boolean isIndexed(byte[] hash, long level) {
         return repository.isIndexed(hash, level);
     }
 
-    @Override
-    public List<byte[]> getPoolTx() {
-        throw new UnsupportedOperationException(
-                "getPoolTx should be called on the tracked repository.");
-    }
-
-    @Override
-    public List<byte[]> getCacheTx() {
-        throw new UnsupportedOperationException(
-                "getCachelTx should be called on the tracked repository.");
-    }
-
     public InternalVmType getVMUsed(AionAddress contract, byte[] codeHash) {
         return repository.getVMUsed(contract, codeHash);
     }

modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java

@@ -324,8 +324,7 @@ public ByteArrayWrapper getStorageValue(AionAddress address, ByteArrayWrapper ke
         return (details == null) ? null : details.get(key);
     }
 
-    @Override
-    public List<byte[]> getPoolTx() {
+    public final List<byte[]> getPoolTx() {
 
         List<byte[]> rtn = new ArrayList<>();
         rwLock.readLock().lock();
@@ -344,8 +343,7 @@ public List<byte[]> getPoolTx() {
         return rtn;
     }
 
-    @Override
-    public List<byte[]> getCacheTx() {
+    public final List<byte[]> getCacheTx() {
 
         List<byte[]> rtn = new ArrayList<>();
         rwLock.readLock().lock();
@@ -650,39 +648,53 @@ public Repository getSnapshotTo(byte[] root) {
         }
     }
 
-    @Override
-    public void addTxBatch(Map<byte[], byte[]> pendingTx, boolean isPool) {
+    public void addPooledTxToDB(Map<byte[], byte[]> pooledTx) {
+        if (pooledTx.isEmpty()) {
+            return;
+        }
+
+        rwLock.writeLock().lock();
+        try {
+            txPoolDatabase.putBatch(pooledTx);
+        } finally {
+            rwLock.writeLock().unlock();
+        }
+    }
 
-        if (pendingTx.isEmpty()) {
+    public void addCachedTxToDB(Map<byte[], byte[]> cachedTx) {
+        if (cachedTx.isEmpty()) {
             return;
         }
 
         rwLock.writeLock().lock();
         try {
-            if (isPool) {
-                txPoolDatabase.putBatch(pendingTx);
-            } else {
-                pendingTxCacheDatabase.putBatch(pendingTx);
-            }
+            pendingTxCacheDatabase.putBatch(cachedTx);
         } finally {
             rwLock.writeLock().unlock();
         }
     }
 
-    @Override
-    public void removeTxBatch(Set<byte[]> clearTxSet, boolean isPool) {
+    public void removePooledTxInDB(List<byte[]> pooledTx) {
+        if (pooledTx.isEmpty()) {
+            return;
+        }
+
+        rwLock.writeLock().lock();
+        try {
+            txPoolDatabase.deleteBatch(pooledTx);
+        } finally {
+            rwLock.writeLock().unlock();
+        }
+    }
 
-        if (clearTxSet.isEmpty()) {
+    public void removeCachedTxInDB(List<byte[]> cachedTx) {
+        if (cachedTx.isEmpty()) {
             return;
         }
 
         rwLock.writeLock().lock();
         try {
-            if (isPool) {
-                txPoolDatabase.deleteBatch(clearTxSet);
-            } else {
-                pendingTxCacheDatabase.deleteBatch(clearTxSet);
-            }
+            pendingTxCacheDatabase.deleteBatch(cachedTx);
         } finally {
             rwLock.writeLock().unlock();
         }
@@ -1145,6 +1157,24 @@ public InternalVmType getVMUsed(AionAddress contract, byte[] codeHash) {
         }
     }
 
+    public void removePoolTx() {
+        rwLock.readLock().lock();
+        try {
+            txPoolDatabase.drop();
+        } finally {
+            rwLock.readLock().unlock();
+        }
+    }
+
+    public void removeCacheTx() {
+        rwLock.readLock().lock();
+        try {
+            pendingTxCacheDatabase.drop();
+        } finally {
+            rwLock.readLock().unlock();
+        }
+    }
+
     private static class AionRepositoryImplHolder {
         // configuration
         private static CfgAion config = CfgAion.inst();