From cb2be668edcb831292f7c0341942846089d92b2d Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Fri, 8 Nov 2024 14:07:35 -0500 Subject: [PATCH 1/4] hypersdk fix --- cmd/nodecmd/sync.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/nodecmd/sync.go b/cmd/nodecmd/sync.go index 06a699d02..ea5c8a42a 100644 --- a/cmd/nodecmd/sync.go +++ b/cmd/nodecmd/sync.go @@ -131,7 +131,6 @@ func trackSubnet( wg := sync.WaitGroup{} wgResults := models.NodeResults{} - subnetAliases := append([]string{blockchainName}, subnetAliases...) for _, host := range hosts { wg.Add(1) go func(nodeResults *models.NodeResults, host *models.Host) { From ddd6184218a3f2d35170b3028a2d467e87bd7e4a Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Tue, 12 Nov 2024 13:34:53 -0500 Subject: [PATCH 2/4] hypersdk fix --- cmd/blockchaincmd/create.go | 4 +--- cmd/nodecmd/wiz.go | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cmd/blockchaincmd/create.go b/cmd/blockchaincmd/create.go index 251ee4848..bf2a97f40 100644 --- a/cmd/blockchaincmd/create.go +++ b/cmd/blockchaincmd/create.go @@ -362,9 +362,7 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error { // subnet-evm check based on genesis // covers both subnet-evm vms and custom vms - if hasSubnetEVMGenesis, rawErr, err := app.HasSubnetEVMGenesis(blockchainName); rawErr != nil { - return rawErr - } else if err != nil { + if hasSubnetEVMGenesis, _, err := app.HasSubnetEVMGenesis(blockchainName); err != nil { return err } else if hasSubnetEVMGenesis && createFlags.enableDebugging { if err := SetBlockchainConf( diff --git a/cmd/nodecmd/wiz.go b/cmd/nodecmd/wiz.go index 61cf9e63c..d76ef84dc 100644 --- a/cmd/nodecmd/wiz.go +++ b/cmd/nodecmd/wiz.go @@ -267,13 +267,6 @@ func wiz(cmd *cobra.Command, args []string) error { return nil } - ux.Logger.PrintToUser("") - ux.Logger.PrintToUser(logging.Green.Wrap("Checking subnet compatibility")) - ux.Logger.PrintToUser("") - if err := checkRPCCompatibility(clusterName, subnetName); err != nil { - return err - } - ux.Logger.PrintToUser("") ux.Logger.PrintToUser(logging.Green.Wrap("Creating the blockchain")) ux.Logger.PrintToUser("") From d2a9fe7cf39bb3a2d7f5f355366e16f4494b0b6f Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Tue, 12 Nov 2024 14:17:49 -0500 Subject: [PATCH 3/4] hypersdk fix --- pkg/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 904daecd6..76a6f3783 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -197,7 +197,7 @@ const ( // Disable it for releases to save cluster creation time EnableSetupCLIFromSource = false SetupCLIFromSourceBranch = "main" - BuildEnvGolangVersion = "1.22.1" + BuildEnvGolangVersion = "1.22.8" IsHealthyJSONFile = "isHealthy.json" IsBootstrappedJSONFile = "isBootstrapped.json" AvalancheGoVersionJSONFile = "avalancheGoVersion.json" From 18e5259b499bb9b487bb5e1e620d3107e68f2171 Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Thu, 14 Nov 2024 16:25:00 -0500 Subject: [PATCH 4/4] use vm id --- cmd/nodecmd/add_dashboard.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/nodecmd/add_dashboard.go b/cmd/nodecmd/add_dashboard.go index a683e8928..c91f63d0b 100644 --- a/cmd/nodecmd/add_dashboard.go +++ b/cmd/nodecmd/add_dashboard.go @@ -6,6 +6,7 @@ import ( "github.com/ava-labs/avalanche-cli/pkg/ansible" "github.com/ava-labs/avalanche-cli/pkg/cobrautils" "github.com/ava-labs/avalanche-cli/pkg/ssh" + "github.com/ava-labs/avalanche-network-runner/utils" "github.com/spf13/cobra" ) @@ -42,9 +43,9 @@ func addCustomDashboard(clusterName, blockchainName string) error { if err != nil { return err } - _, chainID, err := getDeployedSubnetInfo(clusterName, blockchainName) + chainID, err := utils.VMID(blockchainName) if err != nil { return err } - return ssh.RunSSHUpdateMonitoringDashboards(monitoringHosts[0], app.GetMonitoringDashboardDir()+"/", customGrafanaDashboardPath, chainID) + return ssh.RunSSHUpdateMonitoringDashboards(monitoringHosts[0], app.GetMonitoringDashboardDir()+"/", customGrafanaDashboardPath, chainID.String()) }