Upgrade to avalanche rosetta v0.1.42

Author: mboben

server/client/client.go

@@ -6,40 +6,50 @@ import (
 	"strings"
 
 	"github.com/ava-labs/avalanchego/api/info"
+	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/rpc"
-	ethtypes "github.com/ava-labs/coreth/core/types"
+	"github.com/ava-labs/coreth/core/types"
 	"github.com/ava-labs/coreth/interfaces"
-	ethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ava-labs/coreth/plugin/evm"
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ava-labs/avalanche-rosetta/constants"
 )
 
 // Interface compliance
 var _ Client = &client{}
 
 type Client interface {
-	IsBootstrapped(context.Context, string, ...rpc.Option) (bool, error)
+	// info.Client methods
+	InfoClient
+
 	ChainID(context.Context) (*big.Int, error)
-	BlockByHash(context.Context, ethcommon.Hash) (*ethtypes.Block, error)
-	BlockByNumber(context.Context, *big.Int) (*ethtypes.Block, error)
-	HeaderByHash(context.Context, ethcommon.Hash) (*ethtypes.Header, error)
-	HeaderByNumber(context.Context, *big.Int) (*ethtypes.Header, error)
-	TransactionByHash(context.Context, ethcommon.Hash) (*ethtypes.Transaction, bool, error)
-	TransactionReceipt(context.Context, ethcommon.Hash) (*ethtypes.Receipt, error)
+	BlockByHash(context.Context, common.Hash) (*types.Block, error)
+	BlockByNumber(context.Context, *big.Int) (*types.Block, error)
+	HeaderByHash(context.Context, common.Hash) (*types.Header, error)
+	HeaderByNumber(context.Context, *big.Int) (*types.Header, error)
+	TransactionByHash(context.Context, common.Hash) (*types.Transaction, bool, error)
+	TransactionReceipt(context.Context, common.Hash) (*types.Receipt, error)
 	TraceTransaction(context.Context, string) (*Call, []*FlatCall, error)
 	TraceBlockByHash(context.Context, string) ([]*Call, [][]*FlatCall, error)
-	SendTransaction(context.Context, *ethtypes.Transaction) error
-	BalanceAt(context.Context, ethcommon.Address, *big.Int) (*big.Int, error)
-	NonceAt(context.Context, ethcommon.Address, *big.Int) (uint64, error)
+	SendTransaction(context.Context, *types.Transaction) error
+	BalanceAt(context.Context, common.Address, *big.Int) (*big.Int, error)
+	NonceAt(context.Context, common.Address, *big.Int) (uint64, error)
 	SuggestGasPrice(context.Context) (*big.Int, error)
 	EstimateGas(context.Context, interfaces.CallMsg) (uint64, error)
 	TxPoolContent(context.Context) (*TxPoolContent, error)
-	GetNetworkName(context.Context, ...rpc.Option) (string, error)
-	Peers(context.Context, ...rpc.Option) ([]info.Peer, error)
-	GetContractInfo(ethcommon.Address, bool) (string, uint8, error)
+	GetContractInfo(common.Address, bool) (string, uint8, error)
 	CallContract(context.Context, interfaces.CallMsg, *big.Int) ([]byte, error)
+	IssueTx(ctx context.Context, txBytes []byte, options ...rpc.Option) (ids.ID, error)
+	GetAtomicUTXOs(ctx context.Context, addrs []ids.ShortID, sourceChain string, limit uint32, startAddress ids.ShortID, startUTXOID ids.ID, options ...rpc.Option) ([][]byte, ids.ShortID, ids.ID, error)
+	EstimateBaseFee(ctx context.Context) (*big.Int, error)
 }
 
+type EvmClient evm.Client
+
 type client struct {
 	info.Client
+	EvmClient
 	*EthClient
 	*ContractClient
 }
@@ -53,8 +63,9 @@ func NewClient(ctx context.Context, endpoint string) (Client, error) {
 		return nil, err
 	}
 
-	return client{
+	return &client{
 		Client:         info.NewClient(endpoint),
+		EvmClient:      evm.NewClient(endpoint, constants.CChain.String()),
 		EthClient:      eth,
 		ContractClient: NewContractClient(eth.Client),
 	}, nil

server/client/contract.go

@@ -13,29 +13,28 @@ const (
 // ContractClient is a client for the calling contract information
 type ContractClient struct {
 	ethClient ethclient.Client
-	cache     *cache.LRU
+	cache     *cache.LRU[common.Address, *ContractInfo]
+}
+
+type ContractInfo struct {
+	Symbol   string
+	Decimals uint8
 }
 
 // NewContractClient returns a new ContractInfo client
 func NewContractClient(c ethclient.Client) *ContractClient {
 	return &ContractClient{
 		ethClient: c,
-		cache:     &cache.LRU{Size: contractCacheSize},
+		cache:     &cache.LRU[common.Address, *ContractInfo]{Size: contractCacheSize},
 	}
 }
 
 // GetContractInfo returns the symbol and decimals for [addr].
 func (c *ContractClient) GetContractInfo(addr common.Address, erc20 bool) (string, uint8, error) {
 	// We don't define another struct because this is never used outside of this
 	// function.
-	type ContractInfo struct {
-		Symbol   string
-		Decimals uint8
-	}
-
 	if currency, cached := c.cache.Get(addr); cached {
-		cast := currency.(*ContractInfo)
-		return cast.Symbol, cast.Decimals, nil
+		return currency.Symbol, currency.Decimals, nil
 	}
 
 	token, err := NewContractInfoToken(addr, c.ethClient)

server/client/eth.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/ava-labs/coreth/eth/tracers"
 	"github.com/ava-labs/coreth/ethclient"
@@ -24,7 +23,7 @@ type EthClient struct {
 
 // NewEthClient returns a new EVM client
 func NewEthClient(ctx context.Context, endpoint string) (*EthClient, error) {
-	endpointURL := fmt.Sprintf("%s%s", endpoint, prefixEth)
+	endpointURL := endpoint + prefixEth
 
 	c, err := rpc.DialContext(ctx, endpointURL)
 	if err != nil {

server/client/info_client.go

@@ -0,0 +1,17 @@
+package client
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/api/info"
+	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/utils/rpc"
+)
+
+// InfoClient collects all Avalanchego info.Client methods common
+// to Rosetta Clients
+type InfoClient interface {
+	GetBlockchainID(context.Context, string, ...rpc.Option) (ids.ID, error)
+	IsBootstrapped(context.Context, string, ...rpc.Option) (bool, error)
+	Peers(context.Context, ...rpc.Option) ([]info.Peer, error)
+}