kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-24 03:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

wallet only writes changes when change detected + make ownerkey reading play nicely with different cli_update calling mechanisms

Browse Source
This commit is contained in:
Aaron Blankstein
2017-08-18 09:24:27 -04:00
parent 6da4ebd130
commit d59322fcce
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
blockstack_client/rpc.py
View File

@@ -2283,26 +2283,33 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
if privkey_info is None or 'error' in privkey_info:
return self._reply_json({'error': 'Failed to validate private key'}, status_code=401)
new_wallet = backend.registrar.get_wallet(config_path=self.server.config_path)
if 'error' in new_wallet:
return self._reply_json({'error': new_wallet['error']}, status_code=500)
old_wallet = backend.registrar.get_wallet(config_path=self.server.config_path)
if 'error' in old_wallet:
return self._reply_json({'error': old_wallet['error']}, status_code=500)
payment_privkey_info = new_wallet['payment_privkey']
owner_privkey_info = new_wallet['owner_privkey']
data_privkey_info = new_wallet['data_privkey']
payment_privkey_info = old_wallet['payment_privkey']
owner_privkey_info = old_wallet['owner_privkey']
data_privkey_info = old_wallet['data_privkey']
if key_id == 'owner':
changed = owner_privkey_info
owner_privkey_info = privkey_info
elif key_id == 'payment':
changed = payment_privkey_info
payment_privkey_info = privkey_info
elif key_id == 'data':
changed = data_privkey_info
data_privkey_info = privkey_info
else:
return self._reply_json({'error': 'Failed to set private key info'}, status_code=401)
if virtualchain.get_privkey_address(changed) == virtualchain.get_privkey_address(privkey_info):
return self._reply_json({'status': True,
'message' : 'Supplied key was identical to previous; no change written'})
# convert...
new_wallet = make_wallet(None, payment_privkey_info=payment_privkey_info, owner_privkey_info=owner_privkey_info,
data_privkey_info=data_privkey_info, encrypt=False)