Merge pull request #1187 from skhoroshavin/fix-ts-store

Fix crash when catching up genesis txns

Author: ashcherbakov

plenum/server/node.py

@@ -2179,8 +2179,9 @@ def postTxnFromCatchupAddedToLedger(self, ledger_id: int, txn: Any, updateSeqNo=
             state = self.getState(ledger_id)
             state.commit(rootHash=state.headHash)
             if ledger_id == DOMAIN_LEDGER_ID and rh.ts_store:
-                rh.ts_store.set(get_txn_time(txn),
-                                state.headHash)
+                timestamp = get_txn_time(txn)
+                if timestamp is not None:
+                    rh.ts_store.set(timestamp, state.headHash)
             logger.trace("{} added transaction with seqNo {} to ledger {} during catchup, state root {}"
                          .format(self, get_seq_no(txn), ledger_id,
                                  state_roots_serializer.serialize(bytes(state.committedHeadHash))))

plenum/test/node_catchup/test_post_genesis_txn_from_catchup_added_to_ledger.py

@@ -0,0 +1,25 @@
+from typing import Optional
+
+from plenum.common.constants import DOMAIN_LEDGER_ID, CURRENT_PROTOCOL_VERSION
+from plenum.common.txn_util import reqToTxn
+from plenum.test.helper import sdk_random_request_objects
+
+
+def test_post_genesis_txn_from_catchup_added_to_ledger(looper, txnPoolNodeSet):
+    node = txnPoolNodeSet[0]
+
+    def add_txn_to_ledger(txn_time: Optional[int]) -> dict:
+        nonlocal node
+        req = sdk_random_request_objects(1, CURRENT_PROTOCOL_VERSION, identifier='someidentifier')[0]
+        txn = reqToTxn(req)
+        node.domainLedger.append_txns_metadata([txn], txn_time=txn_time)
+        node.domainLedger.appendTxns([txn])
+        return txn
+
+    # Process some genesis txn (which doesn't have timestamp)
+    genesis_txn = add_txn_to_ledger(txn_time=None)
+    node.postTxnFromCatchupAddedToLedger(DOMAIN_LEDGER_ID, genesis_txn)
+
+    # Process some other txn (which does have timestamp)
+    other_txn = add_txn_to_ledger(txn_time=13439852)
+    node.postTxnFromCatchupAddedToLedger(DOMAIN_LEDGER_ID, other_txn)