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

Fix crash during reorg for v2.0.0 #590

Merged
merged 2 commits into from
Jul 27, 2024
Merged

Conversation

gzliudan
Copy link
Collaborator

@gzliudan gzliudan commented Jul 26, 2024

Proposed changes

1. fix crash during reorg

In the function DoCall of file internal/ethapi/api.go:

Old code:

block, err := b.BlockByHash(ctx, header.Hash())

New code:

block, err := b.BlockByNumberOrHash(ctx, blockNrOrHash)

The function BlockByHash returns nil block during reorg, but BlockByNumberOrHash returns block which is we want.

2. fix IsXDCxDisable

In the function func (c *ChainConfig) Rules(num *big.Int) of file params/config.go:

Old code:

IsXDCxDisable:    c.IsTIPXDCXReceiver(num),

IsTIPXDCXReceiver means common.TIPXDCX <= num < common.TIPXDCXReceiverDisable.

New code:

 IsXDCxDisable:    c.IsXDCxDisable(num),

IsXDCxDisable means num >= common.TIPXDCXReceiverDisable.

Types of changes

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

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)
  • Regular KTLO or any of the maintaince work. e.g code style
  • CICD Improvement

Impacted Components

Which part of the codebase this PR will touch base on,

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
  • 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

@liam-lai liam-lai merged commit 438341c into XinFinOrg:master Jul 27, 2024
17 checks passed
liam-lai added a commit that referenced this pull request Jul 29, 2024
* params: fix usage of IsXDCxDisable

* internal/ethapi: fix nil block in function DoCall during reorg

Co-authored-by: Daniel Liu <139250065@qq.com>
wanwiset25 pushed a commit that referenced this pull request Jul 30, 2024
* params: fix usage of IsXDCxDisable

* internal/ethapi: fix nil block in function DoCall during reorg

Co-authored-by: Daniel Liu <139250065@qq.com>
@gzliudan gzliudan deleted the fix-v200 branch August 3, 2024 00:34
wanwiset25 pushed a commit that referenced this pull request Aug 23, 2024
* params: fix usage of IsXDCxDisable

* internal/ethapi: fix nil block in function DoCall during reorg

Co-authored-by: Daniel Liu <139250065@qq.com>
@gzliudan gzliudan mentioned this pull request Sep 3, 2024
19 tasks
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