Code

Enable gas price#1446

Code

Merged

antonydenyer merged 37 commits intoConsensys:masterConsensys/quorum:masterfrom SatpalSandhu61:enable-gas-price-v2SatpalSandhu61/quorum:enable-gas-price-v2Copy head branch name to clipboardJul 21, 2022

+174-72

Commits

Commits on Dec 16, 2019

• Add support for gas price, enabled/disabled using flag in genesis.

  SatpalSandhu61

  committed
  57483cb

  Copy full SHA for 57483cb

Commits on Jan 6, 2020

• Ensure default gas price is set if gas price is enabled.

  SatpalSandhu61

  committed
  75166c1

  Copy full SHA for 75166c1

• Ensure etherbase account is set for gas price reward when using Raft.

  SatpalSandhu61

  committed
  e54f7ab

  Copy full SHA for e54f7ab

Commits on Jan 14, 2020

• Don't check for underpriced or costly transactions if gas price is disabled.

  SatpalSandhu61

  committed
  915e6e5

  Copy full SHA for 915e6e5

Commits on Jan 17, 2020

• Remove check for 'Gas price cannot be 0', as this is already caught by check for 'transaction underpriced'.

  SatpalSandhu61

  committed
  f42358a

  Copy full SHA for f42358a

• Fix broken unit tests.

  SatpalSandhu61

  committed
  7799789

  Copy full SHA for 7799789

• Fix broken unit tests.

  SatpalSandhu61

  committed
  62b3ec6

  Copy full SHA for 62b3ec6

Commits on Mar 6, 2020

• Merge branch 'master' of https://github.com/jpmorganchase/quorum into enable-gas-price

  Show description for edfb65e
  SatpalSandhu61

  committed
  edfb65e

  Copy full SHA for edfb65e

• Merge from master

  SatpalSandhu61

  committed
  897e13d

  Copy full SHA for 897e13d

Commits on Mar 12, 2020

• Also make changes to les SuggestPrice(), for consistency.

  SatpalSandhu61

  committed
  25bdac0

  Copy full SHA for 25bdac0

Commits on Mar 23, 2020

• Merge branch 'master' of https://github.com/jpmorganchase/quorum into enable-gas-price

  SatpalSandhu61

  committed
  d0cfbd8

  Copy full SHA for d0cfbd8

Commits on Mar 27, 2020

• Fixing unit tests. Set default PriceLimit to 1, and allow zero priced local transactions (as per upstream).

  SatpalSandhu61

  committed
  6ec7b29

  Copy full SHA for 6ec7b29

Commits on Jun 25, 2020

• Merge branch 'master' of https://github.com/jpmorganchase/quorum into enable-gas-price

  Show description for b386cfb
  SatpalSandhu61

  committed
  b386cfb

  Copy full SHA for b386cfb

Commits on Jun 26, 2020

• Changes required after pulling from master with 1.9.7 upgrade

  SatpalSandhu61

  committed
  d84e7a2

  Copy full SHA for d84e7a2

Commits on Jun 29, 2020

• Merge branch 'master' of https://github.com/jpmorganchase/quorum into enable-gas-price

  SatpalSandhu61

  committed
  86371bd

  Copy full SHA for 86371bd

Commits on Jul 1, 2020

• Disable block reward, which was being rewarded for Raft only.

  SatpalSandhu61

  committed
  5e89c8f

  Copy full SHA for 5e89c8f

Commits on Aug 17, 2020

• Merge branch 'master' of https://github.com/jpmorganchase/quorum into enable-gas-price

  SatpalSandhu61

  committed
  ea11ba9

  Copy full SHA for ea11ba9

Commits on Aug 20, 2020

• Add return value for backend SetEtherbase(), so user can be notified if it is disallowed.

  SatpalSandhu61

  committed
  e72b3dd

  Copy full SHA for e72b3dd

Commits on Mar 18, 2022

• Merge branch 'master' of https://github.com/ConsenSys/quorum into enable-gas-price

  Show description for 9b5a26f
  SatpalSandhu61

  committed
  9b5a26f

  Copy full SHA for 9b5a26f

Commits on Mar 22, 2022

• Fixing issues after merge from master

  SatpalSandhu61

  committed
  c65937e

  Copy full SHA for c65937e

Commits on Apr 11, 2022

• Merge branch 'master' of https://github.com/ConsenSys/quorum into enable-gas-price-v2

  Show description for b2af6bd
  SatpalSandhu61

  committed
  b2af6bd

  Copy full SHA for b2af6bd

Commits on Apr 25, 2022

• Ensure block rewards match upstream

  SatpalSandhu61

  committed
  d13dc05

  Copy full SHA for d13dc05

• Merge branch 'master' of https://github.com/ConsenSys/quorum into enable-gas-price-v2

  SatpalSandhu61

  committed
  edffe95

  Copy full SHA for edffe95

Commits on May 13, 2022

• Merge branch 'master' of https://github.com/ConsenSys/quorum into enable-gas-price-v2

  SatpalSandhu61

  committed
  bb57613

  Copy full SHA for bb57613

Commits on Jun 13, 2022

• Fix inconsistent gas usage for PMT private transactions between participants and non-participants

  SatpalSandhu61

  committed
  e2e4cfd

  Copy full SHA for e2e4cfd

Commits on Jun 16, 2022

• Add comment

  SatpalSandhu61

  committed
  c8a767b

  Copy full SHA for c8a767b

• Temporary change to run acceptance tests on this branch

  SatpalSandhu61

  committed
  249d364

  Copy full SHA for 249d364

Commits on Jun 17, 2022

• Disable block reward, which was being rewarded for Raft only.

  SatpalSandhu61

  committed
  ce77a7c

  Copy full SHA for ce77a7c

Commits on Jun 22, 2022

• Modify enableGas flag to fork from a block number.

  SatpalSandhu61

  committed
  460df57

  Copy full SHA for 460df57

Commits on Jun 27, 2022

• Correction of enableGasPrice name to enableGasPriceBlock

  SatpalSandhu61

  committed
  c66e127

  Copy full SHA for c66e127

Commits on Jul 14, 2022

• Restore static block reward, otherwise setting isQuorum flag causes different state from upstream geth, resulting in "BAD BLOCK" due to "invalid merkle root".

  SatpalSandhu61

  committed
  d7f63dc

  Copy full SHA for d7f63dc

Commits on Jul 15, 2022

• Merge branch 'master' into enable-gas-price-v2

  baptiste-b-pegasys

  authored
  d4d6878

  Copy full SHA for d4d6878

Commits on Jul 19, 2022

• Fix failing unit tests

  SatpalSandhu61

  committed
  66688aa

  Copy full SHA for 66688aa

• Remove temporary github acceptance test workflow from branch, and fix minor typo

  SatpalSandhu61

  committed
  f36a938

  Copy full SHA for f36a938

Commits on Jul 20, 2022

• Merge branch 'master' of https://github.com/ConsenSys/quorum into enable-gas-price-v2

  SatpalSandhu61

  committed
  506ad57

  Copy full SHA for 506ad57

• Add suppoort for enabling gas price using transitions

  SatpalSandhu61

  committed
  cd9cce8

  Copy full SHA for cd9cce8

• Correction to static block reward, fixes acceptance test.

  SatpalSandhu61

  committed
  0cf170a

  Copy full SHA for 0cf170a