From 98daf2c7cc65189aa195999bb0236fe3e03c4ac8 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Fri, 19 Jan 2018 15:48:20 +0100 Subject: [PATCH 1/2] network: send version first --- lib/network.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/network.py b/lib/network.py index 8456ad5ab..4855c0fcb 100644 --- a/lib/network.py +++ b/lib/network.py @@ -306,6 +306,9 @@ class Network(util.DaemonThread): # Resend unanswered requests requests = self.unanswered_requests.values() self.unanswered_requests = {} + if self.interface.ping_required(): + params = [ELECTRUM_VERSION, PROTOCOL_VERSION] + self.queue_request('server.version', params, self.interface) for request in requests: message_id = self.queue_request(request[0], request[1]) self.unanswered_requests[message_id] = request @@ -314,9 +317,6 @@ class Network(util.DaemonThread): self.queue_request('server.peers.subscribe', []) self.request_fee_estimates() self.queue_request('blockchain.relayfee', []) - if self.interface.ping_required(): - params = [ELECTRUM_VERSION, PROTOCOL_VERSION] - self.queue_request('server.version', params, self.interface) for h in self.subscribed_addresses: self.queue_request('blockchain.scripthash.subscribe', [h]) From 98663d7e20bb391febaffe213bb52b763717e135 Mon Sep 17 00:00:00 2001 From: Serge Victor Date: Thu, 18 Jan 2018 07:07:42 +0700 Subject: [PATCH 2/2] Intruduction of getfee command, fixes #3704 --- lib/commands.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/commands.py b/lib/commands.py index bb10161c6..dead8b82b 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -672,6 +672,12 @@ class Commands: """ return wallet synchronization status """ return self.wallet.is_up_to_date() + @command('n') + def getfeerate(self): + """Return current optimal fee rate per kilobyte, according + to config settings (static/dynamic)""" + return self.config.fee_per_kb() + @command('') def help(self): # for the python console