e2e: Run separate e2e jobs for mainnet and fuji rulesets

.github/workflows/ci.yml

@@ -56,7 +56,7 @@ jobs:
       - name: fuzz_test
         shell: bash
         run: ./scripts/build_fuzz.sh 10 # Run each fuzz test 10 seconds
-  e2e:
+  e2e_local_ruleset:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -74,9 +74,51 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: e2e-tmpnet-data
+          name: e2e-local-tmpnet-data
           path: ${{ env.tmpnet_data_path }}
           if-no-files-found: error
+  e2e_mainnet_ruleset:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.go_version }}
+          check-latest: true
+      - name: Build AvalancheGo Binary
+        shell: bash
+        run: ./scripts/build.sh -r
+      - name: Run e2e tests
+        shell: bash
+        run: E2E_SERIAL=1 ./scripts/tests.e2e.sh --network-id=808
+      - name: Upload tmpnet network dir
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: e2e-mainnet-tmpnet-data
+          path: ~/.tmpnet/networks/808*
+          if-no-files-found: error
+  e2e_fuji_ruleset:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.go_version }}
+          check-latest: true
+      - name: Build AvalancheGo Binary
+        shell: bash
+        run: ./scripts/build.sh -r
+      - name: Run e2e tests
+        shell: bash
+        run: E2E_SERIAL=1 ./scripts/tests.e2e.sh --network-id=909
+      - name: Upload tmpnet network dir
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: e2e-fuji-tmpnet-data
+          path: ~/.tmpnet/networks/909*
+          if-no-files-found: error
   e2e_existing_network:
     runs-on: ubuntu-latest
     steps:

tests/e2e/e2e_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/onsi/gomega"
 
+	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
 
@@ -35,7 +36,11 @@ func init() {
 
 var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// Run only once in the first ginkgo process
-	return e2e.NewTestEnvironment(flagVars, &tmpnet.Network{}).Marshal()
+	return e2e.NewTestEnvironment(flagVars, &tmpnet.Network{
+		Genesis: &genesis.UnparsedConfig{
+			NetworkID: uint32(flagVars.NetworkID()),
+		},
+	}).Marshal()
 }, func(envBytes []byte) {
 	// Run in every ginkgo process
 

tests/fixture/e2e/flags.go

@@ -15,6 +15,7 @@ type FlagVars struct {
 	avalancheGoExecPath string
 	pluginDir           string
 	networkDir          string
+	networkID           uint
 	useExistingNetwork  bool
 }
 
@@ -36,6 +37,10 @@ func (v *FlagVars) NetworkDir() string {
 	return os.Getenv(tmpnet.NetworkDirEnvName)
 }
 
+func (v *FlagVars) NetworkID() uint {
+	return v.networkID
+}
+
 func (v *FlagVars) UseExistingNetwork() bool {
 	return v.useExistingNetwork
 }
@@ -66,6 +71,12 @@ func RegisterFlags() *FlagVars {
 		false,
 		"[optional] whether to target the existing network identified by --network-dir.",
 	)
+	flag.UintVar(
+		&vars.networkID,
+		"network-id",
+		0,
+		"[optional] the network ID to use. By default a compatible network ID will be generated. Use 808 for mainnet configuration and 909 for fuji configuration.",
+	)
 
 	return &vars
 }

tests/fixture/tmpnet/README.md

@@ -70,12 +70,24 @@ the `TMPNET_NETWORK_DIR` env var to this symlink ensures that
 `--use-existing-network` will target the most recently deployed temporary
 network.
 
