Skip to content

use proper block number #20001

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.

Sign up for GitHub

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

Merged
jmank88 merged 2 commits into from
Oct 22, 2025
Merged

use proper block number #20001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a56bb6c
use proper block number
shileiwill Oct 21, 2025
989f647
use pb converter
shileiwill Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dry-buckets-lie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#bugfix block number in fake evm cap
46 changes: 42 additions & 4 deletions core/capabilities/fakes/evm_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package fakes
import (
"context"
"crypto/ecdsa"
"fmt"
"math/big"
"strings"

Expand All @@ -12,6 +13,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rpc"

commonCap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
evmcappb "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/chain-capabilities/evm"
Expand Down Expand Up @@ -425,14 +427,50 @@ func (fc *FakeEVMChain) GetTransactionReceipt(ctx context.Context, metadata comm
func (fc *FakeEVMChain) HeaderByNumber(ctx context.Context, metadata commonCap.RequestMetadata, input *evmcappb.HeaderByNumberRequest) (*commonCap.ResponseAndMetadata[*evmcappb.HeaderByNumberReply], error) {
fc.eng.Infow("EVM Chain HeaderByNumber Started", "input", input)

// Prepare header by number request
blockNumber := new(big.Int).SetBytes(input.BlockNumber.AbsVal)
var (
header *types.Header
err error
)

// Convert the request block number preserving sign.
var reqNum *big.Int
if input != nil {
reqNum = pb.NewIntFromBigInt(input.BlockNumber)
}

// Enforce int64 constraint
if reqNum != nil && !reqNum.IsInt64() {
return nil, fmt.Errorf("block number %s is larger than int64: %w", reqNum.String(), ethereum.NotFound)
}

switch {
// latest block (nil or explicit "latest"): nil or -2
case reqNum == nil || reqNum.Int64() == rpc.LatestBlockNumber.Int64():
header, err = fc.gethClient.HeaderByNumber(ctx, nil)

// non-special, non-negative block number (including 0): >=0
case reqNum.Sign() >= 0:
header, err = fc.gethClient.HeaderByNumber(ctx, reqNum)

// finalized tag: -3
case reqNum.Int64() == rpc.FinalizedBlockNumber.Int64():
header, err = fc.gethClient.HeaderByNumber(ctx, big.NewInt(rpc.FinalizedBlockNumber.Int64()))

// safe tag: -4
case reqNum.Int64() == rpc.SafeBlockNumber.Int64():
header, err = fc.gethClient.HeaderByNumber(ctx, big.NewInt(rpc.SafeBlockNumber.Int64()))

// any other negative is unexpected
default:
return nil, fmt.Errorf("unexpected block number %s: %w", reqNum.String(), ethereum.NotFound)
}

// Get header by number
header, err := fc.gethClient.HeaderByNumber(ctx, blockNumber)
if err != nil {
return nil, err
}
if header == nil {
return nil, ethereum.NotFound
}

// Convert header to protobuf
headerPb := &evmcappb.HeaderByNumberReply{
Expand Down
Loading