From 4ec31b9fe97f1d057a24a0b639baf4fc02a49000 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Tue, 10 Jun 2014 20:40:42 +0200 Subject: [PATCH] prevent collision on daemon port. Add Imported_Wallet (bolkin) --- lib/__init__.py | 2 +- lib/daemon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/__init__.py b/lib/__init__.py index 318a1e0..d4a4e11 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -1,7 +1,7 @@ from version import ELECTRUM_VERSION from util import format_satoshis, print_msg, print_json, print_error, set_verbosity from wallet import WalletSynchronizer, WalletStorage -from wallet import Wallet, Wallet_2of2, Wallet_2of3 +from wallet import Wallet, Wallet_2of2, Wallet_2of3, Imported_Wallet from verifier import TxVerifier from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server from interface import Interface diff --git a/lib/daemon.py b/lib/daemon.py index 590de0e..f99517d 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -307,7 +307,7 @@ class NetworkServer: self.network = network self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.daemon_port = config.get('daemon_port', 8000) + self.daemon_port = config.get('daemon_port', 8001) self.server.bind(('', self.daemon_port)) self.server.listen(5) self.server.settimeout(1) -- 1.7.1