follow-up d6febb5c12

electrum/address_synchronizer.py

@@ -244,6 +244,7 @@ class AddressSynchronizer(Logger, EventListener):
 
     def get_transaction(self, txid: str) -> Transaction:
         tx = self.db.get_transaction(txid)
+        if tx:
             # add verified tx info
             tx.deserialize()
             for txin in tx._inputs:

electrum/util.py

@@ -1289,7 +1289,7 @@ class TxMinedInfo(NamedTuple):
 class ShortID(bytes):
 
     def __repr__(self):
-        return f"<ShortID: {format_short_channel_id(self)}>"
+        return f"<ShortID: {format_short_id(self)}>"
 
     def __str__(self):
         return format_short_id(self)
@@ -1314,7 +1314,7 @@ class ShortID(bytes):
         return ShortID.from_components(*components)
 
     @classmethod
-    def normalize(cls, data: Union[None, str, bytes, 'ShortChannelID']) -> Optional['ShortChannelID']:
+    def normalize(cls, data: Union[None, str, bytes, 'ShortID']) -> Optional['ShortID']:
         if isinstance(data, ShortID) or data is None:
             return data
         if isinstance(data, str):