From edba59ef54b4489ddccdbe70b883bfec42be3d3a Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 25 Nov 2019 21:10:53 +0100 Subject: [PATCH] LNPeerAddr: nicer str formatting for IPv6 hosts --- electrum/lnutil.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/electrum/lnutil.py b/electrum/lnutil.py index 507a697bc..d6c9a3ef5 100644 --- a/electrum/lnutil.py +++ b/electrum/lnutil.py @@ -8,6 +8,8 @@ from collections import namedtuple from typing import NamedTuple, List, Tuple, Mapping, Optional, TYPE_CHECKING, Union, Dict, Set import re +from aiorpcx import NetAddress + from .util import bfh, bh2u, inv_dict, UserFacingException from .crypto import sha256 from .transaction import (Transaction, PartialTransaction, PartialTxInput, TxOutpoint, @@ -662,7 +664,8 @@ class LNPeerAddr(NamedTuple): pubkey: bytes def __str__(self): - return '{}@{}:{}'.format(bh2u(self.pubkey), self.host, self.port) + host_and_port = str(NetAddress(self.host, self.port)) + return '{}@{}'.format(self.pubkey.hex(), host_and_port) def get_compressed_pubkey_from_bech32(bech32_pubkey: str) -> bytes: