fix(eth): use headers for block height and base fee

Author: piotr-roslaniec

pkg/chain/ethereum/block_counter.go

@@ -201,12 +201,12 @@ func (bc *BlockCounter) subscribeBlocks(
 		}
 	}()
 
-	lastBlock, err := chainReader.BlockByNumber(ctx, nil)
+	lastHeader, err := chainReader.HeaderByNumber(ctx, nil)
 	if err != nil {
 		return err
 	}
 
-	bc.subscriptionChannel <- block{lastBlock.Number.String()}
+	bc.subscriptionChannel <- block{lastHeader.Number.String()}
 
 	return nil
 }
@@ -215,17 +215,17 @@ func (bc *BlockCounter) subscribeBlocks(
 func CreateBlockCounter(chainReader ChainReader) (*BlockCounter, error) {
 	ctx := context.Background()
 
-	startupBlock, err := chainReader.BlockByNumber(ctx, nil)
+	startupHeader, err := chainReader.HeaderByNumber(ctx, nil)
 	if err != nil {
 		return nil,
 			fmt.Errorf(
-				"failed to get initial block from the chain: [%v]",
+				"failed to get initial block header from the chain: [%v]",
 				err,
 			)
 	}
 
 	blockCounter := &BlockCounter{
-		latestBlockHeight:   startupBlock.Number.Uint64(),
+		latestBlockHeight:   startupHeader.Number.Uint64(),
 		waiters:             make(map[uint64][]chan uint64),
 		subscriptionChannel: make(chan block),
 	}

pkg/chain/ethereum/chain.go

@@ -39,9 +39,9 @@ type Subscription interface {
 
 // ChainReader provides access to the blockchain.
 type ChainReader interface {
-	// BlockByNumber gets the block by its number. The block number argument
-	// can be nil to select the latest block.
-	BlockByNumber(ctx context.Context, number *big.Int) (*Block, error)
+	// HeaderByNumber gets the block header by its number. The block header
+	// number argument can be nil to select the latest block header.
+	HeaderByNumber(ctx context.Context, number *big.Int) (*Header, error)
 
 	// SubscribeNewHead subscribes to notifications about changes of the
 	// head block of the canonical chain.

pkg/chain/ethereum/ethutil/adapter.go

@@ -14,19 +14,17 @@ type ethereumAdapter struct {
 	delegate EthereumClient
 }
 
-func (ea *ethereumAdapter) BlockByNumber(
+func (ea *ethereumAdapter) HeaderByNumber(
 	ctx context.Context,
 	number *big.Int,
-) (*chainEthereum.Block, error) {
-	block, err := ea.delegate.BlockByNumber(ctx, number)
+) (*chainEthereum.Header, error) {
+	header, err := ea.delegate.HeaderByNumber(ctx, number)
 	if err != nil {
 		return nil, err
 	}
 
-	return &chainEthereum.Block{
-		Header: &chainEthereum.Header{
-			Number: block.Number(),
-		},
+	return &chainEthereum.Header{
+		Number: header.Number,
 	}, nil
 }
 

pkg/chain/ethereum/ethutil/adapter_test.go

@@ -15,7 +15,7 @@ import (
 	chainEthereum "github.com/keep-network/keep-common/pkg/chain/ethereum"
 )
 
-func TestEthereumAdapter_BlockByNumber(t *testing.T) {
+func TestEthereumAdapter_HeaderByNumber(t *testing.T) {
 	client := &mockAdaptedEthereumClient{
 		blocks: []*big.Int{
 			big.NewInt(0),
@@ -31,35 +31,35 @@ func TestEthereumAdapter_BlockByNumber(t *testing.T) {
 
 	adapter := &ethereumAdapter{client}
 
-	blockOne, err := adapter.BlockByNumber(context.Background(), big.NewInt(1))
+	headerOne, err := adapter.HeaderByNumber(context.Background(), big.NewInt(1))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	lastBlock, err := adapter.BlockByNumber(context.Background(), nil)
+	lastHeader, err := adapter.HeaderByNumber(context.Background(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	expectedBlockOneNumber := big.NewInt(1)
-	if expectedBlockOneNumber.Cmp(blockOne.Number) != 0 {
+	expectedHeaderOneNumber := big.NewInt(1)
+	if expectedHeaderOneNumber.Cmp(headerOne.Number) != 0 {
 		t.Errorf(
-			"unexpected block number\n"+
+			"unexpected header number\n"+
 				"expected: [%v]\n"+
 				"actual:   [%v]",
-			expectedBlockOneNumber,
-			blockOne.Number,
+			expectedHeaderOneNumber,
+			headerOne.Number,
 		)
 	}
 
-	expectedLastBlockNumber := big.NewInt(2)
-	if expectedLastBlockNumber.Cmp(lastBlock.Number) != 0 {
+	expectedLastHeaderNumber := big.NewInt(2)
+	if expectedLastHeaderNumber.Cmp(lastHeader.Number) != 0 {
 		t.Errorf(
-			"unexpected last block number\n"+
+			"unexpected last header number\n"+
 				"expected: [%v]\n"+
 				"actual:   [%v]",
-			expectedLastBlockNumber,
-			lastBlock.Number,
+			expectedLastHeaderNumber,
+			lastHeader.Number,
 		)
 	}
 }
@@ -166,22 +166,20 @@ type mockAdaptedEthereumClient struct {
 	nonces        map[common.Address]uint64
 }
 
-func (maec *mockAdaptedEthereumClient) BlockByNumber(
+func (maec *mockAdaptedEthereumClient) HeaderByNumber(
 	ctx context.Context,
 	number *big.Int,
-) (*types.Block, error) {
+) (*types.Header, error) {
 	index := len(maec.blocks) - 1
 
 	if number != nil {
 		index = int(number.Int64())
 	}
 
-	return types.NewBlockWithHeader(
-		&types.Header{
-			Number:  maec.blocks[index],
-			BaseFee: maec.blocksBaseFee[index],
-		},
-	), nil
+	return &types.Header{
+		Number:  maec.blocks[index],
+		BaseFee: maec.blocksBaseFee[index],
+	}, nil
 }
 
 func (maec *mockAdaptedEthereumClient) SubscribeNewHead(

pkg/chain/ethereum/ethutil/mining_waiter.go

@@ -33,9 +33,9 @@ var (
 // increase the transaction's chance for being picked up by miners.
 //
 // Specific action depends on transaction type:
-// - legacy pre EIP-1559 transaction: bumps up the gas price by 20%
-// - dynamic fee post EIP-1559 transaction: bumps up the gas tip cap by 20%
-//   and adjusts the gas fee cap accordingly
+//   - legacy pre EIP-1559 transaction: bumps up the gas price by 20%
+//   - dynamic fee post EIP-1559 transaction: bumps up the gas tip cap by 20%
+//     and adjusts the gas fee cap accordingly
 type MiningWaiter struct {
 	client        EthereumClient
 	checkInterval time.Duration
@@ -391,15 +391,15 @@ func (mw *MiningWaiter) forceMiningDynamicFeeTx(
 }
 
 func (mw *MiningWaiter) latestBaseFee() (*big.Int, error) {
-	latestBlock, err := mw.client.BlockByNumber(
+	latestHeader, err := mw.client.HeaderByNumber(
 		context.Background(),
 		nil,
 	)
 	if err != nil {
-		return nil, fmt.Errorf("could not get the latest block: [%v]", err)
+		return nil, fmt.Errorf("could not get the latest block header: [%v]", err)
 	}
 
-	baseFee := latestBlock.BaseFee()
+	baseFee := latestHeader.BaseFee
 	if baseFee == nil {
 		return nil, fmt.Errorf("not an EIP-1559 block")
 	}