working

Author: felipemadero

local/network.go

@@ -380,6 +380,7 @@ func NewDefaultNetwork(
 // NewDefaultConfig creates a new default network config
 func NewDefaultConfig(binaryPath string) network.Config {
 	config := defaultNetworkConfig
+	config.NetworkID = constants.DefaultNetworkID
 	config.BinaryPath = binaryPath
 	// Don't overwrite [DefaultNetworkConfig.NodeConfigs]
 	config.NodeConfigs = make([]node.Config, len(defaultNetworkConfig.NodeConfigs))
@@ -438,13 +439,18 @@ func NewDefaultConfigNNodes(binaryPath string, numNodes uint32) (network.Config,
 	if int(numNodes) == 1 {
 		netConfig.Flags[config.SybilProtectionEnabledKey] = false
 	}
+	genesis, err := utils.GenerateCustomGenesis(netConfig)
+	if err != nil {
+		return netConfig, err
+	}
+	netConfig.Genesis = string(genesis)
 	return netConfig, nil
 }
 
 type nodeKeys struct {
-	stakingKey string
+	stakingKey  string
 	stakingCert string
-	blsKey string
+	blsKey      string
 }
 
 func getNodeKeys() (*nodeKeys, error) {

network/config.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanche-network-runner/network/node"
-	"github.com/ava-labs/avalanche-network-runner/utils"
 	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/constants"
@@ -85,17 +84,9 @@ func (c *Config) Validate() error {
 		return errors.New("no genesis given")
 	}
 
-	networkID, err := utils.NetworkIDFromGenesis([]byte(c.Genesis))
-	if err != nil {
-		return fmt.Errorf("couldn't get network ID from genesis: %w", err)
-	}
-	if c.NetworkID != 0 {
-		networkID = c.NetworkID
-	}
-
 	var someNodeIsBeacon bool
 	for i, nodeConfig := range c.NodeConfigs {
-		if err := nodeConfig.Validate(networkID); err != nil {
+		if err := nodeConfig.Validate(c.NetworkID); err != nil {
 			var nodeName string
 			if len(nodeConfig.Name) > 0 {
 				nodeName = nodeConfig.Name

utils/constants/constants.go

@@ -13,6 +13,7 @@ const (
 	DefaultPluginDirEnvVar = "AVALANCHEGO_PLUGIN_PATH"
 	LocalGenesisFile       = "genesis.json"
 	IPv4Lookback           = "127.0.0.1"
+	DefaultNetworkID       = 1337
 )
 
 var LocalConfigDir = filepath.Join("local", "default")

utils/genesis.go

@@ -3,9 +3,15 @@
 package utils
 
 import (
+	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"time"
 
+	"github.com/ava-labs/avalanche-network-runner/network"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/formatting"
+	"github.com/ava-labs/avalanchego/vms/platformvm/signer"
 	coreth_params "github.com/ava-labs/coreth/params"
 )
 
@@ -16,6 +22,8 @@ const (
 	defaultLocalCChainFundedAddress = "8db97C7cEcE249c2b98bDC0226Cc4C2A57BF52FC"
 	defaultLocalCChainFundedBalance = "0x295BE96E64066972000000"
 	allocationCommonEthAddress      = "0xb3d82b1367d362de99ab59a658165aff520cbd4d"
+	stakingAddr                     = "X-custom1g65uqn6t77p656w64023nh8nd9updzmxwd59gh"
+	walletAddr                      = "X-custom18jma8ppw3nhx5r4ap8clazz0dps7rv5u9xde7p"
 )
 
 func generateCustomCchainGenesis() ([]byte, error) {
@@ -39,11 +47,8 @@ func generateCustomCchainGenesis() ([]byte, error) {
 	return json.Marshal(cChainGenesisMap)
 }
 
-func generateCustomGenesis(
-	networkID uint32,
-	walletAddr string,
-	stakingAddr string,
-	nodeIDs []string,
+func GenerateCustomGenesis(
+	netConfig network.Config,
 ) ([]byte, error) {
 	genesisMap := map[string]interface{}{}
 
@@ -55,18 +60,45 @@ func generateCustomGenesis(
 	genesisMap["cChainGenesis"] = string(cChainGenesisBytes)
 
 	// pchain genesis
-	genesisMap["networkID"] = networkID
+	genesisMap["networkID"] = netConfig.NetworkID
 	startTime := time.Now().Unix()
 	genesisMap["startTime"] = startTime
 	initialStakers := []map[string]interface{}{}
-	for _, nodeID := range nodeIDs {
+
+	for _, nodeConfig := range netConfig.NodeConfigs {
+		nodeID, err := ToNodeID([]byte(nodeConfig.StakingKey), []byte(nodeConfig.StakingCert))
+		if err != nil {
+			return nil, fmt.Errorf("couldn't get node ID: %w", err)
+		}
+		blsKeyBytes, err := base64.StdEncoding.DecodeString(nodeConfig.StakingSigningKey)
+		if err != nil {
+			return nil, err
+		}
+		blsSk, err := bls.SecretKeyFromBytes(blsKeyBytes)
+		if err != nil {
+			return nil, err
+		}
+		p := signer.NewProofOfPossession(blsSk)
+		pk, err := formatting.Encode(formatting.HexNC, p.PublicKey[:])
+		if err != nil {
+			return nil, err
+		}
+		pop, err := formatting.Encode(formatting.HexNC, p.ProofOfPossession[:])
+		if err != nil {
+			return nil, err
+		}
 		initialStaker := map[string]interface{}{
 			"nodeID":        nodeID,
 			"rewardAddress": walletAddr,
 			"delegationFee": 1000000,
+			"signer": map[string]interface{}{
+				"publicKey":         pk,
+				"proofOfPossession": pop,
+			},
 		}
 		initialStakers = append(initialStakers, initialStaker)
 	}
+
 	genesisMap["initialStakeDuration"] = 31536000
 	genesisMap["initialStakeDurationOffset"] = 5400
 	genesisMap["initialStakers"] = initialStakers

utils/utils.go

@@ -61,7 +61,7 @@ func SetGenesisNetworkID(genesis []byte, networkID uint32) ([]byte, error) {
 	}
 	genesisMap[genesisNetworkIDKey] = networkID
 	var err error
-	genesis, err = json.Marshal(genesisMap)
+	genesis, err = json.MarshalIndent(genesisMap, "", "  ")
 	if err != nil {
 		return nil, fmt.Errorf("couldn't marshal genesis: %w", err)
 	}