replace ledger_hash by migration_hash

Author: Ouziel

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

@@ -296,7 +296,6 @@ def isodt(epoch_time):
     "order_hash",
     "rps_hash",
     "ledger_hash",
-    "migration_hash",
     "txlist_hash",
     "messages_hash",
     "offer_hash",

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

@@ -86,19 +86,12 @@ def append_to_block_ledger(self, item):
     def append_to_block_journal(self, item):
         self.journal.append(item)
 
-    def append_to_block_migration(self, item):
-        self.migration.append(item)
-
     def block_ledger(self):
         return self.ledger
 
     def block_journal(self):
         return self.journal
 
-    def block_migration(self):
-        return self.migration
-
     def reset(self):
         self.ledger = []
         self.journal = []
-        self.migration = []

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

@@ -269,8 +269,7 @@ def debit(db, address, asset, quantity, tx_index, action=None, event=None):
     }
     insert_record(db, "debits", bindings, "DEBIT")
 
-    ConsensusHashBuilder().append_to_block_ledger(f"{block_index}{address}{asset}{quantity}")
-    ConsensusHashBuilder().append_to_block_migration(
+    ConsensusHashBuilder().append_to_block_ledger(
         f"{block_index}{str(address)[0:36]}{asset}{quantity}"
     )
     return utxo_address
@@ -349,8 +348,7 @@ def credit(db, address, asset, quantity, tx_index, action=None, event=None):
     }
     insert_record(db, "credits", bindings, "CREDIT")
 
-    ConsensusHashBuilder().append_to_block_ledger(f"{block_index}{address}{asset}{quantity}")
-    ConsensusHashBuilder().append_to_block_migration(
+    ConsensusHashBuilder().append_to_block_ledger(
         f"{block_index}{str(address)[0:36]}{asset}{quantity}"
     )
 

counterparty-core/counterpartycore/lib/ledger/migrations/0004.add_migration_hash.sql

@@ -309,7 +309,6 @@ def parse_block(
     previous_ledger_hash=None,
     previous_txlist_hash=None,
     previous_messages_hash=None,
-    previous_migration_hash=None,
     reparsing=False,
 ):
     """Parse the block, return hash of new ledger, txlist and messages.
@@ -379,12 +378,6 @@ def parse_block(
             previous_messages_hash,
             ledger.currentstate.ConsensusHashBuilder().block_journal(),
         )
-        new_migration_hash, _found_migration_hash = check.consensus_hash(
-            db,
-            "migration_hash",
-            previous_migration_hash,
-            ledger.currentstate.ConsensusHashBuilder().block_migration(),
-        )
 
         # Update block
 
@@ -394,15 +387,13 @@ def parse_block(
                 txlist_hash=:txlist_hash,
                 ledger_hash=:ledger_hash,
                 messages_hash=:messages_hash,
-                migration_hash=:migration_hash,
                 transaction_count=:transaction_count
             WHERE block_index=:block_index
         """
         update_block_bindings = {
             "txlist_hash": new_txlist_hash,
             "ledger_hash": new_ledger_hash,
             "messages_hash": new_messages_hash,
-            "migration_hash": new_migration_hash,
             "transaction_count": len(transactions),
             "block_index": block_index,
         }
@@ -420,14 +411,13 @@ def parse_block(
                 "ledger_hash": new_ledger_hash,
                 "txlist_hash": new_txlist_hash,
                 "messages_hash": new_messages_hash,
-                "migration_hash": new_migration_hash,
                 "transaction_count": len(transactions),
             },
         )
 
         cursor.close()
 
-        return new_ledger_hash, new_txlist_hash, new_messages_hash, new_migration_hash
+        return new_ledger_hash, new_txlist_hash, new_messages_hash
 
     cursor.close()
     return None, None, None, None
@@ -653,21 +643,18 @@ def reparse(db, block_index=0):
             previous_ledger_hash = None
             previous_txlist_hash = None
             previous_messages_hash = None
-            previous_migration_hash = None
             if CurrentState().current_block_index() > config.BLOCK_FIRST:
                 previous_block = ledger.blocks.get_block(db, block["block_index"] - 1)
                 previous_ledger_hash = previous_block["ledger_hash"]
                 previous_txlist_hash = previous_block["txlist_hash"]
                 previous_messages_hash = previous_block["messages_hash"]
