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

Deprecate gateway fee #2120

Merged
merged 10 commits into from
Jun 16, 2023
Merged

Deprecate gateway fee #2120

merged 10 commits into from
Jun 16, 2023

Conversation

palango
Copy link
Contributor

@palango palango commented Jun 1, 2023

Description

Deprecating the gateway fee.

  • Removes the --light.gatewayfee argument
  • Adds checks to txpools to not accept transactions that include either GatewayFeeRecipient or GatewayFee
  • Adds check to the state machine to not accept transactions that include either GatewayFeeRecipient or GatewayFee
  • Update tests for new behaviour, keep old tests with a pre-g-fork config
  • Corresponding monorepo changes: celo-org/celo-monorepo@2e5d33f

This doesn't include changes to the LES protocol yet, as those can be done independently of a hardfork and are therefore not time sensitive.

@github-actions
Copy link

github-actions bot commented Jun 1, 2023

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 2c1d945

coverage: 48.1% of statements across all listed packages
coverage:  57.9% of statements in consensus/istanbul
coverage:  37.5% of statements in consensus/istanbul/announce
coverage:  54.3% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  24.3% of statements in consensus/istanbul/backend/internal/replica
coverage:  61.8% of statements in consensus/istanbul/core
coverage:  45.0% of statements in consensus/istanbul/db
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  64.4% of statements in consensus/istanbul/uptime
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

@github-actions
Copy link

github-actions bot commented Jun 1, 2023

5823 passed, 44 skipped

@codecov
Copy link

codecov bot commented Jun 2, 2023

Codecov Report

Patch coverage: 63.42% and project coverage change: +1.02 🎉

Comparison is base (71bdbcf) 54.30% compared to head (ecf2e94) 55.32%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2120      +/-   ##
==========================================
+ Coverage   54.30%   55.32%   +1.02%     
==========================================
  Files         692      674      -18     
  Lines      115642   113553    -2089     
==========================================
+ Hits        62795    62825      +30     
+ Misses      49014    46915    -2099     
+ Partials     3833     3813      -20     
Impacted Files Coverage Δ
cmd/devp2p/internal/ethtest/transaction.go 0.00% <0.00%> (ø)
cmd/geth/chaincmd.go 0.00% <0.00%> (ø)
cmd/geth/main.go 21.39% <ø> (+0.91%) ⬆️
cmd/geth/usage.go 10.90% <ø> (ø)
cmd/utils/flags.go 2.56% <0.00%> (ø)
consensus/istanbul/utils.go 47.10% <ø> (+1.13%) ⬆️
contracts/currency/currency.go 55.00% <ø> (ø)
contracts/election/election.go 25.00% <ø> (ø)
contracts/epoch_rewards/epoch_rewards.go 88.88% <ø> (ø)
contracts/freezer/freezer.go 70.00% <ø> (ø)
... and 50 more

... and 35 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@palango palango force-pushed the palango/full-node-incentives branch 2 times, most recently from 2bc2a1a to 7d79724 Compare June 7, 2023 18:24
@palango palango marked this pull request as ready for review June 8, 2023 14:54
@palango palango requested a review from gastonponti June 8, 2023 14:54
@palango palango force-pushed the palango/full-node-incentives branch from 628bdaa to 56a981c Compare June 8, 2023 15:02
@palango palango changed the title WIP: Deprecate gateway fee Deprecate gateway fee Jun 8, 2023
@palango palango force-pushed the palango/full-node-incentives branch 3 times, most recently from 2fc9742 to e0ccae3 Compare June 9, 2023 11:34
core/state_processor.go Show resolved Hide resolved
core/tx_pool_test.go Show resolved Hide resolved
e2e_test/e2e_transfer_test.go Outdated Show resolved Hide resolved
eth/api_backend.go Outdated Show resolved Hide resolved
internal/ethapi/backend.go Outdated Show resolved Hide resolved
les/api_backend.go Show resolved Hide resolved
internal/web3ext/web3ext.go Outdated Show resolved Hide resolved
internal/ethapi/transaction_args.go Show resolved Hide resolved
@palango palango force-pushed the palango/full-node-incentives branch from e0ccae3 to 0b4d347 Compare June 12, 2023 11:04
@palango
Copy link
Contributor Author

palango commented Jun 12, 2023

Changes after review:

  • Don't remove light.gatewayfee flag. Instead move it to the deprecated section.
  • Keep current transaction behaviour until hardfork. This means old code cannot be removed yet.
  • Throw errors on JS API after hardfork instead of removing it outright.

@palango palango force-pushed the palango/full-node-incentives branch from 0b4d347 to d49641a Compare June 12, 2023 11:30
@palango palango requested a review from gastonponti June 12, 2023 11:31
@palango palango force-pushed the palango/full-node-incentives branch 2 times, most recently from 31a1cf7 to 12248be Compare June 12, 2023 12:58
@palango palango requested a review from karlb June 16, 2023 08:23
Copy link
Contributor

@karlb karlb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR brings a lot of GFork names again, which should be gingerbread by now.

@@ -1 +1 @@
d4725a468fa20add9034efd109975b9fc7ec51d1
b9cf8d7bbad5dcd74a8a91b6d6439f314b540db5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is merged after #2130, this should be changed to be301c4b17044e08bf5fb01395804816ee950957.

core/tx_pool_test.go Outdated Show resolved Hide resolved
@palango
Copy link
Contributor Author

palango commented Jun 16, 2023

This PR brings a lot of GFork names again, which should be gingerbread by now.

My idea was to merge this before the renaming PR, because the commit fixing the monorepo tests is already in the branch. So I'd fix those in #2127

@karlb
Copy link
Contributor

karlb commented Jun 16, 2023

This PR brings a lot of GFork names again, which should be gingerbread by now.

My idea was to merge this before the renaming PR, because the commit fixing the monorepo tests is already in the branch. So I'd fix those in #2127

Ah, I somehow thought the rename PR was already merged. OK, then just fix the wrong comments and we're ready to go!

@palango palango force-pushed the palango/full-node-incentives branch from 12248be to a22e49a Compare June 16, 2023 09:41
@palango palango force-pushed the palango/full-node-incentives branch from a22e49a to ecf2e94 Compare June 16, 2023 09:43
@palango palango merged commit 05b05ca into master Jun 16, 2023
@palango palango deleted the palango/full-node-incentives branch June 16, 2023 10:19
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