Revert pending state update optimization; revert snapshotAll()

aionnetwork · Mar 23, 2018 · 6708ddc · 6708ddc
1 parent f8c3386
commit 6708ddc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 52 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
@@ -554,35 +554,20 @@ private AionTxInfo getTransactionInfo(byte[] txHash, byte[] blockHash) {
 
     private void updateState(IAionBlock block) {
 
-        List<AionTransaction> poolTxs = this.txPool.snapshotAll();
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("updateState - snapshotAll tx[{}]", poolTxs.size());
-        }
-
-        IRepositoryCache oldPs = pendingState.startTracking();
-        Set<Address> accs = getTxsAccounts(block.getTransactionsList());
-        for (Address addr : getTxsAccounts(poolTxs)) {
-            if (!accs.contains(addr)) {
-                oldPs.getAccountState(addr);
-            }
-        }
+        pendingState = repository.startTracking();
 
-        pendingState.rollback();
-        oldPs.flush();
+        List<AionTransaction> pendingTxl = this.txPool.snapshotAll();
 
-        for (AionTransaction tx : poolTxs) {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("updateState - snapshotAll tx[{}]", pendingTxl.size());
+        }
+        for (AionTransaction tx : pendingTxl) {
             if (LOG.isTraceEnabled()) {
-                LOG.trace("updateState reCheck poolTx: " + tx.toString());
-            }
-
-            AionTxReceipt receipt;
-            if (accs.contains(tx.getFrom())) {
-                AionTxExecSummary txSum = executeTx(tx, false);
-                receipt = txSum.getReceipt();
-            } else {
-                receipt = new AionTxReceipt();
+                LOG.debug("updateState - loop: " + tx.toString());
             }
 
+            AionTxExecSummary txSum = executeTx(tx, false);
+            AionTxReceipt receipt = txSum.getReceipt();
             receipt.setTransaction(tx);
             fireTxUpdate(receipt, PendingTransactionState.PENDING, block);
         }

diff --git a/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java b/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java
@@ -262,22 +262,6 @@ public void updateBlkNrgLimit(long nrg) {
         }
     }
 
-    @Override
-    public synchronized List<TX> snapshotAll() {
-        List<TX> rtn = new ArrayList<>();
-
-        Map<Address, AccountState> accs = this.getFullAcc();
-        for (AccountState as : accs.values()) {
-            for(AbstractMap.SimpleEntry<ByteArrayWrapper, BigInteger> ae : as.getMap().values()) {
-                rtn.add(this.getMainMap().get(ae.getKey()).getTx());
-            }
-        }
-
-        LOG.info("TxPoolA0.snapshotAll return [{}] TX, poolSize[{}]", rtn.size(), getMainMap().size());
-
-        return rtn;
-    }
-
     @Override
     public TX getPoolTx(Address from, BigInteger txNonce) {
         AbstractMap.SimpleEntry<ByteArrayWrapper, BigInteger> entry = this.getAccView(from).getMap().get(txNonce);
@@ -290,6 +274,11 @@ public List<TX> snapshot() {
         return snapshot(false);
     }
 
+    @Override
+    public synchronized List<TX> snapshotAll() {
+        return snapshot(true);
+    }
+
     private synchronized List<TX> snapshot(boolean getAll) {
         List<TX> rtn = new ArrayList<>();
 
@@ -428,16 +417,4 @@ private void removeTimeoutTxn() {
         }
 
     }
-
-
-
-
-
-
-
-
-
-
-
-
 }