+#### Configuring a network with mainnet or fuji configuration
+
+The `tmpnetctl start-network` command supports creating a network with
+the same ruleset as mainnet or fuji by using specific network IDs. The
+network ID `808` is used to configure a local test network with the
+same ruleset as mainnet, and `909` is used to configure a local test
+network with the same ruleset as fuji. The network ID can be specified
+to `tmpnetctl start-network` via the `--network-id` flag.
+
 ### Via code
 
 A temporary network can be managed in code:
 
 ```golang
 network := &tmpnet.Network{                   // Configure non-default values for the new network
+    Genesis: &genesis.UnparsedConfig{
+        NetworkID: 808,                       // (Optional) Configure the network with the mainnet ruleset (see previous section)
+    },
     DefaultFlags: tmpnet.FlagsMap{
         config.LogLevelKey: "INFO",           // Change one of the network's defaults
     },

tests/fixture/tmpnet/cmd/main.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
 	"github.com/ava-labs/avalanchego/version"
 )
@@ -52,6 +53,7 @@ func main() {
 		avalancheGoPath string
 		pluginDir       string
 		nodeCount       uint8
+		networkID       uint32
 	)
 	startNetworkCmd := &cobra.Command{
 		Use:   "start-network",
@@ -63,7 +65,11 @@ func main() {
 
 			// Root dir will be defaulted on start if not provided
 
-			network := &tmpnet.Network{}
+			network := &tmpnet.Network{
+				Genesis: &genesis.UnparsedConfig{
+					NetworkID: networkID,
+				},
+			}
 
 			// Extreme upper bound, should never take this long
 			networkStartTimeout := 2 * time.Minute
@@ -106,6 +112,7 @@ func main() {
 	startNetworkCmd.PersistentFlags().StringVar(&avalancheGoPath, "avalanchego-path", os.Getenv(tmpnet.AvalancheGoPathEnvName), "The path to an avalanchego binary")
 	startNetworkCmd.PersistentFlags().StringVar(&pluginDir, "plugin-dir", os.ExpandEnv("$HOME/.avalanchego/plugins"), "[optional] the dir containing VM plugins")
 	startNetworkCmd.PersistentFlags().Uint8Var(&nodeCount, "node-count", tmpnet.DefaultNodeCount, "Number of nodes the network should initially consist of")
+	startNetworkCmd.PersistentFlags().Uint32Var(&networkID, "network-id", 0, "The network ID to use. By default a compatible network ID will be generated. Use 808 for mainnet configuration and 909 for fuji configuration.")
 	rootCmd.AddCommand(startNetworkCmd)
 
 	stopNetworkCmd := &cobra.Command{

tests/fixture/tmpnet/genesis.go

@@ -146,9 +146,20 @@ func NewTestGenesis(
 		)
 	}
 
+	// Use the C-Chain configuration appropriate to the network ID
+	var cChainConfig *params.ChainConfig
+	switch networkID {
+	case constants.TestMainnetID:
+		cChainConfig = params.AvalancheMainnetChainConfig
+	case constants.TestFujiID:
+		cChainConfig = params.AvalancheFujiChainConfig
+	default:
+		cChainConfig = params.AvalancheLocalChainConfig
+	}
+
 	// Define C-Chain genesis
 	cChainGenesis := &core.Genesis{
-		Config:     params.AvalancheLocalChainConfig,
+		Config:     cChainConfig,
 		Difficulty: big.NewInt(0), // Difficulty is a mandatory field
 		GasLimit:   defaultGasLimit,
 		Alloc:      cChainBalances,

tests/fixture/tmpnet/network.go

@@ -263,7 +263,7 @@ func (n *Network) Create(rootDir string) error {
 		}
 	}
 
-	if n.Genesis == nil {
+	if n.Genesis == nil || len(n.Genesis.Allocations) == 0 {
 		// Pre-fund known legacy keys to support ad-hoc testing. Usage of a legacy key will
 		// require knowing the key beforehand rather than retrieving it from the set of pre-funded
 		// keys exposed by a network. Since allocation will not be exclusive, a test using a

utils/constants/network_ids.go

@@ -25,6 +25,10 @@ const (
 	UnitTestID uint32 = 10
 	LocalID    uint32 = 12345
 
+	// IDs used for validating mainnet and fuji in e2e
+	TestMainnetID uint32 = 808
+	TestFujiID    uint32 = 909
+
 	MainnetName  = "mainnet"
 	CascadeName  = "cascade"
 	DenaliName   = "denali"

version/constants.go

@@ -130,6 +130,9 @@ var (
 		constants.MainnetID: time.Date(10000, time.December, 1, 0, 0, 0, 0, time.UTC),
 		constants.FujiID:    time.Date(10000, time.December, 1, 0, 0, 0, 0, time.UTC),
 	}
+
+	// Reminder: Add new time variables to updateTimesForTesting to
+	// ensure e2e is able to test with new versions.
 )
 
 func init() {
@@ -174,6 +177,30 @@ func init() {
 		constants.MainnetID: mainnetXChainStopVertexID,
 		constants.FujiID:    fujiXChainStopVertexID,
 	}
+
+	updateTimesForTesting(
+		ApricotPhase1Times,
+		ApricotPhase2Times,
+		ApricotPhase3Times,
+		ApricotPhase4Times,
+		ApricotPhase5Times,
+		ApricotPhasePre6Times,
+		ApricotPhase6Times,
+		ApricotPhasePost6Times,
+		BanffTimes,
+		CortinaTimes,
+		DurangoTimes,
+	)
+}
+
+// updateTimesForTesting ensures that the provided time maps are updated
+// to include entries for contants.TestMainnetID and constants.TestFujiID
+// that mirror their mainnet and fuji equivalents to enable e2e testing.
+func updateTimesForTesting(timeMaps ...map[uint32]time.Time) {
+	for _, timeMap := range timeMaps {
+		timeMap[constants.TestFujiID] = timeMap[constants.FujiID]
+		timeMap[constants.TestMainnetID] = timeMap[constants.MainnetID]
+	}
 }
 
 func GetApricotPhase1Time(networkID uint32) time.Time {