-                previous_migration_hash = previous_block["migration_hash"]
             parse_block(
                 db,
                 block["block_index"],
                 block["block_time"],
                 previous_ledger_hash=previous_ledger_hash,
                 previous_txlist_hash=previous_txlist_hash,
                 previous_messages_hash=previous_messages_hash,
-                previous_migration_hash=previous_migration_hash,
                 reparsing=True,
             )
             block_parsed_count += 1
@@ -754,7 +741,6 @@ def parse_new_block(db, decoded_block, tx_index=None):
             "ledger_hash": None,
             "txlist_hash": None,
             "messages_hash": None,
-            "migration_hash": None,
             "block_index": config.BLOCK_FIRST - 1,
         }
     else:
@@ -799,21 +785,19 @@ def parse_new_block(db, decoded_block, tx_index=None):
                 decoded_tx=transaction,
             )
         # Parse the transactions in the block.
-        new_ledger_hash, new_txlist_hash, new_messages_hash, new_migration_hash = parse_block(
+        new_ledger_hash, new_txlist_hash, new_messages_hash = parse_block(
             db,
             decoded_block["block_index"],
             decoded_block["block_time"],
             previous_ledger_hash=previous_block["ledger_hash"],
             previous_txlist_hash=previous_block["txlist_hash"],
             previous_messages_hash=previous_block["messages_hash"],
-            previous_migration_hash=previous_block["migration_hash"],
         )
 
         duration = time.time() - start_time
 
         log_message = "Block %(block_index)s - Parsing complete. "
         log_message += "L: %(ledger_hash)s, "
-        log_message += "L2: %(migration_hash)s, "
         log_message += "TX: %(txlist_hash)s, "
         log_message += "M: %(messages_hash)s "
         log_message += "(%(duration).2fs)"
@@ -824,7 +808,6 @@ def parse_new_block(db, decoded_block, tx_index=None):
                 "ledger_hash": new_ledger_hash,
                 "txlist_hash": new_txlist_hash,
                 "messages_hash": new_messages_hash,
-                "migration_hash": new_migration_hash,
                 "duration": duration,
             },
         )

counterparty-core/counterpartycore/lib/messages/data/checkpoints.py

@@ -13,7 +13,7 @@
 
 
 def consensus_hash(db, field, previous_consensus_hash, content):
-    assert field in ("ledger_hash", "txlist_hash", "messages_hash", "migration_hash")
+    assert field in ("ledger_hash", "txlist_hash", "messages_hash")
 
     cursor = db.cursor()
     block_index = CurrentState().current_block_index()
@@ -58,7 +58,7 @@ def consensus_hash(db, field, previous_consensus_hash, content):
         ]
         or None
     )
-    if found_hash and field not in ["messages_hash", "ledger_hash"]:
+    if found_hash and field != "messages_hash":
         # Check against existing value.
         if calculated_hash != found_hash:
             raise exceptions.ConsensusError(
@@ -76,7 +76,7 @@ def consensus_hash(db, field, previous_consensus_hash, content):
         network_checkpoints = checkpoints.CHECKPOINTS_MAINNET
 
     if (
-        field not in ["messages_hash", "ledger_hash"]
+        field != "messages_hash"
         and block_index in network_checkpoints
         and network_checkpoints[block_index][field] != calculated_hash
     ):

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

@@ -11,7 +11,7 @@ def test_blocks_functions(ledger_db, current_block_index):
     assert last_block["block_index"] == current_block_index
     assert (
         last_block["ledger_hash"]
-        == "cb226f571087a7585d9ef65ae98d36500e4d0abf3a6737923182d70bf3068e92"
+        == "084d9a93dea77718d67f44e5bb34a63539f4d5437132d8af2b1abfb1e8ddf848"
     )
     assert (
         last_block["txlist_hash"]
@@ -28,7 +28,7 @@ def test_blocks_functions(ledger_db, current_block_index):
     assert last_block["block_index"] == current_block_index
     assert (
         last_block["ledger_hash"]
-        == "cb226f571087a7585d9ef65ae98d36500e4d0abf3a6737923182d70bf3068e92"
+        == "084d9a93dea77718d67f44e5bb34a63539f4d5437132d8af2b1abfb1e8ddf848"
     )
     assert (
         last_block["txlist_hash"]