fixes

Author: Ouziel

counterparty-core/counterpartycore/lib/cli/server.py

@@ -689,7 +689,6 @@ def __init__(self, args, log_stream=None):
         logger.debug(f"Config: {custom_config}")
 
     def run_server(self):
-        CurrentState().set_ledger_state("Starting")
         # download bootstrap if necessary
         if (
             not os.path.exists(config.DATABASE) and self.args.catch_up == "bootstrap"
@@ -786,7 +785,7 @@ def run(self):
 
     def stop(self):
         logger.info("Shutting down...")
-        CurrentState().set_ledger_state("Stopping")
+        CurrentState().set_ledger_state(self.db, "Stopping")
 
         # Ensure all threads are stopped
         if self.follower_daemon:

counterparty-core/counterpartycore/lib/ledger/currentstate.py

@@ -83,10 +83,9 @@ def set_current_tx_hash(self, tx_hash):
     def set_parsing_mempool(self, parsing_mempool):
         self.state["PARSING_MEMPOOL"] = parsing_mempool
 
-    def set_ledger_state(self, status):
+    def set_ledger_state(self, ledger_db, status):
         # use db to share Ledger state with other processes
-        with LedgerDBConnectionPool().connection() as ledger_db:
-            set_config_value(ledger_db, "LEDGER_STATE", status)
+        set_config_value(ledger_db, "LEDGER_STATE", status)
 
     def current_block_index(self):
         return self.state.get("CURRENT_BLOCK_INDEX")
@@ -115,7 +114,7 @@ def parsing_mempool(self):
 
     def ledger_state(self):
         with LedgerDBConnectionPool().connection() as ledger_db:
-            return get_config_value(ledger_db, "LEDGER_STATE")
+            return get_config_value(ledger_db, "LEDGER_STATE") or "Starting"
 
 
 class ConsensusHashBuilder(metaclass=helpers.SingletonMeta):

counterparty-core/counterpartycore/lib/parser/blocks.py

@@ -543,6 +543,7 @@ def rollback(db, block_index=0, force=False):
     if not force and block_index > CurrentState().current_block_index():
         logger.debug("Block index is higher than current block index. No need to reparse.")
         return
+    CurrentState().set_ledger_state(db, "Rollbacking")
     block_index = max(block_index, config.BLOCK_FIRST)
     # clean all tables
     step = f"Rolling Ledger DB back to block {block_index}..."
@@ -587,6 +588,7 @@ def reparse(db, block_index=0):
     if block_index > CurrentState().current_block_index():
         logger.debug("Block index is higher than current block index. No need to reparse.")
         return
+    CurrentState().set_ledger_state(db, "Reparsing")
     cursor = db.cursor()
     # clean all tables except assets' blocks', 'transaction_outputs' and 'transactions'
     with log.Spinner(f"Rolling database back to block {block_index}..."):
@@ -881,7 +883,7 @@ def catch_up(db, check_asset_conservation=True):
     fetcher = None
 
     try:
-        CurrentState().set_ledger_state("Catching Up")
+        CurrentState().set_ledger_state(db, "Catching Up")
         # update the current block index
         current_block_index = ledger.blocks.last_db_index(db)
         if current_block_index == 0:

counterparty-core/counterpartycore/lib/parser/follow.py

@@ -65,7 +65,7 @@ def get_zmq_notifications_addresses():
 
 def start_blockchain_watcher(db):
     try:
-        CurrentState().set_ledger_state("Following")
+        CurrentState().set_ledger_state(db, "Following")
         return BlockchainWatcher(db)
     except exceptions.BitcoindZMQError as e:
         logger.error(e)

counterparty-core/counterpartycore/test/units/ledger/currentstate_test.py

@@ -20,11 +20,11 @@ def test_currentstate(ledger_db, current_block_index, monkeypatch):
     currentstate.CurrentState().set_parsing_mempool(False)
     assert not currentstate.CurrentState().parsing_mempool()
 
-    assert currentstate.CurrentState().ledger_state() == "starting"
-    currentstate.CurrentState().set_ledger_state("running")
-    assert currentstate.CurrentState().ledger_state() == "running"
-    currentstate.CurrentState().set_ledger_state("starting")
-    assert currentstate.CurrentState().ledger_state() == "starting"
+    assert currentstate.CurrentState().ledger_state() == "Starting"
+    currentstate.CurrentState().set_ledger_state(ledger_db, "Following")
+    assert currentstate.CurrentState().ledger_state() == "Following"
+    currentstate.CurrentState().set_ledger_state(ledger_db, "Catching Up")
+    assert currentstate.CurrentState().ledger_state() == "Catching Up"
 
     currentstate.CurrentState().set("toto", "tata")
     assert currentstate.CurrentState().get("toto") == "tata"

counterparty-core/counterpartycore/test/units/ledger/markets_test.py

@@ -6,9 +6,9 @@ def test_markets(ledger_db, defaults):
     assert len(markets.get_open_btc_orders(ledger_db, defaults["addresses"][0])) == 1
 
     original_state = currentstate.CurrentState().ledger_state()
-    currentstate.CurrentState().set_ledger_state("catching up")
+    currentstate.CurrentState().set_ledger_state(ledger_db, "Catching Up")
     assert len(markets.get_matching_orders(ledger_db, "tx_hash", "BTC", "XCP")) == 2
-    currentstate.CurrentState().set_ledger_state(original_state)
+    currentstate.CurrentState().set_ledger_state(ledger_db, original_state)
 
     open_orders = ledger_db.execute(
         """SELECT rowid FROM (