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

Updating all sources of block.Transactions and do the corresponding work for block staking txns #2655

Merged
merged 3 commits into from
Apr 10, 2020

Conversation

denniswon
Copy link
Contributor

Updating all sources of block.Transactions and do the corresponding work for staking txns.
Prevent future bad blocks, needed for fast state sync in the future (refer to InsertReceiptChain function), etc.

Test

build harmony binary
unit test passes
local network achieves consensus as normal

Unit Test Coverage

dennis.won@Jongs-MacBook-Pro:~/harmony-one/harmony (staking) $ go test ./core/rawdb
ok  	github.com/harmony-one/harmony/core/rawdb	0.814s

@denniswon denniswon changed the title Staking Updating all sources of block.Transactions and do the corresponding work for block staking txns Mar 31, 2020
@LeoHChen
Copy link
Contributor

LeoHChen commented Apr 1, 2020

Jenkins, test this please.

@denniswon denniswon changed the base branch from master to stakingtxn_history April 2, 2020 00:04
@denniswon
Copy link
Contributor Author

denniswon commented Apr 2, 2020

@rlan35 @fxfactorial note that this pr is based on top of #2554. Just changed the base of this PR to be harmony-one:stakingtxn_history which reflects denniswon:stakingtxn_history branch for the parent pr (for the ease of reviewing). Once the parent pr is merged to master, will rebase the pr to reflect based on origin master.

Since this is an open source repo where we submit prs from forked repos, no better way for doing stacked/dependent prs. Let me know if anyone has a better method. @harmony-one/core

@denniswon denniswon force-pushed the staking branch 2 times, most recently from 6176d40 to ea54bba Compare April 2, 2020 00:21
@denniswon denniswon force-pushed the stakingtxn_history branch from 87d3a5b to 10dac9b Compare April 2, 2020 09:05
@denniswon denniswon force-pushed the staking branch 2 times, most recently from 603455e to 98ec38d Compare April 2, 2020 18:54
@denniswon denniswon changed the base branch from stakingtxn_history to master April 2, 2020 18:56
core/tx_cacher.go Outdated Show resolved Hide resolved
core/tx_cacher.go Outdated Show resolved Hide resolved
core/tx_cacher.go Outdated Show resolved Hide resolved
@fxfactorial
Copy link
Contributor

looks good, approve after comments addressed

@fxfactorial
Copy link
Contributor

usually if you have a dependency cycle on your own PRs, then you commit whatever you need in both. Then first PR gets merged, then you rebase your second PR off your merged first PR, then you force push on the second PR.

@denniswon
Copy link
Contributor Author

@fxfactorial updated per review.

core/blockchain.go Outdated Show resolved Hide resolved
@denniswon
Copy link
Contributor Author

@fxfactorial updated per review.

@fxfactorial fxfactorial merged commit a37074c into harmony-one:master Apr 10, 2020
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