netdeploy: add KmdJSONOverride

daemon/kmd/config/config.go

@@ -69,6 +69,11 @@
 	ScryptP int `json:"scrypt_p"`
 }
 
+// DefaultConfig returns the default KMDConfig
+func DefaultConfig(dataDir string) KMDConfig {
+	return defaultConfig(dataDir)
+}
+
 // defaultConfig returns the default KMDConfig
 func defaultConfig(dataDir string) KMDConfig {
 	return KMDConfig{
@@ -121,3 +126,14 @@
 	err = cfg.Validate()
 	return
 }
+
+// SaveKMDConfig writes the kmd configuration to disk
+func SaveKMDConfig(dataDir string, cfg KMDConfig) error {
+	err := cfg.Validate()
+	if err != nil {
+		return err
+	}
+	configFilename := filepath.Join(dataDir, kmdConfigFilename)
+
+	return codecs.SaveObjectToFile(configFilename, cfg, true)
+}

netdeploy/networkTemplate.go

@@ -29,6 +29,7 @@
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
+	kmdconfig "github.com/algorand/go-algorand/daemon/kmd/config"
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"github.com/algorand/go-algorand/gen"
 	"github.com/algorand/go-algorand/libgoal"
@@ -131,10 +132,27 @@
 			}
 		}
 
+		var kmdDir string
+		if len(cfg.KmdJSONOverride) > 0 {
+			kmdDir = filepath.Join(nodeDir, libgoal.DefaultKMDDataDir)
+			err = os.MkdirAll(kmdDir, 0700) // kmd requires 700 permissions
+			if err != nil {
+				return
+			}
+			err = createKMDConfigFile(cfg, kmdDir)
+			if err != nil {
+				return
+			}
+		}
+
 		if importKeys && hasWallet {
 			var client libgoal.Client
-			client, err = libgoal.MakeClientWithBinDir(binDir, nodeDir, "", libgoal.KmdClient)
-			if err != nil {
+			if client, err = libgoal.MakeClientFromConfig(libgoal.ClientConfig{
+				AlgodDataDir: nodeDir,
+				KMDDataDir:   kmdDir,
+				CacheDir:     "",
+				BinDir:       binDir,
+			}, libgoal.KmdClient); err != nil {
 				return
 			}
 			_, err = client.CreateWallet(libgoal.UnencryptedWalletName, nil, crypto.MasterDerivationKey{})
@@ -241,12 +259,21 @@
 		return fmt.Errorf("invalid template: at least one relay is required when more than a single node presents")
 	}
 
-	// Validate JSONOverride decoding
+	// Validate ConfigJSONOverride decoding
 	for _, cfg := range t.Nodes {
 		local := config.GetDefaultLocal()
 		err := decodeJSONOverride(cfg.ConfigJSONOverride, &local)
 		if err != nil {
-			return fmt.Errorf("invalid template: unable to decode JSONOverride: %w", err)
+			return fmt.Errorf("invalid template: unable to decode ConfigJSONOverride: %w", err)
+		}
+	}
+
+	// Validate KmdJSONOverride decoding
+	for _, cfg := range t.Nodes {
+		kmdconf := kmdconfig.KMDConfig{}
+		err := decodeJSONOverride(cfg.KmdJSONOverride, &kmdconf)
+		if err != nil {
+			return fmt.Errorf("invalid template: unable to decode KmdJSONOverride: %w", err)
 		}
 	}
 
@@ -293,7 +320,7 @@
 	return
 }
 
