From 98ca2adc5e38c73738e2ff6a2838fced130729d8 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 6 Nov 2018 11:00:06 -0400 Subject: [PATCH] Minimum protocol version raised to 1.2 --- electrumx/server/session.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/electrumx/server/session.py b/electrumx/server/session.py index 974d6c7..af75e08 100644 --- a/electrumx/server/session.py +++ b/electrumx/server/session.py @@ -701,7 +701,7 @@ class SessionBase(RPCSession): class ElectrumX(SessionBase): '''A TCP server that handles incoming Electrum connections.''' - PROTOCOL_MIN = (1, 1) + PROTOCOL_MIN = (1, 2) PROTOCOL_MAX = (1, 4) def __init__(self, *args, **kwargs): @@ -1226,6 +1226,7 @@ class ElectrumX(SessionBase): handlers = { 'blockchain.block.get_chunk': self.block_get_chunk, 'blockchain.block.get_header': self.block_get_header, + 'blockchain.block.headers': self.block_headers_12, 'blockchain.estimatefee': self.estimatefee, 'blockchain.relayfee': self.relayfee, 'blockchain.scripthash.get_balance': self.scripthash_get_balance, @@ -1236,23 +1237,16 @@ class ElectrumX(SessionBase): 'blockchain.transaction.broadcast': self.transaction_broadcast, 'blockchain.transaction.get': self.transaction_get, 'blockchain.transaction.get_merkle': self.transaction_merkle, + 'mempool.get_fee_histogram': self.mempool.compact_fee_histogram, 'server.add_peer': self.add_peer, 'server.banner': self.banner, 'server.donation_address': self.donation_address, 'server.features': self.server_features_async, 'server.peers.subscribe': self.peers_subscribe, + 'server.ping': self.ping, 'server.version': self.server_version, } - if ptuple >= (1, 2): - # New handler as of 1.2 - handlers.update({ - 'mempool.get_fee_histogram': - self.mempool.compact_fee_histogram, - 'blockchain.block.headers': self.block_headers_12, - 'server.ping': self.ping, - }) - if ptuple >= (1, 4): handlers.update({ 'blockchain.block.header': self.block_header,