feat: make a variable to configure l2geth-peer-list (#120)

scroll-tech · Aug 30, 2024 · 0376ccb · 0376ccb
1 parent 4290244
commit 0376ccb
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 56 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.2
+version: 0.0.3
 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.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)
 
 l2-bootnode helm chart
 
@@ -36,30 +36,28 @@ Kubernetes: `>=1.22.0-0`
 | envFrom[0].configMapRef.name | string | `"l2-bootnode-env"` |  |
 | env[0].name | string | `"L2GETH_ROLE"` |  |
 | env[0].value | string | `"bootnode"` |  |
-| env[10].name | string | `"CCC_FLAG"` |  |
-| env[10].value | string | `"--ccc"` |  |
-| env[11].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
-| env[11].value | string | `"1000000"` |  |
-| env[12].name | string | `"L2GETH_EXTRA_PARAMS"` |  |
-| env[12].value | string | `""` |  |
+| env[10].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
+| env[10].value | string | `"1000000"` |  |
+| env[11].name | string | `"L2GETH_EXTRA_PARAMS"` |  |
+| env[11].value | string | `""` |  |
 | env[1].name | string | `"L2GETH_NODEKEY"` |  |
 | env[1].value | string | `""` |  |
-| env[2].name | string | `"L2GETH_PEER_LIST"` |  |
-| env[2].value | string | `"[\"enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303\"]"` |  |
-| env[3].name | string | `"L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK"` |  |
-| env[3].value | string | `"0"` |  |
-| env[4].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
-| env[4].value | string | `"0x6"` |  |
-| env[5].name | string | `"L2GETH_P2P_PORT"` |  |
-| env[5].value | int | `30303` |  |
-| env[6].name | string | `"L2GETH_ENABLE_CCC"` |  |
-| env[6].value | bool | `false` |  |
-| env[7].name | string | `"L2GETH_CCC_RUST_LOG_LEVEL"` |  |
-| env[7].value | string | `"info"` |  |
-| env[8].name | string | `"L2GETH_MAX_PEERS"` |  |
-| env[8].value | int | `500` |  |
-| env[9].name | string | `"VERBOSITY"` |  |
-| env[9].value | int | `3` |  |
+| env[2].name | string | `"L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK"` |  |
+| env[2].value | string | `"0"` |  |
+| env[3].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
+| env[3].value | string | `"0x6"` |  |
+| env[4].name | string | `"L2GETH_P2P_PORT"` |  |
+| env[4].value | int | `30303` |  |
+| env[5].name | string | `"L2GETH_ENABLE_CCC"` |  |
+| env[5].value | bool | `false` |  |
+| env[6].name | string | `"L2GETH_CCC_RUST_LOG_LEVEL"` |  |
+| env[6].value | string | `"info"` |  |
+| env[7].name | string | `"L2GETH_MAX_PEERS"` |  |
+| env[7].value | int | `500` |  |
+| env[8].name | string | `"VERBOSITY"` |  |
+| env[8].value | int | `3` |  |
+| env[9].name | string | `"CCC_FLAG"` |  |
+| env[9].value | string | `"--ccc"` |  |
 | global.fullnameOverride | string | `"l2-bootnode"` |  |
 | global.nameOverride | string | `"l2-bootnode"` |  |
 | image.pullPolicy | string | `"Always"` |  |

diff --git a/charts/l2-bootnode/values.yaml b/charts/l2-bootnode/values.yaml
@@ -18,8 +18,6 @@ env:
     value: bootnode
   - name: L2GETH_NODEKEY
     value: ""
-  - name: L2GETH_PEER_LIST
-    value: '["enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303"]'
   - name: L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK
     value: "0"
   - name: L2GETH_L1_WATCHER_CONFIRMATIONS

diff --git a/charts/l2-rpc/README.md b/charts/l2-rpc/README.md
@@ -36,32 +36,30 @@ Kubernetes: `>=1.22.0-0`
 | envFrom[0].configMapRef.name | string | `"l2-rpc-env"` |  |
 | env[0].name | string | `"L2GETH_ROLE"` |  |
 | env[0].value | string | `"rpc"` |  |
