Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hypersdk fix #2329

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Hypersdk fix #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb2be66
hypersdk fix
sukantoraymond Nov 8, 2024
ddd6184
hypersdk fix
sukantoraymond Nov 12, 2024
d2a9fe7
hypersdk fix
sukantoraymond Nov 12, 2024
18e5259
use vm id
sukantoraymond Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cmd/blockchaincmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 3 additions & 2 deletions cmd/nodecmd/add_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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())
}
1 change: 0 additions & 1 deletion cmd/nodecmd/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 0 additions & 7 deletions cmd/nodecmd/wiz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,6 @@
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("")
Expand Down Expand Up @@ -617,7 +610,7 @@
subnetName string,
) error {
clusterConfig, err := app.GetClusterConfig(clusterName)
if err != nil {

Check failure on line 613 in cmd/nodecmd/wiz.go

View workflow job for this annotation

GitHub Actions / Lint 

func `checkRPCCompatibility` is unused (unused)
return err
}
allHosts, err := ansible.GetInventoryFromAnsibleInventoryFile(app.GetAnsibleInventoryDirPath(clusterName))
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading