revert and set version to 0.17.4.2

qtumproject · Dec 22, 2017 · aab3074 · aab3074
1 parent 7d77f96
commit aab3074
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/transaction.py b/lib/transaction.py
@@ -372,7 +372,7 @@ def get_address_from_output_script(_bytes):
     # 65 BYTES:... CHECKSIG
     match = [ opcodes.OP_PUSHDATA4, opcodes.OP_CHECKSIG ]
     if match_decoded(decoded, match):
-        return TYPE_PUBKEY, pubkey_to_address('p2pkh', bh2u(decoded[0][1]))
+        return TYPE_PUBKEY, bh2u(decoded[0][1])
 
     # Pay-by-Bitcoin-address TxOuts look like:
     # DUP HASH160 20 BYTES:... EQUALVERIFY CHECKSIG

diff --git a/lib/version.py b/lib/version.py
@@ -1,5 +1,5 @@
-ELECTRUM_VERSION = '0.17.4'  # version of the client package
-PROTOCOL_VERSION = '1.2'  # protocol version requested
+ELECTRUM_VERSION = '0.17.4.2'  # version of the client package
+PROTOCOL_VERSION = '1.1'  # protocol version requested
 
 # The hash of the mnemonic seed must begin with this
 SEED_PREFIX      = '01'      # Standard wallet