Skip to content

feat: set impossible lock_transfer_block_id #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 11, 2021
Merged

feat: set impossible lock_transfer_block_id #2316

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1253e4
feat: set impossible lock_transfer_block_id after threshold reached t…
zone117x Jan 11, 2021
c13d85c
Merge branch 'feat/hardcode-export-ht' into feat/v1-lock-block-post-m…
Jan 11, 2021
34192b8
use IMPORT_HEIGHT from virtualchain_hooks
Jan 11, 2021
1c1903a
check db.lastblock, not account[block_id]
Jan 11, 2021
b139c98
Merge branch 'v1-migration' into feat/v1-lock-block-post-migration
Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion blockstack/blockstackd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ def export_account_state(self, account_state):
"""
Make an account state presentable to external consumers
"""
Copy link
Contributor Author

@zone117x zone117x Jan 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jcnelson @kantai this location for a patch was not intuitive for me. There was another area that made more sense, but found this after some local testing. Please confirm

Copy link
Contributor

@kantai kantai Jan 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @jcnelson has the most context on the appropriate place to apply this. Alternatively, you can catch the forwarding that happens in api/server.py and rewrite the lock time there.

Copy link
Member

@jcnelson jcnelson Jan 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All this change will do is alter what is (a) returned by the RESTful API and (b) what is returned by blockstack/lib/client.py. If that's what you want, then this is fine. I think it's more appropriate to do it here than in api/server.py.

return {
result = {
'address': account_state['address'],
'type': account_state['type'],
'credit_value': '{}'.format(account_state['credit_value']),
Expand All @@ -1433,6 +1433,7 @@ def export_account_state(self, account_state):
'vtxindex': account_state['vtxindex'],
'txid': account_state['txid'],
}
return result


def rpc_get_account_record(self, address, token_type, **con_info):
Expand All @@ -1451,11 +1452,17 @@ def rpc_get_account_record(self, address, token_type, **con_info):

db = get_db_state(self.working_dir)
account = db.get_account(address, token_type)
last_block = db.lastblock
db.close()

if account is None:
return {'error': 'No such account', 'http_status': 404}

# if block height is after the migration export threshold, return a lock height that will force the wallet to error when sending a tx
if last_block >= virtualchain_hooks.IMPORT_HEIGHT:
print log.warning('[v2-upgrade] Forcing lock_transfer_block_id to 9999999 to prevent wallet txs')
account['lock_transfer_block_id'] = 9999999

state = self.export_account_state(account)
return self.success_response({'account': state})

Expand Down