Skip to content

fix(params): accept legacy foudationwalletaddr in chain config, fix #2063#2141

Merged
gzliudan merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-zero-FoundationWalletAddr
Mar 6, 2026
Merged

fix(params): accept legacy foudationwalletaddr in chain config, fix #2063#2141
gzliudan merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-zero-FoundationWalletAddr

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

@gzliudan gzliudan commented Mar 6, 2026

Proposed changes

Add backward-compatible XDPoSConfig JSON decoding for the legacy key "foudationWalletAddr" introduced in PR #2063 renamed it to "foundationWalletAddr".

Without this compatibility layer, old on-disk chain configs are decoded with a zero FoundationWalletAddr, causing XDPoSConfigEqual mismatch and startup rewind ("mismatching XDPoS not equal in database").

This patch:

  • Implements custom UnmarshalJSON for XDPoSConfig that reads both keys.
  • Prefers foundationWalletAddr when both keys are present.
  • Keeps existing behavior for all other fields.
  • Adds regression tests for legacy-key decoding and precedence.

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

…inFinOrg#2063

Add backward-compatible XDPoSConfig JSON decoding for the legacy key
"foudationWalletAddr" introduced before PR XinFinOrg#2063 renamed it to
"foundationWalletAddr".

Without this compatibility layer, old on-disk chain configs are decoded with a
zero FoundationWalletAddr, causing XDPoSConfigEqual mismatch and startup rewind
("mismatching XDPoS not equal in database").

This patch:
- Implements custom UnmarshalJSON for XDPoSConfig that reads both keys.
- Prefers foundationWalletAddr when both keys are present.
- Keeps existing behavior for all other fields.
- Adds regression tests for legacy-key decoding and precedence.

Validation:
- go test ./params/...
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 6, 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: 3650962b-d28e-4da2-9bf7-905cf28bca91

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
  • Post copyable unit tests in a comment

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 adds backward-compatible JSON unmarshaling for XDPoSConfig to handle the legacy misspelled key "foudationWalletAddr" that existed in on-disk chain configurations prior to PR #2063 (which renamed it to "foundationWalletAddr"). Without this fix, nodes with old databases would decode FoundationWalletAddr as a zero address, causing an XDPoSConfigEqual mismatch and a forced chain rewind at startup.

Changes:

  • Implements a custom UnmarshalJSON method on XDPoSConfig that reads both "foundationWalletAddr" and the legacy "foudationWalletAddr", preferring the correctly-spelled key when both are present.
  • Adds two regression tests: one for legacy-key-only decoding and one verifying that the correctly-spelled key takes precedence when both keys are present.

Reviewed changes

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

File Description
params/config.go Adds custom UnmarshalJSON for XDPoSConfig with legacy key fallback logic
params/config_test.go Adds two test cases for legacy key decoding and key precedence

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

@gzliudan gzliudan merged commit ed95075 into XinFinOrg:dev-upgrade Mar 6, 2026
17 checks passed
@gzliudan gzliudan deleted the fix-zero-FoundationWalletAddr branch March 6, 2026 22:37
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