Merge branch 'master' of github.com:CounterpartyXCP/counterparty-lib …

…into develop
CounterpartyXCP · Dec 15, 2023 · 757192b · 757192b
2 parents a75e06f + e65172a
commit 757192b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/counterpartylib/lib/blocks.py b/counterpartylib/lib/blocks.py
@@ -51,7 +51,7 @@
          'rps_match_expirations', 'rps_expirations', 'rpsresolves',
          'rps_matches', 'rps',
          'destructions', 'assets', 'addresses', 'sweeps', 'dispensers', 'dispenses',
-         'transaction_outputs','dispenser_refills']
+         'dispenser_refills']
 # Compose list of tables tracked by undolog
 UNDOLOG_TABLES = copy.copy(TABLES)
 UNDOLOG_TABLES.remove('messages')
@@ -984,6 +984,7 @@ def reinitialise(db, block_index=None):
 
     # For rollbacks, just delete new blocks and then reparse what’s left.
     if block_index:
+        cursor.execute('''DELETE FROM transaction_outputs WHERE block_index > ?''', (block_index,))
         cursor.execute('''DELETE FROM transactions WHERE block_index > ?''', (block_index,))
         cursor.execute('''DELETE FROM blocks WHERE block_index > ?''', (block_index,))
     elif config.TESTNET or config.REGTEST:  # block_index NOT specified and we are running testnet
@@ -1044,6 +1045,7 @@ def get_block_index_for_undo_index(undo_indexes, undo_index):
                 undolog_cursor.execute(entry[1])
 
             # Trim back tx and blocks
+            undolog_cursor.execute('''DELETE FROM transaction_outputs WHERE block_index > ?''', (block_index,))
             undolog_cursor.execute('''DELETE FROM transactions WHERE block_index > ?''', (block_index,))
             undolog_cursor.execute('''DELETE FROM blocks WHERE block_index > ?''', (block_index,))
             # As well as undolog entries...

diff --git a/counterpartylib/lib/config.py b/counterpartylib/lib/config.py
@@ -9,7 +9,7 @@
 # Versions
 VERSION_MAJOR = 9
 VERSION_MINOR = 61
-VERSION_REVISION = 0
+VERSION_REVISION = 1
 VERSION_STRING = str(VERSION_MAJOR) + '.' + str(VERSION_MINOR) + '.' + str(VERSION_REVISION)
 
 

diff --git a/counterpartylib/lib/messages/issuance.py b/counterpartylib/lib/messages/issuance.py
@@ -508,7 +508,10 @@ def parse (db, tx, message, message_type_id):
                     asset = namedAsset
 
             if description == None:
-                description = util.get_asset_description(db, asset)
+                try:
+                    description = util.get_asset_description(db, asset)
+                except exceptions.AssetError:
+                    description = ""
 
             status = 'valid'
         except exceptions.AssetIDError: