From b5089c84725c21d1572e24db500a15231120416f Mon Sep 17 00:00:00 2001 From: sbaizet <74511063+sbaizet-ledger@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:39:53 +0200 Subject: [PATCH] Feat remove config files (#176) * test remove config files * put genesis config into value file * add config in value file for balance-checker * add config in value file for bridge-history-api * fix bridge-history-api * bridge-history-fetcher * chain-monitor * coordinator-api * coordinator-cron * frontend * gas-oracle * rollup-explorer-backend * rollup-node * contracts * fix env coordinator-api * update scroll-sdk * test with dev charts * fix: add L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK on production files of bootnodes (#171) * feat: add scroll admin system (#166) * feat: add admin system * fix: update frontend config * fix: admin system add default normal user * fix: production environment * fix: test * fix: coordinator api env (#173) * coordinator-api * update scroll-sdk * test with dev charts * testing * remove config files from scroll-sdk * fix coordinator api and bump version of some charts * update the devnet makefile * bump scroll-sdk to 0.0.38 * add script to prepare config files for devnet * remove configs folder in charts * remove isStandalone value * fix missing labels on config files * add config folder for scroll-sdk only --------- Co-authored-by: Morty <70688412+yiweichi@users.noreply.github.com> --- charts/admin-system-backend/Chart.yaml | 2 +- charts/admin-system-backend/README.md | 3 +- charts/admin-system-backend/configs/.keep | 0 .../templates/config-file.yaml | 5 +- charts/admin-system-backend/values.yaml | 3 + .../values/production.yaml | 3 - charts/admin-system-cron/Chart.yaml | 2 +- charts/admin-system-cron/README.md | 3 +- charts/admin-system-cron/configs/.keep | 0 .../templates/config-file.yaml | 7 +- .../admin-system-cron/templates/helpers.tpl | 47 +++++++ charts/admin-system-cron/values.yaml | 3 + .../admin-system-cron/values/production.yaml | 3 - charts/admin-system-dashboard/Chart.yaml | 2 +- charts/admin-system-dashboard/README.md | 2 +- charts/admin-system-dashboard/configs/.keep | 0 .../values/production.yaml | 3 - charts/balance-checker/Chart.yaml | 2 +- charts/balance-checker/README.md | 3 +- charts/balance-checker/configs/.keep | 0 .../templates/config-file.yaml | 8 +- charts/balance-checker/templates/helpers.tpl | 47 +++++++ charts/balance-checker/values.yaml | 3 + charts/balance-checker/values/production.yaml | 6 +- charts/bridge-history-api/Chart.yaml | 2 +- charts/bridge-history-api/README.md | 7 +- charts/bridge-history-api/configs/.keep | 0 .../templates/config-file.yaml | 8 +- .../bridge-history-api/templates/helpers.tpl | 47 +++++++ charts/bridge-history-api/values.yaml | 7 +- .../bridge-history-api/values/production.yaml | 3 - charts/bridge-history-fetcher/Chart.yaml | 2 +- charts/bridge-history-fetcher/README.md | 7 +- charts/bridge-history-fetcher/configs/.keep | 0 .../templates/config-file.yaml | 8 +- .../templates/helpers.tpl | 47 +++++++ charts/bridge-history-fetcher/values.yaml | 7 +- .../values/production.yaml | 3 - charts/chain-monitor/Chart.yaml | 2 +- charts/chain-monitor/README.md | 3 +- charts/chain-monitor/configs/.keep | 0 .../chain-monitor/templates/config-file.yaml | 8 +- charts/chain-monitor/templates/helpers.tpl | 47 +++++++ charts/chain-monitor/values.yaml | 3 + charts/chain-monitor/values/production.yaml | 3 - charts/contracts/Chart.yaml | 2 +- charts/contracts/README.md | 6 +- charts/contracts/configs/.keep | 0 charts/contracts/templates/config-file.yaml | 11 +- charts/contracts/values.yaml | 10 +- charts/contracts/values/production.yaml | 3 - charts/coordinator-api/Chart.yaml | 2 +- charts/coordinator-api/README.md | 3 +- charts/coordinator-api/configs/.keep | 0 .../templates/config-file.yaml | 8 +- charts/coordinator-api/templates/helpers.tpl | 47 +++++++ charts/coordinator-api/values.yaml | 3 + charts/coordinator-api/values/production.yaml | 3 - charts/coordinator-cron/Chart.yaml | 2 +- charts/coordinator-cron/README.md | 5 +- charts/coordinator-cron/configs/.keep | 0 .../templates/config-file.yaml | 8 +- charts/coordinator-cron/templates/helpers.tpl | 47 +++++++ charts/coordinator-cron/values.yaml | 5 +- .../coordinator-cron/values/production.yaml | 3 - charts/frontends/Chart.yaml | 2 +- charts/frontends/README.md | 3 +- charts/frontends/configs/.keep | 0 charts/frontends/templates/config-file.yaml | 8 +- charts/frontends/templates/helpers.tpl | 47 +++++++ charts/frontends/values.yaml | 3 + charts/frontends/values/production.yaml | 3 - charts/gas-oracle/Chart.yaml | 2 +- charts/gas-oracle/README.md | 5 +- charts/gas-oracle/configs/.keep | 0 charts/gas-oracle/templates/config-file.yaml | 8 +- charts/gas-oracle/templates/helpers.tpl | 47 +++++++ charts/gas-oracle/values.yaml | 5 +- charts/gas-oracle/values/production.yaml | 3 - charts/l2-bootnode/Chart.yaml | 2 +- charts/l2-bootnode/README.md | 2 +- charts/rollup-explorer-backend/Chart.yaml | 2 +- charts/rollup-explorer-backend/README.md | 3 +- charts/rollup-explorer-backend/configs/.keep | 0 .../templates/config-file.yaml | 7 +- .../templates/helpers.tpl | 47 +++++++ charts/rollup-explorer-backend/values.yaml | 3 + .../values/production.yaml | 3 - charts/rollup-node/Chart.yaml | 2 +- charts/rollup-node/README.md | 3 +- charts/rollup-node/configs/.keep | 0 charts/rollup-node/templates/config-file.yaml | 8 +- charts/rollup-node/templates/helpers.tpl | 47 +++++++ charts/rollup-node/values.yaml | 4 +- charts/rollup-node/values/production.yaml | 3 - charts/scroll-common/Chart.yaml | 2 +- charts/scroll-common/README.md | 8 +- charts/scroll-common/configs/.keep | 0 .../scroll-common/templates/genesis.conf.yaml | 3 +- charts/scroll-common/values.yaml | 118 ++++++++++++++++++ charts/scroll-sdk/Chart.yaml | 32 ++--- charts/scroll-sdk/README.md | 30 ++--- .../templates/config-file-for-services.yaml | 88 ------------- charts/scroll-sdk/templates/genesis.conf.yaml | 8 -- .../templates/wait-for-l1-script.yaml | 30 ----- charts/scroll-sdk/values.yaml | 3 + devnet/Makefile | 19 ++- devnet/prepare-config-files.sh | 59 +++++++++ 108 files changed, 914 insertions(+), 297 deletions(-) delete mode 100644 charts/admin-system-backend/configs/.keep delete mode 100644 charts/admin-system-cron/configs/.keep create mode 100644 charts/admin-system-cron/templates/helpers.tpl delete mode 100644 charts/admin-system-dashboard/configs/.keep delete mode 100644 charts/balance-checker/configs/.keep create mode 100644 charts/balance-checker/templates/helpers.tpl delete mode 100644 charts/bridge-history-api/configs/.keep create mode 100644 charts/bridge-history-api/templates/helpers.tpl delete mode 100644 charts/bridge-history-fetcher/configs/.keep create mode 100644 charts/bridge-history-fetcher/templates/helpers.tpl delete mode 100644 charts/chain-monitor/configs/.keep create mode 100644 charts/chain-monitor/templates/helpers.tpl delete mode 100644 charts/contracts/configs/.keep delete mode 100644 charts/coordinator-api/configs/.keep create mode 100644 charts/coordinator-api/templates/helpers.tpl delete mode 100644 charts/coordinator-cron/configs/.keep create mode 100644 charts/coordinator-cron/templates/helpers.tpl delete mode 100644 charts/frontends/configs/.keep create mode 100644 charts/frontends/templates/helpers.tpl delete mode 100644 charts/gas-oracle/configs/.keep create mode 100644 charts/gas-oracle/templates/helpers.tpl delete mode 100644 charts/rollup-explorer-backend/configs/.keep create mode 100644 charts/rollup-explorer-backend/templates/helpers.tpl delete mode 100644 charts/rollup-node/configs/.keep create mode 100644 charts/rollup-node/templates/helpers.tpl delete mode 100644 charts/scroll-common/configs/.keep delete mode 100644 charts/scroll-sdk/templates/genesis.conf.yaml delete mode 100644 charts/scroll-sdk/templates/wait-for-l1-script.yaml create mode 100755 devnet/prepare-config-files.sh diff --git a/charts/admin-system-backend/Chart.yaml b/charts/admin-system-backend/Chart.yaml index 56f21534..9801eba2 100644 --- a/charts/admin-system-backend/Chart.yaml +++ b/charts/admin-system-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: admin-system-backend helm charts name: admin-system-backend -version: 0.0.1 +version: 0.0.2 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/admin-system-backend/README.md b/charts/admin-system-backend/README.md index 660d21ae..4aa29c6a 100644 --- a/charts/admin-system-backend/README.md +++ b/charts/admin-system-backend/README.md @@ -1,6 +1,6 @@ # admin-system-backend -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) admin-system-backend helm charts @@ -103,6 +103,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"200Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"50Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8080` | | diff --git a/charts/admin-system-backend/configs/.keep b/charts/admin-system-backend/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/admin-system-backend/templates/config-file.yaml b/charts/admin-system-backend/templates/config-file.yaml index d1bb31c7..7a5e8309 100644 --- a/charts/admin-system-backend/templates/config-file.yaml +++ b/charts/admin-system-backend/templates/config-file.yaml @@ -1,10 +1,9 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: admin-system-backend-config data: -{{ (.Files.Glob "configs/admin-system-backend-config.json").AsConfig | indent 2 }} + admin-system-backend-config.json: | +{{ .Values.scrollConfig | indent 4 }} --- -{{- end }} diff --git a/charts/admin-system-backend/values.yaml b/charts/admin-system-backend/values.yaml index 3e25e507..44813634 100644 --- a/charts/admin-system-backend/values.yaml +++ b/charts/admin-system-backend/values.yaml @@ -187,3 +187,6 @@ serviceMonitor: - port: http interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/admin-system-backend/values/production.yaml b/charts/admin-system-backend/values/production.yaml index b2a400a8..3619790f 100644 --- a/charts/admin-system-backend/values/production.yaml +++ b/charts/admin-system-backend/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - initContainers: 1-check-postgres-connection: image: atkrad/wait4x:latest diff --git a/charts/admin-system-cron/Chart.yaml b/charts/admin-system-cron/Chart.yaml index 1c4e07e8..a9d45962 100644 --- a/charts/admin-system-cron/Chart.yaml +++ b/charts/admin-system-cron/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: admin-system-cron helm charts name: admin-system-cron -version: 0.0.1 +version: 0.0.2 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/admin-system-cron/README.md b/charts/admin-system-cron/README.md index 4fd8b19d..f5b25544 100644 --- a/charts/admin-system-cron/README.md +++ b/charts/admin-system-cron/README.md @@ -1,6 +1,6 @@ # admin-system-cron -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) admin-system-cron helm charts @@ -62,6 +62,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"1Gi"` | | | resources.requests.cpu | string | `"500m"` | | | resources.requests.memory | string | `"500Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8080` | | diff --git a/charts/admin-system-cron/configs/.keep b/charts/admin-system-cron/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/admin-system-cron/templates/config-file.yaml b/charts/admin-system-cron/templates/config-file.yaml index 99d5bde3..854e5fad 100644 --- a/charts/admin-system-cron/templates/config-file.yaml +++ b/charts/admin-system-cron/templates/config-file.yaml @@ -1,10 +1,11 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: admin-system-cron-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/admin-system-backend-config.json").AsConfig | indent 2 }} + admin-system-backend-config.json: | +{{ .Values.scrollConfig | indent 4 }} --- -{{- end }} diff --git a/charts/admin-system-cron/templates/helpers.tpl b/charts/admin-system-cron/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/admin-system-cron/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/admin-system-cron/values.yaml b/charts/admin-system-cron/values.yaml index 1c23dea6..6b3642b0 100644 --- a/charts/admin-system-cron/values.yaml +++ b/charts/admin-system-cron/values.yaml @@ -97,3 +97,6 @@ serviceMonitor: - port: http interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/admin-system-cron/values/production.yaml b/charts/admin-system-cron/values/production.yaml index d3a5805a..b220b84c 100644 --- a/charts/admin-system-cron/values/production.yaml +++ b/charts/admin-system-cron/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - initContainers: 1-check-postgres-connection: image: atkrad/wait4x:latest diff --git a/charts/admin-system-dashboard/Chart.yaml b/charts/admin-system-dashboard/Chart.yaml index b6400aee..c2c3ec15 100644 --- a/charts/admin-system-dashboard/Chart.yaml +++ b/charts/admin-system-dashboard/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: admin-system-dashboard helm charts name: admin-system-dashboard -version: 0.0.1 +version: 0.0.2 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/admin-system-dashboard/README.md b/charts/admin-system-dashboard/README.md index 8a1a9c2d..f45fc532 100644 --- a/charts/admin-system-dashboard/README.md +++ b/charts/admin-system-dashboard/README.md @@ -1,6 +1,6 @@ # admin-system-dashboard -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) admin-system-dashboard helm charts diff --git a/charts/admin-system-dashboard/configs/.keep b/charts/admin-system-dashboard/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/admin-system-dashboard/values/production.yaml b/charts/admin-system-dashboard/values/production.yaml index a730f6a3..1b6808e0 100644 --- a/charts/admin-system-dashboard/values/production.yaml +++ b/charts/admin-system-dashboard/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - ingress: main: ingressClassName: "nginx" diff --git a/charts/balance-checker/Chart.yaml b/charts/balance-checker/Chart.yaml index 27ece4ef..ee4355ca 100644 --- a/charts/balance-checker/Chart.yaml +++ b/charts/balance-checker/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: balance-checker helm charts name: balance-checker -version: 0.0.2 +version: 0.0.3 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/balance-checker/README.md b/charts/balance-checker/README.md index 964fa1c7..3556a844 100644 --- a/charts/balance-checker/README.md +++ b/charts/balance-checker/README.md @@ -1,6 +1,6 @@ # balance-checker -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) balance-checker helm charts @@ -85,6 +85,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `80` | | diff --git a/charts/balance-checker/configs/.keep b/charts/balance-checker/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/balance-checker/templates/config-file.yaml b/charts/balance-checker/templates/config-file.yaml index 1e303f3f..e3ed7871 100644 --- a/charts/balance-checker/templates/config-file.yaml +++ b/charts/balance-checker/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: balance-checker-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/balance-checker-config.json").AsConfig | indent 2 }} ---- -{{- end }} + balance-checker-config.json : | +{{ .Values.scrollConfig | nindent 4 }} diff --git a/charts/balance-checker/templates/helpers.tpl b/charts/balance-checker/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/balance-checker/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/balance-checker/values.yaml b/charts/balance-checker/values.yaml index 275dee32..c7956d02 100644 --- a/charts/balance-checker/values.yaml +++ b/charts/balance-checker/values.yaml @@ -107,3 +107,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/balance-checker/values/production.yaml b/charts/balance-checker/values/production.yaml index 4bd6d224..13baf1c1 100644 --- a/charts/balance-checker/values/production.yaml +++ b/charts/balance-checker/values/production.yaml @@ -1,8 +1,8 @@ -global: - isStandalone: true - configMaps: env: enabled: true data: SCROLL_L1_RPC: "" + +scrollConfig: | + {} diff --git a/charts/bridge-history-api/Chart.yaml b/charts/bridge-history-api/Chart.yaml index 38addb12..2d2ac495 100644 --- a/charts/bridge-history-api/Chart.yaml +++ b/charts/bridge-history-api/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bridge-history-api helm charts name: bridge-history-api -version: 0.0.6 +version: 0.0.7 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/bridge-history-api/README.md b/charts/bridge-history-api/README.md index b26a39f4..3227bf61 100644 --- a/charts/bridge-history-api/README.md +++ b/charts/bridge-history-api/README.md @@ -1,6 +1,6 @@ # bridge-history-api -![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) bridge-history-api helm charts @@ -27,7 +27,7 @@ Kubernetes: `>=1.22.0-0` | additionalContainers.redis.name | string | `"redis"` | | | command[0] | string | `"/bin/sh"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"bridgehistoryapi-api --config /app/conf/bridge-history-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | +| command[2] | string | `"bridgehistoryapi-api --config /app/conf/bridge-history-api-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | | controller.replicas | int | `1` | | | controller.strategy | string | `"RollingUpdate"` | | | controller.type | string | `"deployment"` | | @@ -69,7 +69,7 @@ Kubernetes: `>=1.22.0-0` | initContainers.2-wait-for-l2-sequencer.image | string | `"atkrad/wait4x:latest"` | | | persistence.bridge-history-api.enabled | bool | `true` | | | persistence.bridge-history-api.mountPath | string | `"/app/conf/"` | | -| persistence.bridge-history-api.name | string | `"bridge-history-config"` | | +| persistence.bridge-history-api.name | string | `"bridge-history-api-config"` | | | persistence.bridge-history-api.type | string | `"configMap"` | | | persistence.wait-for-l1-script.defaultMode | string | `"0777"` | | | persistence.wait-for-l1-script.enabled | bool | `true` | | @@ -91,6 +91,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8080` | | diff --git a/charts/bridge-history-api/configs/.keep b/charts/bridge-history-api/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/bridge-history-api/templates/config-file.yaml b/charts/bridge-history-api/templates/config-file.yaml index 86c94714..75fac4a1 100644 --- a/charts/bridge-history-api/templates/config-file.yaml +++ b/charts/bridge-history-api/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: bridge-history-api-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/bridge-history-config.json").AsConfig | indent 2 }} ---- -{{- end }} + bridge-history-api-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/bridge-history-api/templates/helpers.tpl b/charts/bridge-history-api/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/bridge-history-api/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/bridge-history-api/values.yaml b/charts/bridge-history-api/values.yaml index 19f7ae34..9e3663fa 100644 --- a/charts/bridge-history-api/values.yaml +++ b/charts/bridge-history-api/values.yaml @@ -16,7 +16,7 @@ command: [ "/bin/sh", "-c", - "bridgehistoryapi-api --config /app/conf/bridge-history-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug", + "bridgehistoryapi-api --config /app/conf/bridge-history-api-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug", ] env: @@ -72,7 +72,7 @@ persistence: enabled: true type: configMap mountPath: /app/conf/ - name: bridge-history-config + name: bridge-history-api-config wait-for-l1-script: enabled: true type: configMap @@ -131,3 +131,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/bridge-history-api/values/production.yaml b/charts/bridge-history-api/values/production.yaml index a67c305a..f9e8e733 100644 --- a/charts/bridge-history-api/values/production.yaml +++ b/charts/bridge-history-api/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - controller: replicas: 2 diff --git a/charts/bridge-history-fetcher/Chart.yaml b/charts/bridge-history-fetcher/Chart.yaml index 9c2f2faa..de69d3cd 100644 --- a/charts/bridge-history-fetcher/Chart.yaml +++ b/charts/bridge-history-fetcher/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bridge-history-fetcher helm charts name: bridge-history-fetcher -version: 0.0.8 +version: 0.0.9 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/bridge-history-fetcher/README.md b/charts/bridge-history-fetcher/README.md index bd781360..3ff76496 100644 --- a/charts/bridge-history-fetcher/README.md +++ b/charts/bridge-history-fetcher/README.md @@ -1,6 +1,6 @@ # bridge-history-fetcher -![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) bridge-history-fetcher helm charts @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | command[0] | string | `"/bin/sh"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"bridgehistoryapi-fetcher --config /app/conf/bridge-history-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | +| command[2] | string | `"bridgehistoryapi-fetcher --config /app/conf/bridge-history-fetcher-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | | configMaps.migrate-db.data."migrate-db.json" | string | `"{\n \"l1\": {},\n \"l2\": {},\n \"db\": {\n \"driver_name\": \"postgres\",\n \"maxOpenNum\": 50,\n \"maxIdleNume\": 5,\n \"dsn\": \"\"\n }\n}\n"` | | | configMaps.migrate-db.enabled | bool | `true` | | | controller.replicas | int | `1` | | @@ -75,7 +75,7 @@ Kubernetes: `>=1.22.0-0` | initContainers.4-wait-for-l2-sequencer.image | string | `"atkrad/wait4x:latest"` | | | persistence.bridge-history-fetcher.enabled | bool | `true` | | | persistence.bridge-history-fetcher.mountPath | string | `"/app/conf/"` | | -| persistence.bridge-history-fetcher.name | string | `"bridge-history-config"` | | +| persistence.bridge-history-fetcher.name | string | `"bridge-history-fetcher-config"` | | | persistence.bridge-history-fetcher.type | string | `"configMap"` | | | persistence.migrate-db.defaultMode | string | `"0777"` | | | persistence.migrate-db.enabled | bool | `true` | | @@ -102,6 +102,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8080` | | diff --git a/charts/bridge-history-fetcher/configs/.keep b/charts/bridge-history-fetcher/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/bridge-history-fetcher/templates/config-file.yaml b/charts/bridge-history-fetcher/templates/config-file.yaml index 1053e3b4..85bca6a1 100644 --- a/charts/bridge-history-fetcher/templates/config-file.yaml +++ b/charts/bridge-history-fetcher/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: bridge-history-fetcher-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/bridge-history-config.json").AsConfig | indent 2 }} ---- -{{- end }} + bridge-history-fetcher-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/bridge-history-fetcher/templates/helpers.tpl b/charts/bridge-history-fetcher/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/bridge-history-fetcher/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/bridge-history-fetcher/values.yaml b/charts/bridge-history-fetcher/values.yaml index 9e65894e..8be68a74 100644 --- a/charts/bridge-history-fetcher/values.yaml +++ b/charts/bridge-history-fetcher/values.yaml @@ -16,7 +16,7 @@ command: [ "/bin/sh", "-c", - "bridgehistoryapi-fetcher --config /app/conf/bridge-history-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug", + "bridgehistoryapi-fetcher --config /app/conf/bridge-history-fetcher-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug", ] env: @@ -44,7 +44,7 @@ persistence: enabled: true type: configMap mountPath: /app/conf/ - name: bridge-history-config + name: bridge-history-fetcher-config migrate-db: enabled: true type: configMap @@ -154,3 +154,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/bridge-history-fetcher/values/production.yaml b/charts/bridge-history-fetcher/values/production.yaml index 751f7c75..f07153da 100644 --- a/charts/bridge-history-fetcher/values/production.yaml +++ b/charts/bridge-history-fetcher/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - envFrom: - secretRef: name: bridge-history-fetcher-secret-env diff --git a/charts/chain-monitor/Chart.yaml b/charts/chain-monitor/Chart.yaml index d8451fec..f523627b 100644 --- a/charts/chain-monitor/Chart.yaml +++ b/charts/chain-monitor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: chain-monitor helm charts name: chain-monitor -version: 0.0.7 +version: 0.0.8 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/chain-monitor/README.md b/charts/chain-monitor/README.md index 220554b7..9582bdfc 100644 --- a/charts/chain-monitor/README.md +++ b/charts/chain-monitor/README.md @@ -1,6 +1,6 @@ # chain-monitor -![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) +![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) chain-monitor helm charts @@ -80,6 +80,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8080` | | diff --git a/charts/chain-monitor/configs/.keep b/charts/chain-monitor/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/chain-monitor/templates/config-file.yaml b/charts/chain-monitor/templates/config-file.yaml index cd9c7aaa..a52ad68a 100644 --- a/charts/chain-monitor/templates/config-file.yaml +++ b/charts/chain-monitor/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: chain-monitor-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/chain-monitor-config.json").AsConfig | indent 2 }} ---- -{{- end }} + chain-monitor-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/chain-monitor/templates/helpers.tpl b/charts/chain-monitor/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/chain-monitor/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/chain-monitor/values.yaml b/charts/chain-monitor/values.yaml index f613f0af..ba37ab5e 100644 --- a/charts/chain-monitor/values.yaml +++ b/charts/chain-monitor/values.yaml @@ -126,3 +126,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/chain-monitor/values/production.yaml b/charts/chain-monitor/values/production.yaml index 6f46fa5f..f914a5ed 100644 --- a/charts/chain-monitor/values/production.yaml +++ b/charts/chain-monitor/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - envFrom: - secretRef: name: chain-monitor-secret-env diff --git a/charts/contracts/Chart.yaml b/charts/contracts/Chart.yaml index 724284db..fb08b6cd 100644 --- a/charts/contracts/Chart.yaml +++ b/charts/contracts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: contracts helm charts name: contracts -version: 0.0.7 +version: 0.0.9 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/contracts/README.md b/charts/contracts/README.md index e36ff9e5..21fa2708 100644 --- a/charts/contracts/README.md +++ b/charts/contracts/README.md @@ -1,6 +1,6 @@ # contracts -![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) +![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) contracts helm charts @@ -25,7 +25,9 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` | | | global.isStandalone | bool | `false` | | | image.repository | string | `"scrolltech/scroll-stack-contracts"` | | -| image.tag | string | `"deploy-v0.0.22"` | | +| image.tag | string | `"deploy-v0.0.24"` | | +| scrollConfig | string | `"{}\n"` | | +| scrollConfigContracts | string | `"{}\n"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/contracts/configs/.keep b/charts/contracts/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/contracts/templates/config-file.yaml b/charts/contracts/templates/config-file.yaml index bd3ff162..64b012a4 100644 --- a/charts/contracts/templates/config-file.yaml +++ b/charts/contracts/templates/config-file.yaml @@ -1,11 +1,12 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: scroll-smart-contracts-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/config.toml").AsConfig | indent 2 }} -{{ (.Files.Glob "configs/config-contracts.toml").AsConfig | indent 2 }} ---- -{{- end }} + config.toml: | +{{ .Values.scrollConfig | indent 4 }} + config-contracts.toml: | +{{ .Values.scrollConfigContracts | indent 4 }} diff --git a/charts/contracts/values.yaml b/charts/contracts/values.yaml index de8c476e..41c1d03b 100644 --- a/charts/contracts/values.yaml +++ b/charts/contracts/values.yaml @@ -4,8 +4,16 @@ global: image: repository: scrolltech/scroll-stack-contracts - tag: deploy-v0.0.22 + tag: deploy-v0.0.24 envFrom: - configMapRef: name: contracts-deployment-env + +# here is the place for the config.toml file +scrollConfig: | + {} + +# here is the place for the config-contracts.toml file +scrollConfigContracts: | + {} diff --git a/charts/contracts/values/production.yaml b/charts/contracts/values/production.yaml index 17c29dc2..e473c377 100644 --- a/charts/contracts/values/production.yaml +++ b/charts/contracts/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - configMaps: contracts-deployment-env: enabled: true diff --git a/charts/coordinator-api/Chart.yaml b/charts/coordinator-api/Chart.yaml index 2ff1e68a..3badfaf0 100644 --- a/charts/coordinator-api/Chart.yaml +++ b/charts/coordinator-api/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: coordinator-api helm charts name: coordinator-api -version: 0.0.8 +version: 0.0.9 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/coordinator-api/README.md b/charts/coordinator-api/README.md index 7321da71..3c2d26d3 100644 --- a/charts/coordinator-api/README.md +++ b/charts/coordinator-api/README.md @@ -1,6 +1,6 @@ # coordinator-api -![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) coordinator-api helm charts @@ -108,6 +108,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"24Gi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"20Gi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `80` | | diff --git a/charts/coordinator-api/configs/.keep b/charts/coordinator-api/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/coordinator-api/templates/config-file.yaml b/charts/coordinator-api/templates/config-file.yaml index 396c0d0a..5d079583 100644 --- a/charts/coordinator-api/templates/config-file.yaml +++ b/charts/coordinator-api/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: coordinator-api-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/coordinator-config.json").AsConfig | indent 2 }} ---- -{{- end }} + coordinator-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/coordinator-api/templates/helpers.tpl b/charts/coordinator-api/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/coordinator-api/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/coordinator-api/values.yaml b/charts/coordinator-api/values.yaml index df176ada..a939041a 100644 --- a/charts/coordinator-api/values.yaml +++ b/charts/coordinator-api/values.yaml @@ -296,3 +296,6 @@ ingress: paths: - path: / pathType: Prefix + +scrollConfig: | + {} diff --git a/charts/coordinator-api/values/production.yaml b/charts/coordinator-api/values/production.yaml index 934c5d9d..eeaf4c3d 100644 --- a/charts/coordinator-api/values/production.yaml +++ b/charts/coordinator-api/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - controller: replicas: 2 diff --git a/charts/coordinator-cron/Chart.yaml b/charts/coordinator-cron/Chart.yaml index 5e823f7e..26988f92 100644 --- a/charts/coordinator-cron/Chart.yaml +++ b/charts/coordinator-cron/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: coordinator-cron helm charts name: coordinator-cron -version: 0.0.6 +version: 0.0.7 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/coordinator-cron/README.md b/charts/coordinator-cron/README.md index 43b07c05..380fdbfb 100644 --- a/charts/coordinator-cron/README.md +++ b/charts/coordinator-cron/README.md @@ -1,6 +1,6 @@ # coordinator-cron -![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) coordinator-cron helm charts @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | command[0] | string | `"/bin/sh"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"coordinator_cron --config /app/conf/coordinator-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | +| command[2] | string | `"coordinator_cron --config /app/conf/coordinator-cron-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | | | defaultProbes.custom | bool | `true` | | | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | @@ -76,6 +76,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"200Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"50Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `80` | | diff --git a/charts/coordinator-cron/configs/.keep b/charts/coordinator-cron/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/coordinator-cron/templates/config-file.yaml b/charts/coordinator-cron/templates/config-file.yaml index b706f3b8..38d3efdc 100644 --- a/charts/coordinator-cron/templates/config-file.yaml +++ b/charts/coordinator-cron/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: coordinator-cron-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/coordinator-config.json").AsConfig | indent 2 }} ---- -{{- end }} + coordinator-cron-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/coordinator-cron/templates/helpers.tpl b/charts/coordinator-cron/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/coordinator-cron/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/coordinator-cron/values.yaml b/charts/coordinator-cron/values.yaml index aafa996b..6c205e5e 100644 --- a/charts/coordinator-cron/values.yaml +++ b/charts/coordinator-cron/values.yaml @@ -27,7 +27,7 @@ envFrom: command: [ "/bin/sh", "-c", - "coordinator_cron --config /app/conf/coordinator-config.json \ + "coordinator_cron --config /app/conf/coordinator-cron-config.json \ --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} \ --log.debug", ] @@ -102,3 +102,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/coordinator-cron/values/production.yaml b/charts/coordinator-cron/values/production.yaml index 6add1b37..c6aefed3 100644 --- a/charts/coordinator-cron/values/production.yaml +++ b/charts/coordinator-cron/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - controller: replicas: 2 diff --git a/charts/frontends/Chart.yaml b/charts/frontends/Chart.yaml index 8521525e..81b6ff92 100644 --- a/charts/frontends/Chart.yaml +++ b/charts/frontends/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: frontends helm charts name: frontends -version: 0.0.8 +version: 0.0.9 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/frontends/README.md b/charts/frontends/README.md index ebfe96b6..b879de33 100644 --- a/charts/frontends/README.md +++ b/charts/frontends/README.md @@ -1,6 +1,6 @@ # frontends -![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) frontends helm charts @@ -66,6 +66,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `80` | | diff --git a/charts/frontends/configs/.keep b/charts/frontends/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/frontends/templates/config-file.yaml b/charts/frontends/templates/config-file.yaml index e87bc1f5..53548c1a 100644 --- a/charts/frontends/templates/config-file.yaml +++ b/charts/frontends/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: frontends-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/frontend-config").AsConfig | indent 2 }} ---- -{{- end }} + frontend-config: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/frontends/templates/helpers.tpl b/charts/frontends/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/frontends/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/frontends/values.yaml b/charts/frontends/values.yaml index 82609fe3..edd694d8 100644 --- a/charts/frontends/values.yaml +++ b/charts/frontends/values.yaml @@ -72,3 +72,6 @@ ingress: paths: - path: / pathType: Prefix + +scrollConfig: | + {} diff --git a/charts/frontends/values/production.yaml b/charts/frontends/values/production.yaml index feeed37b..132f3c71 100644 --- a/charts/frontends/values/production.yaml +++ b/charts/frontends/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - persistence: frontends: enabled: true diff --git a/charts/gas-oracle/Chart.yaml b/charts/gas-oracle/Chart.yaml index 57572768..3435edb1 100644 --- 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.7 +version: 0.0.8 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/gas-oracle/README.md b/charts/gas-oracle/README.md index 360b14b0..7aba2813 100644 --- a/charts/gas-oracle/README.md +++ b/charts/gas-oracle/README.md @@ -1,6 +1,6 @@ # gas-oracle -![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) +![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) gas-oracle helm charts @@ -71,7 +71,7 @@ Kubernetes: `>=1.22.0-0` | initContainers.4-wait-for-l2-sequencer.image | string | `"atkrad/wait4x:latest"` | | | persistence.app_name.enabled | bool | `true` | | | persistence.app_name.mountPath | string | `"/app/conf/"` | | -| persistence.app_name.name | string | `"rollup-config"` | | +| persistence.app_name.name | string | `"gas-oracle-config"` | | | persistence.app_name.type | string | `"configMap"` | | | persistence.genesis.enabled | bool | `true` | | | persistence.genesis.mountPath | string | `"/app/genesis/"` | | @@ -104,6 +104,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"500Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"100Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `80` | | diff --git a/charts/gas-oracle/configs/.keep b/charts/gas-oracle/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/gas-oracle/templates/config-file.yaml b/charts/gas-oracle/templates/config-file.yaml index c8e53eda..d9b7c174 100644 --- a/charts/gas-oracle/templates/config-file.yaml +++ b/charts/gas-oracle/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: gas-oracle-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/rollup-config.json").AsConfig | indent 2 }} ---- -{{- end }} + rollup-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/gas-oracle/templates/helpers.tpl b/charts/gas-oracle/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/gas-oracle/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/gas-oracle/values.yaml b/charts/gas-oracle/values.yaml index bd621c8e..7f46dbe3 100644 --- a/charts/gas-oracle/values.yaml +++ b/charts/gas-oracle/values.yaml @@ -32,7 +32,7 @@ persistence: enabled: true type: configMap mountPath: /app/conf/ - name: rollup-config + name: gas-oracle-config genesis: enabled: true type: configMap @@ -150,3 +150,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/gas-oracle/values/production.yaml b/charts/gas-oracle/values/production.yaml index 0e8cec8c..61fe8a25 100644 --- a/charts/gas-oracle/values/production.yaml +++ b/charts/gas-oracle/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - persistence: #TODO is it still needed or can I use the default value ? gas-oracle: diff --git a/charts/l2-bootnode/Chart.yaml b/charts/l2-bootnode/Chart.yaml index af5565a4..4d24f115 100644 --- a/charts/l2-bootnode/Chart.yaml +++ b/charts/l2-bootnode/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: l2-bootnode helm chart name: l2-bootnode -version: 0.0.10 +version: 0.0.11 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/l2-bootnode/README.md b/charts/l2-bootnode/README.md index fdd93814..243c8eda 100644 --- a/charts/l2-bootnode/README.md +++ b/charts/l2-bootnode/README.md @@ -1,6 +1,6 @@ # l2-bootnode -![Version: 0.0.10](https://img.shields.io/badge/Version-0.0.10-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.11](https://img.shields.io/badge/Version-0.0.11-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) l2-bootnode helm chart diff --git a/charts/rollup-explorer-backend/Chart.yaml b/charts/rollup-explorer-backend/Chart.yaml index 816442cb..1aae2e26 100644 --- a/charts/rollup-explorer-backend/Chart.yaml +++ b/charts/rollup-explorer-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: rollup-explorer-backend helm charts name: rollup-explorer-backend -version: 0.0.3 +version: 0.0.4 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/rollup-explorer-backend/README.md b/charts/rollup-explorer-backend/README.md index 99cb176c..a3d81045 100644 --- a/charts/rollup-explorer-backend/README.md +++ b/charts/rollup-explorer-backend/README.md @@ -1,6 +1,6 @@ # rollup-explorer-backend -![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) rollup-explorer-backend helm charts @@ -74,6 +74,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"6Gi"` | | | resources.requests.cpu | string | `"2"` | | | resources.requests.memory | string | `"4Gi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.labels.app | string | `"rollup-explorer-backend"` | | | service.main.ports.http.enabled | bool | `true` | | diff --git a/charts/rollup-explorer-backend/configs/.keep b/charts/rollup-explorer-backend/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/rollup-explorer-backend/templates/config-file.yaml b/charts/rollup-explorer-backend/templates/config-file.yaml index a8affce8..d0d14342 100644 --- a/charts/rollup-explorer-backend/templates/config-file.yaml +++ b/charts/rollup-explorer-backend/templates/config-file.yaml @@ -1,11 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: rollup-explorer-backend-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: config.json: | -{{ .Files.Get "configs/rollup-explorer-backend-config.json" | indent 4 }} ---- -{{- end }} +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/rollup-explorer-backend/templates/helpers.tpl b/charts/rollup-explorer-backend/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/rollup-explorer-backend/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/rollup-explorer-backend/values.yaml b/charts/rollup-explorer-backend/values.yaml index caaa10b0..589aae89 100644 --- a/charts/rollup-explorer-backend/values.yaml +++ b/charts/rollup-explorer-backend/values.yaml @@ -96,3 +96,6 @@ serviceMonitor: - port: metrics interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/rollup-explorer-backend/values/production.yaml b/charts/rollup-explorer-backend/values/production.yaml index 1aebce1f..7f58960b 100644 --- a/charts/rollup-explorer-backend/values/production.yaml +++ b/charts/rollup-explorer-backend/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - controller: replicas: 2 diff --git a/charts/rollup-node/Chart.yaml b/charts/rollup-node/Chart.yaml index 04243540..5f2f9b32 100644 --- 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.10 +version: 0.0.11 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/rollup-node/README.md b/charts/rollup-node/README.md index 954094e6..905f5897 100644 --- a/charts/rollup-node/README.md +++ b/charts/rollup-node/README.md @@ -1,6 +1,6 @@ # rollup-node -![Version: 0.0.10](https://img.shields.io/badge/Version-0.0.10-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.11](https://img.shields.io/badge/Version-0.0.11-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 @@ -97,6 +97,7 @@ Kubernetes: `>=1.22.0-0` | resources.limits.memory | string | `"200Mi"` | | | resources.requests.cpu | string | `"50m"` | | | resources.requests.memory | string | `"50Mi"` | | +| scrollConfig | string | `"{}\n"` | | | service.main.enabled | bool | `true` | | | service.main.ports.http.enabled | bool | `true` | | | service.main.ports.http.port | int | `8090` | | diff --git a/charts/rollup-node/configs/.keep b/charts/rollup-node/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/rollup-node/templates/config-file.yaml b/charts/rollup-node/templates/config-file.yaml index 5044d2f1..28dee573 100644 --- a/charts/rollup-node/templates/config-file.yaml +++ b/charts/rollup-node/templates/config-file.yaml @@ -1,10 +1,10 @@ -{{- if .Values.global.isStandalone }} --- apiVersion: v1 kind: ConfigMap metadata: name: rollup-config + labels: + {{- include "scroll-sdk.labels" $ | nindent 4 }} data: -{{ (.Files.Glob "configs/rollup-config.json").AsConfig | indent 2 }} ---- -{{- end }} + rollup-config.json: | +{{ .Values.scrollConfig | indent 4 }} diff --git a/charts/rollup-node/templates/helpers.tpl b/charts/rollup-node/templates/helpers.tpl new file mode 100644 index 00000000..d762ba10 --- /dev/null +++ b/charts/rollup-node/templates/helpers.tpl @@ -0,0 +1,47 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "scroll-sdk.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scroll-sdk.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} +{{/* +Create chart name and build as used by the chart label. +*/}} +{{- define "scroll-sdk.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} +{{/* +Common labels +*/}} +{{- define "scroll-sdk.labels" -}} +helm.sh/chart: {{ include "scroll-sdk.chart" . }} +{{ include "scroll-sdk.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/build: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} +{{/* +Selector labels +*/}} +{{- define "scroll-sdk.selectorLabels" -}} +app.kubernetes.io/name: {{ include "scroll-sdk.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/rollup-node/values.yaml b/charts/rollup-node/values.yaml index ba2e31f9..b554610d 100644 --- a/charts/rollup-node/values.yaml +++ b/charts/rollup-node/values.yaml @@ -55,7 +55,6 @@ probes: startup: enabled: false - persistence: *app_name: enabled: true @@ -152,3 +151,6 @@ serviceMonitor: - port: http interval: 1m scrapeTimeout: 10s + +scrollConfig: | + {} diff --git a/charts/rollup-node/values/production.yaml b/charts/rollup-node/values/production.yaml index f0b523df..3554ba75 100644 --- a/charts/rollup-node/values/production.yaml +++ b/charts/rollup-node/values/production.yaml @@ -1,6 +1,3 @@ -global: - isStandalone: true - initContainers: 1-check-postgres-connection: image: atkrad/wait4x:latest diff --git a/charts/scroll-common/Chart.yaml b/charts/scroll-common/Chart.yaml index c99498aa..c6d690aa 100644 --- a/charts/scroll-common/Chart.yaml +++ b/charts/scroll-common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: scroll helm charts to deploy common scripts and configuration name: scroll-common -version: 0.0.2 +version: 0.0.3 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/scroll-common/README.md b/charts/scroll-common/README.md index e06d8e1f..553ede21 100644 --- a/charts/scroll-common/README.md +++ b/charts/scroll-common/README.md @@ -1,6 +1,6 @@ # scroll-common -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-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 common scripts and configuration @@ -20,5 +20,11 @@ Kubernetes: `>=1.22.0-0` |------------|------|---------| | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| genesisConfig | string | `"{\n \"config\": {\n \"chainId\": 221122,\n \"homesteadBlock\": 0,\n \"eip150Block\": 0,\n \"eip150Hash\": \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n \"eip155Block\": 0,\n \"eip158Block\": 0,\n \"byzantiumBlock\": 0,\n \"constantinopleBlock\": 0,\n \"petersburgBlock\": 0,\n \"istanbulBlock\": 0,\n \"berlinBlock\": 0,\n \"londonBlock\": 0,\n \"archimedesBlock\": 0,\n \"shanghaiBlock\": 0,\n \"bernoulliBlock\": 0,\n \"curieBlock\": 0,\n \"darwinTime\": 0,\n \"darwinV2Time\": 0,\n \"clique\": {\n \"period\": 3,\n \"epoch\": 30000,\n \"relaxed_period\": true\n },\n \"scroll\": {\n \"useZktrie\": true,\n \"maxTxPerBlock\": 100,\n \"maxTxPayloadBytesPerBlock\": 122880,\n \"feeVaultAddress\": \"0x5300000000000000000000000000000000000005\",\n \"l1Config\": {\n \"l1ChainId\": \"111111\",\n \"l1MessageQueueAddress\": \"0xd33Dd9A1E932181711bA2b3455b9E8500A52756c\",\n \"scrollChainAddress\": \"0xEeb02827DB217733b05e4D6275a849D922bec326\",\n \"numL1MessagesPerBlock\": \"10\"\n }\n }\n },\n \"nonce\": \"0x0\",\n \"timestamp\": \"0x0000000000000000000000000000000000000000000000000000000066ed1bab\",\n \"extraData\": \"0x0000000000000000000000000000000000000000000000000000000000000000756EA06BDEe36de11F22DCca45a31d8a178eF3c60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",\n \"gasLimit\": \"10000000\",\n \"difficulty\": \"0x1\",\n \"mixHash\": \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n \"coinbase\": \"0x0000000000000000000000000000000000000000\",\n \"alloc\": {\n \"0x4e59b44847b379578588920ca78fbf26c0b4956c\": {\n \"balance\": \"0x0\",\n \"code\": \"0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3\",\n \"nonce\": \"0x1\",\n \"storage\": {}\n },\n \"0x5300000000000000000000000000000000000000\": {\n \"balance\": \"0x0\",\n \"code\": \"0x608060405234801561000f575f80fd5b5060043610610090575f3560e01c806383cc76601161006357806383cc7660146100f85780638da5cb5b1461010b578063c4d66de81461011e578063d4b9f4fa14610131578063f2fde38b14610139575f80fd5b806326aad7b7146100945780633cb747bf146100b0578063600a2e77146100db578063715018a6146100ee575b5f80fd5b61009d60015481565b6040519081526020015b60405180910390f35b6053546100c3906001600160a01b031681565b6040516001600160a01b0390911681526020016100a7565b61009d6100e9366004610539565b61014c565b6100f66101ef565b005b61009d610106366004610539565b610224565b6052546100c3906001600160a01b031681565b6100f661012c366004610550565b61023a565b61009d5f5481565b6100f6610147366004610550565b6102d2565b6053545f906001600160a01b0316331461019e5760405162461bcd60e51b815260206004820152600e60248201526d37b7363c9036b2b9b9b2b733b2b960911b60448201526064015b60405180910390fd5b5f806101a98461035e565b60408051838152602081018890529294509092507ffaa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693910160405180910390a19392505050565b6052546001600160a01b031633146102195760405162461bcd60e51b81526004016101959061057d565b6102225f610477565b565b602a8160288110610233575f80fd5b0154905081565b6052546001600160a01b031633146102645760405162461bcd60e51b81526004016101959061057d565b600154156102a85760405162461bcd60e51b815260206004820152601160248201527063616e6e6f7420696e697469616c697a6560781b6044820152606401610195565b6102b06104c8565b605380546001600160a01b0319166001600160a01b0392909216919091179055565b6052546001600160a01b031633146102fc5760405162461bcd60e51b81526004016101959061057d565b6001600160a01b0381166103525760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f20616464726573730000006044820152606401610195565b61035b81610477565b50565b6003545f9081906103b15760405162461bcd60e51b815260206004820152601a60248201527f63616c6c206265666f726520696e697469616c697a6174696f6e0000000000006044820152606401610195565b600154835f5b8215610448576103c86002846105c8565b5f036104125781602a82602881106103e2576103e26105b4565b015561040b82600283602881106103fb576103fb6105b4565b01545f9182526020526040902090565b915061043c565b610439602a8260288110610428576104286105b4565b0154835f9182526020526040902090565b91505b600192831c92016103b7565b81602a826028811061045c5761045c6105b4565b0155505f819055600180548082019091559590945092505050565b605280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0905f90a35050565b5f5b60286104d78260016105fb565b101561035b57610508600282602881106104f3576104f36105b4565b0154600283602881106103fb576103fb6105b4565b60026105158360016105fb565b60288110610525576105256105b4565b01558061053181610614565b9150506104ca565b5f60208284031215610549575f80fd5b5035919050565b5f60208284031215610560575f80fd5b81356001600160a01b0381168114610576575f80fd5b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffd5b5f826105e257634e487b7160e01b5f52601260045260245ffd5b500690565b634e487b7160e01b5f52601160045260245ffd5b8082018082111561060e5761060e6105e7565b92915050565b5f60018201610625576106256105e7565b506001019056fea164736f6c6343000818000a\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x0000000000000000000000000000000000000000000000000000000000000052\": \"0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266\"\n }\n },\n \"0x5300000000000000000000000000000000000002\": {\n \"balance\": \"0x0\",\n \"code\": \"0x608060405234801561000f575f80fd5b5060043610610132575f3560e01c8063715018a6116100b4578063a911d77f11610079578063a911d77f1461024c578063bede39b514610254578063de26c4a114610267578063e88a60ad1461027a578063f2fde38b1461028d578063f45e65d8146102a0575f80fd5b8063715018a6146101eb57806384189161146101f35780638da5cb5b146101fc57806393e59dc114610226578063944b247f14610239575f80fd5b80633d0f963e116100fa5780633d0f963e146101a057806349948e0e146101b3578063519b4bd3146101c65780636a5e67e5146101cf57806370465597146101d8575f80fd5b80630c18c1621461013657806313dad5be1461015257806323e524ac1461016f5780633577afc51461017857806339455d3a1461018d575b5f80fd5b61013f60025481565b6040519081526020015b60405180910390f35b60085461015f9060ff1681565b6040519015158152602001610149565b61013f60065481565b61018b6101863660046109b3565b6102a9565b005b61018b61019b3660046109ca565b61033b565b61018b6101ae3660046109ea565b610438565b61013f6101c1366004610a2b565b6104bb565b61013f60015481565b61013f60075481565b61018b6101e63660046109b3565b6104e0565b61018b61056e565b61013f60055481565b5f5461020e906001600160a01b031681565b6040516001600160a01b039091168152602001610149565b60045461020e906001600160a01b031681565b61018b6102473660046109b3565b6105a2565b61018b61062e565b61018b6102623660046109b3565b61068a565b61013f610275366004610a2b565b610747565b61018b6102883660046109b3565b610764565b61018b61029b3660046109ea565b6107f0565b61013f60035481565b5f546001600160a01b031633146102db5760405162461bcd60e51b81526004016102d290610ad6565b60405180910390fd5b621c9c388111156102ff57604051635742c80560e11b815260040160405180910390fd5b60028190556040518181527f32740b35c0ea213650f60d44366b4fb211c9033b50714e4a1d34e65d5beb9bb4906020015b60405180910390a150565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa158015610382573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103a69190610b0d565b6103c3576040516326b3506d60e11b815260040160405180910390fd5b600182905560058190556040518281527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c449060200160405180910390a16040518181527f9a14bfb5d18c4c3cf14cae19c23d7cf1bcede357ea40ca1f75cd49542c71c214906020015b60405180910390a15050565b5f546001600160a01b031633146104615760405162461bcd60e51b81526004016102d290610ad6565b600480546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f22d1c35fe072d2e42c3c8f9bd4a0d34aa84a0101d020a62517b33fdb3174e5f7910161042c565b6008545f9060ff16156104d7576104d18261087b565b92915050565b6104d1826108c1565b5f546001600160a01b031633146105095760405162461bcd60e51b81526004016102d290610ad6565b610519633b9aca006103e8610b40565b81111561053957604051631e44fdeb60e11b815260040160405180910390fd5b60038190556040518181527f3336cd9708eaf2769a0f0dc0679f30e80f15dcd88d1921b5a16858e8b85c591a90602001610330565b5f546001600160a01b031633146105975760405162461bcd60e51b81526004016102d290610ad6565b6105a05f610904565b565b5f546001600160a01b031633146105cb5760405162461bcd60e51b81526004016102d290610ad6565b6105d9633b9aca0080610b40565b8111156105f95760405163874f603160e01b815260040160405180910390fd5b60068190556040518181527f2ab3f5a4ebbcbf3c24f62f5454f52f10e1a8c9dcc5acac8f19199ce881a6a10890602001610330565b5f546001600160a01b031633146106575760405162461bcd60e51b81526004016102d290610ad6565b60085460ff161561067b576040516379f9c57560e01b815260040160405180910390fd5b6008805460ff19166001179055565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa1580156106d1573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106f59190610b0d565b610712576040516326b3506d60e11b815260040160405180910390fd5b60018190556040518181527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c4490602001610330565b6008545f9060ff161561075b57505f919050565b6104d182610953565b5f546001600160a01b0316331461078d5760405162461bcd60e51b81526004016102d290610ad6565b61079b633b9aca0080610b40565b8111156107bb5760405163f37ec21560e01b815260040160405180910390fd5b60078190556040518181527f6b332a036d8c3ead57dcb06c87243bd7a2aed015ddf2d0528c2501dae56331aa90602001610330565b5f546001600160a01b031633146108195760405162461bcd60e51b81526004016102d290610ad6565b6001600160a01b03811661086f5760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102d2565b61087881610904565b50565b5f633b9aca0060055483516007546108939190610b40565b61089d9190610b40565b6001546006546108ad9190610b40565b6108b79190610b57565b6104d19190610b6a565b5f806108cc83610953565b90505f600154826108dd9190610b40565b9050633b9aca00600354826108f29190610b40565b6108fc9190610b6a565b949350505050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80515f908190815b818110156109a45784818151811061097557610975610b89565b01602001516001600160f81b0319165f036109955760048301925061099c565b6010830192505b60010161095b565b50506002540160400192915050565b5f602082840312156109c3575f80fd5b5035919050565b5f80604083850312156109db575f80fd5b50508035926020909101359150565b5f602082840312156109fa575f80fd5b81356001600160a01b0381168114610a10575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610a3b575f80fd5b813567ffffffffffffffff80821115610a52575f80fd5b818401915084601f830112610a65575f80fd5b813581811115610a7757610a77610a17565b604051601f8201601f19908116603f01168101908382118183101715610a9f57610a9f610a17565b81604052828152876020848701011115610ab7575f80fd5b826020860160208301375f928101602001929092525095945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b5f60208284031215610b1d575f80fd5b81518015158114610a10575f80fd5b634e487b7160e01b5f52601160045260245ffd5b80820281158282048414176104d1576104d1610b2c565b808201808211156104d1576104d1610b2c565b5f82610b8457634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x0000000000000000000000000000000000000000000000000000000000000000\": \"0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266\",\n \"0x0000000000000000000000000000000000000000000000000000000000000008\": \"0x0000000000000000000000000000000000000000000000000000000000000001\"\n }\n },\n \"0x5300000000000000000000000000000000000003\": {\n \"balance\": \"0x0\",\n \"code\": \"0x608060405234801561000f575f80fd5b5060043610610055575f3560e01c8063715018a61461005957806379586dd7146100635780638da5cb5b14610076578063efc78401146100a5578063f2fde38b146100e0575b5f80fd5b6100616100f3565b005b61006161007136600461033a565b610130565b5f54610088906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6100d06100b336600461040c565b6001600160a01b03165f9081526001602052604090205460ff1690565b604051901515815260200161009c565b6100616100ee36600461040c565b610222565b5f546001600160a01b031633146101255760405162461bcd60e51b815260040161011c9061042c565b60405180910390fd5b61012e5f6102ad565b565b5f546001600160a01b031633146101595760405162461bcd60e51b815260040161011c9061042c565b5f5b825181101561021d578160015f85848151811061017a5761017a610463565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f205f6101000a81548160ff0219169083151502179055508281815181106101c9576101c9610463565b60200260200101516001600160a01b03167f8daaf060c3306c38e068a75c054bf96ecd85a3db1252712c4d93632744c42e0d8360405161020d911515815260200190565b60405180910390a260010161015b565b505050565b5f546001600160a01b0316331461024b5760405162461bcd60e51b815260040161011c9061042c565b6001600160a01b0381166102a15760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161011c565b6102aa816102ad565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b634e487b7160e01b5f52604160045260245ffd5b80356001600160a01b0381168114610326575f80fd5b919050565b80358015158114610326575f80fd5b5f806040838503121561034b575f80fd5b823567ffffffffffffffff80821115610362575f80fd5b818501915085601f830112610375575f80fd5b8135602082821115610389576103896102fc565b8160051b604051601f19603f830116810181811086821117156103ae576103ae6102fc565b6040529283528183019350848101820192898411156103cb575f80fd5b948201945b838610156103f0576103e186610310565b855294820194938201936103d0565b96506103ff905087820161032b565b9450505050509250929050565b5f6020828403121561041c575f80fd5b61042582610310565b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x0000000000000000000000000000000000000000000000000000000000000000\": \"0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266\"\n }\n },\n \"0x5300000000000000000000000000000000000004\": {\n \"balance\": \"0x0\",\n \"code\": \"0x6080604052600436106100fd575f3560e01c806370a0823111610092578063a457c2d711610062578063a457c2d7146102a1578063a9059cbb146102c0578063d0e30db0146102df578063d505accf146102e7578063dd62ed3e14610306575f80fd5b806370a08231146102135780637ecebe001461024757806384b0196e1461026657806395d89b411461028d575f80fd5b80632e1a7d4d116100cd5780632e1a7d4d146101a6578063313ce567146101c55780633644e515146101e057806339509351146101f4575f80fd5b806306fdde0314610110578063095ea7b31461013a57806318160ddd1461016957806323b872dd14610187575f80fd5b3661010c5761010a610325565b005b5f80fd5b34801561011b575f80fd5b50610124610376565b6040516101319190611241565b60405180910390f35b348015610145575f80fd5b50610159610154366004611275565b610406565b6040519015158152602001610131565b348015610174575f80fd5b506002545b604051908152602001610131565b348015610192575f80fd5b506101596101a136600461129d565b61041f565b3480156101b1575f80fd5b5061010a6101c03660046112d6565b610442565b3480156101d0575f80fd5b5060405160128152602001610131565b3480156101eb575f80fd5b5061017961052f565b3480156101ff575f80fd5b5061015961020e366004611275565b61053d565b34801561021e575f80fd5b5061017961022d3660046112ed565b6001600160a01b03165f9081526020819052604090205490565b348015610252575f80fd5b506101796102613660046112ed565b61055e565b348015610271575f80fd5b5061027a61057b565b6040516101319796959493929190611306565b348015610298575f80fd5b50610124610602565b3480156102ac575f80fd5b506101596102bb366004611275565b610611565b3480156102cb575f80fd5b506101596102da366004611275565b61068b565b61010a610325565b3480156102f2575f80fd5b5061010a61030136600461139d565b610698565b348015610311575f80fd5b5061017961032036600461140a565b6107f9565b336103308134610823565b806001600160a01b03167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c3460405161036b91815260200190565b60405180910390a250565b6060600380546103859061143b565b80601f01602080910402602001604051908101604052809291908181526020018280546103b19061143b565b80156103fc5780601f106103d3576101008083540402835291602001916103fc565b820191905f5260205f20905b8154815290600101906020018083116103df57829003601f168201915b5050505050905090565b5f336104138185856108e0565b60019150505b92915050565b5f3361042c858285610a04565b610437858585610a7c565b506001949350505050565b3361044d8183610c1e565b5f816001600160a01b0316836040515f6040518083038185875af1925050503d805f8114610496576040519150601f19603f3d011682016040523d82523d5f602084013e61049b565b606091505b50509050806104e75760405162461bcd60e51b81526020600482015260136024820152721dda5d1a191c985dc81155120819985a5b1959606a1b60448201526064015b60405180910390fd5b816001600160a01b03167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b658460405161052291815260200190565b60405180910390a2505050565b5f610538610d46565b905090565b5f3361041381858561054f83836107f9565b610559919061146d565b6108e0565b6001600160a01b0381165f90815260076020526040812054610419565b5f606080828080836105ae7f577261707065642045746865720000000000000000000000000000000000000d6005610e6f565b6105d97f31000000000000000000000000000000000000000000000000000000000000016006610e6f565b604080515f80825260208201909252600f60f81b9b939a50919850469750309650945092509050565b6060600480546103859061143b565b5f338161061e82866107f9565b90508381101561067e5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016104de565b61043782868684036108e0565b5f33610413818585610a7c565b834211156106e85760405162461bcd60e51b815260206004820152601d60248201527f45524332305065726d69743a206578706972656420646561646c696e6500000060448201526064016104de565b5f7f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98888886107168c610f18565b6040805160208101969096526001600160a01b0394851690860152929091166060840152608083015260a082015260c0810186905260e0016040516020818303038152906040528051906020012090505f61077082610f3f565b90505f61077f82878787610f6b565b9050896001600160a01b0316816001600160a01b0316146107e25760405162461bcd60e51b815260206004820152601e60248201527f45524332305065726d69743a20696e76616c6964207369676e6174757265000060448201526064016104de565b6107ed8a8a8a6108e0565b50505050505050505050565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b6001600160a01b0382166108795760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016104de565b8060025f82825461088a919061146d565b90915550506001600160a01b0382165f81815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0383166109425760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016104de565b6001600160a01b0382166109a35760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016104de565b6001600160a01b038381165f8181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b5f610a0f84846107f9565b90505f198114610a765781811015610a695760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016104de565b610a7684848484036108e0565b50505050565b6001600160a01b038316610ae05760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016104de565b6001600160a01b038216610b425760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016104de565b6001600160a01b0383165f9081526020819052604090205481811015610bb95760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016104de565b6001600160a01b038481165f81815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a76565b6001600160a01b038216610c7e5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016104de565b6001600160a01b0382165f9081526020819052604090205481811015610cf15760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016104de565b6001600160a01b0383165f818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef91016109f7565b5f306001600160a01b037f000000000000000000000000d85bdcdae4db1faeb8ef93331525fe68d7c8b3f016148015610d9e57507f0000000000000000000000000000000000000000000000000000000000007a6946145b15610dc857507fd2c591c2db8e7edcffc464f7eae06c0096c77bc8d4606e23c50b9f18fcee6e5290565b610538604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60208201527f00cd3d46df44f2cbb950cf84eb2e92aa2ddd23195b1a009173ea59a063357ed3918101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a08201525f9060c00160405160208183030381529060405280519060200120905090565b606060ff8314610e8957610e8283610f91565b9050610419565b818054610e959061143b565b80601f0160208091040260200160405190810160405280929190818152602001828054610ec19061143b565b8015610f0c5780601f10610ee357610100808354040283529160200191610f0c565b820191905f5260205f20905b815481529060010190602001808311610eef57829003601f168201915b50505050509050610419565b6001600160a01b0381165f9081526007602052604090208054600181018255905b50919050565b5f610419610f4b610d46565b8360405161190160f01b8152600281019290925260228201526042902090565b5f805f610f7a87878787610fce565b91509150610f878161108b565b5095945050505050565b60605f610f9d836111d7565b6040805160208082528183019092529192505f91906020820181803683375050509182525060208101929092525090565b5f807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a083111561100357505f90506003611082565b604080515f8082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015611054573d5f803e3d5ffd5b5050604051601f1901519150506001600160a01b03811661107c575f60019250925050611082565b91505f90505b94509492505050565b5f81600481111561109e5761109e61148c565b036110a65750565b60018160048111156110ba576110ba61148c565b036111075760405162461bcd60e51b815260206004820152601860248201527f45434453413a20696e76616c6964207369676e6174757265000000000000000060448201526064016104de565b600281600481111561111b5761111b61148c565b036111685760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e6774680060448201526064016104de565b600381600481111561117c5761117c61148c565b036111d45760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b60648201526084016104de565b50565b5f60ff8216601f81111561041957604051632cd44ac360e21b815260040160405180910390fd5b5f81518084525f5b8181101561122257602081850181015186830182015201611206565b505f602082860101526020601f19601f83011685010191505092915050565b602081525f61125360208301846111fe565b9392505050565b80356001600160a01b0381168114611270575f80fd5b919050565b5f8060408385031215611286575f80fd5b61128f8361125a565b946020939093013593505050565b5f805f606084860312156112af575f80fd5b6112b88461125a565b92506112c66020850161125a565b9150604084013590509250925092565b5f602082840312156112e6575f80fd5b5035919050565b5f602082840312156112fd575f80fd5b6112538261125a565b60ff60f81b881681525f602060e0602084015261132660e084018a6111fe565b8381036040850152611338818a6111fe565b606085018990526001600160a01b038816608086015260a0850187905284810360c0860152855180825260208088019350909101905f5b8181101561138b5783518352928401929184019160010161136f565b50909c9b505050505050505050505050565b5f805f805f805f60e0888a0312156113b3575f80fd5b6113bc8861125a565b96506113ca6020890161125a565b95506040880135945060608801359350608088013560ff811681146113ed575f80fd5b9699959850939692959460a0840135945060c09093013592915050565b5f806040838503121561141b575f80fd5b6114248361125a565b91506114326020840161125a565b90509250929050565b600181811c9082168061144f57607f821691505b602082108103610f3957634e487b7160e01b5f52602260045260245ffd5b8082018082111561041957634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52602160045260245ffdfea164736f6c6343000818000a\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x0000000000000000000000000000000000000000000000000000000000000003\": \"0x577261707065642045746865720000000000000000000000000000000000001a\",\n \"0x0000000000000000000000000000000000000000000000000000000000000004\": \"0x5745544800000000000000000000000000000000000000000000000000000008\"\n }\n },\n \"0x5300000000000000000000000000000000000005\": {\n \"balance\": \"0x0\",\n \"code\": \"0x6080604052600436106100a8575f3560e01c806384411d651161006257806384411d651461017a5780638da5cb5b1461018f5780639e7adc79146101ad578063f2fde38b146101cc578063feec756c146101eb578063ff4f35461461020a575f80fd5b80632e1a7d4d146100b35780633cb747bf146100d45780633ccfd60b14610110578063457e1a491461012457806366d003ac14610147578063715018a614610166575f80fd5b366100af57005b5f80fd5b3480156100be575f80fd5b506100d26100cd366004610663565b610229565b005b3480156100df575f80fd5b506002546100f3906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b34801561011b575f80fd5b506100d26103e9565b34801561012f575f80fd5b5061013960015481565b604051908152602001610107565b348015610152575f80fd5b506003546100f3906001600160a01b031681565b348015610171575f80fd5b506100d26103f6565b348015610185575f80fd5b5061013960045481565b34801561019a575f80fd5b505f546100f3906001600160a01b031681565b3480156101b8575f80fd5b506100d26101c736600461067a565b61042a565b3480156101d7575f80fd5b506100d26101e636600461067a565b6104a4565b3480156101f6575f80fd5b506100d261020536600461067a565b61052c565b348015610215575f80fd5b506100d2610224366004610663565b6105a6565b6001548110156102b95760405162461bcd60e51b815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d20776974686472616064820152691dd85b08185b5bdd5b9d60b21b608482015260a4015b60405180910390fd5b478082111561031d5760405162461bcd60e51b815260206004820152602a60248201527f4665655661756c743a20696e73756666696369656e742062616c616e636520746044820152696f20776974686472617760b01b60648201526084016102b0565b6004805483019055600354604080518481526001600160a01b0390921660208301523382820152517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1600254600354604080516020810182525f808252915163b2267a7b60e01b81526001600160a01b039485169463b2267a7b9488946103b79491909216928592906004016106a7565b5f604051808303818588803b1580156103ce575f80fd5b505af11580156103e0573d5f803e3d5ffd5b50505050505050565b476103f381610229565b50565b5f546001600160a01b0316331461041f5760405162461bcd60e51b81526004016102b090610711565b6104285f610614565b565b5f546001600160a01b031633146104535760405162461bcd60e51b81526004016102b090610711565b600280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f1c928c417a10a21c3cddad148c5dba5d710e4b1442d6d8a36de345935ad84612905f90a35050565b5f546001600160a01b031633146104cd5760405162461bcd60e51b81526004016102b090610711565b6001600160a01b0381166105235760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102b0565b6103f381610614565b5f546001600160a01b031633146105555760405162461bcd60e51b81526004016102b090610711565b600380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f7e1e96961a397c8aa26162fe259cc837afc95e33aad4945ddc61c18dabb7a6ad905f90a35050565b5f546001600160a01b031633146105cf5760405162461bcd60e51b81526004016102b090610711565b600180549082905560408051828152602081018490527f0d3c80219fe57713b9f9c83d1e51426792d0c14d8e330e65b102571816140965910160405180910390a15050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f60208284031215610673575f80fd5b5035919050565b5f6020828403121561068a575f80fd5b81356001600160a01b03811681146106a0575f80fd5b9392505050565b60018060a01b03851681525f60208560208401526080604084015284518060808501525f5b818110156106e85786810183015185820160a0015282016106cc565b505f60a0828601015260a0601f19601f8301168501019250505082606083015295945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e657200000000000000000060408201526060019056fea164736f6c6343000818000a\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x0000000000000000000000000000000000000000000000000000000000000000\": \"0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266\",\n \"0x0000000000000000000000000000000000000000000000000000000000000001\": \"0x0000000000000000000000000000000000000000000000000de0b6b3a7640000\",\n \"0x0000000000000000000000000000000000000000000000000000000000000002\": \"0x000000000000000000000000d7d858a4960f962e5f5f2ef62349bf83e54bea01\",\n \"0x0000000000000000000000000000000000000000000000000000000000000003\": \"0x0000000000000000000000000000000000000000000000000000000000000001\"\n }\n },\n \"0xd7d858a4960f962e5f5f2ef62349bf83e54bea01\": {\n \"balance\": \"0x7ffffffffffffffffffffffffffffffffffffffffffffff21f494c589c0000\",\n \"code\": \"0x\",\n \"nonce\": \"0x0\",\n \"storage\": {\n \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\": \"0x0000000000000000000000000000000000000000000000000000000000000000\"\n }\n },\n \"0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266\": {\n \"balance\": \"0xde0b6b3a7640000\",\n \"code\": \"0x\",\n \"nonce\": \"0x0\",\n \"storage\": {}\n }\n },\n \"number\": \"0x0\",\n \"gasUsed\": \"0x0\",\n \"parentHash\": \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n \"baseFeePerGas\": null\n}\n"` | | + ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/scroll-common/configs/.keep b/charts/scroll-common/configs/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/scroll-common/templates/genesis.conf.yaml b/charts/scroll-common/templates/genesis.conf.yaml index 9da8a66e..c7cae01f 100644 --- a/charts/scroll-common/templates/genesis.conf.yaml +++ b/charts/scroll-common/templates/genesis.conf.yaml @@ -5,4 +5,5 @@ metadata: {{- include "scroll-common.labels" $ | nindent 4 }} name: genesis-config data: -{{ (.Files.Glob "configs/genesis.json").AsConfig | indent 2 }} + genesis.json: | +{{ .Values.genesisConfig | indent 4 }} diff --git a/charts/scroll-common/values.yaml b/charts/scroll-common/values.yaml index e69de29b..ac6aeff6 100644 --- a/charts/scroll-common/values.yaml +++ b/charts/scroll-common/values.yaml @@ -0,0 +1,118 @@ +genesisConfig: | + { + "config": { + "chainId": 221122, + "homesteadBlock": 0, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "archimedesBlock": 0, + "shanghaiBlock": 0, + "bernoulliBlock": 0, + "curieBlock": 0, + "darwinTime": 0, + "darwinV2Time": 0, + "clique": { + "period": 3, + "epoch": 30000, + "relaxed_period": true + }, + "scroll": { + "useZktrie": true, + "maxTxPerBlock": 100, + "maxTxPayloadBytesPerBlock": 122880, + "feeVaultAddress": "0x5300000000000000000000000000000000000005", + "l1Config": { + "l1ChainId": "111111", + "l1MessageQueueAddress": "0xd33Dd9A1E932181711bA2b3455b9E8500A52756c", + "scrollChainAddress": "0xEeb02827DB217733b05e4D6275a849D922bec326", + "numL1MessagesPerBlock": "10" + } + } + }, + "nonce": "0x0", + "timestamp": "0x0000000000000000000000000000000000000000000000000000000066ed1bab", + "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000756EA06BDEe36de11F22DCca45a31d8a178eF3c60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "gasLimit": "10000000", + "difficulty": "0x1", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "coinbase": "0x0000000000000000000000000000000000000000", + "alloc": { + "0x4e59b44847b379578588920ca78fbf26c0b4956c": { + "balance": "0x0", + "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3", + "nonce": "0x1", + "storage": {} + }, + "0x5300000000000000000000000000000000000000": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610090575f3560e01c806383cc76601161006357806383cc7660146100f85780638da5cb5b1461010b578063c4d66de81461011e578063d4b9f4fa14610131578063f2fde38b14610139575f80fd5b806326aad7b7146100945780633cb747bf146100b0578063600a2e77146100db578063715018a6146100ee575b5f80fd5b61009d60015481565b6040519081526020015b60405180910390f35b6053546100c3906001600160a01b031681565b6040516001600160a01b0390911681526020016100a7565b61009d6100e9366004610539565b61014c565b6100f66101ef565b005b61009d610106366004610539565b610224565b6052546100c3906001600160a01b031681565b6100f661012c366004610550565b61023a565b61009d5f5481565b6100f6610147366004610550565b6102d2565b6053545f906001600160a01b0316331461019e5760405162461bcd60e51b815260206004820152600e60248201526d37b7363c9036b2b9b9b2b733b2b960911b60448201526064015b60405180910390fd5b5f806101a98461035e565b60408051838152602081018890529294509092507ffaa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693910160405180910390a19392505050565b6052546001600160a01b031633146102195760405162461bcd60e51b81526004016101959061057d565b6102225f610477565b565b602a8160288110610233575f80fd5b0154905081565b6052546001600160a01b031633146102645760405162461bcd60e51b81526004016101959061057d565b600154156102a85760405162461bcd60e51b815260206004820152601160248201527063616e6e6f7420696e697469616c697a6560781b6044820152606401610195565b6102b06104c8565b605380546001600160a01b0319166001600160a01b0392909216919091179055565b6052546001600160a01b031633146102fc5760405162461bcd60e51b81526004016101959061057d565b6001600160a01b0381166103525760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f20616464726573730000006044820152606401610195565b61035b81610477565b50565b6003545f9081906103b15760405162461bcd60e51b815260206004820152601a60248201527f63616c6c206265666f726520696e697469616c697a6174696f6e0000000000006044820152606401610195565b600154835f5b8215610448576103c86002846105c8565b5f036104125781602a82602881106103e2576103e26105b4565b015561040b82600283602881106103fb576103fb6105b4565b01545f9182526020526040902090565b915061043c565b610439602a8260288110610428576104286105b4565b0154835f9182526020526040902090565b91505b600192831c92016103b7565b81602a826028811061045c5761045c6105b4565b0155505f819055600180548082019091559590945092505050565b605280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0905f90a35050565b5f5b60286104d78260016105fb565b101561035b57610508600282602881106104f3576104f36105b4565b0154600283602881106103fb576103fb6105b4565b60026105158360016105fb565b60288110610525576105256105b4565b01558061053181610614565b9150506104ca565b5f60208284031215610549575f80fd5b5035919050565b5f60208284031215610560575f80fd5b81356001600160a01b0381168114610576575f80fd5b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffd5b5f826105e257634e487b7160e01b5f52601260045260245ffd5b500690565b634e487b7160e01b5f52601160045260245ffd5b8082018082111561060e5761060e6105e7565b92915050565b5f60018201610625576106256105e7565b506001019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000052": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000002": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610132575f3560e01c8063715018a6116100b4578063a911d77f11610079578063a911d77f1461024c578063bede39b514610254578063de26c4a114610267578063e88a60ad1461027a578063f2fde38b1461028d578063f45e65d8146102a0575f80fd5b8063715018a6146101eb57806384189161146101f35780638da5cb5b146101fc57806393e59dc114610226578063944b247f14610239575f80fd5b80633d0f963e116100fa5780633d0f963e146101a057806349948e0e146101b3578063519b4bd3146101c65780636a5e67e5146101cf57806370465597146101d8575f80fd5b80630c18c1621461013657806313dad5be1461015257806323e524ac1461016f5780633577afc51461017857806339455d3a1461018d575b5f80fd5b61013f60025481565b6040519081526020015b60405180910390f35b60085461015f9060ff1681565b6040519015158152602001610149565b61013f60065481565b61018b6101863660046109b3565b6102a9565b005b61018b61019b3660046109ca565b61033b565b61018b6101ae3660046109ea565b610438565b61013f6101c1366004610a2b565b6104bb565b61013f60015481565b61013f60075481565b61018b6101e63660046109b3565b6104e0565b61018b61056e565b61013f60055481565b5f5461020e906001600160a01b031681565b6040516001600160a01b039091168152602001610149565b60045461020e906001600160a01b031681565b61018b6102473660046109b3565b6105a2565b61018b61062e565b61018b6102623660046109b3565b61068a565b61013f610275366004610a2b565b610747565b61018b6102883660046109b3565b610764565b61018b61029b3660046109ea565b6107f0565b61013f60035481565b5f546001600160a01b031633146102db5760405162461bcd60e51b81526004016102d290610ad6565b60405180910390fd5b621c9c388111156102ff57604051635742c80560e11b815260040160405180910390fd5b60028190556040518181527f32740b35c0ea213650f60d44366b4fb211c9033b50714e4a1d34e65d5beb9bb4906020015b60405180910390a150565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa158015610382573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103a69190610b0d565b6103c3576040516326b3506d60e11b815260040160405180910390fd5b600182905560058190556040518281527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c449060200160405180910390a16040518181527f9a14bfb5d18c4c3cf14cae19c23d7cf1bcede357ea40ca1f75cd49542c71c214906020015b60405180910390a15050565b5f546001600160a01b031633146104615760405162461bcd60e51b81526004016102d290610ad6565b600480546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f22d1c35fe072d2e42c3c8f9bd4a0d34aa84a0101d020a62517b33fdb3174e5f7910161042c565b6008545f9060ff16156104d7576104d18261087b565b92915050565b6104d1826108c1565b5f546001600160a01b031633146105095760405162461bcd60e51b81526004016102d290610ad6565b610519633b9aca006103e8610b40565b81111561053957604051631e44fdeb60e11b815260040160405180910390fd5b60038190556040518181527f3336cd9708eaf2769a0f0dc0679f30e80f15dcd88d1921b5a16858e8b85c591a90602001610330565b5f546001600160a01b031633146105975760405162461bcd60e51b81526004016102d290610ad6565b6105a05f610904565b565b5f546001600160a01b031633146105cb5760405162461bcd60e51b81526004016102d290610ad6565b6105d9633b9aca0080610b40565b8111156105f95760405163874f603160e01b815260040160405180910390fd5b60068190556040518181527f2ab3f5a4ebbcbf3c24f62f5454f52f10e1a8c9dcc5acac8f19199ce881a6a10890602001610330565b5f546001600160a01b031633146106575760405162461bcd60e51b81526004016102d290610ad6565b60085460ff161561067b576040516379f9c57560e01b815260040160405180910390fd5b6008805460ff19166001179055565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa1580156106d1573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106f59190610b0d565b610712576040516326b3506d60e11b815260040160405180910390fd5b60018190556040518181527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c4490602001610330565b6008545f9060ff161561075b57505f919050565b6104d182610953565b5f546001600160a01b0316331461078d5760405162461bcd60e51b81526004016102d290610ad6565b61079b633b9aca0080610b40565b8111156107bb5760405163f37ec21560e01b815260040160405180910390fd5b60078190556040518181527f6b332a036d8c3ead57dcb06c87243bd7a2aed015ddf2d0528c2501dae56331aa90602001610330565b5f546001600160a01b031633146108195760405162461bcd60e51b81526004016102d290610ad6565b6001600160a01b03811661086f5760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102d2565b61087881610904565b50565b5f633b9aca0060055483516007546108939190610b40565b61089d9190610b40565b6001546006546108ad9190610b40565b6108b79190610b57565b6104d19190610b6a565b5f806108cc83610953565b90505f600154826108dd9190610b40565b9050633b9aca00600354826108f29190610b40565b6108fc9190610b6a565b949350505050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80515f908190815b818110156109a45784818151811061097557610975610b89565b01602001516001600160f81b0319165f036109955760048301925061099c565b6010830192505b60010161095b565b50506002540160400192915050565b5f602082840312156109c3575f80fd5b5035919050565b5f80604083850312156109db575f80fd5b50508035926020909101359150565b5f602082840312156109fa575f80fd5b81356001600160a01b0381168114610a10575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610a3b575f80fd5b813567ffffffffffffffff80821115610a52575f80fd5b818401915084601f830112610a65575f80fd5b813581811115610a7757610a77610a17565b604051601f8201601f19908116603f01168101908382118183101715610a9f57610a9f610a17565b81604052828152876020848701011115610ab7575f80fd5b826020860160208301375f928101602001929092525095945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b5f60208284031215610b1d575f80fd5b81518015158114610a10575f80fd5b634e487b7160e01b5f52601160045260245ffd5b80820281158282048414176104d1576104d1610b2c565b808201808211156104d1576104d1610b2c565b5f82610b8457634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000001" + } + }, + "0x5300000000000000000000000000000000000003": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610055575f3560e01c8063715018a61461005957806379586dd7146100635780638da5cb5b14610076578063efc78401146100a5578063f2fde38b146100e0575b5f80fd5b6100616100f3565b005b61006161007136600461033a565b610130565b5f54610088906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6100d06100b336600461040c565b6001600160a01b03165f9081526001602052604090205460ff1690565b604051901515815260200161009c565b6100616100ee36600461040c565b610222565b5f546001600160a01b031633146101255760405162461bcd60e51b815260040161011c9061042c565b60405180910390fd5b61012e5f6102ad565b565b5f546001600160a01b031633146101595760405162461bcd60e51b815260040161011c9061042c565b5f5b825181101561021d578160015f85848151811061017a5761017a610463565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f205f6101000a81548160ff0219169083151502179055508281815181106101c9576101c9610463565b60200260200101516001600160a01b03167f8daaf060c3306c38e068a75c054bf96ecd85a3db1252712c4d93632744c42e0d8360405161020d911515815260200190565b60405180910390a260010161015b565b505050565b5f546001600160a01b0316331461024b5760405162461bcd60e51b815260040161011c9061042c565b6001600160a01b0381166102a15760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161011c565b6102aa816102ad565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b634e487b7160e01b5f52604160045260245ffd5b80356001600160a01b0381168114610326575f80fd5b919050565b80358015158114610326575f80fd5b5f806040838503121561034b575f80fd5b823567ffffffffffffffff80821115610362575f80fd5b818501915085601f830112610375575f80fd5b8135602082821115610389576103896102fc565b8160051b604051601f19603f830116810181811086821117156103ae576103ae6102fc565b6040529283528183019350848101820192898411156103cb575f80fd5b948201945b838610156103f0576103e186610310565b855294820194938201936103d0565b96506103ff905087820161032b565b9450505050509250929050565b5f6020828403121561041c575f80fd5b61042582610310565b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000004": { + "balance": "0x0", + "code": "0x6080604052600436106100fd575f3560e01c806370a0823111610092578063a457c2d711610062578063a457c2d7146102a1578063a9059cbb146102c0578063d0e30db0146102df578063d505accf146102e7578063dd62ed3e14610306575f80fd5b806370a08231146102135780637ecebe001461024757806384b0196e1461026657806395d89b411461028d575f80fd5b80632e1a7d4d116100cd5780632e1a7d4d146101a6578063313ce567146101c55780633644e515146101e057806339509351146101f4575f80fd5b806306fdde0314610110578063095ea7b31461013a57806318160ddd1461016957806323b872dd14610187575f80fd5b3661010c5761010a610325565b005b5f80fd5b34801561011b575f80fd5b50610124610376565b6040516101319190611241565b60405180910390f35b348015610145575f80fd5b50610159610154366004611275565b610406565b6040519015158152602001610131565b348015610174575f80fd5b506002545b604051908152602001610131565b348015610192575f80fd5b506101596101a136600461129d565b61041f565b3480156101b1575f80fd5b5061010a6101c03660046112d6565b610442565b3480156101d0575f80fd5b5060405160128152602001610131565b3480156101eb575f80fd5b5061017961052f565b3480156101ff575f80fd5b5061015961020e366004611275565b61053d565b34801561021e575f80fd5b5061017961022d3660046112ed565b6001600160a01b03165f9081526020819052604090205490565b348015610252575f80fd5b506101796102613660046112ed565b61055e565b348015610271575f80fd5b5061027a61057b565b6040516101319796959493929190611306565b348015610298575f80fd5b50610124610602565b3480156102ac575f80fd5b506101596102bb366004611275565b610611565b3480156102cb575f80fd5b506101596102da366004611275565b61068b565b61010a610325565b3480156102f2575f80fd5b5061010a61030136600461139d565b610698565b348015610311575f80fd5b5061017961032036600461140a565b6107f9565b336103308134610823565b806001600160a01b03167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c3460405161036b91815260200190565b60405180910390a250565b6060600380546103859061143b565b80601f01602080910402602001604051908101604052809291908181526020018280546103b19061143b565b80156103fc5780601f106103d3576101008083540402835291602001916103fc565b820191905f5260205f20905b8154815290600101906020018083116103df57829003601f168201915b5050505050905090565b5f336104138185856108e0565b60019150505b92915050565b5f3361042c858285610a04565b610437858585610a7c565b506001949350505050565b3361044d8183610c1e565b5f816001600160a01b0316836040515f6040518083038185875af1925050503d805f8114610496576040519150601f19603f3d011682016040523d82523d5f602084013e61049b565b606091505b50509050806104e75760405162461bcd60e51b81526020600482015260136024820152721dda5d1a191c985dc81155120819985a5b1959606a1b60448201526064015b60405180910390fd5b816001600160a01b03167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b658460405161052291815260200190565b60405180910390a2505050565b5f610538610d46565b905090565b5f3361041381858561054f83836107f9565b610559919061146d565b6108e0565b6001600160a01b0381165f90815260076020526040812054610419565b5f606080828080836105ae7f577261707065642045746865720000000000000000000000000000000000000d6005610e6f565b6105d97f31000000000000000000000000000000000000000000000000000000000000016006610e6f565b604080515f80825260208201909252600f60f81b9b939a50919850469750309650945092509050565b6060600480546103859061143b565b5f338161061e82866107f9565b90508381101561067e5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016104de565b61043782868684036108e0565b5f33610413818585610a7c565b834211156106e85760405162461bcd60e51b815260206004820152601d60248201527f45524332305065726d69743a206578706972656420646561646c696e6500000060448201526064016104de565b5f7f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98888886107168c610f18565b6040805160208101969096526001600160a01b0394851690860152929091166060840152608083015260a082015260c0810186905260e0016040516020818303038152906040528051906020012090505f61077082610f3f565b90505f61077f82878787610f6b565b9050896001600160a01b0316816001600160a01b0316146107e25760405162461bcd60e51b815260206004820152601e60248201527f45524332305065726d69743a20696e76616c6964207369676e6174757265000060448201526064016104de565b6107ed8a8a8a6108e0565b50505050505050505050565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b6001600160a01b0382166108795760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016104de565b8060025f82825461088a919061146d565b90915550506001600160a01b0382165f81815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0383166109425760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016104de565b6001600160a01b0382166109a35760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016104de565b6001600160a01b038381165f8181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b5f610a0f84846107f9565b90505f198114610a765781811015610a695760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016104de565b610a7684848484036108e0565b50505050565b6001600160a01b038316610ae05760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016104de565b6001600160a01b038216610b425760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016104de565b6001600160a01b0383165f9081526020819052604090205481811015610bb95760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016104de565b6001600160a01b038481165f81815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a76565b6001600160a01b038216610c7e5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016104de565b6001600160a01b0382165f9081526020819052604090205481811015610cf15760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016104de565b6001600160a01b0383165f818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef91016109f7565b5f306001600160a01b037f000000000000000000000000d85bdcdae4db1faeb8ef93331525fe68d7c8b3f016148015610d9e57507f0000000000000000000000000000000000000000000000000000000000007a6946145b15610dc857507fd2c591c2db8e7edcffc464f7eae06c0096c77bc8d4606e23c50b9f18fcee6e5290565b610538604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60208201527f00cd3d46df44f2cbb950cf84eb2e92aa2ddd23195b1a009173ea59a063357ed3918101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a08201525f9060c00160405160208183030381529060405280519060200120905090565b606060ff8314610e8957610e8283610f91565b9050610419565b818054610e959061143b565b80601f0160208091040260200160405190810160405280929190818152602001828054610ec19061143b565b8015610f0c5780601f10610ee357610100808354040283529160200191610f0c565b820191905f5260205f20905b815481529060010190602001808311610eef57829003601f168201915b50505050509050610419565b6001600160a01b0381165f9081526007602052604090208054600181018255905b50919050565b5f610419610f4b610d46565b8360405161190160f01b8152600281019290925260228201526042902090565b5f805f610f7a87878787610fce565b91509150610f878161108b565b5095945050505050565b60605f610f9d836111d7565b6040805160208082528183019092529192505f91906020820181803683375050509182525060208101929092525090565b5f807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a083111561100357505f90506003611082565b604080515f8082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015611054573d5f803e3d5ffd5b5050604051601f1901519150506001600160a01b03811661107c575f60019250925050611082565b91505f90505b94509492505050565b5f81600481111561109e5761109e61148c565b036110a65750565b60018160048111156110ba576110ba61148c565b036111075760405162461bcd60e51b815260206004820152601860248201527f45434453413a20696e76616c6964207369676e6174757265000000000000000060448201526064016104de565b600281600481111561111b5761111b61148c565b036111685760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e6774680060448201526064016104de565b600381600481111561117c5761117c61148c565b036111d45760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b60648201526084016104de565b50565b5f60ff8216601f81111561041957604051632cd44ac360e21b815260040160405180910390fd5b5f81518084525f5b8181101561122257602081850181015186830182015201611206565b505f602082860101526020601f19601f83011685010191505092915050565b602081525f61125360208301846111fe565b9392505050565b80356001600160a01b0381168114611270575f80fd5b919050565b5f8060408385031215611286575f80fd5b61128f8361125a565b946020939093013593505050565b5f805f606084860312156112af575f80fd5b6112b88461125a565b92506112c66020850161125a565b9150604084013590509250925092565b5f602082840312156112e6575f80fd5b5035919050565b5f602082840312156112fd575f80fd5b6112538261125a565b60ff60f81b881681525f602060e0602084015261132660e084018a6111fe565b8381036040850152611338818a6111fe565b606085018990526001600160a01b038816608086015260a0850187905284810360c0860152855180825260208088019350909101905f5b8181101561138b5783518352928401929184019160010161136f565b50909c9b505050505050505050505050565b5f805f805f805f60e0888a0312156113b3575f80fd5b6113bc8861125a565b96506113ca6020890161125a565b95506040880135945060608801359350608088013560ff811681146113ed575f80fd5b9699959850939692959460a0840135945060c09093013592915050565b5f806040838503121561141b575f80fd5b6114248361125a565b91506114326020840161125a565b90509250929050565b600181811c9082168061144f57607f821691505b602082108103610f3957634e487b7160e01b5f52602260045260245ffd5b8082018082111561041957634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52602160045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000003": "0x577261707065642045746865720000000000000000000000000000000000001a", + "0x0000000000000000000000000000000000000000000000000000000000000004": "0x5745544800000000000000000000000000000000000000000000000000000008" + } + }, + "0x5300000000000000000000000000000000000005": { + "balance": "0x0", + "code": "0x6080604052600436106100a8575f3560e01c806384411d651161006257806384411d651461017a5780638da5cb5b1461018f5780639e7adc79146101ad578063f2fde38b146101cc578063feec756c146101eb578063ff4f35461461020a575f80fd5b80632e1a7d4d146100b35780633cb747bf146100d45780633ccfd60b14610110578063457e1a491461012457806366d003ac14610147578063715018a614610166575f80fd5b366100af57005b5f80fd5b3480156100be575f80fd5b506100d26100cd366004610663565b610229565b005b3480156100df575f80fd5b506002546100f3906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b34801561011b575f80fd5b506100d26103e9565b34801561012f575f80fd5b5061013960015481565b604051908152602001610107565b348015610152575f80fd5b506003546100f3906001600160a01b031681565b348015610171575f80fd5b506100d26103f6565b348015610185575f80fd5b5061013960045481565b34801561019a575f80fd5b505f546100f3906001600160a01b031681565b3480156101b8575f80fd5b506100d26101c736600461067a565b61042a565b3480156101d7575f80fd5b506100d26101e636600461067a565b6104a4565b3480156101f6575f80fd5b506100d261020536600461067a565b61052c565b348015610215575f80fd5b506100d2610224366004610663565b6105a6565b6001548110156102b95760405162461bcd60e51b815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d20776974686472616064820152691dd85b08185b5bdd5b9d60b21b608482015260a4015b60405180910390fd5b478082111561031d5760405162461bcd60e51b815260206004820152602a60248201527f4665655661756c743a20696e73756666696369656e742062616c616e636520746044820152696f20776974686472617760b01b60648201526084016102b0565b6004805483019055600354604080518481526001600160a01b0390921660208301523382820152517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1600254600354604080516020810182525f808252915163b2267a7b60e01b81526001600160a01b039485169463b2267a7b9488946103b79491909216928592906004016106a7565b5f604051808303818588803b1580156103ce575f80fd5b505af11580156103e0573d5f803e3d5ffd5b50505050505050565b476103f381610229565b50565b5f546001600160a01b0316331461041f5760405162461bcd60e51b81526004016102b090610711565b6104285f610614565b565b5f546001600160a01b031633146104535760405162461bcd60e51b81526004016102b090610711565b600280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f1c928c417a10a21c3cddad148c5dba5d710e4b1442d6d8a36de345935ad84612905f90a35050565b5f546001600160a01b031633146104cd5760405162461bcd60e51b81526004016102b090610711565b6001600160a01b0381166105235760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102b0565b6103f381610614565b5f546001600160a01b031633146105555760405162461bcd60e51b81526004016102b090610711565b600380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f7e1e96961a397c8aa26162fe259cc837afc95e33aad4945ddc61c18dabb7a6ad905f90a35050565b5f546001600160a01b031633146105cf5760405162461bcd60e51b81526004016102b090610711565b600180549082905560408051828152602081018490527f0d3c80219fe57713b9f9c83d1e51426792d0c14d8e330e65b102571816140965910160405180910390a15050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f60208284031215610673575f80fd5b5035919050565b5f6020828403121561068a575f80fd5b81356001600160a01b03811681146106a0575f80fd5b9392505050565b60018060a01b03851681525f60208560208401526080604084015284518060808501525f5b818110156106e85786810183015185820160a0015282016106cc565b505f60a0828601015260a0601f19601f8301168501019250505082606083015295945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e657200000000000000000060408201526060019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", + "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000d7d858a4960f962e5f5f2ef62349bf83e54bea01", + "0x0000000000000000000000000000000000000000000000000000000000000003": "0x0000000000000000000000000000000000000000000000000000000000000001" + } + }, + "0xd7d858a4960f962e5f5f2ef62349bf83e54bea01": { + "balance": "0x7ffffffffffffffffffffffffffffffffffffffffffffff21f494c589c0000", + "code": "0x", + "nonce": "0x0", + "storage": { + "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000000000000000000000000000000000000000000000" + } + }, + "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": { + "balance": "0xde0b6b3a7640000", + "code": "0x", + "nonce": "0x0", + "storage": {} + } + }, + "number": "0x0", + "gasUsed": "0x0", + "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "baseFeePerGas": null + } diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 7991f74a..0a3376e5 100644 --- 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.37 +version: 0.0.38 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -18,7 +18,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l1-devnet.enabled - name: balance-checker - version: 0.0.2 + version: 0.0.3 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: balance-checker.enabled - name: blockscout @@ -26,11 +26,11 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout.enabled - name: bridge-history-api - version: 0.0.6 + version: 0.0.7 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: bridge-history-api.enabled - name: bridge-history-fetcher - version: 0.0.8 + version: 0.0.9 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: bridge-history-fetcher.enabled - name: blockscout-sc-verifier @@ -38,23 +38,23 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout-sc-verifier.enabled - name: chain-monitor - version: 0.0.7 + version: 0.0.8 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: chain-monitor.enabled - name: contracts - version: 0.0.7 + version: 0.0.9 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: contracts.enabled - name: coordinator-api - version: 0.0.8 + version: 0.0.9 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: coordinator-api.enabled - name: coordinator-cron - version: 0.0.6 + version: 0.0.7 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: coordinator-cron.enabled - name: frontends - version: 0.0.8 + version: 0.0.9 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: frontends.enabled - name: gas-oracle @@ -94,26 +94,30 @@ dependencies: version: 59.0.0 condition: kube-prometheus-stack.enabled - name: rollup-explorer-backend - version: 0.0.3 + version: 0.0.4 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: rollup-explorer-backend.enabled - name: rollup-node - version: 0.0.10 + version: 0.0.11 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: rollup-node.enabled - name: rpc-gateway version: 0.0.2 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: rpc-gateway.enabled + - name: scroll-common + version: 0.0.3 + repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" + condition: scroll-common.enabled - name: admin-system-backend - version: 0.0.1 + version: 0.0.2 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: admin-system-backend.enabled - name: admin-system-cron - version: 0.0.1 + version: 0.0.2 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: admin-system-cron.enabled - name: admin-system-dashboard - version: 0.0.1 + version: 0.0.2 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: admin-system-dashboard.enabled diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index c7668bc3..38113486 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.37](https://img.shields.io/badge/Version-0.0.37-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.38](https://img.shields.io/badge/Version-0.0.38-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 @@ -21,28 +21,29 @@ Kubernetes: `>=1.22.0-0` | https://grafana.github.io/helm-charts | grafana | 7.3.11 | | https://grafana.github.io/helm-charts | loki-stack | 2.10.2 | | https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 59.0.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-backend | 0.0.1 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-cron | 0.0.1 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-dashboard | 0.0.1 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-backend | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-cron | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-dashboard | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.0.3 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.0.3 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout-sc-verifier | 0.0.2 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.6 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.8 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.7 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.7 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.8 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.6 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.8 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.7 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.9 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.8 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.9 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.9 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.7 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.9 | | 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.10 | | 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.10 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-explorer-backend | 0.0.4 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.11 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rpc-gateway | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | scroll-common | 0.0.3 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 15.5.0 | ## Values @@ -188,6 +189,7 @@ Kubernetes: `>=1.22.0-0` | rpc-gateway.ingress.main.hosts[0].paths[0].path | string | `"/"` | | | rpc-gateway.ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | | rpc-gateway.ingress.main.ingressClassName | string | `"nginx"` | | +| scroll-common.enabled | bool | `true` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/scroll-sdk/templates/config-file-for-services.yaml b/charts/scroll-sdk/templates/config-file-for-services.yaml index a008bc57..2e580de3 100644 --- a/charts/scroll-sdk/templates/config-file-for-services.yaml +++ b/charts/scroll-sdk/templates/config-file-for-services.yaml @@ -30,14 +30,6 @@ data: --- {{- end }} {{- if index .Values "bridge-history-api" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: bridge-history-config -data: -{{ (.Files.Glob "bridge-history-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -61,14 +53,6 @@ data: --- {{- end }} {{- if index .Values "chain-monitor" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: chain-monitor-config -data: -{{ (.Files.Glob "chain-monitor-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -81,14 +65,6 @@ data: --- {{- end }} {{- if index .Values "coordinator-api" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: coordinator-api-config -data: -{{ (.Files.Glob "coordinator-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -101,14 +77,6 @@ data: --- {{- end }} {{- if index .Values "coordinator-cron" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: coordinator-cron-config -data: -{{ (.Files.Glob "coordinator-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -131,17 +99,6 @@ data: {{ .Files.Get "configs/contracts.env" | indent 2 }} --- {{- end }} -{{- if index .Values "frontends" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: frontends-config -data: -{{ (.Files.Glob "frontend-config").AsConfig | indent 2 }} ---- -{{- end }} {{- if index .Values "gas-oracle" "enabled" }} apiVersion: v1 kind: ConfigMap @@ -152,15 +109,6 @@ metadata: data: {{ .Files.Get "configs/gas-oracle.env" | indent 2 }} --- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: gas-oracle-config -data: -{{ (.Files.Glob "rollup-config").AsConfig | indent 2 }} ---- {{- end }} {{- if index .Values "l1-devnet" "enabled" }} apiVersion: v1 @@ -218,14 +166,6 @@ data: --- {{- end }} {{- if index .Values "rollup-node" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: rollup-config -data: -{{ (.Files.Glob "rollup-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -238,14 +178,6 @@ data: --- {{- end }} {{- if index .Values "admin-system-backend" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: admin-system-backend-config -data: -{{ (.Files.Glob "admin-system-backend-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -258,14 +190,6 @@ data: --- {{- end }} {{- if index .Values "admin-system-cron" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: admin-system-cron-config -data: -{{ (.Files.Glob "admin-system-backend-config.json").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap @@ -277,15 +201,3 @@ data: {{ .Files.Get "configs/admin-system-backend.env" | indent 2 }} --- {{- end }} -{{- if index .Values "rollup-explorer-backend" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: rollup-explorer-backend-config -data: - config.json: | -{{ .Files.Get "rollup-explorer-backend-config.json" | indent 4 }} ---- -{{- end }} diff --git a/charts/scroll-sdk/templates/genesis.conf.yaml b/charts/scroll-sdk/templates/genesis.conf.yaml deleted file mode 100644 index 42713b40..00000000 --- a/charts/scroll-sdk/templates/genesis.conf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: genesis-config -data: -{{ (.Files.Glob "genesis.json").AsConfig | indent 2 }} diff --git a/charts/scroll-sdk/templates/wait-for-l1-script.yaml b/charts/scroll-sdk/templates/wait-for-l1-script.yaml deleted file mode 100644 index 3b2bd16d..00000000 --- a/charts/scroll-sdk/templates/wait-for-l1-script.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "scroll-sdk.labels" $ | nindent 4 }} - name: wait-for-l1-script -data: - wait-for-l1.sh: | - #!/bin/sh - - # Get L1 endpoint - L1_ENDPOINT=$1 - - # Function to check the Geth node - check_geth_node() { - HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST --data '{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":1}' -H "Content-Type: application/json" $L1_ENDPOINT) - echo "code is $HTTP_CODE" - if [ "$HTTP_CODE" -eq 200 ]; then - echo "Geth node is up and running!" - exit 0 - else - echo "Geth node is not responding, HTTP code: $HTTP_CODE. Retrying in 5 seconds..." - sleep 5 - fi - } - - # Loop until the Geth node responds with HTTP 200 - while true; do - check_geth_node - done diff --git a/charts/scroll-sdk/values.yaml b/charts/scroll-sdk/values.yaml index 862a2689..aca646be 100644 --- a/charts/scroll-sdk/values.yaml +++ b/charts/scroll-sdk/values.yaml @@ -189,6 +189,9 @@ rpc-gateway: - path: / pathType: Prefix +scroll-common: + enabled: true + admin-system-backend: enabled: true diff --git a/devnet/Makefile b/devnet/Makefile index 5fcd4c58..138d2c7d 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -14,9 +14,10 @@ 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.22 + cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.24 echo "Creating env files..." ./create-env-files.sh scroll-sdk + ./prepare-config-files.sh install: helm upgrade -i scroll-sdk scroll-sdk -n $(NAMESPACE) \ @@ -25,7 +26,21 @@ install: --set l2-bootnode.image.tag=$(L2_IMAGE_TAG) \ --set l1-devnet.ingress.main.hosts[0].host=$(L1_RPC_HOST) \ --set l1-devnet.ingress.main.hosts[0].paths[0].path=/ \ - --set l1-devnet.ingress.main.hosts[0].paths[0].pathType=Prefix + --set l1-devnet.ingress.main.hosts[0].paths[0].pathType=Prefix \ + --values scroll-sdk/admin-system-backend-config.yaml \ + --values scroll-sdk/admin-system-cron-config.yaml \ + --values scroll-sdk/bridge-history-api-config.yaml \ + --values scroll-sdk/bridge-history-fetcher-config.yaml \ + --values scroll-sdk/chain-monitor-config.yaml \ + --values scroll-sdk/coordinator-api-config.yaml \ + --values scroll-sdk/coordinator-cron-config.yaml \ + --values scroll-sdk/frontend-config.yaml \ + --values scroll-sdk/gas-oracle-config.yaml \ + --values scroll-sdk/genesis.yaml \ + --values scroll-sdk/rollup-explorer-backend-config.yaml \ + --values scroll-sdk/rollup-node.yaml \ + --values scroll-sdk/scroll-common-config.yaml \ + --values scroll-sdk/scroll-common-config-contracts.yaml reload-env-files: ./create-env-files.sh scroll-sdk diff --git a/devnet/prepare-config-files.sh b/devnet/prepare-config-files.sh new file mode 100755 index 00000000..0914132f --- /dev/null +++ b/devnet/prepare-config-files.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +indent_file_and_add_first_line () { + echo $1 + temp_file="tmp_file" + touch $temp_file + + echo "$2" > "$temp_file" + # Indent each line of the original file by 2 spaces and append to the temporary file + sed 's/^/ /' "$1" >> $temp_file +# # Move the temporary file to replace the original file + mv "$temp_file" "$1" + + echo "Processed file: $1" +} + +# admin-systems +cp scroll-sdk/admin-system-backend-config.yaml scroll-sdk/admin-system-cron-config.yaml +indent_file_and_add_first_line "scroll-sdk/admin-system-backend-config.yaml" "admin-system-backend:" +indent_file_and_add_first_line "scroll-sdk/admin-system-cron-config.yaml" "admin-system-cron:" + +# Balance-checker +indent_file_and_add_first_line "scroll-sdk/balance-checker-config.yaml" "balance-checker:" + +# Bridge-history +cp scroll-sdk/bridge-history-config.yaml scroll-sdk/bridge-history-api-config.yaml +mv scroll-sdk/bridge-history-config.yaml scroll-sdk/bridge-history-fetcher-config.yaml +indent_file_and_add_first_line "scroll-sdk/bridge-history-api-config.yaml" "bridge-history-api:" +indent_file_and_add_first_line "scroll-sdk/bridge-history-fetcher-config.yaml" "bridge-history-fetcher:" + +# chain-monitor +indent_file_and_add_first_line "scroll-sdk/chain-monitor-config.yaml" "chain-monitor:" + +# coordinator +cp scroll-sdk/coordinator-config.yaml scroll-sdk/coordinator-api-config.yaml +mv scroll-sdk/coordinator-config.yaml scroll-sdk/coordinator-cron-config.yaml +indent_file_and_add_first_line "scroll-sdk/coordinator-api-config.yaml" "coordinator-api:" +indent_file_and_add_first_line "scroll-sdk/coordinator-cron-config.yaml" "coordinator-cron:" + +# frontends +indent_file_and_add_first_line "scroll-sdk/frontend-config.yaml" "frontends:" + +# contracts +cp scroll-sdk/config.toml scroll-sdk/scroll-common-config.yaml +cp scroll-sdk/config-contracts.toml scroll-sdk/scroll-common-config-contracts.yaml +{ echo "contracts:"; echo " scrollConfig: |"; sed 's/^/ /' scroll-sdk/scroll-common-config.yaml; } > temp_file && mv temp_file scroll-sdk/scroll-common-config.yaml +{ echo "contracts:"; echo " scrollConfigContracts: |"; sed 's/^/ /' scroll-sdk/scroll-common-config-contracts.yaml; } > temp_file && mv temp_file scroll-sdk/scroll-common-config-contracts.yaml + +# scroll-common +indent_file_and_add_first_line "scroll-sdk/genesis.json" "genesisConfig:" + +# rollup +cp scroll-sdk/rollup-config.yaml scroll-sdk/gas-oracle-config.yaml +mv scroll-sdk/rollup-config.yaml scroll-sdk/rollup-node.yaml +indent_file_and_add_first_line "scroll-sdk/gas-oracle-config.yaml" "gas-oracle:" +indent_file_and_add_first_line "scroll-sdk/rollup-node.yaml" "rollup-node:" + +# rollup-explorer-backend +indent_file_and_add_first_line "scroll-sdk/rollup-explorer-backend-config.yaml" "rollup-explorer-backend:"