Skip to content

fix(eth/gasestimator,internal/ethapi): fix block overrides in estimate gas #34081#2265

Merged
AnilChinchawale merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:refactor-DoEstimateGas
Apr 2, 2026
Merged

fix(eth/gasestimator,internal/ethapi): fix block overrides in estimate gas #34081#2265
AnilChinchawale merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:refactor-DoEstimateGas

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

@gzliudan gzliudan commented Mar 31, 2026

Proposed changes

Align estimateGas with the geth backport by consistently using the block-overridden header for CallDefaults, ToMessage, and gas estimator options.

Drop estimator-side block override plumbing and cap the search upper bound to MaxTxGas when Osaka rules are active (EIP-7825), preventing oversized estimates under Osaka.

Ref: ethereum#34081

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

Copilot AI review requested due to automatic review settings March 31, 2026 22:57
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 31, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: ad41f843-c99b-4c6c-b632-a2e5ad79cefd

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Refactors DoEstimateGas to use a single effective block header after applying BlockOverrides, ensuring gas estimation options and transaction defaults are derived from the same header context.

Changes:

  • Remove the separate estimationHeader alias and reuse header after applying blockOverrides.
  • Use the overridden header consistently for gasestimator.Options, CallDefaults, and ToMessage.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@gzliudan gzliudan force-pushed the refactor-DoEstimateGas branch from 0b766b4 to b3b9e44 Compare April 1, 2026 23:19
@gzliudan gzliudan changed the title refactor(internal/ethapi): simplify DoEstimateGas header usage fix(eth/gasestimator,internal/ethapi): fix block overrides in estimate gas #32348 #34081 Apr 1, 2026
@gzliudan gzliudan force-pushed the refactor-DoEstimateGas branch from b3b9e44 to b208449 Compare April 2, 2026 05:03
@gzliudan gzliudan changed the title fix(eth/gasestimator,internal/ethapi): fix block overrides in estimate gas #32348 #34081 fix(eth/gasestimator,internal/ethapi): fix block overrides in estimate gas #34081 Apr 2, 2026
…e gas ethereum#34081

Align estimateGas with the geth backport by consistently using the block-overridden header for CallDefaults, ToMessage, and gas estimator options.

Drop estimator-side block override plumbing and cap the search upper bound to MaxTxGas when Osaka rules are active (EIP-7825), preventing oversized estimates under Osaka.
@gzliudan gzliudan force-pushed the refactor-DoEstimateGas branch from b208449 to ff63434 Compare April 2, 2026 06:49
@AnilChinchawale AnilChinchawale merged commit ece436f into XinFinOrg:dev-upgrade Apr 2, 2026
13 checks passed
@gzliudan gzliudan deleted the refactor-DoEstimateGas branch April 2, 2026 07:15
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.

6 participants