bug fixes needed by #2776

Author: felipemadero

cmd/blockchaincmd/deploy.go

@@ -18,6 +18,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
+	"github.com/ava-labs/avalanche-cli/pkg/interchain/relayer"
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/localnet"
 	"github.com/ava-labs/avalanche-cli/pkg/metrics"
@@ -944,7 +945,11 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 					deployRelayerFlags.BlockchainsToRelay = utils.Unique(sdkutils.Map(blockchains, func(i localnet.BlockchainInfo) string { return i.Name }))
 				}
 				if network.Kind == models.Local || useLocalMachine {
-					deployRelayerFlags.Key = constants.ICMRelayerKeyName
+					relayerKeyName, _, _, err := relayer.GetDefaultRelayerKeyInfo(app)
+					if err != nil {
+						return err
+					}
+					deployRelayerFlags.Key = relayerKeyName
 					deployRelayerFlags.Amount = constants.DefaultRelayerAmount
 					deployRelayerFlags.BlockchainFundingKey = constants.ICMKeyName
 				}

cmd/nodecmd/wiz.go

@@ -569,7 +569,7 @@ func chooseICMRelayerHost(clusterName string) (*models.Host, error) {
 }
 
 func updateICMRelayerFunds(network models.Network, sc models.Sidecar, blockchainID ids.ID) error {
-	relayerKey, err := app.GetKey(constants.ICMRelayerKeyName, network, true)
+	_, relayerAddress, _, err := relayer.GetDefaultRelayerKeyInfo(app)
 	if err != nil {
 		return err
 	}
@@ -580,7 +580,7 @@ func updateICMRelayerFunds(network models.Network, sc models.Sidecar, blockchain
 	if err := relayer.FundRelayer(
 		network.BlockchainEndpoint(blockchainID.String()),
 		icmKey.PrivKeyHex(),
-		relayerKey.C(),
+		relayerAddress,
 	); err != nil {
 		return nil
 	}
@@ -591,7 +591,7 @@ func updateICMRelayerFunds(network models.Network, sc models.Sidecar, blockchain
 	return relayer.FundRelayer(
 		network.BlockchainEndpoint("C"),
 		ewoqKey.PrivKeyHex(),
-		relayerKey.C(),
+		relayerAddress,
 	)
 }
 
@@ -968,7 +968,7 @@ func setUpSubnetLogging(clusterName, subnetName string) error {
 }
 
 func addBlockchainToRelayerConf(network models.Network, cloudNodeID string, blockchainName string) error {
-	relayerAddress, relayerPrivateKey, err := relayer.GetRelayerKeyInfo(app)
+	_, relayerAddress, relayerPrivateKey, err := relayer.GetDefaultRelayerKeyInfo(app)
 	if err != nil {
 		return err
 	}

pkg/ictt/foundry.go

@@ -3,9 +3,9 @@
 package ictt
 
 import (
-	_ "embed"
 	"fmt"
 	"io"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -42,7 +42,9 @@ func InstallFoundry() error {
 		"-L",
 		fmt.Sprintf("https://raw.githubusercontent.com/ava-labs/foundry/%s/foundryup/install", foundryVersion),
 	)
+	cmdsEnv := append(os.Environ(), "XDG_CONFIG_HOME=")
 	installCmd := exec.Command("bash")
+	installCmd.Env = cmdsEnv
 	var downloadOutbuf, downloadErrbuf strings.Builder
 	downloadCmdStdoutPipe, err := downloadCmd.StdoutPipe()
 	if err != nil {
@@ -76,7 +78,9 @@ func InstallFoundry() error {
 		return err
 	}
 	ux.Logger.PrintToUser(strings.TrimSuffix(installOutbuf.String(), "\n"))
-	out, err := exec.Command(foundryupPath, "-v", foundryVersion).CombinedOutput()
+	foundryupCmd := exec.Command(foundryupPath, "-v", foundryVersion)
+	foundryupCmd.Env = cmdsEnv
+	out, err := foundryupCmd.CombinedOutput()
 	ux.Logger.PrintToUser(string(out))
 	if err != nil {
 		ux.Logger.PrintToUser("")

pkg/interchain/relayer/relayer.go

@@ -40,27 +40,28 @@ const (
 
 var relayerRequiredBalance = big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(500)) // 500 AVAX
 
-func GetRelayerKeyInfo(app *application.Avalanche) (string, string, error) {
-	keyPath := app.GetKeyPath(constants.ICMRelayerKeyName)
+func GetDefaultRelayerKeyInfo(app *application.Avalanche) (string, string, string, error) {
+	keyName := constants.ICMRelayerKeyName
+	keyPath := app.GetKeyPath(keyName)
 	var (
 		k   *key.SoftKey
 		err error
 	)
 	if utils.FileExists(keyPath) {
 		k, err = key.LoadSoft(models.NewLocalNetwork().ID, keyPath)
 		if err != nil {
-			return "", "", err
+			return "", "", "", err
 		}
 	} else {
 		k, err = key.NewSoft(0)
 		if err != nil {
-			return "", "", err
+			return "", "", "", err
 		}
 		if err := k.Save(keyPath); err != nil {
-			return "", "", err
+			return "", "", "", err
 		}
 	}
-	return k.C(), k.PrivKeyHex(), nil
+	return keyName, k.C(), k.PrivKeyHex(), nil
 }
 
 func FundRelayer(

pkg/vm/create_evm.go

@@ -158,7 +158,7 @@ func CreateEVMGenesis(
 	genesisBlock0Timestamp := utils.TimeToNewUint64(time.Now())
 	precompiles := getPrecompiles(params, genesisBlock0Timestamp)
 
-	relayerAddress, _, err := relayer.GetRelayerKeyInfo(app)
+	_, relayerAddress, _, err := relayer.GetDefaultRelayerKeyInfo(app)
 	if err != nil {
 		return nil, err
 	}