Feature: Add solidification stage to pipeline and only broadcast solid transactions

python-regression/tests/features/steps/api_test_steps.py

@@ -1,14 +1,13 @@
 from aloe import *
 from util import static_vals
+from util import logger as log
 from util.test_logic import api_test_logic as api_utils
 from util.threading_logic import pool_logic as pool
 from util.neighbor_logic import neighbor_logic as neighbors
 from util.response_logic import response_handling as responses
 from time import sleep, time
 
-import logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 testAddress = static_vals.TEST_ADDRESS
 

python-regression/tests/features/steps/local_snapshots_steps.py

@@ -1,9 +1,8 @@
 from aloe import step
 from util.test_logic import api_test_logic as api_utils
+from util import logger as log
 
-import logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 
 @step(r'A local snapshot was taken on "([^"]+)" at index (\d+)')

python-regression/tests/features/steps/response_handling_steps.py

@@ -1,11 +1,10 @@
-import logging
 from aloe import world, step
-from util.response_logic import response_handling as response_handling
 from util.test_logic import api_test_logic as api_utils
 from util.test_logic import value_fetch_logic
+from util.response_logic import response_handling as response_handling
+from util import logger as log
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 world.test_vars = {}
 

python-regression/tests/features/steps/transaction_steps.py

@@ -1,15 +1,13 @@
 from aloe import world, step
 from iota import Transaction
 from util import static_vals as static
+from util import logger as log
 from util.test_logic import api_test_logic as api_utils
 from util.transaction_bundle_logic import transaction_logic as transactions
 from util.milestone_logic import milestones
 from time import sleep
 
-import logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
+logger = log.getLogger(__name__)
 
 @step(r'a transaction is generated and attached on "([^"]+)" with:')
 def generate_transaction_and_attach(step, node):
@@ -204,7 +202,8 @@ def wait_for_update(index, api):
         if node_info['latestSolidSubtangleMilestoneIndex'] == index:
             updated = True
             break
-        i += 1;
+        i += 1
         sleep(1)
+        logger.info("Waiting... {}".format(i))
 
     assert updated is True, "The node was unable to update to index {}".format(index)

python-regression/util/logger.py

@@ -0,0 +1,5 @@
+import logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s: %(message)s')
+
+def getLogger(name):
+    return logging.getLogger(name)

python-regression/util/milestone_logic/milestones.py

@@ -1,11 +1,9 @@
 from iota import ProposedTransaction, ProposedBundle, Tag, Address, Transaction
 from util import conversion as converter
+from util import logger as log
 from util.transaction_bundle_logic import bundle_logic
 
