lukechilds
/
electrum
mirror of https://github.com/lukechilds/electrum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

simplify tx.sign()

283
ThomasV 12 years ago
parent
70445da940
commit
e91e02f2ce
1 changed files with 42 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 111
      lib/bitcoin.py

111
lib/bitcoin.py
View File

@ -526,17 +526,17 @@ class Transaction:
s += int_to_hex(txin['index'],4) # prev index s += int_to_hex(txin['index'],4) # prev index
if for_sig is None: if for_sig is None:
pubkeysig = txin.get('pubkeysig') signatures = txin['signatures']
if pubkeysig: pubkeys = txin['pubkeys']
pubkey, sig = pubkeysig[0] if not txin.get('redeemScript'):
sig = sig + chr(1) # hashtype pubkey = pubkeys[0]
script = op_push( len(sig)) sig = signatures[0]
script += sig.encode('hex') sig = sig + '01' # hashtype
script += op_push( len(pubkey)) script = op_push(len(sig)/2)
script += pubkey.encode('hex') script += sig
script += op_push(len(pubkey)/2)
script += pubkey
else: else:
signatures = txin['signatures']
pubkeys = txin['pubkeys']
script = '00' # op_0 script = '00' # op_0
for sig in signatures: for sig in signatures:
sig = sig + '01' sig = sig + '01'
@ -595,76 +595,51 @@ class Transaction:
def sign(self, private_keys): def sign(self, private_keys):
import deserialize import deserialize
is_complete = True is_complete = True
for i, txin in enumerate(self.inputs): for i, txin in enumerate(self.inputs):
tx_for_sig = self.serialize( self.inputs, self.outputs, for_sig = i ) # build list of public/private keys
txin_pk = private_keys.get( txin.get('address') ) keypairs = {}
redeem_script = txin.get('redeemScript') for sec in private_keys.get( txin.get('address') ):
compressed = is_compressed(sec)
pkey = regenerate_key(sec)
pubkey = GetPubKey(pkey.pubkey, compressed)
keypairs[ pubkey.encode('hex') ] = sec
redeem_script = txin.get('redeemScript')
if redeem_script: if redeem_script:
# parse the redeem script # parse the redeem script
num, redeem_pubkeys = deserialize.parse_redeemScript(redeem_script) num, redeem_pubkeys = deserialize.parse_redeemScript(redeem_script)
txin["pubkeys"] = redeem_pubkeys else:
num = 1
# list of already existing signatures redeem_pubkeys = keypairs.keys()
signatures = txin.get("signatures",[])
# continue if this txin is complete # get list of already existing signatures
if len(signatures) == num: signatures = txin.get("signatures",[])
continue # continue if this txin is complete
if len(signatures) == num:
continue
# build list of public/private keys tx_for_sig = self.serialize( self.inputs, self.outputs, for_sig = i )
keypairs = {} for pubkey in redeem_pubkeys:
for sec in txin_pk: # check if we have the corresponding private key
if pubkey in keypairs.keys():
# add signature
sec = keypairs[pubkey]
compressed = is_compressed(sec) compressed = is_compressed(sec)
pkey = regenerate_key(sec) pkey = regenerate_key(sec)
pubkey = GetPubKey(pkey.pubkey, compressed) secexp = pkey.secret
keypairs[ pubkey.encode('hex') ] = sec private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
public_key = private_key.get_verifying_key()
for pubkey in redeem_pubkeys: sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
# check if we have a key corresponding to the redeem script signatures.append( sig.encode('hex') )
if pubkey in keypairs.keys():
# add signature txin["signatures"] = signatures
sec = keypairs[pubkey] txin["pubkeys"] = redeem_pubkeys
compressed = is_compressed(sec) print_error("signatures", signatures)
pkey = regenerate_key(sec) is_complete = is_complete and len(signatures) == num
secexp = pkey.secret
private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
public_key = private_key.get_verifying_key()
sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
signatures.append( sig.encode('hex') )
# for p2sh, pubkeysig is a tuple (may be incomplete)
txin["signatures"] = signatures
print_error("signatures", signatures)
is_complete = is_complete and len(signatures) == num
else:
if txin.get("pubkeysig"):
continue
if not txin_pk:
is_complete = False
continue
sec = txin_pk[0]
compressed = is_compressed(sec)
pkey = regenerate_key(sec)
secexp = pkey.secret
private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
public_key = private_key.get_verifying_key()
pkey = EC_KEY(secexp)
pubkey = GetPubKey(pkey.pubkey, compressed)
sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
txin["pubkeysig"] = [(pubkey, sig)]
self.is_complete = is_complete self.is_complete = is_complete
self.raw = self.serialize( self.inputs, self.outputs ) self.raw = self.serialize( self.inputs, self.outputs )

Write Preview
Loading…
Cancel
Save