E2E Fuji Script

bootstrap_validators.json

@@ -0,0 +1 @@
+[{"NodeID":"NodeID-GpzpffsNMw23XCrFY55LLfuV1JfF5uZyq","Weight":100,"Balance":100000000,"BLSPublicKey":"0xa150e9289102920d5c5dcb631496f8a5dc524699382d6c1ca14a2b0214ee46376bf94aae16f8e488d7f9b5fcb8a156ea","BLSProofOfPossession":"0xb129d7192da980d89832719277997cdfb04a261065460822e9456f2c33801febb3b8f790c15be99dda00807822a782590f045eaf70676c5ab40664edf6d55bc33d43297eca2258bd5c51e3fb2d5ae6c4abcbfea20d7b67a42c3d2a971196a9fe","ChangeOwnerAddr":"P-fuji1377nx80rx3pzneup5qywgdgdsmzntql7trcqlg","ValidationID":""},{"NodeID":"NodeID-H77h3dVKC7zeVJM7hBpFSNMj48pSq3jRK","Weight":100,"Balance":100000000,"BLSPublicKey":"0x84e80935f121b80efbe17b038b0b41d16def4f4acbf9c97b6168d91601c98bf943f7888e9d53d222552b276e0043cb7f","BLSProofOfPossession":"0xa12beb8fe978e87bd51400508fb1d2e817e4fe85ee919c52a51bbc11a834c476295c266c9dff505d98f24ec52380bfef0e39ff3849ede1b823968f07b70381b55b32ddc748281e19004dc95baab9679724996e959bf4fb60c707a62555c1f3f7","ChangeOwnerAddr":"P-fuji1377nx80rx3pzneup5qywgdgdsmzntql7trcqlg","ValidationID":""}]

cmd/blockchaincmd/convert.go

