Merge branch 'main' into latest-released-awm-relayer

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: Lint Golang
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: v1.56.2
           working-directory: .

cmd/blockchaincmd/describe.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/key"
 	"github.com/ava-labs/avalanche-cli/pkg/localnet"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
-	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/txutils"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
@@ -114,7 +113,7 @@ func PrintSubnetInfo(blockchainName string, onlyLocalnetInfo bool) error {
 
 	localChainID := ""
 	for net, data := range sc.Networks {
-		network, err := networkoptions.GetNetworkFromSidecarNetworkName(app, net)
+		network, err := app.GetNetworkFromSidecarNetworkName(net)
 		if err != nil {
 			return err
 		}
@@ -173,7 +172,7 @@ func PrintSubnetInfo(blockchainName string, onlyLocalnetInfo bool) error {
 	t.SetTitle("Teleporter")
 	hasTeleporterInfo := false
 	for net, data := range sc.Networks {
-		network, err := networkoptions.GetNetworkFromSidecarNetworkName(app, net)
+		network, err := app.GetNetworkFromSidecarNetworkName(net)
 		if err != nil {
 			return err
 		}

cmd/contractcmd/deploy_erc20.go

@@ -46,7 +46,9 @@ func newDeployERC20Cmd() *cobra.Command {
 	}
 	networkoptions.AddNetworkFlagsToCmd(cmd, &deployERC20Flags.Network, true, deployERC20SupportedNetworkOptions)
 	deployERC20Flags.PrivateKeyFlags.AddToCmd(cmd, "as contract deployer")
-	deployERC20Flags.chainFlags.AddToCmd(cmd, "deploy the ERC20 contract", true)
+	// enabling blockchain names, C-Chain and blockchain IDs
+	deployERC20Flags.chainFlags.SetEnabled(true, true, false, false, true)
+	deployERC20Flags.chainFlags.AddToCmd(cmd, "deploy the ERC20 contract into %s")
 	cmd.Flags().StringVar(&deployERC20Flags.symbol, "symbol", "", "set the token symbol")
 	cmd.Flags().Uint64Var(&deployERC20Flags.supply, "supply", 0, "set the token supply")
 	cmd.Flags().StringVar(&deployERC20Flags.funded, "funded", "", "set the funded address")
@@ -76,9 +78,7 @@ func deployERC20(_ *cobra.Command, _ []string) error {
 			app,
 			network,
 			prompt,
-			false,
 			"",
-			true,
 			&deployERC20Flags.chainFlags,
 		); cancel || err != nil {
 			return err

cmd/interchaincmd/tokentransferrercmd/deploy.go

@@ -75,14 +75,18 @@ func NewDeployCmd() *cobra.Command {
 		"home-blockchain",
 		"c-chain-home",
 		"",
+		"",
+		"",
 	)
-	deployFlags.homeFlags.chainFlags.AddToCmd(cmd, "set the Transferrer's Home Chain", false)
+	deployFlags.homeFlags.chainFlags.AddToCmd(cmd, "set the Transferrer's Home Chain into %s")
 	deployFlags.remoteFlags.chainFlags.SetFlagNames(
 		"remote-blockchain",
 		"c-chain-remote",
 		"",
+		"",
+		"",
 	)
-	deployFlags.remoteFlags.chainFlags.AddToCmd(cmd, "set the Transferrer's Remote Chain", false)
+	deployFlags.remoteFlags.chainFlags.AddToCmd(cmd, "set the Transferrer's Remote Chain into %s")
 	cmd.Flags().BoolVar(&deployFlags.homeFlags.native, "deploy-native-home", false, "deploy a Transferrer Home for the Chain's Native Token")
 	cmd.Flags().StringVar(&deployFlags.homeFlags.erc20Address, "deploy-erc20-home", "", "deploy a Transferrer Home for the given Chain's ERC20 Token")
 	cmd.Flags().StringVar(&deployFlags.homeFlags.homeAddress, "use-home", "", "use the given Transferrer's Home Address")
@@ -177,7 +181,7 @@ func CallDeploy(_ []string, flags DeployFlags) error {
 	// Home Chain Prompts
 	if !flags.homeFlags.chainFlags.Defined() {
 		prompt := "Where is the Token origin?"
-		if cancel, err := contract.PromptChain(app, network, prompt, false, "", false, &flags.homeFlags.chainFlags); err != nil {
+		if cancel, err := contract.PromptChain(app, network, prompt, "", &flags.homeFlags.chainFlags); err != nil {
 			return err
 		} else if cancel {
 			return nil
@@ -368,13 +372,18 @@ func CallDeploy(_ []string, flags DeployFlags) error {
 		if flags.remoteFlags.native {
 			prompt = "Where should the token be available as a Native Token?"
 		}
+		flags.remoteFlags.chainFlags.SetEnabled(
+			true,
+			!flags.homeFlags.chainFlags.CChain,
+			false,
+			false,
+			false,
+		)
 		if cancel, err := contract.PromptChain(
 			app,
 			network,
 			prompt,
-			flags.homeFlags.chainFlags.CChain,
 			flags.homeFlags.chainFlags.BlockchainName,
-			false,
 			&flags.remoteFlags.chainFlags,
 		); err != nil {
 			return err

cmd/keycmd/list.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
+	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/ids"
 	ledger "github.com/ava-labs/avalanchego/utils/crypto/ledger"
 	"github.com/ava-labs/avalanchego/utils/formatting/address"
@@ -143,12 +144,13 @@ keys or for the ledger addresses associated to certain indices.`,
 }
 
 type Clients struct {
-	x       map[models.Network]avm.Client
-	p       map[models.Network]platformvm.Client
-	c       map[models.Network]ethclient.Client
-	cGeth   map[models.Network]*goethereumethclient.Client
-	evm     map[models.Network]map[string]ethclient.Client
-	evmGeth map[models.Network]map[string]*goethereumethclient.Client
+	x             map[models.Network]avm.Client
+	p             map[models.Network]platformvm.Client
+	c             map[models.Network]ethclient.Client
+	cGeth         map[models.Network]*goethereumethclient.Client
+	evm           map[models.Network]map[string]ethclient.Client
+	evmGeth       map[models.Network]map[string]*goethereumethclient.Client
+	blockchainRPC map[models.Network]map[string]string
 }
 
 func getClients(networks []models.Network, pchain bool, cchain bool, xchain bool, subnets []string) (
@@ -162,6 +164,7 @@ func getClients(networks []models.Network, pchain bool, cchain bool, xchain bool
 	cGethClients := map[models.Network]*goethereumethclient.Client{}
 	evmClients := map[models.Network]map[string]ethclient.Client{}
 	evmGethClients := map[models.Network]map[string]*goethereumethclient.Client{}
+	blockchainRPCs := map[models.Network]map[string]string{}
 	for _, network := range networks {
 		if pchain {
 			pClients[network] = platformvm.NewClient(network.Endpoint)
@@ -207,7 +210,12 @@ func getClients(networks []models.Network, pchain bool, cchain bool, xchain bool
 						false,
 					)
 					if err == nil {
-						_, b := evmClients[network]
+						_, b := blockchainRPCs[network]
+						if !b {
+							blockchainRPCs[network] = map[string]string{}
+						}
+						blockchainRPCs[network][subnetName] = endpoint
+						_, b = evmClients[network]
 						if !b {
 							evmClients[network] = map[string]ethclient.Client{}
 						}
@@ -231,12 +239,13 @@ func getClients(networks []models.Network, pchain bool, cchain bool, xchain bool
 		}
 	}
 	return &Clients{
-		p:       pClients,
-		x:       xClients,
-		c:       cClients,
-		evm:     evmClients,
-		cGeth:   cGethClients,
-		evmGeth: evmGethClients,
+		p:             pClients,
+		x:             xClients,
+		c:             cClients,
+		evm:           evmClients,
+		cGeth:         cGethClients,
+		evmGeth:       evmGethClients,
+		blockchainRPC: blockchainRPCs,
 	}, nil
 }
 
@@ -376,7 +385,12 @@ func getStoredKeyInfo(
 					keyName,
 				)
 				if err != nil {
-					return nil, err
+					ux.Logger.RedXToUser(
+						"failure obtaining info for blockchain %s on url %s",
+						subnetName,
+						clients.blockchainRPC[network][subnetName],
+					)
+					continue
 				}
 				addrInfos = append(addrInfos, addrInfo...)
 			}