Skip to content

Commit 01f1b09

Browse files
sukantoraymondsukantoraymond
committed
devnet fix
1 parent 04cee9f commit 01f1b09

File tree

4 files changed

+94
-88
lines changed

4 files changed

+94
-88
lines changed

‎cmd/blockchaincmd/add_validator.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ func addValidator(cmd *cobra.Command, args []string) error {
357357
}
358358
deployer := subnet.NewPublicDeployer(kc, network)
359359
if !sovereign {
360-
return CallAddValidatorNonSOV(deployer, network, kc, useLedger, blockchainName, nodeIDStr, defaultValidatorParams, waitForTxAcceptance)
360+
return CallAddValidatorNonSOV(deployer, network, kc, useLedger, blockchainName, nodeIDStr, defaultValidatorParams, waitForTxAcceptance, weight)
361361
}
362362
if err := CallAddValidator(
363363
deployer,
@@ -738,6 +738,7 @@ func CallAddValidatorNonSOV(
738738
nodeIDStr string,
739739
defaultValidatorParamsSetting bool,
740740
waitForTxAcceptanceSetting bool,
741+
validatorWeight uint64,
741742
) error {
742743
var start time.Time
743744
nodeID, err := ids.NodeIDFromString(nodeIDStr)
@@ -760,7 +761,7 @@ func CallAddValidatorNonSOV(
760761
if useDefaultStartTime && startTimeStr != "" {
761762
return errMutuallyExclusiveStartOptions
762763
}
763-
if useDefaultWeight && weight != 0 {
764+
if useDefaultWeight && validatorWeight != 0 {
764765
return errMutuallyExclusiveWeightOptions
765766
}
766767

@@ -811,7 +812,7 @@ func CallAddValidatorNonSOV(
811812
}
812813
ux.Logger.PrintToUser("Your auth keys for add validator tx creation: %s", subnetAuthKeys)
813814

814-
selectedWeight, err := getWeight()
815+
selectedWeight, err := getWeight(validatorWeight, useDefaultWeight)
815816
if err != nil {
816817
return err
817818
}
@@ -990,10 +991,10 @@ func PromptNodeID(goal string) (ids.NodeID, error) {
990991
return app.Prompt.CaptureNodeID(txt)
991992
}
992993

993-
func getWeight() (uint64, error) {
994+
func getWeight(inputWeight uint64, usingDefaultWeight bool) (uint64, error) {
994995
// this sets either the global var weight or useDefaultWeight to enable repeated execution with
995996
// state keeping from node cmds
996-
if weight == 0 && !useDefaultWeight {
997+
if inputWeight == 0 && !usingDefaultWeight {
997998
defaultWeight := fmt.Sprintf("Default (%d)", constants.DefaultStakeWeight)
998999
txt := "What stake weight would you like to assign to the validator?"
9991000
weightOptions := []string{defaultWeight, "Custom"}
@@ -1003,16 +1004,16 @@ func getWeight() (uint64, error) {
10031004
}
10041005
switch weightOption {
10051006
case defaultWeight:
1006-
useDefaultWeight = true
1007+
usingDefaultWeight = true
10071008
default:
1008-
weight, err = app.Prompt.CaptureWeight(txt, func(uint64) error { return nil })
1009+
inputWeight, err = app.Prompt.CaptureWeight(txt, func(uint64) error { return nil })
10091010
if err != nil {
10101011
return 0, err
10111012
}
10121013
}
10131014
}
1014-
if useDefaultWeight {
1015+
if usingDefaultWeight {
10151016
return constants.DefaultStakeWeight, nil
10161017
}
1017-
return weight, nil
1018+
return inputWeight, nil
10181019
}

‎cmd/blockchaincmd/deploy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
860860
}
861861

862862
// needs to first stop relayer so non sovereign subnets successfully restart
863-
if sidecar.TeleporterReady && !icmSpec.SkipICMDeploy && !icmSpec.SkipRelayerDeploy && network.Kind != models.Mainnet {
863+
if sidecar.TeleporterReady && !icmSpec.SkipICMDeploy && !icmSpec.SkipRelayerDeploy && network.Kind != models.Mainnet && network.Kind != models.Devnet {
864864
_ = relayercmd.CallStop(nil, relayercmd.StopFlags{}, network)
865865
}
866866

‎cmd/nodecmd/validate_subnet.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ func addNodeAsSubnetValidator(
107107
nodeID,
108108
defaultValidatorParams,
109109
waitForTxAcceptance,
110+
0,
110111
); err != nil {
111112
return err
112113
}

‎cmd/nodecmd/wiz.go‎

Lines changed: 82 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"time"
1515

1616
"github.com/ava-labs/avalanche-cli/cmd/blockchaincmd"
17-
"github.com/ava-labs/avalanche-cli/cmd/interchaincmd/messengercmd"
1817
"github.com/ava-labs/avalanche-cli/pkg/ansible"
1918
awsAPI "github.com/ava-labs/avalanche-cli/pkg/cloud/aws"
2019
"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
@@ -25,7 +24,6 @@ import (
2524
"github.com/ava-labs/avalanche-cli/pkg/interchain/relayer"
2625
"github.com/ava-labs/avalanche-cli/pkg/metrics"
2726
"github.com/ava-labs/avalanche-cli/pkg/models"
28-
"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
2927
"github.com/ava-labs/avalanche-cli/pkg/node"
3028
"github.com/ava-labs/avalanche-cli/pkg/ssh"
3129
"github.com/ava-labs/avalanche-cli/pkg/subnet"
@@ -228,9 +226,15 @@ func wiz(cmd *cobra.Command, args []string) error {
228226

229227
if !clusterAlreadyExists {
230228
globalNetworkFlags.UseDevnet = true
231-
if len(useCustomAvalanchegoVersion) == 0 && !useLatestAvalanchegoReleaseVersion && !useLatestAvalanchegoPreReleaseVersion {
232-
useAvalanchegoVersionFromSubnet = subnetName
233-
}
229+
//if len(useCustomAvalanchegoVersion) == 0 && !useLatestAvalanchegoReleaseVersion && !useLatestAvalanchegoPreReleaseVersion {
230+
// useAvalanchegoVersionFromSubnet = subnetName
231+
//}
232+
// Hardcode version for devnet to avoid resolution issues
233+
useCustomAvalanchegoVersion = "v1.13.5"
234+
useLatestAvalanchegoReleaseVersion = false
235+
useLatestAvalanchegoPreReleaseVersion = false
236+
useAvalanchegoVersionFromSubnet = ""
237+
ux.Logger.PrintToUser("=== WIZ DEBUG: Hardcoded AvalancheGo version to v1.13.5 for devnet ===")
234238
ux.Logger.PrintToUser("")
235239
ux.Logger.PrintToUser(logging.Green.Wrap("Creating the devnet..."))
236240
ux.Logger.PrintToUser("")
@@ -319,42 +323,42 @@ func wiz(cmd *cobra.Command, args []string) error {
319323
return err
320324
}
321325

322-
isEVMGenesis, _, err := app.HasSubnetEVMGenesis(subnetName)
323-
if err != nil {
324-
return err
325-
}
326-
327-
var awmRelayerHost *models.Host
328-
if sc.TeleporterReady && sc.RunRelayer && isEVMGenesis {
329-
// get or set AWM Relayer host and configure/stop service
330-
awmRelayerHost, err = node.GetICMRelayerHost(app, clusterName)
331-
if err != nil {
332-
return err
333-
}
334-
if awmRelayerHost == nil {
335-
awmRelayerHost, err = chooseICMRelayerHost(clusterName)
336-
if err != nil {
337-
return err
338-
}
339-
// get awm-relayer latest version
340-
relayerVersion, err := relayer.GetLatestRelayerReleaseVersion()
341-
if err != nil {
342-
return err
343-
}
344-
if err := setICMRelayerHost(awmRelayerHost, relayerVersion); err != nil {
345-
return err
346-
}
347-
if err := setICMRelayerSecurityGroupRule(clusterName, awmRelayerHost); err != nil {
348-
return err
349-
}
350-
} else {
351-
ux.Logger.PrintToUser("")
352-
ux.Logger.PrintToUser(logging.Green.Wrap("Stopping AWM Relayer Service"))
353-
if err := ssh.RunSSHStopICMRelayerService(awmRelayerHost); err != nil {
354-
return err
355-
}
356-
}
357-
}
326+
//isEVMGenesis, _, err := app.HasSubnetEVMGenesis(subnetName)
327+
//if err != nil {
328+
// return err
329+
//}
330+
//
331+
//var awmRelayerHost *models.Host
332+
//if sc.TeleporterReady && sc.RunRelayer && isEVMGenesis {
333+
// // get or set AWM Relayer host and configure/stop service
334+
// awmRelayerHost, err = node.GetICMRelayerHost(app, clusterName)
335+
// if err != nil {
336+
// return err
337+
// }
338+
// if awmRelayerHost == nil {
339+
// awmRelayerHost, err = chooseICMRelayerHost(clusterName)
340+
// if err != nil {
341+
// return err
342+
// }
343+
// // get awm-relayer latest version
344+
// relayerVersion, err := relayer.GetLatestRelayerReleaseVersion()
345+
// if err != nil {
346+
// return err
347+
// }
348+
// if err := setICMRelayerHost(awmRelayerHost, relayerVersion); err != nil {
349+
// return err
350+
// }
351+
// if err := setICMRelayerSecurityGroupRule(clusterName, awmRelayerHost); err != nil {
352+
// return err
353+
// }
354+
// } else {
355+
// ux.Logger.PrintToUser("")
356+
// ux.Logger.PrintToUser(logging.Green.Wrap("Stopping AWM Relayer Service"))
357+
// if err := ssh.RunSSHStopICMRelayerService(awmRelayerHost); err != nil {
358+
// return err
359+
// }
360+
// }
361+
//}
358362

359363
ux.Logger.PrintToUser("")
360364
ux.Logger.PrintToUser(logging.Green.Wrap("Setting the nodes as subnet trackers"))
@@ -392,43 +396,43 @@ func wiz(cmd *cobra.Command, args []string) error {
392396
}
393397
}
394398

395-
if sc.TeleporterReady && sc.RunRelayer && isEVMGenesis {
396-
ux.Logger.PrintToUser("")
397-
ux.Logger.PrintToUser(logging.Green.Wrap("Setting up ICM on subnet"))
398-
ux.Logger.PrintToUser("")
399-
flags := messengercmd.DeployFlags{
400-
ChainFlags: contract.ChainSpec{
401-
BlockchainName: subnetName,
402-
},
403-
PrivateKeyFlags: contract.PrivateKeyFlags{
404-
KeyName: constants.ICMKeyName,
405-
},
406-
Network: networkoptions.NetworkFlags{
407-
ClusterName: clusterName,
408-
},
409-
DeployMessenger: deployICMMessenger,
410-
DeployRegistry: deployICMRegistry,
411-
ForceRegistryDeploy: true,
412-
Version: icmVersion,
413-
MessengerContractAddressPath: icmMessengerContractAddressPath,
414-
MessengerDeployerAddressPath: icmMessengerDeployerAddressPath,
415-
MessengerDeployerTxPath: icmMessengerDeployerTxPath,
416-
RegistryBydecodePath: icmRegistryBydecodePath,
417-
IncludeCChain: true,
418-
}
419-
if err := messengercmd.CallDeploy([]string{}, flags, models.UndefinedNetwork); err != nil {
420-
return err
421-
}
422-
ux.Logger.PrintToUser("")
423-
ux.Logger.PrintToUser(logging.Green.Wrap("Starting AWM Relayer Service"))
424-
ux.Logger.PrintToUser("")
425-
if err := updateICMRelayerFunds(network, sc, blockchainID); err != nil {
426-
return err
427-
}
428-
if err := updateICMRelayerHostConfig(network, awmRelayerHost, subnetName); err != nil {
429-
return err
430-
}
431-
}
399+
//if sc.TeleporterReady && sc.RunRelayer && isEVMGenesis {
400+
// ux.Logger.PrintToUser("")
401+
// ux.Logger.PrintToUser(logging.Green.Wrap("Setting up ICM on subnet"))
402+
// ux.Logger.PrintToUser("")
403+
// flags := messengercmd.DeployFlags{
404+
// ChainFlags: contract.ChainSpec{
405+
// BlockchainName: subnetName,
406+
// },
407+
// PrivateKeyFlags: contract.PrivateKeyFlags{
408+
// KeyName: constants.ICMKeyName,
409+
// },
410+
// Network: networkoptions.NetworkFlags{
411+
// ClusterName: clusterName,
412+
// },
413+
// DeployMessenger: deployICMMessenger,
414+
// DeployRegistry: deployICMRegistry,
415+
// ForceRegistryDeploy: true,
416+
// Version: icmVersion,
417+
// MessengerContractAddressPath: icmMessengerContractAddressPath,
418+
// MessengerDeployerAddressPath: icmMessengerDeployerAddressPath,
419+
// MessengerDeployerTxPath: icmMessengerDeployerTxPath,
420+
// RegistryBydecodePath: icmRegistryBydecodePath,
421+
// IncludeCChain: true,
422+
// }
423+
// if err := messengercmd.CallDeploy([]string{}, flags, models.UndefinedNetwork); err != nil {
424+
// return err
425+
// }
426+
// ux.Logger.PrintToUser("")
427+
// ux.Logger.PrintToUser(logging.Green.Wrap("Starting AWM Relayer Service"))
428+
// ux.Logger.PrintToUser("")
429+
// if err := updateICMRelayerFunds(network, sc, blockchainID); err != nil {
430+
// return err
431+
// }
432+
// if err := updateICMRelayerHostConfig(network, awmRelayerHost, subnetName); err != nil {
433+
// return err
434+
// }
435+
//}
432436

433437
ux.Logger.PrintToUser("")
434438
if clusterAlreadyExists {

0 commit comments

Comments
 (0)