Skip to content

refactor(core/state): add GetStateAndCommittedState #31585#2316

Open
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:getcommittedstate
Open

refactor(core/state): add GetStateAndCommittedState #31585#2316
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:getcommittedstate

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

Proposed changes

expose a combined state getter and use it in sstore gas accounting.

keep tracer test doubles compatible with the vm interface change.

Ref: ethereum#31585

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

expose a combined state getter and use it in sstore gas accounting.

keep tracer test doubles compatible with the vm interface change.
Copilot AI review requested due to automatic review settings April 17, 2026 11:50
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 17, 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: 87ee6ba9-9a41-43c4-8e99-9d96db8ff833

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

This PR introduces a combined storage getter (GetStateAndCommittedState) to reduce duplicated state lookups, and updates SSTORE gas accounting to use the combined getter while keeping tracer-related test doubles compatible with the VM interface change.

Changes:

  • Add GetStateAndCommittedState to core/vm.StateDB and implement it in core/state.StateDB (and hooked wrapper).
  • Refactor SSTORE gas accounting paths to use the combined getter instead of separate GetState/GetCommittedState calls.
  • Add/adjust tests to validate the combined getter behavior and confirm SSTORE gas uses it; add an interpreter cancellation test/benchmark.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
eth/tracers/logger/logger_test.go Updates dummy StateDB to satisfy the new VM interface method.
core/vm/operations_acl.go Refactors EIP-2200/2929 SSTORE gas accounting to use the combined getter.
core/vm/interpreter_test.go Adds loop-interrupt test and a benchmark for interpreter/SSTORE gas path.
core/vm/interface.go Replaces GetCommittedState in the VM StateDB interface with GetStateAndCommittedState.
core/vm/gas_table_test.go Adds a test ensuring EIP-2200 SSTORE gas uses the combined getter.
core/vm/gas_table.go Refactors legacy and EIP-2200 SSTORE gas accounting to use the combined getter.
core/state/statedb_test.go Adds unit test covering StateDB.GetStateAndCommittedState semantics.
core/state/statedb_hooked.go Updates hooked StateDB wrapper to forward the combined getter.
core/state/statedb.go Implements GetStateAndCommittedState on StateDB.

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

Comment thread core/vm/interpreter_test.go
Comment thread core/vm/interpreter_test.go
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.

5 participants