-| env[10].name | string | `"VERBOSITY"` |  |
-| env[10].value | int | `3` |  |
-| env[11].name | string | `"CCC_FLAG"` |  |
-| env[11].value | string | `"--ccc"` |  |
-| env[12].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
-| env[12].value | string | `"1000000"` |  |
-| env[13].name | string | `"L2GETH_EXTRA_PARAMS"` |  |
-| env[13].value | string | `""` |  |
+| env[10].name | string | `"CCC_FLAG"` |  |
+| env[10].value | string | `"--ccc"` |  |
+| env[11].name | string | `"L2GETH_MIN_GAS_PRICE"` |  |
+| env[11].value | string | `"1000000"` |  |
+| env[12].name | string | `"L2GETH_EXTRA_PARAMS"` |  |
+| env[12].value | string | `""` |  |
 | env[1].name | string | `"L2GETH_NODEKEY"` |  |
 | env[1].value | string | `""` |  |
-| env[2].name | string | `"L2GETH_PEER_LIST"` |  |
-| env[2].value | string | `"[\"enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303\"]"` |  |
-| env[3].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
-| env[3].value | string | `"0x6"` |  |
-| 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 | int | `30303` |  |
-| env[7].name | string | `"L2GETH_ENABLE_CCC"` |  |
-| env[7].value | bool | `false` |  |
-| env[8].name | string | `"L2GETH_CCC_RUST_LOG_LEVEL"` |  |
-| env[8].value | string | `"info"` |  |
-| env[9].name | string | `"L2GETH_MAX_PEERS"` |  |
-| env[9].value | int | `500` |  |
+| env[2].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` |  |
+| env[2].value | string | `"0x6"` |  |
+| env[3].name | string | `"L2GETH_RPC_HTTP_PORT"` |  |
+| env[3].value | int | `8545` |  |
+| env[4].name | string | `"L2GETH_RPC_WS_PORT"` |  |
+| env[4].value | int | `8546` |  |
+| env[5].name | string | `"L2GETH_P2P_PORT"` |  |
+| env[5].value | int | `30303` |  |
+| env[6].name | string | `"L2GETH_ENABLE_CCC"` |  |
+| env[6].value | bool | `false` |  |
+| env[7].name | string | `"L2GETH_CCC_RUST_LOG_LEVEL"` |  |
+| env[7].value | string | `"info"` |  |
+| env[8].name | string | `"L2GETH_MAX_PEERS"` |  |
+| env[8].value | int | `500` |  |
+| env[9].name | string | `"VERBOSITY"` |  |
+| env[9].value | int | `3` |  |
 | global.fullnameOverride | string | `"l2-rpc"` |  |
 | global.nameOverride | string | `"l2-rpc"` |  |
 | image.pullPolicy | string | `"Always"` |  |

diff --git a/charts/l2-rpc/values.yaml b/charts/l2-rpc/values.yaml
@@ -49,8 +49,8 @@ env:
     value: rpc
   - name: L2GETH_NODEKEY
     value: ""
-  - name: L2GETH_PEER_LIST
-    value: '["enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303"]'
+#  - name: L2GETH_PEER_LIST
+#    value: '["enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303"]'
   - name: L2GETH_L1_WATCHER_CONFIRMATIONS
     value: "0x6"
   - name: L2GETH_RPC_HTTP_PORT

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.4
+version: 0.0.5
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:

diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -1,6 +1,6 @@
 # scroll-sdk
 
-![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)
 
 scroll helm charts to deploy scroll sdk
 

diff --git a/charts/scroll-sdk/config.toml b/charts/scroll-sdk/config.toml
@@ -41,7 +41,7 @@ L1_GAS_ORACLE_SENDER_ADDR = "0x90F79bf6EB2c4f870365E785982E1f101E93b906"
 L2_GAS_ORACLE_SENDER_ADDR = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 
 L2GETH_SIGNER_0_ADDRESS = "0x756EA06BDEe36de11F22DCca45a31d8a178eF3c6"
-
+L2GETH_PEER_LIST = '["enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303"]'
 [db]
 DATABASE_HOST = "postgresql"
 DATABASE_PORT = 5432

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_EXPLORER_DB_CONNECTION_STRING:DATABASE_URL 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"
+            echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2GETH_PEER_LIST:L2GETH_PEER_LIST"
             ;;
         l2-rpc)
             echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK"