some TransactionValidator fixes regarding solidity (#913)

Set transactions in TipsViewModel solid accordingly
iotaledger · Aug 14, 2018 · 55c62ba · 55c62ba
1 parent 7ebad49
commit 55c62ba
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/com/iota/iri/TransactionValidator.java b/src/main/java/com/iota/iri/TransactionValidator.java
@@ -202,7 +202,8 @@ void propagateSolidTransactions() {
                 for(Hash h: approvers) {
                     TransactionViewModel tx = TransactionViewModel.fromHash(tangle, h);
                     if(quietQuickSetSolid(tx)) {
-                        tx.update(tangle, "solid");
+                        tx.update(tangle, "solid|height");
+                        tipsViewModel.setSolid(h);
                         addSolidTransaction(h);
                     }
                 }
@@ -221,6 +222,8 @@ public void updateStatus(TransactionViewModel transactionViewModel) throws Excep
         tipsViewModel.removeTipHash(transactionViewModel.getBranchTransactionHash());
 
         if(quickSetSolid(transactionViewModel)) {
+            transactionViewModel.update(tangle, "solid|height");
+            tipsViewModel.setSolid(transactionViewModel.getHash());
             addSolidTransaction(transactionViewModel.getHash());
         }
     }

diff --git a/src/main/java/com/iota/iri/controllers/TipsViewModel.java b/src/main/java/com/iota/iri/controllers/TipsViewModel.java
@@ -98,6 +98,12 @@ public int nonSolidSize() {
             return tips.size();
         }
     }
+
+    public int solidSize() {
+        synchronized (sync) {
+            return solidTips.size();
+        }
+    }
 
     public int size() {
         synchronized (sync) {
@@ -140,4 +146,4 @@ public Iterator<K> iterator() {
         }
     }
 
-}
+}
diff --git a/src/main/java/com/iota/iri/service/TipsSolidifier.java b/src/main/java/com/iota/iri/service/TipsSolidifier.java
@@ -30,9 +30,17 @@ public TipsSolidifier(final Tangle tangle,
     public void init() {
         solidityRescanHandle = new Thread(() -> {
 
+            long lastTime = 0;
             while (!shuttingDown) {
                 try {
                     scanTipsForSolidity();
+                    if (log.isDebugEnabled()) {
+                        long now = System.currentTimeMillis();
+                        if ((now - lastTime) > 10000L) {
+                            lastTime = now;
+                            log.debug("#Solid/NonSolid: {}/{}", tipsViewModel.solidSize(), tipsViewModel.nonSolidSize());
+                        }
+                    }
                 } catch (Exception e) {
                     log.error("Error during solidity scan : {}", e);
                 }