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

【new feature 1】 Migrate chain mask list config to full shard id list #571

Merged
merged 15 commits into from
Apr 3, 2020

Conversation

scf0220
Copy link
Contributor

@scf0220 scf0220 commented Mar 26, 2020

@scf0220 scf0220 changed the title Migrate chain mask list config to full shard id list 【new feature】 Migrate chain mask list config to full shard id list Mar 26, 2020
@scf0220 scf0220 changed the title 【new feature】 Migrate chain mask list config to full shard id list 【new feature 1】 Migrate chain mask list config to full shard id list Mar 27, 2020
cluster/rpc/interface.go Outdated Show resolved Hide resolved
cluster/rpc/grpc_types.go Outdated Show resolved Hide resolved
@scf0220 scf0220 changed the base branch from users/denglun/merge_master_to_dev to dev March 30, 2020 08:09
* first commit:
adding tx to queue needs to check gasprice in QKC

* fix-test add patch

* 【new feature 3】Update gas for transfer mnt precompiled (#575)

* first commit

* transferMnt not support static call

* delete unless code

* return gas=0 when err

* 【new feature 4】add uint128_max check for tx gasprice, startgas, token id fields (#576)

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

* 【new feature 5】Reduce shard staking requirement for PoSW (#577)

* first commit

* add cache for decay data

* *big.Int -> big.Int

* 【new feature 6】Update contract bytecode && setup MNT system contract deploy timestamp (#578)

* update contract bytecode

* setup MNT system contract deploy timestamp

* update mainnet config
@scf0220 scf0220 merged commit f0c6b1b into dev Apr 3, 2020
@scf0220 scf0220 deleted the users/chunfengSun/deleteChainMaskList branch April 7, 2020 01:34
scf0220 added a commit that referenced this pull request Apr 21, 2020
* Add precompiled contract for minting MNT & deploy system contracts (#516)

* Add precompiled contract for minting MNT
* deploy system contracts based on msg.data

* 【evm】Support using trie for storing native token balances (#518)

【evm】Support using trie for storing native token balances (#518)

* call general native token manager contract (#521)

call general native token manager contract; test native token manager contract; testnet 3.2

* Increase gas cost on transfer native tokens (#532)

* testnet3.2 update (#534)

* testnet 3.2 update

* update ts

* 【evm-2】pay transaction gas with native token (#530)

【evm-2】pay transaction gas with native token (#530)

* buy gas fixes (#536)

* fix set timeStamp  (#540)

fix set timeStamp  (#540)

* update testnet32 (#543)

* testnet 3.2 update

* 【test 3.2 fix】 (#546)

【test 3.2 fix】 (#546)

* fix data races (#541)

* enhance logs and fix some race
* randomize simulate time

* uses a precompiled contract to get native token balance (#548)

* merge master to dev (#568)

* merge master to dev
* fix tests
* update docker

* Go version update, etc. (#570)

* 【new feature 1】 Migrate chain mask list config to full shard id list (#571)

* merge master to dev

* fix tests

* fix tests

* fix tests

* update docker

* remove

* update go version

* remove bin

* first commit

* fix test and merge dev

* rename

* 【new feature 2】adding tx to queue needs to check gasprice in QKC (#574)

* first commit:
adding tx to queue needs to check gasprice in QKC

* fix-test add patch

* 【new feature 3】Update gas for transfer mnt precompiled (#575)

* first commit

* transferMnt not support static call

* delete unless code

* return gas=0 when err

* 【new feature 4】add uint128_max check for tx gasprice, startgas, token id fields (#576)

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

* 【new feature 5】Reduce shard staking requirement for PoSW (#577)

* first commit

* add cache for decay data

* *big.Int -> big.Int

* 【new feature 6】Update contract bytecode && setup MNT system contract deploy timestamp (#578)

* update contract bytecode

* setup MNT system contract deploy timestamp

* update mainnet config

Co-authored-by: syntrust <[email protected]>

* add testnet 3.3 config (#579)

* add 3.3 config

* fix err check

* modify 3.0 3.1 3.2 config's networkid

* 【testnet3.3-1】merge from master, Resolve conflicts (#582)

【testnet3.3-1】merge from master, Resolve conflicts (#582)

* 【dev-1】 update contract (#587)

* update contract

* update contract (#588)

* 【dev-fix】 (#589)

* fix balanceMnt return value

* fix unit test

Co-authored-by: Deng Lun <[email protected]>
Co-authored-by: syntrust <[email protected]>
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