Skip to content

chore: update production example files & contracts & bridge-history #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/balance-checker/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: balance-checker helm charts
name: balance-checker
version: 0.0.4
version: 0.0.5
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion charts/balance-checker/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# balance-checker

![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)
![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-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

Expand Down
3 changes: 0 additions & 3 deletions charts/balance-checker/values/production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ configMaps:
data:
SCROLL_L1_RPC: ""
SCROLL_L2_RPC: ""

scrollConfig: |
{}
2 changes: 1 addition & 1 deletion charts/bridge-history-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: bridge-history-api helm charts
name: bridge-history-api
version: 0.0.7
version: 0.0.8
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/bridge-history-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bridge-history-api

![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)

bridge-history-api helm charts

Expand Down Expand Up @@ -42,7 +42,7 @@ Kubernetes: `>=1.22.0-0`
| global.nameOverride | string | `"bridge-history-api"` | |
| image.pullPolicy | string | `"Always"` | |
| image.repository | string | `"scrolltech/bridgehistoryapi-api"` | |
| image.tag | string | `"v4.4.59"` | |
| image.tag | string | `"v4.4.71"` | |
| ingress.main.annotations | object | `{}` | |
| ingress.main.enabled | bool | `true` | |
| ingress.main.hosts[0].host | string | `"bridge-history-api.scrollsdk"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/bridge-history-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ controller:
image:
repository: scrolltech/bridgehistoryapi-api
pullPolicy: Always
tag: v4.4.59
tag: v4.4.71

command:
[
Expand Down
1 change: 0 additions & 1 deletion charts/bridge-history-api/values/production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ envFrom:
- secretRef:
name: bridge-history-api-secret-env

# TODO make this consistent with devnet, we should use bridge-history-api-config instead of bridge-history-config
persistence:
bridge-history-api:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion charts/bridge-history-fetcher/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: bridge-history-fetcher helm charts
name: bridge-history-fetcher
version: 0.0.11
version: 0.0.12
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
6 changes: 3 additions & 3 deletions charts/bridge-history-fetcher/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bridge-history-fetcher

![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)
![Version: 0.0.12](https://img.shields.io/badge/Version-0.0.12-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

Expand Down Expand Up @@ -42,7 +42,7 @@ Kubernetes: `>=1.22.0-0`
| global.nameOverride | string | `"bridge-history-fetcher"` | |
| image.pullPolicy | string | `"Always"` | |
| image.repository | string | `"scrolltech/bridgehistoryapi-fetcher"` | |
| image.tag | string | `"v4.4.59"` | |
| image.tag | string | `"v4.4.71"` | |
| initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | |
| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_BRIDGE_HISTORY_DB_DSN)"` | |
| initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | |
Expand All @@ -53,7 +53,7 @@ Kubernetes: `>=1.22.0-0`
| initContainers.2-migrate-db.command[1] | string | `"-c"` | |
| initContainers.2-migrate-db.command[2] | string | `"db_cli --config /config/migrate-db.json migrate"` | |
| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | |
| initContainers.2-migrate-db.image | string | `"scrolltech/bridgehistoryapi-db-cli:v4.4.59"` | |
| initContainers.2-migrate-db.image | string | `"scrolltech/bridgehistoryapi-db-cli:v4.4.71"` | |
| initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` | |
| initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` | |
| initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/bridge-history-fetcher/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ controller:
image:
repository: scrolltech/bridgehistoryapi-fetcher
pullPolicy: Always
tag: v4.4.59
tag: v4.4.71

command:
[
Expand Down Expand Up @@ -93,7 +93,7 @@ initContainers:
- configMapRef:
name: bridge-history-fetcher-env
2-migrate-db:
image: scrolltech/bridgehistoryapi-db-cli:v4.4.59
image: scrolltech/bridgehistoryapi-db-cli:v4.4.71
command: ["/bin/sh", "-c", "db_cli --config /config/migrate-db.json migrate"]
volumeMounts:
- name: migrate-db
Expand Down
1 change: 0 additions & 1 deletion charts/bridge-history-fetcher/values/production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ envFrom:
name: bridge-history-fetcher-secret-env

persistence:
# TODO make this consistent with devnet, we should use bridge-history-fetcher-config instead of bridge-history-config
bridge-history-fetcher:
enabled: true
type: configMap
Expand Down
2 changes: 1 addition & 1 deletion charts/contracts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: contracts helm charts
name: contracts
version: 0.0.15
version: 0.0.16
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/contracts/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# contracts

![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
![Version: 0.0.16](https://img.shields.io/badge/Version-0.0.16-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)

contracts helm charts

Expand All @@ -25,7 +25,7 @@ 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-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae"` | |
| image.tag | string | `"deploy-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1"` | |
| scrollConfig | string | `"{}\n"` | |
| scrollConfigContracts | string | `"{}\n"` | |

Expand Down
2 changes: 1 addition & 1 deletion charts/contracts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ global:

image:
repository: scrolltech/scroll-stack-contracts
tag: deploy-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
tag: deploy-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1

envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/l2-sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: l2-sequencer helm charts
name: l2-sequencer
version: 0.0.14
version: 0.0.15
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion charts/l2-sequencer/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# l2-sequencer

![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)

l2-sequencer helm charts

Expand Down
8 changes: 8 additions & 0 deletions charts/l2-sequencer/values/production-0.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
global:
fullnameOverride: l2-sequencer-0

resources:
requests:
memory: "150Mi"
cpu: "50m"
limits:
memory: "8Gi"
cpu: "4"

envFrom:
- configMapRef:
name: l2-sequencer-0-env
Expand Down
2 changes: 1 addition & 1 deletion charts/rollup-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: rollup-node helm charts
name: rollup-node
version: 0.0.14
version: 0.0.15
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/rollup-node/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# rollup-node

![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-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

Expand Down Expand Up @@ -49,7 +49,7 @@ Kubernetes: `>=1.22.0-0`
| initContainers.2-migrate-db.command[1] | string | `"-c"` | |
| initContainers.2-migrate-db.command[2] | string | `"db_cli migrate --config /config/migrate-db.json"` | |
| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"rollup-node-env"` | |
| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli:v4.4.60"` | |
| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli:v4.4.71"` | |
| initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` | |
| initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` | |
| initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/rollup-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ initContainers:
- configMapRef:
name: rollup-node-env
2-migrate-db:
image: scrolltech/rollup-db-cli:v4.4.60
image: scrolltech/rollup-db-cli:v4.4.71
command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
volumeMounts:
- name: migrate-db
Expand Down
8 changes: 8 additions & 0 deletions charts/rollup-node/values/production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ initContainers:
- secretRef:
name: rollup-node-secret-env

resources:
requests:
memory: "50Mi"
cpu: "100m"
limits:
memory: "200Mi"
cpu: "500m"

envFrom:
- secretRef:
name: rollup-node-secret-env
Expand Down
14 changes: 7 additions & 7 deletions charts/scroll-sdk/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: scroll helm charts to deploy scroll sdk
name: scroll-sdk
version: 0.0.59
version: 0.0.60
appVersion: v0.1.0
kubeVersion: ">=1.22.0-0"
maintainers:
Expand All @@ -18,19 +18,19 @@ dependencies:
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: l1-devnet.enabled
- name: balance-checker
version: 0.0.4
version: 0.0.5
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: balance-checker.enabled
- name: blockscout
version: 0.0.4
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: blockscout.enabled
- name: bridge-history-api
version: 0.0.7
version: 0.0.8
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: bridge-history-api.enabled
- name: bridge-history-fetcher
version: 0.0.11
version: 0.0.12
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: bridge-history-fetcher.enabled
- name: blockscout-sc-verifier
Expand All @@ -42,7 +42,7 @@ dependencies:
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: chain-monitor.enabled
- name: contracts
version: 0.0.15
version: 0.0.16
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: contracts.enabled
- name: coordinator-api
Expand Down Expand Up @@ -74,7 +74,7 @@ dependencies:
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: l2-rpc.enabled
- name: l2-sequencer
version: 0.0.14
version: 0.0.15
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: l2-sequencer.enabled
- name: postgresql
Expand All @@ -86,7 +86,7 @@ dependencies:
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: rollup-explorer-backend.enabled
- name: rollup-node
version: 0.0.14
version: 0.0.15
repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
condition: rollup-node.enabled
- name: rpc-gateway
Expand Down
12 changes: 6 additions & 6 deletions charts/scroll-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ Kubernetes: `>=1.22.0-0`
| 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.4 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.0.5 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.0.4 |
| 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.7 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.11 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.8 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.12 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.11 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.15 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.16 |
| 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.10 |
Expand All @@ -36,9 +36,9 @@ Kubernetes: `>=1.22.0-0`
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.0.3 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.0.16 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.16 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.14 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.15 |
| 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.14 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.15 |
| 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.5 |
| oci://ghcr.io/scroll-tech/scroll-sdk/helm | scroll-monitor | 0.0.6 |
Expand Down
4 changes: 2 additions & 2 deletions devnet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ L1_RPC_HOST := l1-devnet.scrollsdk

bootstrap:
echo "Pulling helm chart..."
helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/dev/scroll-sdk --version 0.0.59
helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.59
echo "Extracting helm chart..."
tar -xvf *.tgz
$(MAKE) config

config:
echo "Creating configuration files..."
cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1
echo "Creating env files..."
./create-env-files.sh scroll-sdk
./prepare-config-files.sh
Expand Down
Loading
Loading