Transaction Search Fix (#731)

* Transaction Search from Mempool + Block in Buffer

* Removing too much logging

* Avoid interactive output in tests

* Avoid console output in tests

Author: cyyber

.travis.yml

@@ -32,7 +32,7 @@ jobs:
       - echo "Skip installing requirements.txt when running integration tests"
       script:
       - "./travis/build.sh"
-      - sudo pip install -U coverage codacy-coverage
+      - sudo pip install -U coverage codacy-coverage | cat
       - if [[ "$TRAVIS_BRANCH" == "master" ]]; then python-codacy-coverage -r coverage.xml || echo "failed"; fi
 
     - stage: build+test
@@ -71,7 +71,7 @@ jobs:
       - python --version
       - echo "Skip installing requirements.txt when running integration tests"
       script:
-      - sudo pip install -U docker-compose
+      - sudo pip install -U docker-compose | cat
       - docker-compose --version
       - "cd tests_integration; python3 runtest_nodes_synchronize.py"
 
@@ -85,7 +85,7 @@ jobs:
       - python --version
       - echo "Skip installing requirements.txt when running integration tests"
       script:
-      - sudo pip install -U docker-compose
+      - sudo pip install -U docker-compose | cat
       - docker-compose --version
       - "cd tests_integration; python3 runtest_nodes_1minAfterSync.py"
 
@@ -100,7 +100,7 @@ jobs:
       - echo "Skip installing requirements.txt when using docker builders"
       script:
       - sudo apt install -y python-dev libssl-dev libffi-dev
-      - sudo pip install -U pip setuptools twine pyOpenSSL ndg-httpsclient pyasn1
+      - sudo pip install -U pip setuptools twine pyOpenSSL ndg-httpsclient pyasn1 | cat
       - "./travis/build.sh"
 
       deploy:

qrl/core/BlockMetadata.py

@@ -1,7 +1,8 @@
 # coding=utf-8
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-from typing import Dict  # noqa
+from typing import Dict, Optional  # noqa
+from pyqrllib.pyqrllib import bin2hstr
 
 from qrl.core.AddressState import AddressState  # noqa
 from qrl.core.Block import Block
@@ -36,6 +37,9 @@ def __init__(self,
         self.hash_chain = hash_chain
         self.voted_weight = 0
         self.total_stake_amount = 0
+        self.approved_txns = dict()
+        for tx in block.transactions:
+            self.approved_txns[bin2hstr(tx.transaction_hash)] = tx
 
     def update_vote_metadata(self, prev_stake_validators_tracker):
         self.total_stake_amount = prev_stake_validators_tracker.get_total_stake_amount()
@@ -73,3 +77,16 @@ def update_stxn_state(self, pstate):
                     self.address_state_dict[addr].pubhashes == addr_state.pubhashes and \
                     self.address_state_dict[addr].tokens == addr_state.tokens:
                 del self.address_state_dict[addr]
+
+    def contains_txn(self, transaction_hash: bytes) -> bool:
+        if bin2hstr(transaction_hash) in self.approved_txns:
+            return True
+
+        return False
+
+    def get_txn(self, transaction_hash: bytes) -> Optional[bool]:
+        txhash = bin2hstr(transaction_hash)
+        if txhash in self.approved_txns:
+            return self.approved_txns[txhash]
+
+        return None

qrl/core/BufferedChain.py

@@ -146,10 +146,28 @@ def get_vote_metadata(self, blocknumber: int):
             return [self.blocks[blocknumber].voted_weight, self.blocks[blocknumber].total_stake_amount]
         return self._chain.pstate.get_vote_metadata(blocknumber)
 
-    def get_transaction(self, transaction_hash)->Optional[Transaction]:
+    def get_blockidx_from_txhash(self, transaction_hash) -> Optional[Transaction]:
+        answer = self._chain.pstate.get_tx_metadata(transaction_hash)
+        if answer is not None:
+            _, block_index = answer
+            return block_index
+
+        for block_idx in self.blocks:
+            if self.blocks[block_idx].contains_txn(transaction_hash):
+                return block_idx
+
+        return None
+
+    def get_transaction(self, transaction_hash) -> Optional[Transaction]:
         for tx in self.tx_pool.transaction_pool:
             if tx.txhash == transaction_hash:
                 return tx
+
+        for block_idx in self.blocks:
+            tx = self.blocks[block_idx].get_txn(transaction_hash)
+            if tx:
+                return tx
+
         return self._chain.get_transaction(transaction_hash)
 
     def _move_to_mainchain(self) -> bool:

qrl/core/qrlnode.py

@@ -353,12 +353,7 @@ def get_block_from_index(self, index: int) -> Block:
         return self._buffered_chain.get_block(index)
 
     def get_blockidx_from_txhash(self, transaction_hash):
-        answer = self.db_state.get_tx_metadata(transaction_hash)
-        if answer is None:
-            return None
-        else:
-            _, block_index = answer
-        return block_index
+        return self._buffered_chain.get_blockidx_from_txhash(transaction_hash)
 
     def get_token_detailed_list(self):
         pbdata = self.db_state.get_token_list()

qrl/services/PublicAPIService.py

@@ -109,8 +109,12 @@ def GetObject(self, request: qrl_pb2.GetObjectReq, context) -> qrl_pb2.GetObject
         if transaction is not None:
             answer.found = True
             block_index = self.qrlnode.get_blockidx_from_txhash(transaction.txhash)
-            block = self.qrlnode.get_block_from_index(block_index)
-            txextended = qrl_pb2.TransactionExtended(header=block.blockheader.pbdata,
+            blockheader = None
+            if block_index:
+                block = self.qrlnode.get_block_from_index(block_index)
+                blockheader = block.blockheader.pbdata
+
+            txextended = qrl_pb2.TransactionExtended(header=blockheader,
                                                      tx=transaction.pbdata)
             answer.transaction.CopyFrom(txextended)
             return answer

tests/core/test_BufferedChain.py

@@ -20,7 +20,7 @@
 from qrl.generated import qrl_pb2
 from tests.misc.helper import set_wallet_dir, get_alice_xmss, mocked_genesis, get_random_xmss, get_token_transaction, destroy_state
 
-logger.initialize_default(force_console_output=True)
+logger.initialize_default()
 
 
 class TestBufferedChain(TestCase):

tests/core/test_Chain.py

@@ -16,7 +16,7 @@
 from qrl.core.StakeValidatorsTracker import StakeValidatorsTracker
 from tests.misc.helper import set_wallet_dir, get_alice_xmss
 
-logger.initialize_default(force_console_output=True)
+logger.initialize_default()
 
 
 class TestChain(TestCase):
@@ -121,5 +121,3 @@ def test_add_many_and_save(self):
                         self.assertEqual(i, chain.height)  # FIXME: wrong name, it is not height but max_index
 
                         self.assertTrue(res)
-
-                print(qrl.core.config.dev.disk_writes_after_x_blocks)

tests/core/test_DependencyChecker.py

@@ -11,7 +11,7 @@
 from qrl.core import logger
 from qrl.core.DependencyChecker import DependencyChecker
 
-logger.initialize_default(force_console_output=True)
+logger.initialize_default()
 
 
 class TestDependencyChecker(TestCase):

tests/core/test_GenesisBlock.py

@@ -6,7 +6,7 @@
 from qrl.core import logger
 from qrl.core.GenesisBlock import GenesisBlock
 
-logger.initialize_default(force_console_output=True)
+logger.initialize_default()
 
 
 class TestGenesisBlock(TestCase):

tests/core/test_StakeValidator.py

@@ -10,7 +10,7 @@
 from qrl.crypto.xmss import XMSS
 from tests.misc.helper import get_alice_xmss
 
-logger.initialize_default(force_console_output=True)
+logger.initialize_default()
 
 
 class TestStakeValidator(TestCase):