Skip to content
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.

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

Merge master into dev #868

Draft
wants to merge 30 commits into
base: dev
Choose a base branch
from
Draft

Merge master into dev #868

wants to merge 30 commits into from

Conversation

ninjaahhh
Copy link
Contributor

No description provided.

qizhou and others added 29 commits February 11, 2020 16:08
* first version of pbft without view change
* [ci] Run weekly check-db on whole dataset

* Fix unit test workflow
Bumps [psutil](https://github.com/giampaolo/psutil) from 5.4.5 to 5.6.6.
- [Release notes](https://github.com/giampaolo/psutil/releases)
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](giampaolo/psutil@release-5.4.5...release-5.6.6)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix the typo of website pages
add a note about re-selecting contract after re-compile in remix
* remove executing_on_head in state.py

* remove unused changed
remove unused variables in _Account
* Migrate chain mask list config to full shard id list

* Update config and fix redundant code

* Backward compatable

* Address comments

Co-authored-by: ninjaahhh <[email protected]>
* adding tx to queue needs to check gasprice in QKC

* use the name convert_to_default_chain_token_gasprice
* Update gas for transfer mnt precompiled

* Rename

* Address comments

* Address comments
* add uint128_max check for tx gasprice, startgas, token id fields

* import InvalidTransaction

* use TOKEN_ID_MAX to check max token id
* Reduce shard staking requirement for PoSW

* Address comments
* Update contract bytecode

* Update to e99d944c51
@ninjaahhh ninjaahhh requested a review from a team March 30, 2020 21:56
@ninjaahhh ninjaahhh marked this pull request as draft April 30, 2020 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants