tcleanup (dead code) - electrum - Electrum Bitcoin wallet
(HTM) git clone https://git.parazyd.org/electrum
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
---
(DIR) commit 85505c1d8eee7f5aa1d3a1f4dba766e52bddcdf1
(DIR) parent 0636ef8b329505cfb04ef767d5e97d8637d996f9
(HTM) Author: ThomasV <thomasv@gitorious>
Date: Sat, 21 Jun 2014 21:17:40 +0200
cleanup (dead code)
Diffstat:
M lib/transaction.py | 8 --------
M lib/wallet.py | 22 ----------------------
2 files changed, 0 insertions(+), 30 deletions(-)
---
(DIR) diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -597,8 +597,6 @@ class Transaction:
def is_complete(self):
for i, txin in enumerate(self.inputs):
- #redeem_script = txin.get('redeemScript')
- #num, redeem_pubkeys = parse_redeemScript(redeem_script) if redeem_script else (1, [txin.get('redeemPubkey')])
pubkeys = txin['pubkeys']
signatures = txin.get("signatures",{})
if len(signatures) == txin['num_sig']:
t@@ -614,15 +612,9 @@ class Transaction:
for i, txin in enumerate(self.inputs):
- # if the input is multisig, parse redeem script
- #redeem_script = txin.get('redeemScript')
- #num, redeem_pubkeys = parse_redeemScript(redeem_script) if redeem_script else (1, [txin.get('redeemPubkey')])
redeem_pubkeys = txin['pubkeys']
num = len(redeem_pubkeys)
- # add pubkeys
- ### txin["pubkeys"] = redeem_pubkeys
-
# get list of already existing signatures
signatures = txin.get("signatures",{})
# continue if this txin is complete
(DIR) diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1592,28 +1592,6 @@ class OldWallet(Deterministic_Wallet):
s = self.get_seed(password)
return ' '.join(mnemonic.mn_encode(s))
-
- def add_keypairs_from_KeyID(self, tx, keypairs, password):
- # first check the provided password
- for txin in tx.inputs:
- keyid = txin.get('KeyID')
- if keyid:
- m = re.match("old\(([0-9a-f]+),(\d+),(\d+)", keyid)
- if not m: continue
- mpk = m.group(1)
- if mpk != self.storage.get('master_public_key'): continue
- for_change = int(m.group(2))
- num = int(m.group(3))
- account = self.accounts[0]
- addr = account.get_address(for_change, num)
- txin['address'] = addr # fixme: side effect
- pk = account.get_private_key((for_change, num), self, password)
- for sec in pk:
- pubkey = public_key_from_private_key(sec)
- keypairs[pubkey] = sec
-
-
-
def check_pending_accounts(self):
pass