Skip to content

Add main link #2775

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

Merged
sukantoraymond merged 25 commits into from
May 1, 2025
Merged

Add main link #2775

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a03b3d9
control default latest version for avago and subnetevm
sukantoraymond Apr 7, 2025
1ecb4fe
add rpc to json
sukantoraymond Apr 7, 2025
1adf4a3
get latest cli version
sukantoraymond Apr 7, 2025
79a9cc2
update json model
sukantoraymond Apr 7, 2025
6cc37fc
update evm prompts
sukantoraymond Apr 8, 2025
079b182
update evm prompt
sukantoraymond Apr 8, 2025
16ff987
update avalanchego latest
sukantoraymond Apr 8, 2025
36ccd1e
add e2e test
sukantoraymond Apr 9, 2025
1556b85
remove unncessary file
sukantoraymond Apr 9, 2025
cbbfe9e
lint
sukantoraymond Apr 9, 2025
f56b137
try with lower versions
sukantoraymond Apr 10, 2025
5eba446
update how we get newest avago version
sukantoraymond Apr 10, 2025
9b8b529
Merge branch 'main' into control-default-version
sukantoraymond Apr 10, 2025
8dd666f
fix lint
sukantoraymond Apr 10, 2025
f864a75
address comments
sukantoraymond Apr 10, 2025
06789f6
fix ci
sukantoraymond Apr 11, 2025
70add0b
fix ci
sukantoraymond Apr 11, 2025
bbd6742
Merge branch 'main' into control-default-version
sukantoraymond Apr 14, 2025
cb591a9
fix lint
sukantoraymond Apr 14, 2025
f65345b
Merge branch 'main' into control-default-version
sukantoraymond Apr 29, 2025
7d8b016
lint
sukantoraymond Apr 29, 2025
5b90883
move to dependencies pkg
sukantoraymond Apr 29, 2025
afb4852
lint
sukantoraymond Apr 29, 2025
9a217e1
add main link
sukantoraymond Apr 29, 2025
8d7eb3c
Merge branch 'main' into add-main-link
sukantoraymond May 1, 2025
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
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/add_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ func CallAddValidator(
if err != nil {
return err
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
addValidatorFlags.SigAggFlags.AggregatorLogLevel,
addValidatorFlags.SigAggFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterNameFlagValue),
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/change_weight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ func changeWeightACP99(
if err != nil {
return err
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
changeWeightFlags.SigAggFlags.AggregatorLogLevel,
changeWeightFlags.SigAggFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterName),
Expand Down
18 changes: 8 additions & 10 deletions cmd/blockchaincmd/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"strings"
"time"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/cmd/flags"
"github.com/ava-labs/avalanche-cli/pkg/blockchain"
"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
Expand All @@ -27,7 +29,6 @@ import (
"github.com/ava-labs/avalanche-cli/pkg/utils"
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanche-cli/pkg/validatormanager"
"github.com/ava-labs/avalanche-cli/pkg/vm"
blockchainSDK "github.com/ava-labs/avalanche-cli/sdk/blockchain"
"github.com/ava-labs/avalanche-cli/sdk/evm"
sdkutils "github.com/ava-labs/avalanche-cli/sdk/utils"
Expand Down Expand Up @@ -189,18 +190,15 @@ func StartLocalMachine(
availableBalance,
)
}
avagoVersionSettings := node.AvalancheGoVersionSettings{}
avagoVersionSettings := dependencies.AvalancheGoVersionSettings{}
// setup (install if needed) avalanchego binary
avagoVersion := userProvidedAvagoVersion
if userProvidedAvagoVersion == constants.DefaultAvalancheGoVersion && avagoBinaryPath == "" {
// nothing given: get avago version from RPC compat
avagoVersion, err = vm.GetLatestAvalancheGoByProtocolVersion(
app,
sidecar.RPCVersion,
constants.AvalancheGoCompatibilityURL,
)
// nothing given: get avago version from RPC compat using latest.json defined in
// https://raw.githubusercontent.com/ava-labs/avalanche-cli/control-default-version/versions/latest.json
avagoVersion, err = dependencies.GetLatestCLISupportedDependencyVersion(app, constants.AvalancheGoRepoName, network, &sidecar.RPCVersion)
if err != nil {
if err != vm.ErrNoAvagoVersion {
if err != dependencies.ErrNoAvagoVersion {
return false, err
}
avagoVersion = constants.LatestPreReleaseVersionTag
Expand Down Expand Up @@ -379,7 +377,7 @@ func InitializeValidatorManager(
RPC: rpcURL,
BootstrapValidators: avaGoBootstrapValidators,
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
signatureAggregatorFlags.AggregatorLogLevel,
signatureAggregatorFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterName),
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
if vmVersion != latest && vmVersion != preRelease && vmVersion != "" && !semver.IsValid(vmVersion) {
return fmt.Errorf("invalid version string, should be semantic version (ex: v1.1.1): %s", vmVersion)
}
vmVersion, err = vm.PromptVMVersion(app, constants.SubnetEVMRepoName, vmVersion)
vmVersion, err = vm.PromptSubnetEVMVersion(app, vmVersion)
if err != nil {
return err
}
Expand Down
11 changes: 4 additions & 7 deletions cmd/blockchaincmd/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"os"
"path/filepath"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/cmd/flags"
"github.com/ava-labs/avalanche-cli/cmd/interchaincmd/messengercmd"
"github.com/ava-labs/avalanche-cli/cmd/interchaincmd/relayercmd"
Expand Down Expand Up @@ -484,14 +486,9 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
avagoVersion := userProvidedAvagoVersion

if avagoVersion == constants.DefaultAvalancheGoVersion && avagoBinaryPath == "" {
// nothing given: get avago version from RPC compat
avagoVersion, err = vm.GetLatestAvalancheGoByProtocolVersion(
app,
sidecar.RPCVersion,
constants.AvalancheGoCompatibilityURL,
)
avagoVersion, err = dependencies.GetLatestCLISupportedDependencyVersion(app, constants.AvalancheGoRepoName, network, &sidecar.RPCVersion)
if err != nil {
if err != vm.ErrNoAvagoVersion {
if err != dependencies.ErrNoAvagoVersion {
return err
}
avagoVersion = constants.LatestPreReleaseVersionTag
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/remove_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func removeValidatorSOV(
if err != nil {
return err
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
removeValidatorFlags.SigAggFlags.AggregatorLogLevel,
removeValidatorFlags.SigAggFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterName),
Expand Down
2 changes: 1 addition & 1 deletion cmd/contractcmd/init_validator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
if err != nil {
return err
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
initValidatorManagerFlags.SigAggFlags.AggregatorLogLevel,
initValidatorManagerFlags.SigAggFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterName),
Expand Down
4 changes: 3 additions & 1 deletion cmd/networkcmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"path/filepath"
"time"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
"github.com/ava-labs/avalanche-cli/pkg/constants"
"github.com/ava-labs/avalanche-cli/pkg/interchain/relayer"
Expand Down Expand Up @@ -274,7 +276,7 @@ func startLocalClusters(avalancheGoBinPath string) error {
nil,
localnet.ConnectionSettings{},
nil,
node.AvalancheGoVersionSettings{},
dependencies.AvalancheGoVersionSettings{},
models.NewLocalNetwork(),
); err != nil {
return err
Expand Down
20 changes: 4 additions & 16 deletions cmd/nodecmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
"sync"
"time"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/cmd/flags"
"github.com/ava-labs/avalanche-cli/pkg/ansible"
awsAPI "github.com/ava-labs/avalanche-cli/pkg/cloud/aws"
Expand All @@ -27,7 +29,6 @@ import (
"github.com/ava-labs/avalanche-cli/pkg/ssh"
"github.com/ava-labs/avalanche-cli/pkg/utils"
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanche-cli/pkg/vm"
sdkutils "github.com/ava-labs/avalanche-cli/sdk/utils"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/staking"
Expand Down Expand Up @@ -309,13 +310,13 @@ func createNodes(cmd *cobra.Command, args []string) error {
}
network = models.NewNetworkFromCluster(network, clusterName)
globalNetworkFlags.UseDevnet = network.Kind == models.Devnet // set globalNetworkFlags.UseDevnet to true if network is devnet for further use
avaGoVersionSetting := node.AvalancheGoVersionSettings{
avaGoVersionSetting := dependencies.AvalancheGoVersionSettings{
UseAvalanchegoVersionFromSubnet: useAvalanchegoVersionFromSubnet,
UseLatestAvalanchegoReleaseVersion: useLatestAvalanchegoReleaseVersion,
UseLatestAvalanchegoPreReleaseVersion: useLatestAvalanchegoPreReleaseVersion,
UseCustomAvalanchegoVersion: useCustomAvalanchegoVersion,
}
avalancheGoVersion, err := node.GetAvalancheGoVersion(app, avaGoVersionSetting)
avalancheGoVersion, err := dependencies.GetAvalancheGoVersion(app, avaGoVersionSetting, network)
if err != nil {
return err
}
Expand Down Expand Up @@ -1043,19 +1044,6 @@ func provideStakingCertAndKey(host *models.Host) error {
return ssh.RunSSHUploadStakingFiles(host, keyPath)
}

func GetLatestAvagoVersionForRPC(configuredRPCVersion int, latestPreReleaseVersion string) (string, error) {
desiredAvagoVersion, err := vm.GetLatestAvalancheGoByProtocolVersion(
app, configuredRPCVersion, constants.AvalancheGoCompatibilityURL)
if err == vm.ErrNoAvagoVersion {
ux.Logger.PrintToUser("No Avago version found for subnet. Defaulting to latest pre-release version")
return latestPreReleaseVersion, nil
}
if err != nil {
return "", err
}
return desiredAvagoVersion, nil
}

func setCloudService() (string, error) {
if utils.IsE2E() {
if !utils.E2EDocker() {
Expand Down
6 changes: 4 additions & 2 deletions cmd/nodecmd/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"strings"
"time"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/cmd/flags"
"github.com/ava-labs/avalanche-cli/pkg/blockchain"
"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
Expand Down Expand Up @@ -248,7 +250,7 @@ func localStartNode(_ *cobra.Command, args []string) error {
latestAvagoPreReleaseVersion = false
latestAvagoReleaseVersion = false
}
avaGoVersionSetting := node.AvalancheGoVersionSettings{
avaGoVersionSetting := dependencies.AvalancheGoVersionSettings{
UseCustomAvalanchegoVersion: useCustomAvalanchegoVersion,
UseLatestAvalanchegoPreReleaseVersion: latestAvagoPreReleaseVersion,
UseLatestAvalanchegoReleaseVersion: latestAvagoReleaseVersion,
Expand Down Expand Up @@ -535,7 +537,7 @@ func localValidate(_ *cobra.Command, args []string) error {
if err != nil {
return err
}
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLogger(
localValidateFlags.SigAggFlags.AggregatorLogLevel,
localValidateFlags.SigAggFlags.AggregatorLogToStdout,
app.GetAggregatorLogDir(clusterName),
Expand Down
8 changes: 4 additions & 4 deletions cmd/nodecmd/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"
"sync"

"github.com/ava-labs/avalanche-cli/pkg/prompts"
"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/pkg/node"
"github.com/ava-labs/avalanche-cli/pkg/prompts"

"github.com/ava-labs/avalanche-cli/pkg/docker"

Expand Down Expand Up @@ -141,13 +141,13 @@ func setupNode(_ *cobra.Command, _ []string) error {
if err != nil {
return err
}
avaGoVersionSetting := node.AvalancheGoVersionSettings{
avaGoVersionSetting := dependencies.AvalancheGoVersionSettings{
UseAvalanchegoVersionFromSubnet: useAvalanchegoVersionFromSubnet,
UseLatestAvalanchegoReleaseVersion: useLatestAvalanchegoReleaseVersion,
UseLatestAvalanchegoPreReleaseVersion: useLatestAvalanchegoPreReleaseVersion,
UseCustomAvalanchegoVersion: useCustomAvalanchegoVersion,
}
avalancheGoVersion, err := node.GetAvalancheGoVersion(app, avaGoVersionSetting)
avalancheGoVersion, err := dependencies.GetAvalancheGoVersion(app, avaGoVersionSetting, network)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion cmd/nodecmd/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"strings"
"sync"

"github.com/ava-labs/avalanche-cli/pkg/dependencies"

"github.com/ava-labs/avalanche-cli/pkg/node"

"github.com/ava-labs/avalanche-cli/pkg/ansible"
Expand Down Expand Up @@ -185,7 +187,7 @@ func getNodesUpgradeInfo(hosts []*models.Host) (map[*models.Host]nodeUpgradeInfo
nodeUpgradeInfo.SubnetEVMIDsToUpgrade = append(nodeUpgradeInfo.SubnetEVMIDsToUpgrade, vmName)
}
// find the highest version of avalanche go that is still compatible with current highest rpc
avalancheGoVersionToUpdateTo, err = GetLatestAvagoVersionForRPC(rpcVersion, latestAvagoVersion)
avalancheGoVersionToUpdateTo, err = dependencies.GetLatestAvalancheGoByProtocolVersion(app, rpcVersion)
if err != nil {
nodeErrors[hostID] = err
continue
Expand Down
4 changes: 0 additions & 4 deletions pkg/application/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,6 @@ func (app *Avalanche) GetDownloader() Downloader {
return app.Downloader
}

func (*Avalanche) GetAvalanchegoCompatibilityURL() string {
return constants.AvalancheGoCompatibilityURL
}

func (app *Avalanche) ReadUpgradeFile(blockchainName string) ([]byte, error) {
upgradeBytesFilePath := app.GetUpgradeBytesFilePath(blockchainName)

Expand Down
1 change: 1 addition & 0 deletions pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ const (
FujiAvalancheGoV113 = "v1.13.0-fuji"
AvalancheGoCompatibilityURL = "https://raw.githubusercontent.com/ava-labs/avalanchego/master/version/compatibility.json"
SubnetEVMRPCCompatibilityURL = "https://raw.githubusercontent.com/ava-labs/subnet-evm/master/compatibility.json"
CLILatestDependencyURL = "https://raw.githubusercontent.com/ava-labs/avalanche-cli/main/versions/latest.json"
Copy link

@Tonix517 Tonix517 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this url gave me 404

Copy link

@Tonix517 Tonix517 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm - saw #2724


YesLabel = "Yes"
NoLabel = "No"
Expand Down
Loading
Loading