From e9c21235c85c258b8f76249e48854daf1732b287 Mon Sep 17 00:00:00 2001 From: "liam.lai" Date: Thu, 20 Nov 2025 00:18:34 +0800 Subject: [PATCH] resolve conflit --- eth/api_backend.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eth/api_backend.go b/eth/api_backend.go index 66c1b3d316..e5f4d29b9c 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -94,8 +94,8 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, blockNr rpc.BlockNum } else { return nil, errors.New("PoS V1 does not support confirmed block lookup") } - } else if number.Int64() < 0 { - return nil, fmt.Errorf("invalid block number %d", number.Int64()) + } else if blockNr.Int64() < 0 { + return nil, fmt.Errorf("invalid block number %d", blockNr.Int64()) } header := b.eth.blockchain.GetHeaderByNumber(uint64(blockNr)) if header == nil { @@ -146,8 +146,8 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, blockNr rpc.BlockNumb } else { return nil, errors.New("PoS V1 does not support confirmed block lookup") } - } else if number.Int64() < 0 { - return nil, fmt.Errorf("invalid block number %d", number.Int64()) + } else if blockNr.Int64() < 0 { + return nil, fmt.Errorf("invalid block number %d", blockNr.Int64()) } return b.eth.blockchain.GetBlockByNumber(uint64(blockNr)), nil }