commit 556fa30ddfb479140bcee203f945b428fe33d738
parent 19ced234aa75ee23087eebe5a5c5cfb43f167c9d
Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 2 May 2019 12:04:06 +0200
interface: partially fix ipv6 proxy
note that network.deserialize_proxy is still broken for ipv6
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/electrum/interface.py b/electrum/interface.py
@@ -33,7 +33,7 @@ from collections import defaultdict
from ipaddress import IPv4Network, IPv6Network, ip_address
import aiorpcx
-from aiorpcx import RPCSession, Notification
+from aiorpcx import RPCSession, Notification, NetAddress
from aiorpcx.curio import timeout_after, TaskTimeout
import certifi
@@ -218,7 +218,7 @@ class Interface(PrintError):
auth = None
else:
auth = aiorpcx.socks.SOCKSUserAuth(username, pw)
- addr = "{}:{}".format(proxy['host'], proxy['port'])
+ addr = NetAddress(proxy['host'], proxy['port'])
if proxy['mode'] == "socks4":
self.proxy = aiorpcx.socks.SOCKSProxy(addr, aiorpcx.socks.SOCKS4a, auth)
elif proxy['mode'] == "socks5":