LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-30 17:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename methods

Browse source
This commit is contained in:
thomasv 2012-02-06 18:10:30 +01:00
parent d978a8fbcd
commit 95014bd4b7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/wallet.py
View file

@ -333,7 +333,7 @@ class Wallet:
def get_sequence(self,n,for_change): def get_sequence(self,n,for_change):
return string_to_number( Hash( "%d:%d:"%(n,for_change) + self.master_public_key ) ) return string_to_number( Hash( "%d:%d:"%(n,for_change) + self.master_public_key ) )
def get_private_key2(self, address, password): def get_private_key(self, address, password):
""" Privatekey(type,n) = Master_private_key + H(n|S|type) """ """ Privatekey(type,n) = Master_private_key + H(n|S|type) """
order = generator_secp256k1.order() order = generator_secp256k1.order()
@ -361,7 +361,7 @@ class Wallet:
return "\x18Bitcoin Signed Message:\n" + chr( len(message) ) + message return "\x18Bitcoin Signed Message:\n" + chr( len(message) ) + message
def sign_message(self, address, message, password): def sign_message(self, address, message, password):
private_key = ecdsa.SigningKey.from_string( self.get_private_key2(address, password), curve = SECP256k1 ) private_key = ecdsa.SigningKey.from_string( self.get_private_key(address, password), curve = SECP256k1 )
public_key = private_key.get_verifying_key() public_key = private_key.get_verifying_key()
signature = private_key.sign_digest( Hash( self.msg_magic( message ) ), sigencode = ecdsa.util.sigencode_string ) signature = private_key.sign_digest( Hash( self.msg_magic( message ) ), sigencode = ecdsa.util.sigencode_string )
assert public_key.verify_digest( signature, Hash( self.msg_magic( message ) ), sigdecode = ecdsa.util.sigdecode_string) assert public_key.verify_digest( signature, Hash( self.msg_magic( message ) ), sigdecode = ecdsa.util.sigdecode_string)
@ -413,7 +413,7 @@ class Wallet:
raise BaseException("Bad signature") raise BaseException("Bad signature")
def create_new_address2(self, for_change): def create_new_address(self, for_change):
""" Publickey(type,n) = Master_public_key + H(n|S|type)*point """ """ Publickey(type,n) = Master_public_key + H(n|S|type)*point """
curve = SECP256k1 curve = SECP256k1
n = len(self.change_addresses) if for_change else len(self.addresses) n = len(self.change_addresses) if for_change else len(self.addresses)
@ -438,12 +438,12 @@ class Wallet:
is_new = False is_new = False
while True: while True:
if self.change_addresses == []: if self.change_addresses == []:
self.create_new_address2(True) self.create_new_address(True)
is_new = True is_new = True
continue continue
a = self.change_addresses[-1] a = self.change_addresses[-1]
if self.history.get(a): if self.history.get(a):
self.create_new_address2(True) self.create_new_address(True)
is_new = True is_new = True
else: else:
break break
@ -451,13 +451,13 @@ class Wallet:
n = self.gap_limit n = self.gap_limit
while True: while True:
if len(self.addresses) < n: if len(self.addresses) < n:
self.create_new_address2(False) self.create_new_address(False)
is_new = True is_new = True
continue continue
if map( lambda a: self.history.get(a), self.addresses[-n:] ) == n*[[]]: if map( lambda a: self.history.get(a), self.addresses[-n:] ) == n*[[]]:
break break
else: else:
self.create_new_address2(False) self.create_new_address(False)
is_new = True is_new = True
@ -543,7 +543,7 @@ class Wallet:
if not self.history.get(addr): if not self.history.get(addr):
n = n + 1 n = n + 1
if n < self.gap_limit: if n < self.gap_limit:
new_address = self.create_new_address2(False) new_address = self.create_new_address(False)
self.history[new_address] = [] #get from server self.history[new_address] = [] #get from server
return True, new_address return True, new_address
else: else:
@ -629,7 +629,7 @@ class Wallet:
s_inputs = [] s_inputs = []
for i in range(len(inputs)): for i in range(len(inputs)):
addr, v, p_hash, p_pos, p_scriptPubKey, _, _ = inputs[i] addr, v, p_hash, p_pos, p_scriptPubKey, _, _ = inputs[i]
private_key = ecdsa.SigningKey.from_string( self.get_private_key2(addr, password), curve = SECP256k1 ) private_key = ecdsa.SigningKey.from_string( self.get_private_key(addr, password), curve = SECP256k1 )
public_key = private_key.get_verifying_key() public_key = private_key.get_verifying_key()
pubkey = public_key.to_string() pubkey = public_key.to_string()
tx = filter( raw_tx( inputs, outputs, for_sig = i ) ) tx = filter( raw_tx( inputs, outputs, for_sig = i ) )