tuse python3 in scripts shebang, fix #4519 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 04432fe93e89092a69a898e8511fd400cf6a212f
DIR parent 586aee45eb36bd797333cf23440ed6a8e2bc8ec4
HTML Author: Janus <ysangkok@gmail.com>
Date: Tue, 10 Jul 2018 13:49:51 +0200
use python3 in scripts shebang, fix #4519
Diffstat:
M scripts/block_headers | 2 +-
M scripts/estimate_fee | 5 +++--
M scripts/util.py | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
---
DIR diff --git a/scripts/block_headers b/scripts/block_headers
t@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# A simple script that connects to a server and displays block headers
DIR diff --git a/scripts/estimate_fee b/scripts/estimate_fee
t@@ -1,5 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import util, json
-peers = util.get_peers()
+from electrum.network import filter_protocol
+peers = filter_protocol(util.get_peers())
results = util.send_request(peers, 'blockchain.estimatefee', [2])
print(json.dumps(results, indent=4))
DIR diff --git a/scripts/util.py b/scripts/util.py
t@@ -10,6 +10,7 @@ def get_interfaces(servers, timeout=10):
'''Returns a map of servers to connected interfaces. If any
connections fail or timeout, they will be missing from the map.
'''
+ assert type(servers) is list
socket_queue = queue.Queue()
config = SimpleConfig()
connecting = {}
t@@ -51,6 +52,9 @@ def get_peers():
peers = {}
# 1. get connected interfaces
server = config.get('server')
+ if server is None:
+ print("You need to set a secure server, for example (for mainnet): 'electrum setconfig server helicarrier.bauerj.eu:50002:s'")
+ return []
interfaces = get_interfaces([server])
if not interfaces:
print("No connection to", server)