forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix crash during reorg for v2.0.0 (#590)

Browse source 
* params: fix usage of IsXDCxDisable

* internal/ethapi: fix nil block in function DoCall during reorg
This commit is contained in:
Daniel Liu 2024-07-27 22:16:26 +08:00 committed by GitHub
parent ad49e17909
commit 438341c2ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ethapi/api.go
View file

@ -1319,7 +1319,7 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
// this makes sure resources are cleaned up. // this makes sure resources are cleaned up.
defer cancel() defer cancel()
block, err := b.BlockByHash(ctx, header.Hash()) block, err := b.BlockByNumberOrHash(ctx, blockNrOrHash)
if err != nil { if err != nil {
return nil, 0, false, err, nil return nil, 0, false, err, nil
} }

6
params/config.go
View file

@ -626,6 +626,10 @@ func (c *ChainConfig) IsTIPXDCXReceiver(num *big.Int) bool {
return isForked(common.TIPXDCX, num) && !isForked(common.TIPXDCXReceiverDisable, num) return isForked(common.TIPXDCX, num) && !isForked(common.TIPXDCXReceiverDisable, num)
} }
func (c *ChainConfig) IsXDCxDisable(num *big.Int) bool {
return isForked(common.TIPXDCXReceiverDisable, num)
}
func (c *ChainConfig) IsTIPXDCXLending(num *big.Int) bool { func (c *ChainConfig) IsTIPXDCXLending(num *big.Int) bool {
return isForked(common.TIPXDCXLending, num) return isForked(common.TIPXDCXLending, num)
} }
@ -789,7 +793,7 @@ func (c *ChainConfig) Rules(num *big.Int) Rules {
IsLondon: c.IsLondon(num), IsLondon: c.IsLondon(num),
IsMerge: c.IsMerge(num), IsMerge: c.IsMerge(num),
IsShanghai: c.IsShanghai(num), IsShanghai: c.IsShanghai(num),
IsXDCxDisable: c.IsTIPXDCXReceiver(num), IsXDCxDisable: c.IsXDCxDisable(num),
IsEIP1559: c.IsEIP1559(num), IsEIP1559: c.IsEIP1559(num),
} }
} }