[sc-3794]: removes watchdog from relays and simplifies chart a bit mo…

…re (#117)
chronicleprotocol · Feb 2, 2024 · bb653f5 · bb653f5
1 parent 3710c3e
commit bb653f5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 46 deletions.
diff --git a/charts/spectre/Chart.yaml b/charts/spectre/Chart.yaml
@@ -20,10 +20,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.29.2"
+appVersion: "0.29.4"
diff --git a/charts/spectre/README.md b/charts/spectre/README.md
@@ -1,6 +1,6 @@
 # spectre
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.29.2](https://img.shields.io/badge/AppVersion-0.29.2-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.29.4](https://img.shields.io/badge/AppVersion-0.29.4-informational?style=flat-square)
 
 A Helm chart for deploying Chronicle Spectre Relay on Kubernetes
 
@@ -20,8 +20,9 @@ A Helm chart for deploying Chronicle Spectre Relay on Kubernetes
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
-| chainId | int | `1442` | must match target chain |
+| chainId | string | `nil` | must match target chain |
 | chainType | string | `nil` | can be one of mainnet: `eth`, `arb`, `opt`, `gno`, `scr`, `zkevm`, `mantle`, or testnets: `gor`, `sep`, `ogor`, `mango`, `testnet-zkEVM-mango`, `mantle-testnet`, `scr-sepolia` |
+| entryPointOverride | list | `[]` |  |
 | env.normal.CFG_WEBAPI_ENABLE | int | `1` |  |
 | env.normal.CFG_WEBAPI_ETH_ADDR_BOOK | string | `""` |  |
 | env.normal.CFG_WEBAPI_LISTEN_ADDR | string | `":8080"` |  |
@@ -69,10 +70,6 @@ A Helm chart for deploying Chronicle Spectre Relay on Kubernetes
 | serviceAccount.name | string | `""` |  |
 | tolerations | list | `[]` |  |
 | txType | string | `nil` | can be one of `legacy`or `eip1559` |
-| watchdogChainRpcUrls | string | `nil` | WATCHDOG_CHAIN_RPC_URLS comma separated list of ethereum rpc urls |
-| watchdogConfigReg | string | `"0xE1CcD31f46F30A764DbACB4759E69d8799126941"` | `WATCHDOG_CONFIG_REGISTRY` onchain registry address, use staging `0xE1CcD31f46F30A764DbACB4759E69d8799126941` or prod `0x94Fea534aef6df5cF66C2DAE5CE0A05d10C068F3` |
-| watchdogEthFrom | string | `"0x0000000000000000000000000000000000000000"` | `WATCHDOG_ETH_FROM` address (in seconds) |
-| watchdogInterval | string | `"300s"` | `WATCHDOG_INTERVAL` interval (in seconds) |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
diff --git a/charts/spectre/ci/testnet-envs-values.yaml b/charts/spectre/ci/testnet-envs-values.yaml
@@ -1,16 +1,23 @@
-rpcUrl: https://rpc.public.zkevm-test.net
+rpcUrl: https://ethereum-sepolia.blockpi.network/v1/rpc/public
 # -- must match target chain
-chainId: 1442
+chainId: '11155111'
 # -- can be one of `legacy`or `eip1559`
 txType: legacy
 # -- can be one of mainnet: `eth`, `arb`, `opt`, `gno`, `scr`, `zkevm`, `mantle`, or testnets: `gor`, `sep`, `ogor`, `mango`, `testnet-zkEVM-mango`, `mantle-testnet`, `scr-sepolia`
-chainType: testnet-zkEVM-mango
+chainType: sep
 
-# -- `WATCHDOG_CONFIG_REGISTRY` onchain registry address, use staging `0xE1CcD31f46F30A764DbACB4759E69d8799126941` or prod `0x94Fea534aef6df5cF66C2DAE5CE0A05d10C068F3`
-watchdogConfigReg: "0xE1CcD31f46F30A764DbACB4759E69d8799126941"
-# -- `WATCHDOG_INTERVAL` interval (in seconds)
-watchdogInterval: "300s"
-# -- `WATCHDOG_ETH_FROM` address (in seconds)
-watchdogEthFrom: '0x0000000000000000000000000000000000000000'
-# -- WATCHDOG_CHAIN_RPC_URLS comma separated list of ethereum rpc urls
-watchdogChainRpcUrls: "https://ethereum-sepolia.blockpi.network/v1/rpc/public"
+env:
+  normal:
+    CFG_WEBAPI_ENABLE: 1
+    CFG_WEBAPI_LISTEN_ADDR: ":8080"
+    CFG_WEBAPI_SOCKS5_PROXY_ADDR: ""
+    CFG_WEBAPI_ETH_ADDR_BOOK: ""
+    CFG_WEBAPI_STATIC_ADDR_BOOK: ""
+
+    CFG_SPECTRE_PAIRS: "DAI/USD"
+      # CFG_MODELS: '"MKR/USD"\n"MKR/ETH"'
+
+    CFG_ETH_FROM: "0x1e68967a10a30602EbBa297cffeCC3645cB28D99"
+    CFG_ETH_PASS: ""
+    # THIS keystore is for testing purposes only. do not send funds here as you will lose them:
+    CFG_ETH_KEYS: '{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"22ae1be4ab7cd766e05c03e334deb9d2"},"ciphertext":"56439cc948fbecff1c252f5cede620f65821c6446ddb6d4bfa38f17754555a44","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"7dcaf2f0196aa5c9d05dc15fac39ec15dbd99db2311813fd3d1d98324faf05c5"},"mac":"191ffca516d2c263402bd03e4cf1a6df60ebc833f489346fefdf0fe89138f305"},"id":"aea697d6-94d9-4433-bd69-4808597b0768","version":3}'
diff --git a/charts/spectre/templates/deployment.yaml b/charts/spectre/templates/deployment.yaml
@@ -32,6 +32,14 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.entryPointOverride }}
+          command:
+            {{- range .Values.entryPointOverride }}
+            - {{ . | quote }}
+            {{- end }}
+          {{- else }}
+          command: ["/usr/local/bin/chronicle-app"]
+          {{- end }}
           args:
             - "run"
             - "-v"