-func decodeJSONOverride(override string, cfg *config.Local) error {
+func decodeJSONOverride[T any](override string, cfg *T) error {
 	if override != "" {
 		reader := strings.NewReader(override)
 		dec := json.NewDecoder(reader)
@@ -340,3 +367,13 @@
 
 	return cfg, cfg.SaveToFile(configFile)
 }
+
+func createKMDConfigFile(node remote.NodeConfigGoal, kmdDir string) error {
+	cfg := kmdconfig.DefaultConfig(kmdDir)
+	err := decodeJSONOverride(node.KmdJSONOverride, &cfg)
+	if err != nil {
+		return err
+	}
+
+	return kmdconfig.SaveKMDConfig(kmdDir, cfg)
+}

netdeploy/networkTemplates_test.go

@@ -235,7 +235,21 @@ func TestDevModeValidate(t *testing.T) {
 				},
 			},
 		}
-		require.ErrorContains(t, tmpl.Validate(), "unable to decode JSONOverride")
+		require.ErrorContains(t, tmpl.Validate(), "unable to decode ConfigJSONOverride")
+	})
+
+	t.Run("KmdJSONOverride does not parse", func(t *testing.T) {
+		t.Parallel()
+		tmpl := NetworkTemplate{
+			Genesis: devmodeGenesis,
+			Nodes: []remote.NodeConfigGoal{
+				{
+					IsRelay:         false,
+					KmdJSONOverride: "DOES NOT PARSE",
+				},
+			},
+		}
+		require.ErrorContains(t, tmpl.Validate(), "unable to decode KmdJSONOverride")
 	})
 
 	t.Run("ConfigJSONOverride unknown key", func(t *testing.T) {
@@ -252,6 +266,20 @@ func TestDevModeValidate(t *testing.T) {
 		require.ErrorContains(t, tmpl.Validate(), "json: unknown field \"Unknown Key\"")
 	})
 
+	t.Run("KmdJSONOverride unknown key", func(t *testing.T) {
+		t.Parallel()
+		tmpl := NetworkTemplate{
+			Genesis: devmodeGenesis,
+			Nodes: []remote.NodeConfigGoal{
+				{
+					IsRelay:         false,
+					KmdJSONOverride: "{\"Unknown Key\": \"Valid JSON\"}",
+				},
+			},
+		}
+		require.ErrorContains(t, tmpl.Validate(), "json: unknown field \"Unknown Key\"")
+	})
+
 	t.Run("Valid multi-node DevMode", func(t *testing.T) {
 		t.Parallel()
 		tmpl := NetworkTemplate{

netdeploy/remote/nodeConfig.go

@@ -63,5 +63,6 @@ type NodeConfigGoal struct {
 	P2PPeerID          string `json:",omitempty"`
 	DeadlockDetection  int    `json:"-"`
 	ConfigJSONOverride string `json:",omitempty"` // Raw json to merge into config.json after other modifications are complete
+	KmdJSONOverride    string `json:",omitempty"` // Raw json to merge into default kmd-config.json
 	PeerList           string `json:",omitempty"` // Semicolon separated list of peers to connect to. Only applicable for non-relays
 }

test/testdata/nettemplates/TwoNodes50Each.json

@@ -22,14 +22,16 @@
             "Wallets": [
                 { "Name": "Wallet1",
                   "ParticipationOnly": false }
-            ]
+            ],
+            "KmdJSONOverride": "{\"session_lifetime_secs\": 300}"
         },
         {
             "Name": "Node",
             "Wallets": [
                 { "Name": "Wallet2",
                   "ParticipationOnly": false }
-            ]
+            ],
+            "KmdJSONOverride": "{\"session_lifetime_secs\": 300}"
         }
     ]
 }

test/testdata/nettemplates/TwoNodes50EachFuture.json

@@ -23,14 +23,16 @@
             "Wallets": [
                 { "Name": "Wallet1",
                   "ParticipationOnly": false }
-            ]
+            ],
+            "KmdJSONOverride": "{\"session_lifetime_secs\": 300}"
         },
         {
             "Name": "Node",
             "Wallets": [
                 { "Name": "Wallet2",
                   "ParticipationOnly": false }
-            ]
+            ],
+            "KmdJSONOverride": "{\"session_lifetime_secs\": 300}"
         }
     ]
 }