Make upgradecmd to work (#2764)

* make upgrade to work

* missing file

* make import to rename current upgrade

* staff automatically being updated

* nit

* nit

Author: felipemadero

cmd/blockchaincmd/configure.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/ava-labs/avalanche-cli/cmd/blockchaincmd/upgradecmd"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
@@ -118,6 +119,8 @@ func configure(_ *cobra.Command, args []string) error {
 		}
 	}
 
+	upgradecmd.PrintHowToApplyConfChangesMessage(blockchainName)
+
 	return nil
 }
 

cmd/blockchaincmd/convert.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/ava-labs/avalanche-cli/pkg/dependencies"
@@ -126,8 +125,7 @@ func StartLocalMachine(
 	if network.Kind == models.Local {
 		useLocalMachine = true
 	}
-	networkNameComponent := strings.ReplaceAll(strings.ToLower(network.Name()), " ", "-")
-	clusterName := fmt.Sprintf("%s-local-node-%s", blockchainName, networkNameComponent)
+	clusterName := localnet.LocalClusterName(network, blockchainName)
 	if clusterNameFlagValue != "" {
 		clusterName = clusterNameFlagValue
 		if localnet.LocalClusterExists(app, clusterName) {
@@ -209,12 +207,6 @@ func StartLocalMachine(
 			return false, err
 		}
 		nodeConfig := map[string]interface{}{}
-		if app.AvagoNodeConfigExists(blockchainName) {
-			nodeConfig, err = utils.ReadJSON(app.GetAvagoNodeConfigPath(blockchainName))
-			if err != nil {
-				return false, err
-			}
-		}
 		if partialSync {
 			nodeConfig[config.PartialSyncPrimaryNetworkKey] = true
 		}

cmd/blockchaincmd/deploy.go

@@ -935,7 +935,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 					AllowPrivateIPs:    relayerAllowPrivateIPs,
 				}
 				if network.Kind == models.Local {
-					blockchains, err := localnet.GetLocalNetworkBlockchainInfo(app)
+					blockchains, err := localnet.GetLocalNetworkBlockchainsInfo(app)
 					if err != nil {
 						return err
 					}

cmd/blockchaincmd/upgradecmd/generate.go

@@ -5,7 +5,7 @@ package upgradecmd
 import (
 	"encoding/json"
 	"fmt"
-	"math/big"
+	"os"
 	"time"
 
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
@@ -17,8 +17,6 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/vm"
 	avalancheSDK "github.com/ava-labs/avalanche-cli/sdk/vm"
 	"github.com/ava-labs/avalanchego/utils/logging"
-	"github.com/ava-labs/avalanchego/utils/units"
-	"github.com/ava-labs/coreth/ethclient"
 	"github.com/ava-labs/subnet-evm/commontype"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/precompile/contracts/deployerallowlist"
@@ -30,7 +28,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/spf13/cobra"
-	"go.uber.org/zap"
 )
 
 const (
@@ -47,8 +44,6 @@ const (
 	RewardManager     = "Customize Fees Distribution"
 )
 
-var blockchainName string
-
 // avalanche blockchain upgrade generate
 func newUpgradeGenerateCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -63,7 +58,7 @@ guides the user through the process using an interactive wizard.`,
 }
 
 func upgradeGenerateCmd(_ *cobra.Command, args []string) error {
-	blockchainName = args[0]
+	blockchainName := args[0]
 	if !app.GenesisExists(blockchainName) {
 		ux.Logger.PrintToUser("The provided blockchain name %q does not exist", blockchainName)
 		return nil
@@ -118,8 +113,8 @@ func upgradeGenerateCmd(_ *cobra.Command, args []string) error {
 			return err
 		}
 
-		ux.Logger.PrintToUser(fmt.Sprintf("Set parameters for the %q precompile", precomp))
-		if cancelled, err := promptParams(precomp, &precompiles.PrecompileUpgrades); err != nil {
+		ux.Logger.PrintToUser("Set parameters for the %q precompile", precomp)
+		if cancelled, err := promptParams(blockchainName, precomp, &precompiles.PrecompileUpgrades); err != nil {
 			return err
 		} else if cancelled {
 			continue
@@ -143,12 +138,47 @@ func upgradeGenerateCmd(_ *cobra.Command, args []string) error {
 		}
 	}
 
-	jsonBytes, err := json.Marshal(&precompiles)
+	upgradeBytes, err := json.Marshal(&precompiles)
 	if err != nil {
 		return err
 	}
 
-	return app.WriteUpgradeFile(blockchainName, jsonBytes)
+	return writeUpgrade(blockchainName, upgradeBytes)
+}
+
+func writeUpgrade(blockchainName string, upgradeBytes []byte) error {
+	upgradeBytesFilePath := app.GetUpgradeBytesFilePath(blockchainName)
+	if utils.FileExists(upgradeBytesFilePath) {
+		timestamp := time.Now().UTC().Format("20060102150405")
+		renamedUpgradeBytesFilePath := upgradeBytesFilePath + "_" + timestamp
+		ux.Logger.PrintToUser("")
+		ux.Logger.PrintToUser("A previous upgrade is found. Renaming it to %s", renamedUpgradeBytesFilePath)
+		if err := os.Rename(upgradeBytesFilePath, renamedUpgradeBytesFilePath); err != nil {
+			return err
+		}
+	}
+	ux.Logger.PrintToUser("")
+	ux.Logger.PrintToUser("Writing upgrade into %s", upgradeBytesFilePath)
+	if err := app.WriteUpgradeFile(blockchainName, upgradeBytes); err != nil {
+		return err
+	}
+	PrintHowToApplyConfChangesMessage(blockchainName)
+	return nil
+}
+
+func PrintHowToApplyConfChangesMessage(blockchainName string) {
+	ux.Logger.PrintToUser("")
+	ux.Logger.PrintToUser("To apply the change on Local Network:")
+	ux.Logger.PrintToUser("  avalanche network stop")
+	ux.Logger.PrintToUser("  avalanche network start")
+	ux.Logger.PrintToUser("")
+	ux.Logger.PrintToUser("To apply the change to local validators on Fuji:")
+	ux.Logger.PrintToUser("  avalanche node local stop %s-local-node-fuji", blockchainName)
+	ux.Logger.PrintToUser("  avalanche node local start %s-local-start-fuji", blockchainName)
+	ux.Logger.PrintToUser("")
+	ux.Logger.PrintToUser("To apply the change to local validators on Mainnet:")
+	ux.Logger.PrintToUser("  avalanche node local stop %s-local-node-mainnet", blockchainName)
+	ux.Logger.PrintToUser("  avalanche node local start %s-local-start-mainnet", blockchainName)
 }
 
 func queryActivationTimestamp() (time.Time, error) {
@@ -189,7 +219,7 @@ func queryActivationTimestamp() (time.Time, error) {
 	return date, nil
 }
 
-func promptParams(precomp string, precompiles *[]params.PrecompileUpgrade) (bool, error) {
+func promptParams(blockchainName string, precomp string, precompiles *[]params.PrecompileUpgrade) (bool, error) {
 	sc, err := app.LoadSidecar(blockchainName)
 	if err != nil {
 		return false, err
@@ -529,71 +559,6 @@ func promptTxAllowListParams(
 	return false, nil
 }
 
-func getCClient(apiEndpoint string, blockchainID string) (ethclient.Client, error) {
-	cClient, err := ethclient.Dial(fmt.Sprintf("%s/ext/bc/%s/rpc", apiEndpoint, blockchainID))
-	if err != nil {
-		return nil, err
-	}
-	return cClient, nil
-}
-
-func ensureHaveBalanceLocalNetwork(which string, addresses []common.Address, blockchainID string) error {
-	cClient, err := getCClient(constants.LocalAPIEndpoint, blockchainID)
-	if err != nil {
-		return err
-	}
-	for _, address := range addresses {
-		// we can break at the first address who has a non-zero balance
-		accountBalance, err := getAccountBalance(cClient, address.String())
-		if err != nil {
-			return err
-		}
-		if accountBalance > float64(0) {
-			return nil
-		}
-	}
-	return fmt.Errorf("at least one of the %s addresses requires a positive token balance", which)
-}
-
-func ensureHaveBalance(
-	sc *models.Sidecar,
-	which string,
-	addresses []common.Address,
-) error {
-	if len(addresses) < 1 {
-		return nil
-	}
-	switch sc.VM {
-	case models.SubnetEvm:
-		// Currently only checking if admins have balance for subnets deployed in Local Network
-		if networkData, ok := sc.Networks["Local Network"]; ok {
-			blockchainID := networkData.BlockchainID.String()
-			if err := ensureHaveBalanceLocalNetwork(which, addresses, blockchainID); err != nil {
-				return err
-			}
-		}
-	default:
-		app.Log.Warn("Unsupported VM type", zap.Any("vm-type", sc.VM))
-	}
-	return nil
-}
-
-func getAccountBalance(cClient ethclient.Client, addrStr string) (float64, error) {
-	addr := common.HexToAddress(addrStr)
-	ctx, cancel := utils.GetAPIContext()
-	balance, err := cClient.BalanceAt(ctx, addr, nil)
-	defer cancel()
-	if err != nil {
-		return 0, err
-	}
-	// convert to nAvax
-	balance = balance.Div(balance, big.NewInt(int64(units.Avax)))
-	if balance.Cmp(big.NewInt(0)) == 0 {
-		return 0, nil
-	}
-	return float64(balance.Uint64()) / float64(units.Avax), nil
-}
-
 func promptAdminManagerAndEnabledAddresses(
 	sc *models.Sidecar,
 	action string,
@@ -602,11 +567,5 @@ func promptAdminManagerAndEnabledAddresses(
 	if cancelled || err != nil {
 		return nil, nil, nil, cancelled, err
 	}
-	if err := ensureHaveBalance(sc, adminLabel, allowList.AdminAddresses); err != nil {
-		return nil, nil, nil, false, err
-	}
-	if err := ensureHaveBalance(sc, managerLabel, allowList.ManagerAddresses); err != nil {
-		return nil, nil, nil, false, err
-	}
 	return allowList.AdminAddresses, allowList.ManagerAddresses, allowList.EnabledAddresses, false, nil
 }

cmd/blockchaincmd/upgradecmd/import.go

@@ -52,10 +52,10 @@ func upgradeImportCmd(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	fileBytes, err := os.ReadFile(upgradeBytesFilePath)
+	upgradeBytes, err := os.ReadFile(upgradeBytesFilePath)
 	if err != nil {
 		return fmt.Errorf("failed to read the provided upgrade file: %w", err)
 	}
 
-	return app.WriteUpgradeFile(blockchainName, fileBytes)
+	return writeUpgrade(blockchainName, upgradeBytes)
 }

cmd/blockchaincmd/upgradecmd/validations.go

@@ -0,0 +1,81 @@
+// Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package upgradecmd
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ava-labs/avalanche-cli/pkg/constants"
+	"github.com/ava-labs/avalanche-cli/pkg/models"
+	"github.com/ava-labs/avalanche-cli/pkg/utils"
+	"github.com/ava-labs/avalanchego/utils/units"
+	"github.com/ava-labs/coreth/ethclient"
+	"github.com/ethereum/go-ethereum/common"
+	"go.uber.org/zap"
+)
+
+func getCClient(apiEndpoint string, blockchainID string) (ethclient.Client, error) {
+	cClient, err := ethclient.Dial(fmt.Sprintf("%s/ext/bc/%s/rpc", apiEndpoint, blockchainID))
+	if err != nil {
+		return nil, err
+	}
+	return cClient, nil
+}
+
+func ensureHaveBalanceLocalNetwork(which string, addresses []common.Address, blockchainID string) error {
+	cClient, err := getCClient(constants.LocalAPIEndpoint, blockchainID)
+	if err != nil {
+		return err
+	}
+	for _, address := range addresses {
+		// we can break at the first address who has a non-zero balance
+		accountBalance, err := getAccountBalance(cClient, address.String())
+		if err != nil {
+			return err
+		}
+		if accountBalance > float64(0) {
+			return nil
+		}
+	}
+	return fmt.Errorf("at least one of the %s addresses requires a positive token balance", which)
+}
+
+func ensureHaveBalance(
+	sc *models.Sidecar,
+	which string,
+	addresses []common.Address,
+) error {
+	if len(addresses) < 1 {
+		return nil
+	}
+	switch sc.VM {
+	case models.SubnetEvm:
+		// Currently only checking if admins have balance for subnets deployed in Local Network
+		if networkData, ok := sc.Networks["Local Network"]; ok {
+			blockchainID := networkData.BlockchainID.String()
+			if err := ensureHaveBalanceLocalNetwork(which, addresses, blockchainID); err != nil {
+				return err
+			}
+		}
+	default:
+		app.Log.Warn("Unsupported VM type", zap.Any("vm-type", sc.VM))
+	}
+	return nil
+}
+
+func getAccountBalance(cClient ethclient.Client, addrStr string) (float64, error) {
+	addr := common.HexToAddress(addrStr)
+	ctx, cancel := utils.GetAPIContext()
+	balance, err := cClient.BalanceAt(ctx, addr, nil)
+	defer cancel()
+	if err != nil {
+		return 0, err
+	}
+	// convert to nAvax
+	balance = balance.Div(balance, big.NewInt(int64(units.Avax)))
+	if balance.Cmp(big.NewInt(0)) == 0 {
+		return 0, nil
+	}
+	return float64(balance.Uint64()) / float64(units.Avax), nil
+}