oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Version 0.6.2, Rev3310"

Browse source 
This reverts commit 98c6add637.
This commit is contained in:
shortcutme 2018-02-09 11:39:36 +01:00
parent 98c6add637
commit 9f35efc31d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
8 changed files with 17 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/User/User.py
View file

@ -39,31 +39,26 @@ class User(object):
user_data["sites"] = self.sites
user_data["certs"] = self.certs
helper.atomicWrite("%s/users.json" % config.data_dir, json.dumps(users, indent=2, sort_keys=True))
self.log.debug("Saved in %.3fs" % (time.time() - s))
self.log.debug("Saved in %.3fs" % (time.time()-s))
def getAddressAuthIndex(self, address):
return int(address.encode("hex"), 16)
@util.Noparallel()
def generateAuthAddress(self, address):
s = time.time()
address_id = self.getAddressAuthIndex(address) # Convert site address to int
auth_privatekey = CryptBitcoin.hdPrivatekey(self.master_seed, address_id)
self.sites[address] = {
"auth_address": CryptBitcoin.privatekeyToAddress(auth_privatekey),
"auth_privatekey": auth_privatekey
}
self.save()
self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s))
return self.sites[address]
# Get user site data
# Return: {"auth_address": "xxx", "auth_privatekey": "xxx"}
def getSiteData(self, address, create=True):
if address not in self.sites: # Generate new BIP32 child key based on site address
if not create:
return {"auth_address": None, "auth_privatekey": None} # Dont create user yet
self.generateAuthAddress(address)
s = time.time()
address_id = self.getAddressAuthIndex(address) # Convert site address to int
auth_privatekey = CryptBitcoin.hdPrivatekey(self.master_seed, address_id)
self.sites[address] = {
"auth_address": CryptBitcoin.privatekeyToAddress(auth_privatekey),
"auth_privatekey": auth_privatekey
}
self.save()
self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s))
return self.sites[address]
def deleteSiteData(self, address):