From: thomasv <thomasv@gitorious>
Date: Tue, 12 Mar 2013 16:54:26 +0000 (+0100)
Subject: replace 'ElectrumKeyID' with more general 'KeyID' field in transactions
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=10bfcb918b5882b91547cefb9cd2fa3dec08b2b1;p=electrum-nvc.git

replace 'ElectrumKeyID' with more general 'KeyID' field in transactions
---

diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index a3403fe..1bfee8c 100644
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -825,7 +825,7 @@ class Transaction:
             for i in self.inputs:
                 e = { 'txid':i['tx_hash'], 'vout':i['index'],
                       'scriptPubKey':i.get('raw_output_script'),
-                      'electrumKeyID':i.get('electrumKeyID'),
+                      'KeyID':i.get('KeyID'),
                       'redeemScript':i.get('redeemScript'),
                       'signatures':i.get('signatures'),
                       'pubkeys':i.get('pubkeys'),
diff --git a/lib/wallet.py b/lib/wallet.py
index ba64ad9..2fbae84 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -256,7 +256,7 @@ class Wallet:
                 if item.get('txid') == txin['tx_hash'] and item.get('vout') == txin['index']:
                     txin['raw_output_script'] = item['scriptPubKey']
                     txin['redeemScript'] = item.get('redeemScript')
-                    txin['electrumKeyID'] = item.get('electrumKeyID')
+                    txin['KeyID'] = item.get('KeyID')
                     break
             else:
                 for item in unspent_coins:
@@ -268,8 +268,9 @@ class Wallet:
                     raise
 
             # find the address:
-            if txin.get('electrumKeyID'):
-                account, sequence = txin.get('electrumKeyID')
+            if txin.get('KeyID'):
+                account, name, sequence = txin.get('KeyID')
+                if name != 'Electrum': continue
                 sec = self.sequences[account].get_private_key(sequence, seed)
                 addr = self.sequences[account].get_address(sequence)
                 txin['address'] = addr
@@ -771,7 +772,7 @@ class Wallet:
                 pk_addresses.append(address)
                 continue
             account, sequence = self.get_address_index(address)
-            txin['electrumKeyID'] = (account, sequence) # used by the server to find the key
+            txin['KeyID'] = (account, 'Electrum', sequence) # used by the server to find the key
             pk_addr, redeemScript = self.sequences[account].get_input_info(sequence)
             if redeemScript: txin['redeemScript'] = redeemScript
             pk_addresses.append(pk_addr)