-import logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
+logger = log.getLogger(__name__)
 
 def issue_milestone(address, api, index, *reference_transaction):
     txn1 = ProposedTransaction(

python-regression/util/neighbor_logic/neighbor_logic.py

@@ -1,6 +1,5 @@
-import logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+from util import logger as log
+logger = log.getLogger(__name__)
 
 
 def check_if_neighbors(api, neighbors, expected_neighbor):

python-regression/util/response_logic/response_handling.py

@@ -1,8 +1,7 @@
-import logging
 from util.threading_logic import pool_logic as pool
+from util import logger as log
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 
 def find_in_response(key, response):

python-regression/util/test_logic/api_test_logic.py

@@ -1,13 +1,12 @@
 import json
-import logging
 import urllib3
 from aloe import world
 from iota import Iota, Address, Tag, TryteString
 
 from . import value_fetch_logic as value_fetch
+from util import logger as log
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 
 def prepare_api_call(node_name, **kwargs):

python-regression/util/threading_logic/pool_logic.py

@@ -1,7 +1,6 @@
 from multiprocessing.dummy import Pool
-import logging
-logging.basicConfig(level=logging.DEBUG)
-logger = logging.getLogger(__name__)
+from util import logger as log
+logger = log.getLogger(__name__)
 
 
 def start_pool(function, iterations, args):

python-regression/util/transaction_bundle_logic/transaction_logic.py

@@ -2,10 +2,9 @@
 from util import static_vals as static
 from util.test_logic import api_test_logic as api_utils
 from util.test_logic import value_fetch_logic as value_fetch
-import logging
+from util import logger as log
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = log.getLogger(__name__)
 
 
 def create_transaction_bundle(address, tag, value):

src/main/java/com/iota/iri/Iota.java

@@ -22,6 +22,8 @@
 import com.iota.iri.service.transactionpruning.DepthPruningCondition;
 import com.iota.iri.service.transactionpruning.SizePruningCondition;
 import com.iota.iri.service.transactionpruning.TransactionPruner;
+import com.iota.iri.service.validation.TransactionSolidifier;
+import com.iota.iri.service.validation.TransactionValidator;
 import com.iota.iri.storage.*;
 import com.iota.iri.storage.rocksDB.RocksDBPersistenceProvider;
 import com.iota.iri.utils.Pair;
@@ -95,6 +97,8 @@ public class Iota {
 
     public final MilestoneSolidifier milestoneSolidifier;
 
+    public final TransactionSolidifier transactionSolidifier;
+
     public final BundleValidator bundleValidator;
 
     public final Tangle tangle;
@@ -126,7 +130,7 @@ public Iota(IotaConfig configuration, SpentAddressesProvider spentAddressesProvi
             TransactionRequester transactionRequester, NeighborRouter neighborRouter,
             TransactionProcessingPipeline transactionProcessingPipeline, TipsRequester tipsRequester,
             TipsViewModel tipsViewModel, TipSelector tipsSelector, LocalSnapshotsPersistenceProvider localSnapshotsDb,
-            CacheManager cacheManager) {
+            CacheManager cacheManager, TransactionSolidifier transactionSolidifier) {
         this.configuration = configuration;
 
         this.ledgerService = ledgerService;
@@ -144,9 +148,9 @@ public Iota(IotaConfig configuration, SpentAddressesProvider spentAddressesProvi
         this.neighborRouter = neighborRouter;
         this.txPipeline = transactionProcessingPipeline;
         this.tipsRequester = tipsRequester;
+        this.transactionSolidifier = transactionSolidifier;
         this.localSnapshotsDb = localSnapshotsDb;
 
-
         // legacy classes
         this.bundleValidator = bundleValidator;
         this.tangle = tangle;
@@ -199,8 +203,6 @@ public void init() throws Exception {
             tangle.clearMetadata(com.iota.iri.model.persistables.Transaction.class);
         }
 
-        transactionValidator.init();
-
         txPipeline.start();
         neighborRouter.start();
         tipsRequester.start();
@@ -209,6 +211,7 @@ public void init() throws Exception {
         latestSolidMilestoneTracker.start();
         seenMilestonesRetriever.start();
         milestoneSolidifier.start();
+        transactionSolidifier.start();
 
         if (localSnapshotManager != null) {
             localSnapshotManager.addSnapshotCondition(new SnapshotDepthCondition(configuration, snapshotProvider));
@@ -255,6 +258,7 @@ private void rescanDb() throws Exception {
     public void shutdown() throws Exception {
         // shutdown in reverse starting order (to not break any dependencies)
         milestoneSolidifier.shutdown();
+        transactionSolidifier.shutdown();
         seenMilestonesRetriever.shutdown();
         latestSolidMilestoneTracker.shutdown();
         latestMilestoneTracker.shutdown();
@@ -269,7 +273,6 @@ public void shutdown() throws Exception {
         tipsRequester.shutdown();
         txPipeline.shutdown();
         neighborRouter.shutdown();
-        transactionValidator.shutdown();
         localSnapshotsDb.shutdown();
         tangle.shutdown();
 

src/main/java/com/iota/iri/MainInjectionConfiguration.java

@@ -27,6 +27,9 @@
 import com.iota.iri.service.tipselection.impl.*;
 import com.iota.iri.service.transactionpruning.TransactionPruner;
 import com.iota.iri.service.transactionpruning.async.AsyncTransactionPruner;
+import com.iota.iri.service.validation.TransactionSolidifier;
+import com.iota.iri.service.validation.TransactionValidator;
+import com.iota.iri.service.validation.impl.TransactionSolidifierImpl;
 import com.iota.iri.storage.LocalSnapshotsPersistenceProvider;
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.storage.rocksDB.RocksDBPersistenceProvider;
@@ -114,8 +117,8 @@ SeenMilestonesRetriever provideSeenMilestonesRetriever(Tangle tangle, SnapshotPr
 
     @Singleton
     @Provides
-    MilestoneSolidifier provideMilestoneSolidifier(SnapshotProvider snapshotProvider, TransactionValidator transactionValidator) {
-        return new MilestoneSolidifierImpl(snapshotProvider, transactionValidator);
+    MilestoneSolidifier provideMilestoneSolidifier(SnapshotProvider snapshotProvider, TransactionSolidifier transactionSolidifier) {
+        return new MilestoneSolidifierImpl(snapshotProvider, transactionSolidifier);
     }
 
     @Singleton
@@ -136,8 +139,14 @@ LocalSnapshotManager provideLocalSnapshotManager(SnapshotProvider snapshotProvid
 
     @Singleton
     @Provides
-    TransactionValidator provideTransactionValidator(Tangle tangle, SnapshotProvider snapshotProvider, TipsViewModel tipsViewModel, TransactionRequester transactionRequester) {
-        return new TransactionValidator(tangle, snapshotProvider, tipsViewModel, transactionRequester, configuration);
+    TransactionValidator provideTransactionValidator(SnapshotProvider snapshotProvider, TransactionRequester transactionRequester) {
+        return new TransactionValidator(snapshotProvider, transactionRequester, configuration);
+    }
+
+    @Singleton
+    @Provides
+    TransactionSolidifier provideTransactionSolidifier(Tangle tangle, SnapshotProvider snapshotProvider, TransactionRequester transactionRequester, TipsViewModel tipsViewModel){
+        return new TransactionSolidifierImpl(tangle, snapshotProvider, transactionRequester, tipsViewModel);
     }
 
     @Singleton
@@ -171,12 +180,12 @@ Iota provideIota(SpentAddressesProvider spentAddressesProvider, SpentAddressesSe
             TransactionRequester transactionRequester, NeighborRouter neighborRouter,
             TransactionProcessingPipeline transactionProcessingPipeline, TipsRequester tipsRequester,
             TipsViewModel tipsViewModel, TipSelector tipsSelector, LocalSnapshotsPersistenceProvider localSnapshotsDb,
-            CacheManager cacheManager) {
+            CacheManager cacheManager, TransactionSolidifier transactionSolidifier) {
         return new Iota(configuration, spentAddressesProvider, spentAddressesService, snapshotProvider, snapshotService,
                 localSnapshotManager, milestoneService, latestMilestoneTracker, latestSolidMilestoneTracker,
                 seenMilestonesRetriever, ledgerService, transactionPruner, milestoneSolidifier, bundleValidator, tangle,
                 transactionValidator, transactionRequester, neighborRouter, transactionProcessingPipeline,
-                tipsRequester, tipsViewModel, tipsSelector, localSnapshotsDb, cacheManager);
+                tipsRequester, tipsViewModel, tipsSelector, localSnapshotsDb, cacheManager, transactionSolidifier);
     }
 
     @Singleton
@@ -191,8 +200,8 @@ API provideApi(IXI ixi, TransactionRequester transactionRequester,
                           SpentAddressesService spentAddressesService, Tangle tangle, BundleValidator bundleValidator,
                           SnapshotProvider snapshotProvider, LedgerService ledgerService, NeighborRouter neighborRouter, TipSelector tipsSelector,
                           TipsViewModel tipsViewModel, TransactionValidator transactionValidator,
-                          LatestMilestoneTracker latestMilestoneTracker, TransactionProcessingPipeline txPipeline) {
-        return new API(configuration, ixi, transactionRequester, spentAddressesService, tangle, bundleValidator, snapshotProvider, ledgerService, neighborRouter, tipsSelector, tipsViewModel, transactionValidator, latestMilestoneTracker, txPipeline);
+                          LatestMilestoneTracker latestMilestoneTracker, TransactionProcessingPipeline txPipeline, TransactionSolidifier transactionSolidifier) {
+        return new API(configuration, ixi, transactionRequester, spentAddressesService, tangle, bundleValidator, snapshotProvider, ledgerService, neighborRouter, tipsSelector, tipsViewModel, transactionValidator, latestMilestoneTracker, txPipeline, transactionSolidifier);
     }
 
     @Singleton