@@ -122,6 +122,7 @@ func StartLocalMachine(
 	availableBalance uint64,
 	httpPorts []uint,
 	stakingPorts []uint,
+	cmd *cobra.Command,
 ) (bool, error) {
 	var err error
 	if network.Kind == models.Local {
@@ -147,7 +148,7 @@ func StartLocalMachine(
 		useLocalMachine = true
 	}
 	// ask user if we want to use local machine if cluster is not provided
-	if !useLocalMachine && clusterNameFlagValue == "" {
+	if !cmd.Flags().Changed("use-local-machine") && !useLocalMachine && clusterNameFlagValue == "" {
 		ux.Logger.PrintToUser("You can use your local machine as a bootstrap validator on the blockchain")
 		ux.Logger.PrintToUser("This means that you don't have to to set up a remote server on a cloud service (e.g. AWS / GCP) to be a validator on the blockchain.")
 
@@ -538,7 +539,7 @@ func convertSubnetToL1(
 }
 
 // convertBlockchain is the cobra command run for converting subnets into sovereign L1
-func convertBlockchain(_ *cobra.Command, args []string) error {
+func convertBlockchain(cmd *cobra.Command, args []string) error {
 	blockchainName := args[0]
 
 	chains, err := ValidateSubnetNameAndGetChains(args)
@@ -673,6 +674,7 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 				availableBalance,
 				httpPorts,
 				stakingPorts,
+				cmd,
 			); err != nil {
 				return err
 			} else if cancel {

cmd/blockchaincmd/deploy.go

@@ -581,73 +581,76 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 	deployBalance := uint64(deployBalanceAVAX * float64(units.Avax))
 	// whether user has created Avalanche Nodes when blockchain deploy command is called
 	if sidecar.Sovereign {
-		if changeOwnerAddress == "" {
-			// use provided key as change owner unless already set
-			if pAddr, err := kc.PChainFormattedStrAddresses(); err == nil && len(pAddr) > 0 {
-				changeOwnerAddress = pAddr[0]
-				ux.Logger.PrintToUser("Using [%s] to be set as a change owner for leftover AVAX", changeOwnerAddress)
-			}
-		}
-		if !generateNodeID {
-			if cancel, err := StartLocalMachine(
-				network,
-				sidecar,
-				blockchainName,
-				deployBalance,
-				availableBalance,
-				httpPorts,
-				stakingPorts,
-			); err != nil {
-				return err
-			} else if cancel {
-				return nil
-			}
-		}
-		switch {
-		case len(bootstrapEndpoints) > 0:
+		if len(bootstrapValidators) == 0 {
 			if changeOwnerAddress == "" {
-				changeOwnerAddress, err = blockchain.GetKeyForChangeOwner(app, network)
-				if err != nil {
-					return err
+				// use provided key as change owner unless already set
+				if pAddr, err := kc.PChainFormattedStrAddresses(); err == nil && len(pAddr) > 0 {
+					changeOwnerAddress = pAddr[0]
+					ux.Logger.PrintToUser("Using [%s] to be set as a change owner for leftover AVAX", changeOwnerAddress)
 				}
 			}
-			for _, endpoint := range bootstrapEndpoints {
-				infoClient := info.NewClient(endpoint)
-				ctx, cancel := utils.GetAPILargeContext()
-				defer cancel()
-				nodeID, proofOfPossession, err := infoClient.GetNodeID(ctx)
-				if err != nil {
+			if !generateNodeID {
+				if cancel, err := StartLocalMachine(
+					network,
+					sidecar,
+					blockchainName,
+					deployBalance,
+					availableBalance,
+					httpPorts,
+					stakingPorts,
+					cmd,
+				); err != nil {
 					return err
+				} else if cancel {
+					return nil
 				}
-				publicKey = "0x" + hex.EncodeToString(proofOfPossession.PublicKey[:])
-				pop = "0x" + hex.EncodeToString(proofOfPossession.ProofOfPossession[:])
-
-				bootstrapValidators = append(bootstrapValidators, models.SubnetValidator{
-					NodeID:               nodeID.String(),
-					Weight:               constants.BootstrapValidatorWeight,
-					Balance:              deployBalance,
-					BLSPublicKey:         publicKey,
-					BLSProofOfPossession: pop,
-					ChangeOwnerAddr:      changeOwnerAddress,
-				})
-			}
-		case clusterNameFlagValue != "":
-			// for remote clusters we don't need to ask for bootstrap validators and can read it from filesystem
-			bootstrapValidators, err = getClusterBootstrapValidators(clusterNameFlagValue, network, deployBalance)
-			if err != nil {
-				return fmt.Errorf("error getting bootstrap validators from cluster %s: %w", clusterNameFlagValue, err)
 			}
+			switch {
+			case len(bootstrapEndpoints) > 0:
+				if changeOwnerAddress == "" {
+					changeOwnerAddress, err = blockchain.GetKeyForChangeOwner(app, network)
+					if err != nil {
+						return err
+					}
+				}
+				for _, endpoint := range bootstrapEndpoints {
+					infoClient := info.NewClient(endpoint)
+					ctx, cancel := utils.GetAPILargeContext()
+					defer cancel()
+					nodeID, proofOfPossession, err := infoClient.GetNodeID(ctx)
+					if err != nil {
+						return err
+					}
+					publicKey = "0x" + hex.EncodeToString(proofOfPossession.PublicKey[:])
+					pop = "0x" + hex.EncodeToString(proofOfPossession.ProofOfPossession[:])
+
+					bootstrapValidators = append(bootstrapValidators, models.SubnetValidator{
+						NodeID:               nodeID.String(),
+						Weight:               constants.BootstrapValidatorWeight,
+						Balance:              deployBalance,
+						BLSPublicKey:         publicKey,
+						BLSProofOfPossession: pop,
+						ChangeOwnerAddr:      changeOwnerAddress,
+					})
+				}
+			case clusterNameFlagValue != "":
+				// for remote clusters we don't need to ask for bootstrap validators and can read it from filesystem
+				bootstrapValidators, err = getClusterBootstrapValidators(clusterNameFlagValue, network, deployBalance)
+				if err != nil {
+					return fmt.Errorf("error getting bootstrap validators from cluster %s: %w", clusterNameFlagValue, err)
+				}
 
-		default:
-			bootstrapValidators, err = promptBootstrapValidators(
-				network,
-				changeOwnerAddress,
-				numBootstrapValidators,
-				deployBalance,
-				availableBalance,
-			)
-			if err != nil {
-				return err
+			default:
+				bootstrapValidators, err = promptBootstrapValidators(
+					network,
+					changeOwnerAddress,
+					numBootstrapValidators,
+					deployBalance,
+					availableBalance,
+				)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	} else if network.Kind == models.Local {

compatibility_test.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/ava-labs/avalanche-cli/internal/mocks"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetLatestCLISupportedDependencyVersion(t *testing.T) {
+	testCases := []struct {
+		name           string
+		dependency     string
+		expectedError  bool
+		expectedResult string
+	}{
+		{
+			name:           "valid dependency",
+			dependency:     "github.com/example/package",
+			expectedError:  false,
+			expectedResult: "v1.0.0",
+		},
+		{
+			name:           "empty dependency",
+			dependency:     "",
+			expectedError:  true,
+			expectedResult: "",
+		},
+		{
+			name:           "invalid dependency format",
+			dependency:     "invalid/format",
+			expectedError:  true,
+			expectedResult: "",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			result, err := GetLatestCLISupportedDependencyVersion(tc.dependency)
+
+			if tc.expectedError {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tc.expectedResult, result)
+			}
+		})
+	}
+}
+
+func TestDownloader(t *testing.T) {
+	mockDownloader := &mocks.Downloader{}
+	mockDownloader.On("Download", mock.MatchedBy(func(url string) bool {
+		return url == "https://github.com/ava-labs/avalanchego/releases/download/v1.17.1/avalanchego-linux-amd64-v1.17.1.tar.gz"
+	})).Return(zipBytes1, nil)
+
+	mockDownloader.On("Download", mock.MatchedBy(func(url string) bool {
+		return url == "https://github.com/ava-labs/avalanchego/releases/download/v1.18.5/avalanchego-macos-v1.18.5.zip"
+	})).Return(zipBytes2, nil)
+}