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.

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

Jump to bottom

Enable gas price #1446

Merged
merged 37 commits into from
Jul 21, 2022
Merged

Enable gas price #1446

merged 37 commits into from
Jul 21, 2022

Conversation

SatpalSandhu61
Copy link
Contributor

@SatpalSandhu61 SatpalSandhu61 commented Jul 8, 2022 •
edited by antonydenyer
Loading

Allow GoQuorum to be set up as a gas enabled network.

Associated changes and pull requests:

@SatpalSandhu61
Add support for gas price, enabled/disabled using flag in genesis.
57483cb
@SatpalSandhu61
Ensure default gas price is set if gas price is enabled.
75166c1
@SatpalSandhu61
Ensure etherbase account is set for gas price reward when using Raft.
e54f7ab
@SatpalSandhu61
Don't check for underpriced or costly transactions if gas price is di…
915e6e5 
…sabled.
@SatpalSandhu61
Remove check for 'Gas price cannot be 0', as this is already caught b…
f42358a 
…y check for 'transaction underpriced'.
@SatpalSandhu61
Fix broken unit tests.
7799789
@SatpalSandhu61
Fix broken unit tests.
62b3ec6
@SatpalSandhu61
Merge branch 'master' of https://github.com/jpmorganchase/quorum into…
edfb65e 
… enable-gas-price

� Conflicts:
�	params/config.go
@SatpalSandhu61
Merge from master
897e13d
@SatpalSandhu61
Also make changes to les SuggestPrice(), for consistency.
25bdac0
@SatpalSandhu61
Merge branch 'master' of https://github.com/jpmorganchase/quorum into…
d0cfbd8 
… enable-gas-price
@SatpalSandhu61
Fixing unit tests. Set default PriceLimit to 1, and allow zero priced…
6ec7b29 
… local transactions (as per upstream).
@SatpalSandhu61
Merge branch 'master' of https://github.com/jpmorganchase/quorum into…
b386cfb 
… enable-gas-price

� Conflicts:
�	core/state_processor.go
�	core/tx_pool.go
�	internal/ethapi/api.go
�	params/config.go
@SatpalSandhu61
Changes required after pulling from master with 1.9.7 upgrade
d84e7a2
@SatpalSandhu61
Merge branch 'master' of https://github.com/jpmorganchase/quorum into…
86371bd 
… enable-gas-price
@SatpalSandhu61
Disable block reward, which was being rewarded for Raft only.
5e89c8f
@SatpalSandhu61
Merge branch 'master' of https://github.com/jpmorganchase/quorum into…
ea11ba9 
… enable-gas-price
@SatpalSandhu61
Add return value for backend SetEtherbase(), so user can be notified …
e72b3dd 
…if it is disallowed.
@SatpalSandhu61
Merge branch 'master' of https://github.com/ConsenSys/quorum into ena…
9b5a26f 
…ble-gas-price

� Conflicts:
�	core/state_processor.go
�	core/tx_pool.go
�	params/config.go
�	raft/handler_test.go
@SatpalSandhu61
Fixing issues after merge from master
c65937e
@SatpalSandhu61
Merge branch 'master' of https://github.com/ConsenSys/quorum into ena…
b2af6bd 
…ble-gas-price-v2

� Conflicts:
�	params/config.go
@SatpalSandhu61
Ensure block rewards match upstream
d13dc05
@SatpalSandhu61
Merge branch 'master' of https://github.com/ConsenSys/quorum into ena…
edffe95 
…ble-gas-price-v2
@SatpalSandhu61
Merge branch 'master' of https://github.com/ConsenSys/quorum into ena…
bb57613 
…ble-gas-price-v2
@SatpalSandhu61
Fix inconsistent gas usage for PMT private transactions between parti…
e2e4cfd 
…cipants and non-participants
@SatpalSandhu61
Add comment
c8a767b
@SatpalSandhu61
Temporary change to run acceptance tests on this branch
249d364
@SatpalSandhu61
Disable block reward, which was being rewarded for Raft only.
ce77a7c
@SatpalSandhu61
Modify enableGas flag to fork from a block number.
460df57
@SatpalSandhu61
Correction of enableGasPrice name to enableGasPriceBlock
c66e127
@SatpalSandhu61 SatpalSandhu61 changed the title Enable gas price v2 Enable gas price Jul 8, 2022
@SatpalSandhu61
Restore static block reward, otherwise setting isQuorum flag causes d…
d7f63dc 
…ifferent state from upstream geth, resulting in "BAD BLOCK" due to "invalid merkle root".
@antonydenyer antonydenyer marked this pull request as ready for review July 15, 2022 12:24
@antonydenyer antonydenyer mentioned this pull request Jul 15, 2022
Closed
baptiste-b-pegasys
baptiste-b-pegasys reviewed Jul 15, 2022
View reviewed changes
.github/workflows/build.yml Outdated Show resolved Hide resolved
consensus/ethash/consensus.go Outdated Show resolved Hide resolved
@antonydenyer antonydenyer merged commit 66587a6 into Consensys:master Jul 21, 2022
@SatpalSandhu61 SatpalSandhu61 deleted the enable-gas-price-v2 branch July 25, 2022 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@baptiste-b-pegasys baptiste-b-pegasys baptiste-b-pegasys approved these changes

@antonydenyer antonydenyer antonydenyer approved these changes

@achraf17 achraf17 Awaiting requested review from achraf17

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SatpalSandhu61 @antonydenyer @baptiste-b-pegasys