clean diff

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

genesis/genesis.go

@@ -273,14 +273,19 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 	hrp := constants.GetHRP(config.NetworkID)
 
 	amount := uint64(0)
-	networkID := json.Uint32(config.NetworkID)
-	avax := avm.AssetDefinition{
-		Name:         "Avalanche",
-		Symbol:       "AVAX",
-		Denomination: 9,
-		InitialState: map[string][]interface{}{},
+
+	// Specify the genesis state of the AVM
+	avmArgs := avm.BuildGenesisArgs{
+		NetworkID: json.Uint32(config.NetworkID),
+		Encoding:  defaultEncoding,
 	}
 	{
+		avax := avm.AssetDefinition{
+			Name:         "Avalanche",
+			Symbol:       "AVAX",
+			Denomination: 9,
+			InitialState: map[string][]interface{}{},
+		}
 		memoBytes := []byte{}
 		xAllocations := []Allocation(nil)
 		for _, allocation := range config.Allocations {
@@ -309,26 +314,23 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 		if err != nil {
 			return nil, ids.Empty, fmt.Errorf("couldn't parse memo bytes to string: %w", err)
 		}
+		avmArgs.GenesisData = map[string]avm.AssetDefinition{
+			"AVAX": avax, // The AVM starts out with one asset: AVAX
+		}
 	}
+	avmReply := avm.BuildGenesisReply{}
 
-	genesisData := map[string]avm.AssetDefinition{
-		"AVAX": avax, // The AVM starts out with one asset: AVAX
-	}
-
-	xchainFormattedGenesisBytes, err := avm.BuildGenesis(
-		networkID,
-		genesisData,
-		defaultEncoding,
-	)
+	avmSS := avm.CreateStaticService()
+	err := avmSS.BuildGenesis(nil, &avmArgs, &avmReply)
 	if err != nil {
 		return nil, ids.ID{}, err
 	}
 
-	xchainGenesisBytes, err := formatting.Decode(defaultEncoding, xchainFormattedGenesisBytes)
+	bytes, err := formatting.Decode(defaultEncoding, avmReply.Bytes)
 	if err != nil {
 		return nil, ids.ID{}, fmt.Errorf("couldn't parse avm genesis reply: %w", err)
 	}
-	avaxAssetID, err := AVAXAssetID(xchainGenesisBytes)
+	avaxAssetID, err := AVAXAssetID(bytes)
 	if err != nil {
 		return nil, ids.ID{}, fmt.Errorf("couldn't generate AVAX asset ID: %w", err)
 	}
@@ -342,7 +344,15 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 	initiallyStaked := set.Of(config.InitialStakedFunds...)
 	skippedAllocations := []Allocation(nil)
 
-	pchainUtxos := make([]api.UTXO, 0)
+	// Specify the initial state of the Platform Chain
+	platformvmArgs := api.BuildGenesisArgs{
+		AvaxAssetID:   avaxAssetID,
+		NetworkID:     json.Uint32(config.NetworkID),
+		Time:          json.Uint64(config.StartTime),
+		InitialSupply: json.Uint64(initialSupply),
+		Message:       config.Message,
+		Encoding:      defaultEncoding,
+	}
 	for _, allocation := range config.Allocations {
 		if initiallyStaked.Contains(allocation.AVAXAddr) {
 			skippedAllocations = append(skippedAllocations, allocation)
@@ -358,7 +368,7 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 				if err != nil {
 					return nil, ids.Empty, fmt.Errorf("couldn't encode message: %w", err)
 				}
-				pchainUtxos = append(pchainUtxos,
+				platformvmArgs.UTXOs = append(platformvmArgs.UTXOs,
 					api.UTXO{
 						Locktime: json.Uint64(unlock.Locktime),
 						Amount:   json.Uint64(unlock.Amount),
@@ -374,7 +384,6 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 	allNodeAllocations := splitAllocations(skippedAllocations, len(config.InitialStakers))
 	endStakingTime := genesisTime.Add(time.Duration(config.InitialStakeDuration) * time.Second)
 	stakingOffset := time.Duration(0)
-	validators := make([]api.GenesisPermissionlessValidator, 0, len(config.InitialStakers))
 	for i, staker := range config.InitialStakers {
 		nodeAllocations := allNodeAllocations[i]
 		endStakingTime := endStakingTime.Add(-stakingOffset)
@@ -408,7 +417,7 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 
 		delegationFee := json.Uint32(staker.DelegationFee)
 
-		validators = append(validators,
+		platformvmArgs.Validators = append(platformvmArgs.Validators,
 			api.GenesisPermissionlessValidator{
 				GenesisValidator: api.GenesisValidator{
 					StartTime: json.Uint64(genesisTime.Unix()),
@@ -431,9 +440,9 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 	if err != nil {
 		return nil, ids.Empty, fmt.Errorf("couldn't encode message: %w", err)
 	}
-	chains := []api.Chain{
+	platformvmArgs.Chains = []api.Chain{
 		{
-			GenesisData: xchainFormattedGenesisBytes,
+			GenesisData: avmReply.Bytes,
 			SubnetID:    constants.PrimaryNetworkID,
 			VMID:        constants.AVMID,
 			FxIDs: []ids.ID{
@@ -451,28 +460,18 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 		},
 	}
 
-	_, pchainFormattedGenesisBytes, err := api.BuildGenesis(
-		avaxAssetID,
-		networkID,
-		pchainUtxos,
-		validators,
-		chains,
-		json.Uint64(config.StartTime),
-		json.Uint64(initialSupply),
-		config.Message,
-		defaultEncoding,
-	)
-
-	if err != nil {
+	platformvmReply := api.BuildGenesisReply{}
+	platformvmSS := api.StaticService{}
+	if err := platformvmSS.BuildGenesis(nil, &platformvmArgs, &platformvmReply); err != nil {
 		return nil, ids.ID{}, fmt.Errorf("problem while building platform chain's genesis state: %w", err)
 	}
 
-	pchainFormattedBytes, err := formatting.Decode(defaultEncoding, pchainFormattedGenesisBytes)
+	genesisBytes, err := formatting.Decode(platformvmReply.Encoding, platformvmReply.Bytes)
 	if err != nil {
 		return nil, ids.ID{}, fmt.Errorf("problem parsing platformvm genesis bytes: %w", err)
 	}
 
-	return pchainFormattedBytes, avaxAssetID, nil
+	return genesisBytes, avaxAssetID, nil
 }
 
 func splitAllocations(allocations []Allocation, numSplits int) [][]Allocation {

genesis/genesis_test.go

@@ -4,7 +4,6 @@
 package genesis
 
 import (
-	_ "embed"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
@@ -14,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	_ "embed"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/ids"

tests/e2e/e2e_test.go

@@ -6,7 +6,7 @@ package e2e_test
 import (
 	"testing"
 
-	"github.com/onsi/ginkgo/v2"
+	ginkgo "github.com/onsi/ginkgo/v2"
 
 	"github.com/onsi/gomega"