Merge branch 'master' into powerslider/1410-context-cancel-misleading-logs

Author: powerslider

RELEASES.md

@@ -3,6 +3,8 @@
 ## Pending Release
 
 - Removes `avax.version` API
+- Removes `customethclient` package in favor of `ethclient` package and temporary type registrations (`WithTempRegisteredLibEVMExtras`)
+  - Also removes blockHook extension in `ethclient` package.
 
 ## [v0.16.0](https://github.com/ava-labs/coreth/releases/tag/v0.16.0)
 

ethclient/ethclient.go

@@ -35,6 +35,7 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 	"github.com/ava-labs/coreth/rpc"
 	ethereum "github.com/ava-labs/libevm"
 	"github.com/ava-labs/libevm/common"
@@ -45,8 +46,6 @@ import (
 // Client defines typed wrappers for the Ethereum RPC API.
 type Client struct {
 	c *rpc.Client
-	// blockHook is called when a block is decoded.
-	blockHook BlockHook
 }
 
 // Dial connects a client to the given URL.
@@ -132,10 +131,12 @@ func (ec *Client) BlockReceipts(ctx context.Context, blockNrOrHash rpc.BlockNumb
 }
 
 type rpcBlock struct {
-	Hash         common.Hash         `json:"hash"`
-	Transactions []rpcTransaction    `json:"transactions"`
-	UncleHashes  []common.Hash       `json:"uncles"`
-	Withdrawals  []*types.Withdrawal `json:"withdrawals,omitempty"`
+	Hash           common.Hash         `json:"hash"`
+	Transactions   []rpcTransaction    `json:"transactions"`
+	UncleHashes    []common.Hash       `json:"uncles"`
+	Withdrawals    []*types.Withdrawal `json:"withdrawals,omitempty"`
+	Version        uint32              `json:"version"`
+	BlockExtraData *hexutil.Bytes      `json:"blockExtraData"`
 }
 
 func (ec *Client) getBlock(ctx context.Context, method string, args ...interface{}) (*types.Block, error) {
@@ -204,16 +205,18 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
 		}
 		txs[i] = tx.tx
 	}
-	block := types.NewBlockWithHeader(head).WithBody(types.Body{
-		Transactions: txs,
-		Uncles:       uncles,
-	})
-	// Fill the block with the extra data. BlockHook can modify the block.
-	if ec.blockHook != nil {
-		if err := ec.blockHook.OnBlockDecoded(raw, block); err != nil {
-			return nil, err
-		}
+
+	block := types.NewBlockWithHeader(head).WithBody(
+		types.Body{
+			Transactions: txs,
+			Uncles:       uncles,
+			Withdrawals:  body.Withdrawals,
+		})
+	extra := &customtypes.BlockBodyExtra{
+		Version: body.Version,
+		ExtData: (*[]byte)(body.BlockExtraData),
 	}
+	customtypes.SetBlockExtra(block, extra)
 	return block, nil
 }
 

ethclient/ethclient_ext.go

@@ -5,19 +5,16 @@ package ethclient
 
 import (
 	"context"
-	"encoding/json"
 	"math/big"
 
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/hexutil"
-	"github.com/ava-labs/libevm/core/types"
 
 	// Force-load precompiles to trigger registration
 	_ "github.com/ava-labs/coreth/precompile/registry"
 
 	"github.com/ava-labs/coreth/accounts/abi/bind"
 	"github.com/ava-labs/coreth/interfaces"
-	"github.com/ava-labs/coreth/rpc"
 
 	ethereum "github.com/ava-labs/libevm"
 )
@@ -42,23 +39,6 @@ var (
 	_ interfaces.AcceptedContractCaller = (*Client)(nil)
 )
 
-// NewClientWithHook creates a client that uses the given RPC client and block hook.
-func NewClientWithHook(c *rpc.Client, hook BlockHook) *Client {
-	return &Client{
-		c:         c,
-		blockHook: hook,
-	}
-}
-
-// BlockHook is an interface that can be implemented to modify the block
-// after it has been decoded. This is useful for plugins that want to
-// modify the block before it is returned to the caller.
-type BlockHook interface {
-	// OnBlockDecoded is called when a block is decoded. It can be used to
-	// modify the block before it is returned to the caller.
-	OnBlockDecoded(raw json.RawMessage, block *types.Block) error
-}
-
 // SubscribeNewAcceptedTransactions subscribes to notifications about the accepted transaction hashes on the given channel.
 func (ec *Client) SubscribeNewAcceptedTransactions(ctx context.Context, ch chan<- *common.Hash) (ethereum.Subscription, error) {
 	sub, err := ec.c.EthSubscribe(ctx, ch, "newAcceptedTransactions")