Merge branch 'develop' into feat-scroll-admin-system

scroll-tech · Sep 19, 2024 · c276ad8 · c276ad8
2 parents 2f05462 + 8ad7c7d
commit c276ad8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 5 deletions.
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.9
+version: 0.0.10
 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.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-bootnode helm chart
 

diff --git a/charts/l2-bootnode/values/production-1.yaml b/charts/l2-bootnode/values/production-1.yaml
@@ -33,5 +33,6 @@ configMaps:
     data:
       CHAIN_ID: ""
       L2GETH_NODEKEY: ""
+      L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_L1_ENDPOINT: ""
       L2GETH_PEER_LIST: '[]'
diff --git a/charts/l2-bootnode/values/production-2.yaml b/charts/l2-bootnode/values/production-2.yaml
@@ -33,5 +33,6 @@ configMaps:
     data:
       CHAIN_ID: ""
       L2GETH_NODEKEY: ""
+      L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_L1_ENDPOINT: ""
       L2GETH_PEER_LIST: '[]'
diff --git a/charts/l2-bootnode/values/production-3.yaml b/charts/l2-bootnode/values/production-3.yaml
@@ -33,5 +33,6 @@ configMaps:
     data:
       CHAIN_ID: ""
       L2GETH_NODEKEY: ""
+      L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK: ""
       L2GETH_L1_ENDPOINT: ""
       L2GETH_PEER_LIST: '[]'
diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
@@ -66,7 +66,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l1-explorer.enabled
   - name: l2-bootnode
-    version: 0.0.9
+    version: 0.0.10
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: l2-bootnode.enabled
   - name: l2-rpc

diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -37,7 +37,7 @@ 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.9 |
+| 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 |

diff --git a/charts/scroll-sdk/templates/init-db-job.yaml b/charts/scroll-sdk/templates/init-db-job.yaml
@@ -7,6 +7,14 @@ metadata:
 spec:
   template:
     spec:
+      initContainers:
+      - name: 1-wait-for-postgres
+        image: atkrad/wait4x:latest
+        args:
+          - tcp
+          - postgresql:5432
+          - --timeout
+          - "0"
       containers:
         - name: init-db
           image: postgres:latest

diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh
@@ -58,7 +58,7 @@ get_service_configmap_variables() {
             echo "CHAIN_ID_L1:CHAIN_ID L1_RPC_ENDPOINT:ETHEREUM_JSONRPC_HTTP_URL L1_RPC_ENDPOINT:ETHEREUM_JSONRPC_TRACE_URL L1_RPC_ENDPOINT:JSON_RPC L1_RPC_ENDPOINT_WEBSOCKET:ETHEREUM_JSONRPC_WS_URL L1_EXPLORER_DB_CONNECTION_STRING:DATABASE_URL"
             ;;
         l2-bootnode)
-            echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2_GETH_STATIC_PEERS:L2GETH_PEER_LIST"
+            echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2_GETH_STATIC_PEERS:L2GETH_PEER_LIST L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK"
             ;;
         l2-rpc)
             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"