Add prompt for default values and remove prompt for remote gas token (adding a flag for it)

cmd/subnetcmd/create.go

@@ -43,6 +43,7 @@ type CreateFlags struct {
 	vmVersion                     string
 	useLatestReleasedVMVersion    bool
 	useLatestPreReleasedVMVersion bool
+	useExternalGasToken           bool
 }
 
 var (
@@ -96,6 +97,7 @@ configuration, pass the -f flag.`,
 	cmd.Flags().BoolVar(&useRepo, "from-github-repo", false, "generate custom VM binary from github repository")
 	cmd.Flags().BoolVar(&createFlags.useWarp, "warp", true, "generate a vm with warp support (needed for teleporter)")
 	cmd.Flags().BoolVar(&createFlags.useTeleporter, "teleporter", false, "interoperate with other blockchains using teleporter")
+	cmd.Flags().BoolVar(&createFlags.useExternalGasToken, "external-gas-token", false, "use a gas token from another blockchain")
 	return cmd
 }
 
@@ -197,9 +199,17 @@ func createSubnetConfig(cmd *cobra.Command, args []string) error {
 	}
 
 	if vmType == models.SubnetEvm {
+		if genesisFile == "" {
+			// Default
+			createFlags.useDefaults, err = vm.PromptDefaults(app, createFlags.useDefaults)
+			if err != nil {
+				return err
+			}
+		}
+
 		// get vm version
 		vmVersion := createFlags.vmVersion
-		if createFlags.useLatestReleasedVMVersion {
+		if createFlags.useLatestReleasedVMVersion || createFlags.useDefaults {
 			vmVersion = latest
 		}
 		if createFlags.useLatestPreReleasedVMVersion {
@@ -244,6 +254,7 @@ func createSubnetConfig(cmd *cobra.Command, args []string) error {
 				useTeleporterFlag,
 				createFlags.useDefaults,
 				createFlags.useWarp,
+				createFlags.useExternalGasToken,
 			)
 			if err != nil {
 				return err

cmd/subnetcmd/upgradecmd/generate.go

@@ -378,10 +378,10 @@ func GetFeeConfig(config params.ChainConfig, useDefault bool) (
 	error,
 ) {
 	const (
-		useFast   = "High disk use   / High Throughput   5 mil   gas/s"
-		useMedium = "Medium disk use / Medium Throughput 2 mil   gas/s"
-		useSlow   = "Low disk use    / Low Throughput    1.5 mil gas/s (C-Chain's setting)"
-		customFee = "Customize fee config"
+		lowOption    = "Low block size    / Low Throughput    12 mil gas per block"
+		mediumOption = "Medium block size / Medium Throughput 15 mil gas per block (C-Chain's setting)"
+		highOption   = "High block size   / High Throughput   20 mil gas per block"
+		customFee    = "Customize fee config"
 
 		setGasLimit                 = "Set gas limit"
 		setBlockRate                = "Set target block rate"
@@ -396,11 +396,12 @@ func GetFeeConfig(config params.ChainConfig, useDefault bool) (
 	config.FeeConfig = vm.StarterFeeConfig
 
 	if useDefault {
-		config.FeeConfig.TargetGas = vm.LowTarget
+		config.FeeConfig.GasLimit = vm.LowGasLimit
+		config.FeeConfig.TargetGas = config.FeeConfig.TargetGas.Mul(config.FeeConfig.GasLimit, vm.NoDynamicFeesGasLimitToTargetGasFactor)
 		return config, nil
 	}
 
-	feeConfigOptions := []string{useSlow, useMedium, useFast, customFee}
+	feeConfigOptions := []string{lowOption, mediumOption, highOption, customFee}
 
 	feeDefault, err := app.Prompt.CaptureList(
 		"How would you like to set fees",
@@ -410,16 +411,24 @@ func GetFeeConfig(config params.ChainConfig, useDefault bool) (
 		return config, err
 	}
 
+	useDynamicFees := false
+	if feeDefault != customFee {
+		useDynamicFees, err = app.Prompt.CaptureYesNo("Do you want to enable dynamic fees?")
+		if err != nil {
+			return config, err
+		}
+	}
+
 	switch feeDefault {
-	case useFast:
-		config.FeeConfig.TargetGas = vm.HighTarget
-		return config, nil
-	case useMedium:
-		config.FeeConfig.TargetGas = vm.MediumTarget
-		return config, nil
-	case useSlow:
-		config.FeeConfig.TargetGas = vm.LowTarget
+	case lowOption:
+		vm.SetStandardGas(&config, vm.LowGasLimit, vm.LowTargetGas, useDynamicFees)
 		return config, nil
+	case mediumOption:
+		vm.SetStandardGas(&config, vm.MediumGasLimit, vm.MediumTargetGas, useDynamicFees)
+		return config, err
+	case highOption:
+		vm.SetStandardGas(&config, vm.HighGasLimit, vm.HighTargetGas, useDynamicFees)
+		return config, err
 	default:
 		ux.Logger.PrintToUser("Customizing fee config")
 	}

pkg/vm/allocations.go

@@ -70,18 +70,19 @@ func getAllocation(
 	subnetName string,
 	defaultAirdropAmount string,
 	multiplier *big.Int,
+	useExternalGasToken bool,
 ) (core.GenesisAlloc, error) {
-	if params.initialTokenAllocation.allocToNewKey {
-		return getNewAllocation(app, subnetName, defaultAirdropAmount)
-	}
-
-	if params.initialTokenAllocation.allocToEwoq {
-		return getEwoqAllocation(defaultAirdropAmount)
-	}
-
 	allocations := core.GenesisAlloc{}
-	amount := new(big.Int).SetUint64(params.initialTokenAllocation.customBalance)
-	amount = amount.Mul(amount, multiplier)
-	addAllocation(allocations, params.initialTokenAllocation.customAddress.Hex(), amount)
+	if !useExternalGasToken {
+		if params.initialTokenAllocation.allocToNewKey {
+			return getNewAllocation(app, subnetName, defaultAirdropAmount)
+		}
+		if params.initialTokenAllocation.allocToEwoq {
+			return getEwoqAllocation(defaultAirdropAmount)
+		}
+		amount := new(big.Int).SetUint64(params.initialTokenAllocation.customBalance)
+		amount = amount.Mul(amount, multiplier)
+		addAllocation(allocations, params.initialTokenAllocation.customAddress.Hex(), amount)
+	}
 	return allocations, nil
 }

pkg/vm/createEvm.go

@@ -95,6 +95,7 @@ func CreateEvmGenesis(
 		subnetName,
 		defaultEvmAirdropAmount,
 		oneAvax,
+		params.UseExternalGasToken,
 	)
 	if err != nil {
 		return nil, err