Check for non empty genesis

subnet/add_validator_subnet_test.go

@@ -23,7 +23,6 @@ func TestAddValidatorDeploy(_ *testing.T) {
 	subnetParams := SubnetParams{
 		SubnetEVM: &SubnetEVMParams{
 			EvmChainID:       1234567,
-			EvmDefaults:      true,
 			EnableWarp:       true,
 			EnableTeleporter: true,
 			EnableRelayer:    true,

subnet/subnet.go

@@ -8,10 +8,11 @@
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/ava-labs/subnet-evm/precompile/contracts/warp"
 	"math/big"
 	"os"
 	"time"
 
 	"github.com/ava-labs/avalanche-tooling-sdk-go/avalanche"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/key"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/teleporter"
@@ -23,7 +24,6 @@
 	"github.com/ava-labs/subnet-evm/core"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/precompile/contracts/txallowlist"
-	"github.com/ava-labs/subnet-evm/precompile/contracts/warp"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -51,9 +51,6 @@
 	// Chain ID to use in Subnet-EVM
 	EvmChainID uint64
 
-	// Use default settings for fees, airdrop, precompiles and teleporter in Subnet-EVM
-	EvmDefaults bool
-
 	// Enable Avalanche Warp Messaging (AWM) when deploying a VM
 
 	// See https://docs.avax.network/build/cross-chain/awm/overview for
@@ -136,6 +133,14 @@
 	if subnetParams.SubnetEVM == nil && subnetParams.CustomVM != nil {
 		return nil, fmt.Errorf("SubnetEVM params and CustomVM params cannot both be non-empty")
 	}
+	if subnetParams.SubnetEVM != nil {
+		if subnetParams.SubnetEVM.GenesisParams == nil {
+			return nil, fmt.Errorf("SubnetEVM Genesis params cannot be empty")
+		}
+		if subnetParams.SubnetEVM.EvmChainID == 0 {
+			return nil, fmt.Errorf("SubnetEVM EvmChainID cannot be empty")
+		}
+	}
 	var genesisBytes []byte
 	var err error
 	switch {
@@ -145,6 +150,7 @@
 		genesisBytes, err = createEvmGenesis(
 			subnetParams.SubnetEVM.EvmChainID,
 			subnetParams.SubnetEVM.GenesisParams,
+			subnetParams.SubnetEVM.EnableWarp,
 		)
 	case subnetParams.CustomVM != nil:
 		genesisBytes, err = createCustomVMGenesis()
@@ -160,10 +166,10 @@
 	return &subnet, nil
 }
 
-// removed usewarp from argument, to use warp add it manualluy to precompile
 func createEvmGenesis(
 	chainID uint64,
 	genesisParams *EVMGenesisParams,
+	useWarp bool,
 ) ([]byte, error) {
 	genesis := core.Genesis{}
 	genesis.Timestamp = *utils.TimeToNewUint64(time.Now())
@@ -174,30 +180,28 @@
 	var err error
 
 	if genesisParams.FeeConfig == commontype.EmptyFeeConfig {
-		conf.FeeConfig = vm.StarterFeeConfig
-	} else {
-		conf.FeeConfig = genesisParams.FeeConfig
+		return nil, fmt.Errorf("genesis params fee config cannot be empty")
 	}
-	allocation := core.GenesisAlloc{}
+
 	if genesisParams.Allocation == nil {
-		allocation, err = getNewAllocation(vm.DefaultEvmAirdropAmount, genesisParams.AllocationKey)
-		if err != nil {
-			return nil, err
-		}
+		return nil, fmt.Errorf("genesis params allocation cannot be empty")
 	}
-
+	allocation := genesisParams.Allocation
 	if genesisParams.TeleporterInfo != nil {
 		allocation = addTeleporterAddressToAllocations(
 			allocation,
 			genesisParams.TeleporterInfo.FundedAddress,
 			genesisParams.TeleporterInfo.FundedBalance,
 		)
 	}
+
 	if genesisParams.Precompiles == nil {
+		return nil, fmt.Errorf("genesis params precompiles cannot be empty")
+	}
+	if useWarp {
 		warpConfig := vm.ConfigureWarp(&genesis.Timestamp)
 		conf.GenesisPrecompiles[warp.ConfigKey] = &warpConfig
 	}
-
 	if genesisParams.TeleporterInfo != nil {
 		*conf = vm.AddTeleporterAddressesToAllowLists(
 			*conf,
@@ -262,7 +266,7 @@
 	)
 }
 
 func getNewAllocation(defaultAirdropAmount string, key *key.SoftKey) (core.GenesisAlloc, error) {
 	allocation := core.GenesisAlloc{}
 	defaultAmount, ok := new(big.Int).SetString(defaultAirdropAmount, 10)
 	if !ok {

subnet/subnet_test.go

@@ -22,7 +22,6 @@ func TestSubnetDeploy(_ *testing.T) {
 	subnetParams := SubnetParams{
 		SubnetEVM: &SubnetEVMParams{
 			EvmChainID:       1234567,
-			EvmDefaults:      true,
 			EnableWarp:       true,
 			EnableTeleporter: true,
 			EnableRelayer:    true,