Fix l2 sequencer backup (#177)

sbaizet-ledger · web-flow · commit c680e6b85f28 · 2024-09-25T16:17:14.000+02:00
* upgrade l2geth to 5.7.21

* fix the sequencer

* fix create-env-file script
diff --git 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.11
+version: 0.0.12
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
diff --git a/charts/l2-bootnode/README.md b/charts/l2-bootnode/README.md
@@ -1,6 +1,6 @@
 # l2-bootnode
 
-![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)
 
 l2-bootnode helm chart
 
@@ -58,7 +58,7 @@ Kubernetes: `>=1.22.0-0`
 | global.nameOverride | string | `"l2-bootnode"` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/l2geth"` |  |
-| image.tag | string | `"scroll-v5.7.11"` |  |
+| image.tag | string | `"scroll-v5.7.21"` |  |
 | initContainers.wait-for-l1.command[0] | string | `"/bin/sh"` |  |
 | initContainers.wait-for-l1.command[1] | string | `"-c"` |  |
 | initContainers.wait-for-l1.command[2] | string | `"/wait-for-l1.sh $L2GETH_L1_ENDPOINT"` |  |
diff --git a/charts/l2-bootnode/values.yaml b/charts/l2-bootnode/values.yaml
@@ -11,7 +11,7 @@ controller:
 image:
   repository: scrolltech/l2geth
   pullPolicy: Always
-  tag: scroll-v5.7.11
+  tag: scroll-v5.7.21
 
 env:
   - name: L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK
diff --git a/charts/l2-rpc/Chart.yaml b/charts/l2-rpc/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: l2-rpc helm chart
 name: l2-rpc
-version: 0.0.10
+version: 0.0.11
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
diff --git a/charts/l2-rpc/README.md b/charts/l2-rpc/README.md
@@ -1,6 +1,6 @@
 # l2-rpc
 
-![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-rpc helm chart
 
@@ -60,7 +60,7 @@ Kubernetes: `>=1.22.0-0`
 | global.nameOverride | string | `"l2-rpc"` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/l2geth"` |  |
-| image.tag | string | `"scroll-v5.7.11"` |  |
+| image.tag | string | `"scroll-v5.7.21"` |  |
 | ingress.main.annotations | object | `{}` |  |
 | ingress.main.enabled | bool | `true` |  |
 | ingress.main.hosts[0].host | string | `"l2-rpc.scrollsdk"` |  |
diff --git a/charts/l2-rpc/values.yaml b/charts/l2-rpc/values.yaml
@@ -11,7 +11,7 @@ controller:
 image:
   repository: scrolltech/l2geth
   pullPolicy: Always
-  tag: scroll-v5.7.11
+  tag: scroll-v5.7.21
 
 service:
   main:
diff --git a/charts/l2-sequencer/Chart.yaml b/charts/l2-sequencer/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: l2-sequencer helm charts
 name: l2-sequencer
-version: 0.0.9
+version: 0.0.10
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
diff --git a/charts/l2-sequencer/README.md b/charts/l2-sequencer/README.md
@@ -1,6 +1,6 @@
 # l2-sequencer
 
-![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)
+![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)
 
 l2-sequencer helm charts
 
@@ -25,9 +25,7 @@ Kubernetes: `>=1.22.0-0`
 |-----|------|---------|-------------|
 | command[0] | string | `"bash"` |  |
 | command[1] | string | `"-c"` |  |
-| command[2] | string | `"mkdir -p /l2geth/data/keystore && mkdir -p /l2geth/data/geth && echo ${L2GETH_PASSWORD} > /l2geth/password && echo ${L2GETH_KEYSTORE}  > /l2geth/data/keystore/keystore.json && echo ${L2GETH_NODEKEY} > /l2geth/data/geth/nodekey && geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && geth --datadir \"/l2geth/data\" --port \"$L2GETH_P2P_PORT\" --nodiscover --syncmode full --networkid \"$CHAIN_ID\" --http --http.port \"$L2GETH_RPC_HTTP_PORT\" --http.addr \"0.0.0.0\" --http.vhosts=\"*\" --http.corsdomain \"*\" --http.api \"eth,scroll,net,web3,debug\" --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 --ws --ws.port \"$L2GETH_RPC_WS_PORT\" --ws.addr \"0.0.0.0\" --ws.api \"eth,scroll,net,web3,debug\" --unlock \"$L2GETH_SIGNER_ADDRESS\" --password \"/l2geth/password\" --allow-insecure-unlock --mine --ccc --ccc.numworkers 5 --gcmode archive --cache.noprefetch --verbosity ${VERBOSITY} --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --miner.gaslimit \"$L2GETH_MINER_GASLIMIT\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --gpo.percentile 20 --gpo.blocks 100 --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" --rollup.verify --metrics --metrics.expensive $L2GETH_EXTRA_PARAMS"` |  |
-| configMaps.config.data."config.toml" | string | `"[Node.P2P] StaticNodes = \"[]\"\n"` |  |
-| configMaps.config.enabled | bool | `true` |  |
+| command[2] | string | `"mkdir -p /l2geth/data/keystore && mkdir -p /l2geth/data/geth && echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && echo ${L2GETH_PASSWORD} > /l2geth/password && echo ${L2GETH_KEYSTORE}  > /l2geth/data/keystore/keystore.json && echo ${L2GETH_NODEKEY} > /l2geth/data/geth/nodekey && geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && geth --datadir \"/l2geth/data\" --port \"$L2GETH_P2P_PORT\" --nodiscover --syncmode full --networkid \"$CHAIN_ID\" --config \"/l2geth/config.toml\" --http --http.port \"$L2GETH_RPC_HTTP_PORT\" --http.addr \"0.0.0.0\" --http.vhosts=\"*\" --http.corsdomain \"*\" --http.api \"eth,scroll,net,web3,debug\" --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 --ws --ws.port \"$L2GETH_RPC_WS_PORT\" --ws.addr \"0.0.0.0\" --ws.api \"eth,scroll,net,web3,debug\" --unlock \"$L2GETH_SIGNER_ADDRESS\" --password \"/l2geth/password\" --allow-insecure-unlock --mine --ccc --ccc.numworkers 5 --gcmode archive --cache.noprefetch --verbosity ${VERBOSITY} --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --miner.gaslimit \"$L2GETH_MINER_GASLIMIT\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --gpo.percentile 20 --gpo.blocks 100 --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" --rollup.verify --metrics --metrics.expensive $L2GETH_EXTRA_PARAMS"` |  |
 | controller.replicas | int | `1` |  |
 | controller.strategy | string | `"RollingUpdate"` |  |
 | controller.type | string | `"statefulset"` |  |
@@ -36,31 +34,29 @@ Kubernetes: `>=1.22.0-0`
 | defaultProbes.spec.httpGet.path | string | `"/"` |  |
 | defaultProbes.spec.httpGet.port | int | `8545` |  |
 | envFrom[0].configMapRef.name | string | `"l2-sequencer-env"` |  |
-| env[0].name | string | `"L2GETH_PEER_LIST"` |  |
-| env[0].value[0] | string | `""` |  |
-| env[1].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
-| env[1].value | string | `"0x6"` |  |
-| env[2].name | string | `"L2GETH_LOCALS"` |  |
-| env[2].value | string | `""` |  |
-| env[3].name | string | `"L2GETH_ENABLE_CCC"` |  |
-| env[3].value | string | `"true"` |  |
-| env[4].name | string | `"L2GETH_MINER_GASLIMIT"` |  |
-| env[4].value | string | `"10000000"` |  |
-| env[5].name | string | `"L2GETH_RPC_HTTP_PORT"` |  |
-| env[5].value | int | `8545` |  |
-| env[6].name | string | `"L2GETH_RPC_WS_PORT"` |  |
-| env[6].value | int | `8546` |  |
-| env[7].name | string | `"L2GETH_P2P_PORT"` |  |
-| env[7].value | string | `"30303"` |  |
-| env[8].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
-| env[8].value | string | `"1000000"` |  |
-| env[9].name | string | `"VERBOSITY"` |  |
-| env[9].value | string | `"3"` |  |
+| env[0].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
+| env[0].value | string | `"0x6"` |  |
+| env[1].name | string | `"L2GETH_LOCALS"` |  |
+| env[1].value | string | `""` |  |
+| env[2].name | string | `"L2GETH_ENABLE_CCC"` |  |
+| env[2].value | string | `"true"` |  |
+| env[3].name | string | `"L2GETH_MINER_GASLIMIT"` |  |
+| env[3].value | string | `"10000000"` |  |
+| env[4].name | string | `"L2GETH_RPC_HTTP_PORT"` |  |
+| env[4].value | int | `8545` |  |
+| env[5].name | string | `"L2GETH_RPC_WS_PORT"` |  |
+| env[5].value | int | `8546` |  |
+| env[6].name | string | `"L2GETH_P2P_PORT"` |  |
+| env[6].value | string | `"30303"` |  |
+| env[7].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
+| env[7].value | string | `"1000000"` |  |
+| env[8].name | string | `"VERBOSITY"` |  |
+| env[8].value | string | `"3"` |  |
 | global.fullnameOverride | string | `"l2-sequencer"` |  |
 | global.nameOverride | string | `"l2-sequencer"` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/l2geth"` |  |
-| image.tag | string | `"scroll-v5.7.11"` |  |
+| image.tag | string | `"scroll-v5.7.21"` |  |
 | initContainers.wait-for-l1.command[0] | string | `"/bin/sh"` |  |
 | initContainers.wait-for-l1.command[1] | string | `"-c"` |  |
 | initContainers.wait-for-l1.command[2] | string | `"/wait-for-l1.sh $L2GETH_L1_ENDPOINT"` |  |
diff --git a/charts/l2-sequencer/values.yaml b/charts/l2-sequencer/values.yaml
@@ -11,11 +11,9 @@ controller:
 image:
   repository: scrolltech/l2geth
   pullPolicy: Always
-  tag: scroll-v5.7.11
+  tag: scroll-v5.7.21
 
 env:
-  - name: L2GETH_PEER_LIST
-    value: [""]
   - name: L2GETH_L1_WATCHER_CONFIRMATIONS
     value: "0x6"
   - name: L2GETH_LOCALS
@@ -45,12 +43,14 @@ command:
     "-c",
     "mkdir -p /l2geth/data/keystore && \
     mkdir -p /l2geth/data/geth && \
+    echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && \
     echo ${L2GETH_PASSWORD} > /l2geth/password && \
     echo ${L2GETH_KEYSTORE}  > /l2geth/data/keystore/keystore.json && \
     echo ${L2GETH_NODEKEY} > /l2geth/data/geth/nodekey && \
     geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && \
     geth --datadir \"/l2geth/data\" \
     --port \"$L2GETH_P2P_PORT\" --nodiscover --syncmode full --networkid \"$CHAIN_ID\" \
+    --config \"/l2geth/config.toml\" \
     --http --http.port \"$L2GETH_RPC_HTTP_PORT\" --http.addr \"0.0.0.0\" --http.vhosts=\"*\" --http.corsdomain \"*\" --http.api \"eth,scroll,net,web3,debug\" \
     --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 \
     --ws --ws.port \"$L2GETH_RPC_WS_PORT\" --ws.addr \"0.0.0.0\" --ws.api \"eth,scroll,net,web3,debug\" \
@@ -153,13 +153,6 @@ persistence:
     name: wait-for-l1-script
     defaultMode: "0777"
 
-configMaps:
-  config:
-    enabled: true
-    data:
-      config.toml: |
-        [Node.P2P] StaticNodes = "[]"
-
 serviceMonitor:
   main:
     enabled: true
diff --git a/charts/l2-sequencer/values/production-1.yaml b/charts/l2-sequencer/values/production-1.yaml
@@ -30,6 +30,7 @@ configMaps:
       L2GETH_L1_ENDPOINT: ""
       L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_SIGNER_ADDRESS: ""
+      L2GETH_PEER_LIST: '[""]'
 
 persistence:
   env:
diff --git a/charts/l2-sequencer/values/production-2.yaml b/charts/l2-sequencer/values/production-2.yaml
@@ -25,11 +25,13 @@ initContainers:
 configMaps:
   env:
     enabled: true
+    provider: aws
     data:
       CHAIN_ID: ""
       L2GETH_L1_ENDPOINT: ""
       L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_SIGNER_ADDRESS: ""
+      L2GETH_PEER_LIST: '[""]'
 
 persistence:
   env:
diff --git a/charts/l2-sequencer/values/production-3.yaml b/charts/l2-sequencer/values/production-3.yaml
@@ -25,11 +25,13 @@ initContainers:
 configMaps:
   env:
     enabled: true
+    provider: aws
     data:
       CHAIN_ID: ""
       L2GETH_L1_ENDPOINT: ""
       L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_SIGNER_ADDRESS: ""
+      L2GETH_PEER_LIST: '[""]'
 
 persistence:
   env:
diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: scroll helm charts to deploy scroll sdk
 name: scroll-sdk
-version: 0.0.38
+version: 0.0.39
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -66,19 +66,19 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l1-explorer.enabled
   - name: l2-bootnode
-    version: 0.0.10
+    version: 0.0.11
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l2-bootnode.enabled
   - name: l2-rpc
-    version: 0.0.10
+    version: 0.0.11
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l2-rpc.enabled
   - name: grafana
     repository: "https://grafana.github.io/helm-charts"
     version: 7.3.11
     condition: grafana.enabled
   - name: l2-sequencer
-    version: 0.0.9
+    version: 0.0.10
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l2-sequencer.enabled
   - name: loki-stack
diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -1,6 +1,6 @@
 # scroll-sdk
 
-![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)
+![Version: 0.0.39](https://img.shields.io/badge/Version-0.0.39-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
 
@@ -37,9 +37,9 @@ Kubernetes: `>=1.22.0-0`
 | 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 | l2-bootnode | 0.0.11 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.11 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 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 |
diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh
@@ -64,7 +64,7 @@ get_service_configmap_variables() {
             echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2_GETH_STATIC_PEERS:L2GETH_PEER_LIST"
             ;;
         l2-sequencer)
-            echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2GETH_SIGNER_ADDRESS:L2GETH_SIGNER_ADDRESS L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2GETH_KEYSTORE:L2GETH_KEYSTORE L2GETH_PASSWORD:L2GETH_PASSWORD L2GETH_NODEKEY:L2GETH_NODEKEY"
+            echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2GETH_SIGNER_ADDRESS:L2GETH_SIGNER_ADDRESS L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2GETH_KEYSTORE:L2GETH_KEYSTORE L2GETH_PASSWORD:L2GETH_PASSWORD L2GETH_NODEKEY:L2GETH_NODEKEY L2_GETH_STATIC_PEERS:L2GETH_PEER_LIST"
             ;;
         rollup-node)
             echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN L1_SCROLL_CHAIN_PROXY_ADDR:L1_SCROLL_CHAIN_PROXY_ADDR L1_COMMIT_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_COMMIT_SENDER_PRIVATE_KEY L1_FINALIZE_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_FINALIZE_SENDER_PRIVATE_KEY"
