fix: incorrect config keys

chainflip-io · Oct 6, 2023 · 87f64c4 · 87f64c4
1 parent f2b7d7b
commit 87f64c4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -27,15 +27,15 @@ common:
 engine:
   settings:
     btc:
-      http_node_endpoint: http://a108a82b574a640359e360cf66afd45d-424380952.eu-central-1.elb.amazonaws.com
+      http_endpoint: http://a108a82b574a640359e360cf66afd45d-424380952.eu-central-1.elb.amazonaws.com
       rpc_password: flip
       rpc_user: flip
     dot:
-      http_node_endpoint: https://pdot-rpc.chainflip.xyz:443
-      ws_node_endpoint: wss://pdot-rpc.chainflip.xyz:443
+      http_endpoint: https://pdot-rpc.chainflip.xyz:443
+      ws_endpoint: wss://pdot-rpc.chainflip.xyz:443
     eth:
-      http_node_endpoint: <YOUR_HTTP_NODE_ENDPOINT>
-      ws_node_endpoint: <YOUR_WS_NODE_ENDPOINT>
+      http_endpoint: <YOUR_http_endpoint>
+      ws_endpoint: <YOUR_ws_endpoint>
     node_p2p:
       ip_address: <YOUR_IP_ADDRESS> # pick a ClusterIP for the service
 ```

diff --git a/charts/node/Chart.yaml b/charts/node/Chart.yaml
@@ -10,6 +10,6 @@ maintainers:
 
 type: application
 
-version: 0.4.2
+version: 0.4.3
 
 appVersion: "0.9.0"
diff --git a/charts/node/README.md b/charts/node/README.md
@@ -33,7 +33,7 @@ Deploy a Chainflip Validator or Archive node on Kubernetes
 | common.keys.signingKey | string | `""` | signing key; recommended to leave empty and provide through a secret |
 | common.keys.signingKeyFileName | string | `"signing_key_file"` | signing key file name |
 | common.role | string | `"validator"` | desired role for your node; `validator` or `archive` |
-| engine | object | `{"affinity":{},"extraArgs":{},"extraEnv":[],"extraEnvFrom":[],"extraInitContainers":[],"fullnameOverride":"","healthcheck":{"enabled":true,"hostname":"0.0.0.0","port":"5555"},"image":{"pullPolicy":"Always","repository":"chainfliplabs/chainflip-engine","tag":""},"metrics":{"enabled":false,"hostname":"0.0.0.0","port":5566},"nodeSelector":{},"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"existingClaim":"","size":"5Gi","storageClass":""},"ports":{"ip":"8078"},"resources":{},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"settings":{"btc":{"http_node_endpoint":"","rpc_password":"flip","rpc_user":"flip"},"dot":{"http_node_endpoint":"","ws_node_endpoint":""},"eth":{"http_node_endpoint":"","ws_node_endpoint":""},"existingConfigMap":"","node_p2p":{"allow_local_ip":true,"ip_address":""}},"tolerations":[]}` | chainflip-engine configuration |
+| engine | object | `{"affinity":{},"extraArgs":{},"extraEnv":[],"extraEnvFrom":[],"extraInitContainers":[],"fullnameOverride":"","healthcheck":{"enabled":true,"hostname":"0.0.0.0","port":"5555"},"image":{"pullPolicy":"Always","repository":"chainfliplabs/chainflip-engine","tag":""},"metrics":{"enabled":false,"hostname":"0.0.0.0","port":5566},"nodeSelector":{},"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"existingClaim":"","size":"5Gi","storageClass":""},"ports":{"ip":"8078"},"resources":{},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"settings":{"btc":{"http_endpoint":"","rpc_password":"flip","rpc_user":"flip"},"dot":{"http_endpoint":"","ws_endpoint":""},"eth":{"http_endpoint":"","ws_endpoint":""},"existingConfigMap":"","node_p2p":{"allow_local_ip":true,"ip_address":""}},"tolerations":[]}` | chainflip-engine configuration |
 | engine.affinity | object | `{}` | set pod affinity |
 | engine.extraArgs | object | `{}` | chainflip-engine extra arguments |
 | engine.extraEnv | list | `[]` | set extra environment variables |
@@ -65,17 +65,17 @@ Deploy a Chainflip Validator or Archive node on Kubernetes
 | engine.service.annotations | object | `{}` | chainflip-engine service annotations |
 | engine.service.port | int | `80` | chainflip-engine service port |
 | engine.service.type | string | `"ClusterIP"` | chainflip-engine service type |
-| engine.settings | object | `{"btc":{"http_node_endpoint":"","rpc_password":"flip","rpc_user":"flip"},"dot":{"http_node_endpoint":"","ws_node_endpoint":""},"eth":{"http_node_endpoint":"","ws_node_endpoint":""},"existingConfigMap":"","node_p2p":{"allow_local_ip":true,"ip_address":""}}` | chainflip-engine Settings.toml configuration |
-| engine.settings.btc | object | `{"http_node_endpoint":"","rpc_password":"flip","rpc_user":"flip"}` | bitcoin settings |
-| engine.settings.btc.http_node_endpoint | string | `""` | bitcoin node http endpoint |
+| engine.settings | object | `{"btc":{"http_endpoint":"","rpc_password":"flip","rpc_user":"flip"},"dot":{"http_endpoint":"","ws_endpoint":""},"eth":{"http_endpoint":"","ws_endpoint":""},"existingConfigMap":"","node_p2p":{"allow_local_ip":true,"ip_address":""}}` | chainflip-engine Settings.toml configuration |
+| engine.settings.btc | object | `{"http_endpoint":"","rpc_password":"flip","rpc_user":"flip"}` | bitcoin settings |
+| engine.settings.btc.http_endpoint | string | `""` | bitcoin node http endpoint |
 | engine.settings.btc.rpc_password | string | `"flip"` | bitcoin rpc password |
 | engine.settings.btc.rpc_user | string | `"flip"` | bitcoin rpc user |
-| engine.settings.dot | object | `{"http_node_endpoint":"","ws_node_endpoint":""}` | polkadot settings |
-| engine.settings.dot.http_node_endpoint | string | `""` | polkadot node http endpoint |
-| engine.settings.dot.ws_node_endpoint | string | `""` | polkadot node ws endpoint |
-| engine.settings.eth | object | `{"http_node_endpoint":"","ws_node_endpoint":""}` | ethereum settings |
-| engine.settings.eth.http_node_endpoint | string | `""` | ethereum node ws endpoint |
-| engine.settings.eth.ws_node_endpoint | string | `""` | ethereum node http endpoint |
+| engine.settings.dot | object | `{"http_endpoint":"","ws_endpoint":""}` | polkadot settings |
+| engine.settings.dot.http_endpoint | string | `""` | polkadot node http endpoint |
+| engine.settings.dot.ws_endpoint | string | `""` | polkadot node ws endpoint |
+| engine.settings.eth | object | `{"http_endpoint":"","ws_endpoint":""}` | ethereum settings |
+| engine.settings.eth.http_endpoint | string | `""` | ethereum node ws endpoint |
+| engine.settings.eth.ws_endpoint | string | `""` | ethereum node http endpoint |
 | engine.settings.existingConfigMap | string | `""` | existing configMap with Settings.toml |
 | engine.settings.node_p2p | object | `{"allow_local_ip":true,"ip_address":""}` | node_p2p settings |
 | engine.settings.node_p2p.allow_local_ip | bool | `true` | allow local ip addresses |

diff --git a/charts/node/templates/engine-cm.yaml b/charts/node/templates/engine-cm.yaml
@@ -23,13 +23,13 @@ data:
     private_key_file = "{{ .Values.common.keys.keysPath }}/{{ .Values.common.keys.ethereumKeyFileName }}"
 
     [eth.rpc]
-    ws_node_endpoint = "{{ required "Please provide a ws_node_endpoint of an Ethereum node" .Values.engine.settings.eth.ws_node_endpoint }}"
-    http_node_endpoint = "{{ required "Please provide a http_node_endpoint of an Ethereum node" .Values.engine.settings.eth.http_node_endpoint }}"
+    ws_endpoint = "{{ required "Please provide a ws_endpoint of an Ethereum node" .Values.engine.settings.eth.ws_endpoint }}"
+    http_endpoint = "{{ required "Please provide a http_endpoint of an Ethereum node" .Values.engine.settings.eth.http_endpoint }}"
 
     {{ if .Values.engine.settings.eth_backup.enabled }}
     [eth.backup_rpc]
-    http_node_endpoint = "{{ .Values.engine.settings.eth_backup.http_node_endpoint }}"
-    ws_node_endpoint = "{{ .Values.engine.settings.eth_backup.ws_node_endpoint }}"
+    http_endpoint = "{{ .Values.engine.settings.eth_backup.http_endpoint }}"
+    ws_endpoint = "{{ .Values.engine.settings.eth_backup.ws_endpoint }}"
     {{- end }}
 
     {{ if .Values.engine.ports.healthcheck.enabled }}
@@ -42,23 +42,23 @@ data:
     db_file = "{{ .Values.common.basePath }}/data.db"
 
     [dot.rpc]
-    ws_node_endpoint = "{{ required "Please provide a ws_node_endpoint of an Polkadot node" .Values.engine.settings.dot.ws_node_endpoint }}"
-    http_node_endpoint = "{{ required "Please provide a http_node_endpoint of an Polkadot node" .Values.engine.settings.dot.http_node_endpoint }}"
+    ws_endpoint = "{{ required "Please provide a ws_endpoint of an Polkadot node" .Values.engine.settings.dot.ws_endpoint }}"
+    http_endpoint = "{{ required "Please provide a http_endpoint of an Polkadot node" .Values.engine.settings.dot.http_endpoint }}"
 
     {{ if .Values.engine.settings.dot_backup.enabled }}
     [dot.backup_rpc]
-    http_node_endpoint = "{{ .Values.engine.settings.dot_backup.http_node_endpoint }}"
-    ws_node_endpoint = "{{ .Values.engine.settings.dot_backup.ws_node_endpoint }}"
+    http_endpoint = "{{ .Values.engine.settings.dot_backup.http_endpoint }}"
+    ws_endpoint = "{{ .Values.engine.settings.dot_backup.ws_endpoint }}"
     {{- end }}
 
     [btc.rpc]
-    http_node_endpoint = "{{ required "Please provide a http_node_endpoint of an Bitcoin node" .Values.engine.settings.btc.http_node_endpoint }}"
+    http_endpoint = "{{ required "Please provide a http_endpoint of an Bitcoin node" .Values.engine.settings.btc.http_endpoint }}"
     rpc_user = "{{ .Values.engine.settings.btc.rpc_user }}"
     rpc_password = "{{ .Values.engine.settings.btc.rpc_password }}"
 
     {{ if .Values.engine.settings.btc_backup.enabled }}
     [btc.backup_rpc]
-    http_node_endpoint = "{{ .Values.engine.settings.btc_backup.http_node_endpoint }}"
+    http_endpoint = "{{ .Values.engine.settings.btc_backup.http_endpoint }}"
     rpc_user = "{{ .Values.engine.settings.btc_backup.rpc_user }}"
     rpc_password = "{{ .Values.engine.settings.btc_backup.rpc_password }}"
     {{- end }}

diff --git a/charts/node/tests/engine_settings_test.yaml b/charts/node/tests/engine_settings_test.yaml
@@ -19,13 +19,13 @@ tests:
   - it: should specify backup nodes if set
     set:
       engine.settings.eth_backup.enabled: true
-      engine.settings.eth_backup.ws_node_endpoint: "ws://test"
-      engine.settings.eth_backup.http_node_endpoint: "http://test"
+      engine.settings.eth_backup.ws_endpoint: "ws://test"
+      engine.settings.eth_backup.http_endpoint: "http://test"
       engine.settings.dot_backup.enabled: true
-      engine.settings.dot_backup.ws_node_endpoint: "ws://test"
-      engine.settings.dot_backup.http_node_endpoint: "http://test"
+      engine.settings.dot_backup.ws_endpoint: "ws://test"
+      engine.settings.dot_backup.http_endpoint: "http://test"
       engine.settings.btc_backup.enabled: true
-      engine.settings.btc_backup.http_node_endpoint: "http://test"
+      engine.settings.btc_backup.http_endpoint: "http://test"
       engine.settings.btc_backup.rpc_user: "test"
       engine.settings.btc_backup.rpc_password: "test"
     asserts:

diff --git a/charts/node/tests/values/happy.values.yaml b/charts/node/tests/values/happy.values.yaml
@@ -6,12 +6,12 @@ engine:
     node_p2p:
       ip_address: "172.20.1.1"
     eth:
-      ws_node_endpoint: "test"
-      http_node_endpoint: "test"
+      ws_endpoint: "test"
+      http_endpoint: "test"
     dot:
-      ws_node_endpoint: "test"
-      http_node_endpoint: "test"
+      ws_endpoint: "test"
+      http_endpoint: "test"
     btc:
-      http_node_endpoint: "test"
+      http_endpoint: "test"
       rpc_user: "flip"
       rpc_password: "flip"
diff --git a/charts/node/values.yaml b/charts/node/values.yaml
@@ -326,10 +326,10 @@ engine:
     # -- ethereum settings
     eth:
       # -- ethereum node http endpoint
-      ws_node_endpoint: ""
+      ws_endpoint: ""
 
       # -- ethereum node ws endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
     # -- set up an optional backup ethereum node
     eth_backup:
@@ -338,18 +338,18 @@ engine:
       enabled: false
 
       # -- ethereum backup node ws endpoint
-      ws_node_endpoint: ""
+      ws_endpoint: ""
 
       # -- ethereum backup node http endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
     # -- polkadot settings
     dot:
       # -- polkadot node ws endpoint
-      ws_node_endpoint: ""
+      ws_endpoint: ""
 
       # -- polkadot node http endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
     # -- set up an optional backup ethereum node
     dot_backup:
@@ -358,15 +358,15 @@ engine:
       enabled: false
 
       # -- polkadot backup node ws endpoint
-      ws_node_endpoint: ""
+      ws_endpoint: ""
 
       # -- polkadot backup node http endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
     # -- bitcoin settings
     btc:
       # -- bitcoin node http endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
       # -- bitcoin rpc user
       rpc_user: ""
@@ -379,7 +379,7 @@ engine:
       enabled: false
 
       # -- bitcoin backup node http endpoint
-      http_node_endpoint: ""
+      http_endpoint: ""
 
       # -- bitcoin backup rpc user
       rpc_user: ""