bug fixes

ObolNetwork · Aug 8, 2024 · 0d280e5 · 0d280e5
1 parent c33443f
commit 0d280e5
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/cli/actions/importKeys.go b/cli/actions/importKeys.go
@@ -116,6 +116,15 @@ func (s *sedgeActions) ImportValidatorKeys(options ImportValidatorKeysOptions) e
 			log.Infof("Copying the keys from %s", charonPath)
 			options.From = filepath.Join(options.GenerationPath, "keystore")
 		}
+		defaultCharonPath := filepath.Join(configs.DefaultAbsSedgeDataPath, ".charon")
+		//Copy the folder from charonPath to defaultCharonPath
+		log.Infof("Copying Charon contents to the default path %s", defaultCharonPath)
+		if err := os.MkdirAll(defaultCharonPath, os.ModePerm); err != nil {
+			return err
+		}
+		if err := copy.Copy(charonPath, defaultCharonPath); err != nil {
+			return err
+		}
 		charonValidatorKeysPath := filepath.Join(charonPath, "validator_keys")
 		defaultKeystorePath := filepath.Join(configs.DefaultAbsSedgeDataPath, "keystore")
 		log.Infof("Copying the keys to the default path %s", defaultKeystorePath)

diff --git a/configs/client_images.yaml b/configs/client_images.yaml
@@ -40,4 +40,4 @@ validator:
 distributed:
   charon:
     name: ghcr.io/obolnetwork/charon
-    version: v0.19.2
+    version: v1.0.1
diff --git a/configs/paths.go b/configs/paths.go
@@ -27,5 +27,5 @@ const (
 	ConsensusDir                        = "consensus-data"
 	ValidatorDir                        = "validator-data"
 	KeystoreDir                         = "keystore"
-	DistributedValidatorDir             = "../.charon"
+	DistributedValidatorDir             = ".charon"
 )
diff --git a/templates/services/merge/distributedValidator/charon.tmpl b/templates/services/merge/distributedValidator/charon.tmpl
@@ -1,6 +1,7 @@
 {{/* charon.tmpl */}}
 {{ define "distributedValidator" }}
   dv:
+    container_name: sedge-dv-client{{if .ContainerTag}}-{{.ContainerTag}}{{end}}
     image: ${DV_IMAGE_VERSION}
     environment:
       - CHARON_BEACON_NODE_ENDPOINTS=${CC_API_URL}
@@ -10,10 +11,12 @@
       - CHARON_P2P_EXTERNAL_HOSTNAME=${DV_INSTANCE_NAME:-charon}
       - CHARON_P2P_TCP_ADDRESS=0.0.0.0:{{.DVDiscoveryPort}}
       - CHARON_VALIDATOR_API_ADDRESS=127.0.0.1:{{.DVApiPort}}
-      - CHARON_MONITORING_ADDRESS=0.0.0.0:{{.DVMetricsPort}}
-      - CHARON_BUILDER_API={{.MevBoostOnValidator}}
+      - CHARON_MONITORING_ADDRESS=0.0.0.0:{{.DVMetricsPort}}{{if .MevBoostOnValidator}}
+      - CHARON_BUILDER_API={{.MevBoostOnValidator}}{{end}}
     ports:
       - ${CHARON_PORT_P2P_TCP:-{{.DVDiscoveryPort}}}:${CHARON_PORT_P2P_TCP:-{{.DVDiscoveryPort}}}/tcp
+    expose:
+      - {{.DVMetricsPort}}
     networks:
       - sedge
     volumes:

diff --git a/templates/services/merge/validator/lighthouse.tmpl b/templates/services/merge/validator/lighthouse.tmpl
@@ -29,8 +29,8 @@
       - --metrics-port={{.VlMetricsPort}}
       - --metrics-address=0.0.0.0{{range $flag := .VlExtraFlags}}
       - --{{$flag}}{{end}}{{if .MevBoostOnValidator}}
-      - --builder-proposals{{end}}{{if .LoggingDriver}}
-      - {{if .Distributed}}--distributed{{end}}
+      - --builder-proposals{{end}}{{if .Distributed}}
+      - --distributed{{end}}{{if .LoggingDriver}}
     logging:
       driver: "{{.LoggingDriver}}"{{if eq .LoggingDriver "json-file"}}
       options:

diff --git a/templates/services/merge/validator/lodestar.tmpl b/templates/services/merge/validator/lodestar.tmpl
@@ -21,7 +21,7 @@
       - --dataDir=/data
       - --logFile=/data/logs/validator.log
       - --logFileLevel=${VL_LOG_LEVEL}
-      - --server=${CC_API_URL}
+      - --server={{if .Distributed}}${DV_API_URL}{{else}}${CC_API_URL}{{end}}
       - --metrics=true
       - --metrics.address=0.0.0.0
       - --metrics.port={{.VlMetricsPort}}{{with .FeeRecipient}}

diff --git a/templates/services/merge/validator/prysm.tmpl b/templates/services/merge/validator/prysm.tmpl
@@ -20,7 +20,7 @@
       - --wallet-password-file=/keystore/keystore_password.txt{{if .CustomConsensusConfigs}}{{if .CustomNetworkConfigPath}}
       - --chain-config-file=/network_config/config.yml{{end}}{{else}}
       - --{{if .SplittedNetwork}}${CL_NETWORK}{{else}}${NETWORK}{{end}}{{end}}
-      - --beacon-rpc-provider=${CC_ADD_API_URL}
+      - --beacon-rpc-provider={{if .Distributed}}${DV_API_URL}{{else}}${CC_ADD_API_URL}{{end}}
       - --graffiti=${GRAFFITI}
       - --verbosity=${VL_LOG_LEVEL}
       - --accept-terms-of-use

diff --git a/templates/services/merge/validator/teku.tmpl b/templates/services/merge/validator/teku.tmpl
@@ -17,7 +17,7 @@
     command:
       - validator-client{{if .CustomConsensusConfigs}}{{if .CustomNetworkConfigPath}}
       - --network=/network_config/config.yml{{end}}{{end}}
-      - --beacon-node-api-endpoint=${CC_API_URL}
+      - --beacon-node-api-endpoint={{if .Distributed}}${DV_API_URL}{{else}}${CC_API_URL}{{end}}
       - --data-path=/data
       - --log-destination=CONSOLE
       - --validators-graffiti=${GRAFFITI}