AaronFiore/electrum
1
0
Fork 0
Code Activity

ChannelDB: trivial fixes re node alias

Browse Source
This commit is contained in:
SomberNight
2020-03-02 04:31:21 +01:00
parent c7704fb8ee
commit 9cdc3287c1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/channel_db.py
View File

@@ -138,18 +138,22 @@ class NodeInfo(NamedTuple):
alias: str alias: str
@staticmethod @staticmethod
def from_msg(payload): def from_msg(payload) -> Tuple['NodeInfo', Sequence['NodeAddress']]:
node_id = payload['node_id'] node_id = payload['node_id']
features = int.from_bytes(payload['features'], "big") features = int.from_bytes(payload['features'], "big")
validate_features(features) validate_features(features)
addresses = NodeInfo.parse_addresses_field(payload['addresses']) addresses = NodeInfo.parse_addresses_field(payload['addresses'])
alias = payload['alias'].rstrip(b'\x00') alias = payload['alias'].rstrip(b'\x00')
try:
alias = alias.decode('utf8')
except:
alias = ''
timestamp = int.from_bytes(payload['timestamp'], "big") timestamp = int.from_bytes(payload['timestamp'], "big")
return NodeInfo(node_id=node_id, features=features, timestamp=timestamp, alias=alias), [ return NodeInfo(node_id=node_id, features=features, timestamp=timestamp, alias=alias), [
Address(host=host, port=port, node_id=node_id, last_connected_date=None) for host, port in addresses] NodeAddress(host=host, port=port, node_id=node_id, last_connected_date=None) for host, port in addresses]
@staticmethod @staticmethod
def from_raw_msg(raw: bytes) -> 'NodeInfo': def from_raw_msg(raw: bytes) -> Tuple['NodeInfo', Sequence['NodeAddress']]:
payload_dict = decode_msg(raw)[1] payload_dict = decode_msg(raw)[1]
return NodeInfo.from_msg(payload_dict) return NodeInfo.from_msg(payload_dict)
@@ -194,7 +198,7 @@ class NodeInfo(NamedTuple):
return addresses return addresses
class Address(NamedTuple): class NodeAddress(NamedTuple):
node_id: bytes node_id: bytes
host: str host: str
port: int port: int
@@ -678,3 +682,6 @@ class ChannelDB(SqlDB):
if node_id in (chan.node_id, chan.get_local_pubkey()): if node_id in (chan.node_id, chan.get_local_pubkey()):
relevant_channels.add(chan.short_channel_id) relevant_channels.add(chan.short_channel_id)
return relevant_channels return relevant_channels
def get_node_info_for_node_id(self, node_id: bytes) -> Optional['NodeInfo']:
return self._nodes.get(node_id)