tadd getmerkle command - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5fa2a48343be7253497bb96ad70d091011ef4389
DIR parent 81be685644c7d4f726f03a5060b27ed456423c69
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 12 May 2015 12:30:26 +0200
add getmerkle command
Diffstat:
M lib/commands.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -107,7 +107,8 @@ register_command('verifymessage', 3,-1, False, False, False, 'Verifies a
register_command('encrypt', 2,-1, False, False, False, 'encrypt a message with pubkey','encrypt <pubkey> <message>')
register_command('decrypt', 2,-1, False, True, True, 'decrypt a message encrypted with pubkey','decrypt <pubkey> <message>')
-register_command('getproof', 1, 1, True, False, False, 'get merkle proof', 'getproof <address>')
+register_command('getmerkle', 2, 2, True, False, False, 'Get Merkle branch of a transaction included in a block', 'getmerkle <txid> <height>')
+register_command('getproof', 1, 1, True, False, False, 'Get Merkle branch of an address in the UTXO set', 'getproof <address>')
register_command('getutxoaddress', 2, 2, True, False, False, 'get the address of an unspent transaction output','getutxoaddress <txid> <pos>')
register_command('sweep', 2, 3, True, False, False, 'Sweep a private key.', 'sweep privkey addr [fee]')
register_command('make_seed', 3, 3, False, False, False, 'Create a seed.','options: --nbits --entropy --lang')
t@@ -254,6 +255,9 @@ class Commands:
out.append(i)
return out
+ def getmerkle(self, txid, height):
+ return self.network.synchronous_get([ ('blockchain.transaction.get_merkle', [txid, int(height)]) ])[0]
+
def getservers(self):
while not self.network.is_up_to_date():
time.sleep(0.1)