@@ -56,22 +64,6 @@ spec:
           env:
             - name: CFG_ENVIRONMENT
               value: "{{ .Values.environment | default "prod" }}"
-          {{- if .Values.watchdogConfigReg }}
-            - name: WATCHDOG_CONFIG_REGISTRY
-              value: "{{ .Values.watchdogConfigReg }}"
-          {{- end }}
-          {{- if .Values.watchdogInterval }}
-            - name: WATCHDOG_INTERVAL
-              value: "{{ .Values.watchdogInterval | default "900s" }}"
-          {{- end }}
-          {{- if .Values.watchdogEthFrom }}
-            - name: WATCHDOG_ETH_FROM
-              value: "{{ .Values.watchdogEthFrom }}"
-          {{- end }}
-          {{- if .Values.watchdogChainRpcUrls }}
-            - name: WATCHDOG_CHAIN_RPC_URLS
-              value: "{{ .Values.watchdogChainRpcUrls }}"
-          {{- end }}
             - name: CFG_CHAIN_RPC_URLS
               value: "{{ .Values.rpcUrl }}"
             - name: CFG_CHAIN_ID

diff --git a/charts/spectre/values.yaml b/charts/spectre/values.yaml
@@ -15,7 +15,7 @@ environment: stage
 # -- rpcUrl for the target chain
 rpcUrl: null
 # -- must match target chain
-chainId: 1442
+chainId: null
 # -- can be one of `legacy`or `eip1559`
 txType: null
 # -- can be one of mainnet: `eth`, `arb`, `opt`, `gno`, `scr`, `zkevm`, `mantle`, or testnets: `gor`, `sep`, `ogor`, `mango`, `testnet-zkEVM-mango`, `mantle-testnet`, `scr-sepolia`
@@ -33,10 +33,19 @@ ethConfig: {}
   #   existingSecret: ""
   #   key: ""
 # Environment variable listing
+
+entryPointOverride: []
+  # - "/usr/local/bin/watchdog"
+  # - "/usr/local/bin/chronicle-appp"
+
 env:
   normal:
     # webapi - receive only (Spectre)
     CFG_WEBAPI_ENABLE: 1
+    # CFG_MODELS: |-
+    #   "LIDO_LST/1DAY"
+    #   "ETH/BTC"
+    # CFG_SPECTRE_PAIRS:  "MKR/USD"
     # receiving
     CFG_WEBAPI_LISTEN_ADDR: ":8080"
     # sending (disabled)
@@ -65,15 +74,6 @@ env:
 logLevel: null
 logFormat: null
 
-# -- `WATCHDOG_CONFIG_REGISTRY` onchain registry address, use staging `0xE1CcD31f46F30A764DbACB4759E69d8799126941` or prod `0x94Fea534aef6df5cF66C2DAE5CE0A05d10C068F3`
-watchdogConfigReg: "0xE1CcD31f46F30A764DbACB4759E69d8799126941"
-# -- `WATCHDOG_INTERVAL` interval (in seconds)
-watchdogInterval: "300s"
-# -- `WATCHDOG_ETH_FROM` address (in seconds)
-watchdogEthFrom: '0x0000000000000000000000000000000000000000'
-# -- WATCHDOG_CHAIN_RPC_URLS comma separated list of ethereum rpc urls
-watchdogChainRpcUrls: null
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""