Merge pull request #1235 from iotadevelopment/merge_txrequesterfix

Fix: Node requested old transactions forever
iotaledger · Dec 13, 2018 · df04e1b · df04e1b
2 parents ffa7a37 + 506e205
commit df04e1b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/iota/iri/TransactionValidator.java b/src/main/java/com/iota/iri/TransactionValidator.java
@@ -260,8 +260,8 @@ public boolean checkSolidity(Hash hash, boolean milestone, int maxProcessedTrans
                 }
 
                 final TransactionViewModel transaction = fromHash(tangle, hashPointer);
-                if(!transaction.isSolid()) {
-                    if (transaction.getType() == PREFILLED_SLOT && !snapshotProvider.getInitialSnapshot().hasSolidEntryPoint(hashPointer)) {
+                if(!transaction.isSolid() && !snapshotProvider.getInitialSnapshot().hasSolidEntryPoint(hashPointer)) {
+                    if (transaction.getType() == PREFILLED_SLOT) {
                         solid = false;
 
                         if (!transactionRequester.isTransactionRequested(hashPointer, milestone)) {
@@ -436,13 +436,15 @@ private boolean quickSetSolid(final TransactionViewModel transactionViewModel) t
      * @throws Exception if we encounter an error while requesting a transaction
      */
     private boolean checkApproovee(TransactionViewModel approovee) throws Exception {
-        if(approovee.getType() == PREFILLED_SLOT) {
-            transactionRequester.requestTransaction(approovee.getHash(), false);
-            return false;
-        }
         if(snapshotProvider.getInitialSnapshot().hasSolidEntryPoint(approovee.getHash())) {
             return true;
         }
+        if(approovee.getType() == PREFILLED_SLOT) {
+            // don't solidify from the bottom until cuckoo filters can identify where we deleted -> otherwise we will
+            // continue requesting old transactions forever
+            //transactionRequester.requestTransaction(approovee.getHash(), false);
+            return false;
+        }
         return approovee.isSolid();
     }
 

diff --git a/src/main/java/com/iota/iri/network/impl/TransactionRequesterWorkerImpl.java b/src/main/java/com/iota/iri/network/impl/TransactionRequesterWorkerImpl.java
@@ -147,6 +147,9 @@ public void shutdown() {
      */
     private TransactionViewModel getTransactionToSendWithRequest() throws Exception {
         Hash tip = tipsViewModel.getRandomSolidTipHash();
+        if (tip == null) {
+            tip = tipsViewModel.getRandomNonSolidTipHash();
+        }
 
         return TransactionViewModel.fromHash(tangle, tip == null ? Hash.NULL_HASH : tip);
     }