feat: remove pk and dsn from configs

scroll-tech · Sep 10, 2024 · f99878a · f99878a
1 parent c441ddf
commit f99878a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 25 deletions.
diff --git a/charts/gas-oracle/Chart.yaml b/charts/gas-oracle/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: gas-oracle helm charts
 name: gas-oracle
-version: 0.0.6
+version: 0.0.7
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:

diff --git a/charts/gas-oracle/README.md b/charts/gas-oracle/README.md
@@ -1,6 +1,6 @@
 # gas-oracle
 
-![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 gas-oracle helm charts
 
@@ -26,7 +26,7 @@ Kubernetes: `>=1.22.0-0`
 | command[0] | string | `"/bin/sh"` |  |
 | command[1] | string | `"-c"` |  |
 | command[2] | string | `"gas_oracle --config /app/conf/rollup-config.json --genesis /app/genesis/genesis.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` |  |
-| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n    \"driver_name\": \"postgres\",\n    \"dsn\": \"postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable\"\n}\n"` |  |
+| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n    \"driver_name\": \"postgres\",\n    \"dsn\": \"\"\n}\n"` |  |
 | configMaps.migrate-db.enabled | bool | `true` |  |
 | defaultProbes.custom | bool | `true` |  |
 | defaultProbes.enabled | bool | `true` |  |
@@ -39,7 +39,7 @@ Kubernetes: `>=1.22.0-0`
 | global.nameOverride | string | `"gas-oracle"` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/gas-oracle"` |  |
-| image.tag | string | `"v4.4.59"` |  |
+| image.tag | string | `"v4.4.60"` |  |
 | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` |  |
 | initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_ROLLUP_DB_CONFIG_DSN)"` |  |
 | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` |  |
@@ -49,7 +49,8 @@ Kubernetes: `>=1.22.0-0`
 | initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` |  |
 | initContainers.2-migrate-db.command[1] | string | `"-c"` |  |
 | initContainers.2-migrate-db.command[2] | string | `"db_cli migrate --config /config/migrate-db.json"` |  |
-| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli"` |  |
+| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"gas-oracle-env"` |  |
+| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli:v4.4.60"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` |  |

diff --git a/charts/gas-oracle/values.yaml b/charts/gas-oracle/values.yaml
@@ -6,7 +6,7 @@ global:
 image:
   repository: scrolltech/gas-oracle
   pullPolicy: Always
-  tag: v4.4.59
+  tag: v4.4.60
 
 command:
   [
@@ -98,12 +98,15 @@ initContainers:
       - configMapRef:
           name: gas-oracle-env
   2-migrate-db:
-    image: scrolltech/rollup-db-cli
+    image: scrolltech/rollup-db-cli:v4.4.60
     command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
     volumeMounts:
       - name: migrate-db
         mountPath: /config/migrate-db.json
         subPath: migrate-db.json
+    envFrom:
+      - configMapRef:
+          name: gas-oracle-env
   3-wait-for-l1:
     image: scrolltech/scroll-alpine:v0.0.1
     command:
@@ -134,7 +137,7 @@ configMaps:
       migrate-db.json: |
         {
             "driver_name": "postgres",
-            "dsn": "postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable"
+            "dsn": ""
         }
 
 serviceMonitor:

diff --git a/charts/rollup-node/Chart.yaml b/charts/rollup-node/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: rollup-node helm charts
 name: rollup-node
-version: 0.0.8
+version: 0.0.9
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:

diff --git a/charts/rollup-node/README.md b/charts/rollup-node/README.md
@@ -1,6 +1,6 @@
 # rollup-node
 
-![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.9](https://img.shields.io/badge/Version-0.0.9-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 rollup-node helm charts
 
@@ -26,7 +26,7 @@ Kubernetes: `>=1.22.0-0`
 | command[0] | string | `"/bin/sh"` |  |
 | command[1] | string | `"-c"` |  |
 | command[2] | string | `"rollup_relayer --config /app/conf/rollup-config.json --genesis /app/genesis/genesis.json --import-genesis --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug --verbosity 3"` |  |
-| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n    \"driver_name\": \"postgres\",\n    \"dsn\": \"postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable\"\n}\n"` |  |
+| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n    \"driver_name\": \"postgres\",\n    \"dsn\": \"\"\n}\n"` |  |
 | configMaps.migrate-db.enabled | bool | `true` |  |
 | controller.replicas | int | `1` |  |
 | controller.strategy | string | `"Recreate"` |  |
@@ -38,7 +38,7 @@ Kubernetes: `>=1.22.0-0`
 | global.nameOverride | string | `"rollup-node"` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/rollup-relayer"` |  |
-| image.tag | string | `"v4.4.59"` |  |
+| image.tag | string | `"v4.4.60"` |  |
 | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` |  |
 | initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_ROLLUP_DB_CONFIG_DSN)"` |  |
 | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` |  |
@@ -48,7 +48,8 @@ Kubernetes: `>=1.22.0-0`
 | initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` |  |
 | initContainers.2-migrate-db.command[1] | string | `"-c"` |  |
 | initContainers.2-migrate-db.command[2] | string | `"db_cli migrate --config /config/migrate-db.json"` |  |
-| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli"` |  |
+| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"rollup-node-env"` |  |
+| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli:v4.4.60"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` |  |

diff --git a/charts/rollup-node/values.yaml b/charts/rollup-node/values.yaml
@@ -11,7 +11,7 @@ controller:
 image:
   repository: scrolltech/rollup-relayer
   pullPolicy: Always
-  tag: v4.4.59
+  tag: v4.4.60
 
 env:
   - name: METRICS_PORT
@@ -96,12 +96,15 @@ initContainers:
       - configMapRef:
           name: rollup-node-env
   2-migrate-db:
-    image: scrolltech/rollup-db-cli
+    image: scrolltech/rollup-db-cli:v4.4.60
     command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
     volumeMounts:
       - name: migrate-db
         mountPath: /config/migrate-db.json
         subPath: migrate-db.json
+    envFrom:
+      - configMapRef:
+          name: rollup-node-env
   3-wait-for-l1:
     image: scrolltech/scroll-alpine:v0.0.1
     command:
@@ -136,7 +139,7 @@ configMaps:
       migrate-db.json: |
         {
             "driver_name": "postgres",
-            "dsn": "postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable"
+            "dsn": ""
         }
 
 serviceMonitor:

diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: scroll helm charts to deploy scroll sdk
 name: scroll-sdk
-version: 0.0.30
+version: 0.0.31
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -58,7 +58,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: frontends.enabled
   - name: gas-oracle
-    version: 0.0.6
+    version: 0.0.7
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: gas-oracle.enabled
   - name: l1-explorer
@@ -98,7 +98,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: rollup-explorer-backend.enabled
   - name: rollup-node
-    version: 0.0.8
+    version: 0.0.9
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: rollup-node.enabled
   - name: rpc-gateway

diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -1,6 +1,6 @@
 # scroll-sdk
 
-![Version: 0.0.30](https://img.shields.io/badge/Version-0.0.30-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.31](https://img.shields.io/badge/Version-0.0.31-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 scroll helm charts to deploy scroll sdk
 
@@ -31,14 +31,14 @@ Kubernetes: `>=1.22.0-0`
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.6 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.6 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.7 |
-| oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.0.6 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.0.7 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-devnet | 0.0.3 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.0.2 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.0.8 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.10 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.9 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-explorer-backend | 0.0.3 |
-| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.8 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.9 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rpc-gateway | 0.0.2 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 15.5.0 |
 

diff --git a/devnet/Makefile b/devnet/Makefile
@@ -13,7 +13,7 @@ bootstrap:
 
 config:
 		echo "Creating configuration files..."
-		cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.20
+		cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.20-remove-pk
 		echo "Creating env files..."
 		./create-env-files.sh scroll-sdk
 

diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh
@@ -46,7 +46,7 @@ get_service_configmap_variables() {
             echo "COORDINATOR_DB_CONNECTION_STRING:SCROLL_COORDINATOR_DB_DSN"
             ;;
         gas-oracle)
-            echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC GAS_ORACLE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN"
+            echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC GAS_ORACLE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN L2_GAS_ORACLE_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L1_CONFIG_RELAYER_CONFIG_GAS_ORACLE_SENDER_PRIVATE_KEY L1_GAS_ORACLE_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_GAS_ORACLE_SENDER_PRIVATE_KEY"
             ;;
         l1-devnet)
             echo "CHAIN_ID_L1:CHAIN_ID"
@@ -64,7 +64,7 @@ get_service_configmap_variables() {
             echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2GETH_SIGNER_ADDRESS:L2GETH_SIGNER_ADDRESS L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2GETH_KEYSTORE:L2GETH_KEYSTORE L2GETH_PASSWORD:L2GETH_PASSWORD L2GETH_NODEKEY:L2GETH_NODEKEY"
             ;;
         rollup-node)
-            echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN L1_SCROLL_CHAIN_PROXY_ADDR:L1_SCROLL_CHAIN_PROXY_ADDR"
+            echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN L1_SCROLL_CHAIN_PROXY_ADDR:L1_SCROLL_CHAIN_PROXY_ADDR L1_COMMIT_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_COMMIT_SENDER_PRIVATE_KEY L1_FINALIZE_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_FINALIZE_SENDER_PRIVATE_KEY"
             ;;
         *)
             echo "Service $service_name not found."