cometbft · cason · Sep 4, 2024 · Sep 2, 2024 · Sep 2, 2024 · Sep 2, 2024
@@ -141,6 +141,11 @@ type Manifest struct {
 	// -1 denotes it is set at genesis.
 	// 0 denotes it is set at InitChain.
 	PbtsUpdateHeight int64 `toml:"pbts_update_height"`
+
+	// Config is a set of key-value config entries to write to CometBFT's
+	// configuration files for all nodes. The format is "key = value".
+	// Example: "p2p.send_rate = 512000".
+	Config []string `toml:"config"`
 }
 
 // ManifestNode represents a node in a testnet manifest.
@@ -242,6 +247,11 @@ type ManifestNode struct {
 
 	// Simulated clock skew for this node
 	ClockSkew time.Duration `toml:"clock_skew"`
+
+	// Config is a set of key-value config entries to write to CometBFT's
+	// configuration files for this node. The format is "key = value".
+	// Example: "p2p.send_rate = 512000".
+	Config []string `toml:"config"`
 }
 
 // Save saves the testnet manifest to a file.

@@ -240,6 +240,11 @@ func NewTestnetFromManifest(manifest Manifest, file string, ifd InfrastructureDa
 		} else if testnet.DefaultZone != "" {
 			node.Zone = ZoneID(testnet.DefaultZone)
 		}
+		// Configs are applied in order, so a local Config in Node
+		// should override a global config in Testnet.
+		if len(manifest.Config) > 0 {
+			node.Config = append(testnet.Config, node.Config...)
+		}
 
 		testnet.Nodes = append(testnet.Nodes, node)
 	}
@@ -394,6 +399,13 @@ func (t Testnet) Validate() error {
 			return fmt.Errorf("invalid node %q: %w", node.Name, err)
 		}
 	}
+	for _, entry := range t.Config {
+		tokens := strings.Split(entry, " = ")
+		if len(tokens) != 2 {
+			return fmt.Errorf("invalid config entry: \"%s\", "+
+				"expected \"key = value\"", entry)
+		}
+	}
 	return nil
 }
 
@@ -521,7 +533,13 @@ func (n Node) Validate(testnet Testnet) error {
 			return fmt.Errorf("invalid perturbation %q", perturbation)
 		}
 	}
-
+	for _, entry := range n.Config {
+		tokens := strings.Split(entry, " = ")
+		if len(tokens) != 2 {
+			return fmt.Errorf("invalid config entry: \"%s\", "+
+				"expected \"key = value\"", entry)
+		}
+	}
 	return nil
 }
 

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
+	"github.com/spf13/viper"
 
 	"github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/crypto/ed25519"
@@ -316,6 +317,21 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) {
 	if node.CompactionInterval != 0 && node.Compact {
 		cfg.Storage.CompactionInterval = node.CompactionInterval
 	}
+
+	// We currently need viper in order to parse config files.
+	if len(node.Config) > 0 {
+		viper.Reset()
+		for _, entry := range node.Config {
+			tokens := strings.Split(entry, " = ")
+			key, value := tokens[0], tokens[1]
+			logger.Debug("Applying Comet config", "node", node.Name, key, value)
+			viper.Set(key, value)
+		}
+		if err := viper.Unmarshal(cfg); err != nil {
+			return nil, err
+		}
+	}
+
 	return cfg, nil
 }