[Infra] Fullnode on LocalNet

build/debug_keybase/main.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"bytes"
 	"crypto/md5" // nolint:gosec // Weak hashing function only used to check if the file has been changed
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 
@@ -26,6 +28,14 @@ const (
 	debugKeybaseImportConcurrencyLimit = 4
 )
 
+type K8sSecret struct {
+	ApiVersion string            `yaml:"apiVersion"`
+	Kind       string            `yaml:"kind"`
+	MetaData   map[string]string `yaml:"metadata"`
+	Type       string            `yaml:"type"`
+	StringData map[string]string `yaml:"stringData"`
+}
+
 func main() {
 	if len(os.Args) < 3 {
 		fmt.Println("Usage: go run main.go <source_yaml> <target_folder>")
@@ -55,7 +65,7 @@ func main() {
 func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {
 	fmt.Println("⚙️  Initializing debug Keybase...")
 
-	validatorKeysPairMap, err := parseValidatorPrivateKeysFromEmbeddedYaml(privateKeysYamlBytes)
+	validatorKeysPairMap, err := parsePrivateKeysFromEmbeddedYaml(privateKeysYamlBytes)
 	if err != nil {
 		panic(err)
 	}
@@ -143,24 +153,29 @@ func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {
 	fmt.Printf("✅ Keybase dumped in %s\n", targetFilePath)
 }
 
-func parseValidatorPrivateKeysFromEmbeddedYaml(privateKeysYamlBytes []byte) (map[string]string, error) {
+func parsePrivateKeysFromEmbeddedYaml(privateKeysYamlBytes []byte) ([]string, error) {
 	// Parse the YAML file and load into the config struct
-	var config struct {
-		ApiVersion string            `yaml:"apiVersion"`
-		Kind       string            `yaml:"kind"`
-		MetaData   map[string]string `yaml:"metadata"`
-		Type       string            `yaml:"type"`
-		StringData map[string]string `yaml:"stringData"`
-	}
-	if err := yaml.Unmarshal(privateKeysYamlBytes, &config); err != nil {
-		return nil, err
-	}
-	validatorKeysMap := make(map[string]string)
+	decoder := yaml.NewDecoder(bytes.NewReader(privateKeysYamlBytes))
+	keysList := []string{}
+
+	for {
+		var secret K8sSecret
+
+		err := decoder.Decode(&secret)
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, err
+		}
+
+		for _, privHexString := range secret.StringData {
+			keysList = append(keysList, privHexString)
+		}
 
-	for id, privHexString := range config.StringData {
-		validatorKeysMap[id] = privHexString
 	}
-	return validatorKeysMap, nil
+
+	return keysList, nil
 }
 
 func cleanupStaleFiles(targetFolderPath string) {

build/docs/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [0.0.0.41] - 2023-05-05
+
+- Added private keys for all (except fisherman) actors
+- Changed the debug_keybase package to support multiple yaml secrets in one yaml file
+- Added full node (non-staked validator)
+
 ## [0.0.0.40] - 2023-05-04
 
 - Added `network_id` parameter to the node config files

build/localnet/Tiltfile

@@ -9,7 +9,10 @@ root_dir = os.path.dirname(tiltfile_dir + "/../..")
 localnet_config_path = root_dir + "/localnet_config.yaml"
 
 # Create localnet config file from defaults, and if some default configuration doesn't exist in it - populate with default values
-localnet_config_defaults = {"validators": {"count": 4}}
+localnet_config_defaults = {
+    "validators": {"count": 4},
+    "full_nodes": {"count": 1}
+}
 
 localnet_config_file = read_yaml(localnet_config_path, default=localnet_config_defaults)
 
@@ -93,9 +96,9 @@ local_resource(
     labels=['watchers']
 )
 
-# Builds and maintains the validator container image after the binary is built on local machine, restarts a process on code change
+# Builds and maintains the pocket container image after the binary is built on local machine, restarts a process on code change
 docker_build_with_restart(
-    "validator-image",
+    "pocket-image",
     root_dir,
     dockerfile_contents="""FROM debian:bullseye
 COPY bin/pocket-linux /usr/local/bin/pocket
@@ -141,7 +144,6 @@ COPY bin/client-linux /usr/local/bin/client
     ]
 )
 
-# TODO: https://github.com/tilt-dev/tilt/issues/3048
 # Pushes localnet manifests to the cluster.
 k8s_yaml(
     [
@@ -160,6 +162,8 @@ k8s_yaml(['manifests/cluster-manager.yaml'])
 k8s_resource('pocket-v1-cluster-manager', labels=['cluster-manager'])
 
 check_helm_dependencies_for_chart(root_dir + "/charts/pocket")
+
+# Provisions validators
 for x in range(localnet_config["validators"]["count"]):
     validator_number = x + 1
     formatted_validator_number = local('printf "%03d" ' + str(validator_number))
@@ -169,13 +173,35 @@ for x in range(localnet_config["validators"]["count"]):
         namespace="default",
         set=[
             "global.postgresql.auth.postgresPassword=LocalNetPassword",
-            "image.repository=validator-image",
+            "image.repository=pocket-image",
             "privateKeySecretKeyRef.name=validators-private-keys",
             "privateKeySecretKeyRef.key=%s" % formatted_validator_number,
             "genesis.preProvisionedGenesis.enabled=false",
             "genesis.externalConfigMap.name=v1-localnet-genesis",
             "genesis.externalConfigMap.key=genesis.json",
             "postgresql.primary.persistence.enabled=false",
+            "nodeType=validator",
+        ]
+    ))
+
+# Provisions full nodes
+for x in range(localnet_config["full_nodes"]["count"]):
+    node_number = x + 1
+    formatted_node_number = local('printf "%03d" ' + str(node_number))
+
+    k8s_yaml(helm(root_dir + "/charts/pocket",
+        name="full-node-%s" % formatted_node_number,
+        namespace="default",
+        set=[
+            "global.postgresql.auth.postgresPassword=LocalNetPassword",
+            "image.repository=pocket-image",
+            "privateKeySecretKeyRef.name=misc-private-keys",
+            "privateKeySecretKeyRef.key=%s" % formatted_node_number,
+            "genesis.preProvisionedGenesis.enabled=false",
+            "genesis.externalConfigMap.name=v1-localnet-genesis",
+            "genesis.externalConfigMap.key=genesis.json",
+            "postgresql.primary.persistence.enabled=false",
+            "nodeType=full",
         ]
     ))
 

build/localnet/manifests/cli-client.yaml

@@ -75,7 +75,7 @@ spec:
               value: validator1
               # Any host that is visible and connected to the cluster can be arbitrarily selected as the RPC host
             - name: RPC_HOST
-              value: pocket-validators
+              value: pocket-full-nodes
               # TECHDEBT(#678): debug client requires hostname to participate
               # in P2P networking.
             - name: POCKET_P2P_HOSTNAME

build/localnet/manifests/cluster-manager.yaml

@@ -20,5 +20,5 @@ spec:
         - cluster-manager
       env:
         - name: RPC_HOST
-          value: pocket-validators
+          value: pocket-full-nodes
   serviceAccountName: cluster-manager-account

build/localnet/manifests/network.yaml

@@ -16,3 +16,21 @@ spec:
     - port: 9000
       targetPort: 9000
       name: metrics
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: pocket-full-nodes
+  annotations:
+    prometheus.io/scrape: "false"
+    prometheus.io/port: "9000"
+spec:
+  selector:
+    pokt.network/purpose: full
+  ports:
+    - port: 50832
+      targetPort: 50832
+      name: rpc
+    - port: 9000
+      targetPort: 9000
+      name: metrics