diff --git a/charts/l2-bootnode/Chart.yaml b/charts/l2-bootnode/Chart.yaml index 5f1c3904..81e2324a 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.14 +version: 0.0.15 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 3d916fbb..558e97f8 100644 --- a/charts/l2-bootnode/README.md +++ b/charts/l2-bootnode/README.md @@ -1,6 +1,6 @@ # l2-bootnode -![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-bootnode helm chart @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | command[0] | string | `"bash"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && echo ${L2GETH_NODEKEY} > /l2geth/data/geth/nodekey && echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && geth --datadir \"/l2geth/data\" --port \"$L2GETH_P2P_PORT\" --syncmode full --networkid \"$CHAIN_ID\" --maxpeers \"$L2GETH_MAX_PEERS\" --netrestrict \"$L2GETH_NETRESTRICT\" --nat \"$L2GETH_NAT\" --bootnodes \"\" --gcmode archive --config \"/l2geth/config.toml\" --cache.noprefetch --verbosity 3 --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" $METRICS_FLAGS --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --metrics --metrics.expensive $L2GETH_EXTRA_PARAMS"` | | +| command[2] | string | `"geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && echo ${L2GETH_NODEKEY} > /l2geth/data/geth/nodekey && echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && geth --datadir \"/l2geth/data\" --port \"$L2GETH_P2P_PORT\" --syncmode full --networkid \"$CHAIN_ID\" --maxpeers \"$L2GETH_MAX_PEERS\" --netrestrict \"$L2GETH_NETRESTRICT\" --nat \"$L2GETH_NAT\" --bootnodes \"\" --gcmode archive --config \"/l2geth/config.toml\" --cache.noprefetch --verbosity 3 --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" $METRICS_FLAGS --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --metrics --metrics.expensive $L2GETH_EXTRA_PARAMS"` | | | controller.replicas | int | `1` | | | controller.strategy | string | `"RollingUpdate"` | | | controller.type | string | `"statefulset"` | | @@ -36,20 +36,30 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"l2-bootnode-env"` | | | env[0].name | string | `"L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK"` | | | env[0].value | string | `"0"` | | +| env[10].name | string | `"L2GETH_GLOBAL_SLOTS"` | | +| env[10].value | string | `"40960"` | | +| env[11].name | string | `"L2GETH_ACCOUNT_SLOTS"` | | +| env[11].value | string | `"128"` | | +| env[12].name | string | `"L2GETH_EXTRA_PARAMS"` | | +| env[12].value | string | `""` | | | env[1].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` | | | env[1].value | string | `"0x6"` | | | env[2].name | string | `"L2GETH_P2P_PORT"` | | | env[2].value | int | `30303` | | | env[3].name | string | `"L2GETH_CCC_FLAG"` | | | env[3].value | string | `"--ccc"` | | -| env[4].name | string | `"L2GETH_MAX_PEERS"` | | -| env[4].value | int | `500` | | -| env[5].name | string | `"VERBOSITY"` | | -| env[5].value | int | `3` | | -| env[6].name | string | `"L2GETH_MIN_GAS_PRICE"` | | -| env[6].value | string | `"1000000"` | | -| env[7].name | string | `"L2GETH_EXTRA_PARAMS"` | | -| env[7].value | string | `""` | | +| env[4].name | string | `"L2GETH_CCC_NUMWORKERS"` | | +| env[4].value | string | `"5"` | | +| env[5].name | string | `"L2GETH_MAX_PEERS"` | | +| env[5].value | int | `500` | | +| env[6].name | string | `"VERBOSITY"` | | +| env[6].value | int | `3` | | +| env[7].name | string | `"L2GETH_MIN_GAS_PRICE"` | | +| env[7].value | string | `"1000000"` | | +| env[8].name | string | `"L2GETH_GLOBAL_QUEUE"` | | +| env[8].value | string | `"4096"` | | +| env[9].name | string | `"L2GETH_ACCOUNT_QUEUE"` | | +| env[9].value | string | `"256"` | | | 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 index eb686144..6bb80be5 100644 --- a/charts/l2-bootnode/values.yaml +++ b/charts/l2-bootnode/values.yaml @@ -22,12 +22,22 @@ env: value: 30303 - name: L2GETH_CCC_FLAG value: "--ccc" + - name: L2GETH_CCC_NUMWORKERS + value: "5" - name: L2GETH_MAX_PEERS value: 500 - name: VERBOSITY value: 3 - name: L2GETH_MIN_GAS_PRICE value: "1000000" + - name: L2GETH_GLOBAL_QUEUE + value: "4096" + - name: L2GETH_ACCOUNT_QUEUE + value: "256" + - name: L2GETH_GLOBAL_SLOTS + value: "40960" + - name: L2GETH_ACCOUNT_SLOTS + value: "128" - name: L2GETH_EXTRA_PARAMS value: "" @@ -52,9 +62,12 @@ command: --pprof --pprof.addr \"0.0.0.0\" --pprof.port 6060 \ $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" \ $METRICS_FLAGS \ - --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG \ + --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" \ + --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" \ + --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG \ --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" \ - --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" \ + --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 \ + --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" \ --metrics --metrics.expensive \ $L2GETH_EXTRA_PARAMS" ] diff --git a/charts/l2-rpc/Chart.yaml b/charts/l2-rpc/Chart.yaml index 3f896aa1..205c8237 100644 --- 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.14 +version: 0.0.15 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/l2-rpc/README.md b/charts/l2-rpc/README.md index 3e640e73..1b3bda21 100644 --- a/charts/l2-rpc/README.md +++ b/charts/l2-rpc/README.md @@ -1,6 +1,6 @@ # l2-rpc -![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-rpc helm chart @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | command[0] | string | `"bash"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && 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\" $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" $METRICS_FLAGS --gcmode archive --cache.noprefetch --verbosity 3 --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --gpo.percentile 20 --gpo.blocks 100 --gpo.congestionthreshold 500 --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"` | | +| command[2] | string | `"geth --datadir \"/l2geth/data\" init /l2geth/genesis/genesis.json && echo \"[Node.P2P] StaticNodes = $L2GETH_PEER_LIST\" > \"/l2geth/config.toml\" && 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\" $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" $METRICS_FLAGS --gcmode archive --cache.noprefetch --verbosity 3 --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --gpo.percentile 20 --gpo.blocks 100 --gpo.congestionthreshold 500 --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,6 +36,16 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"l2-rpc-env"` | | | env[0].name | string | `"L2GETH_NODEKEY"` | | | env[0].value | string | `""` | | +| env[10].name | string | `"L2GETH_GLOBAL_QUEUE"` | | +| env[10].value | string | `"4096"` | | +| env[11].name | string | `"L2GETH_ACCOUNT_QUEUE"` | | +| env[11].value | string | `"256"` | | +| env[12].name | string | `"L2GETH_GLOBAL_SLOTS"` | | +| env[12].value | string | `"40960"` | | +| env[13].name | string | `"L2GETH_ACCOUNT_SLOTS"` | | +| env[13].value | string | `"128"` | | +| env[14].name | string | `"L2GETH_EXTRA_PARAMS"` | | +| env[14].value | string | `""` | | | env[1].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` | | | env[1].value | string | `"0x6"` | | | env[2].name | string | `"L2GETH_RPC_HTTP_PORT"` | | @@ -46,14 +56,14 @@ Kubernetes: `>=1.22.0-0` | env[4].value | int | `30303` | | | env[5].name | string | `"L2GETH_CCC_FLAG"` | | | env[5].value | string | `"--ccc"` | | -| env[6].name | string | `"L2GETH_MAX_PEERS"` | | -| env[6].value | int | `500` | | -| env[7].name | string | `"VERBOSITY"` | | -| env[7].value | int | `3` | | -| env[8].name | string | `"L2GETH_MIN_GAS_PRICE"` | | -| env[8].value | string | `"1000000"` | | -| env[9].name | string | `"L2GETH_EXTRA_PARAMS"` | | -| env[9].value | string | `""` | | +| env[6].name | string | `"L2GETH_CCC_NUMWORKERS"` | | +| env[6].value | string | `"5"` | | +| 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 | `"L2GETH_MIN_GAS_PRICE"` | | +| env[9].value | string | `"1000000"` | | | 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 index 389fa7da..ef32196d 100644 --- a/charts/l2-rpc/values.yaml +++ b/charts/l2-rpc/values.yaml @@ -57,12 +57,22 @@ env: value: 30303 - name: L2GETH_CCC_FLAG value: "--ccc" + - name: L2GETH_CCC_NUMWORKERS + value: "5" - name: L2GETH_MAX_PEERS value: 500 - name: VERBOSITY value: 3 - name: L2GETH_MIN_GAS_PRICE value: "1000000" + - name: L2GETH_GLOBAL_QUEUE + value: "4096" + - name: L2GETH_ACCOUNT_QUEUE + value: "256" + - name: L2GETH_GLOBAL_SLOTS + value: "40960" + - name: L2GETH_ACCOUNT_SLOTS + value: "128" - name: L2GETH_EXTRA_PARAMS value: "" @@ -88,10 +98,11 @@ command: --gcmode archive \ --cache.noprefetch \ --verbosity 3 \ - --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG \ - --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" \ - --gpo.percentile 20 \ - --gpo.blocks 100 \ + --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" \ + --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" \ + --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG \ + --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 \ + --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" --gpo.percentile 20 --gpo.blocks 100 \ --gpo.congestionthreshold 500 \ --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" \ --rollup.verify \ diff --git a/charts/l2-sequencer/Chart.yaml b/charts/l2-sequencer/Chart.yaml index 16a5e34d..830fd854 100644 --- 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.12 +version: 0.0.13 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/l2-sequencer/README.md b/charts/l2-sequencer/README.md index db401f71..7f1e09fe 100644 --- a/charts/l2-sequencer/README.md +++ b/charts/l2-sequencer/README.md @@ -1,6 +1,6 @@ # l2-sequencer -![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) +![Version: 0.0.13](https://img.shields.io/badge/Version-0.0.13-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,7 +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 \"[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 $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" --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"` | | +| 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 $L2GETH_CCC_FLAG --ccc.numworkers \"$L2GETH_CCC_NUMWORKERS\" --gcmode archive --cache.noprefetch --verbosity ${VERBOSITY} --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" --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,22 +36,32 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"l2-sequencer-env"` | | | env[0].name | string | `"L2GETH_L1_WATCHER_CONFIRMATIONS"` | | | env[0].value | string | `"0x6"` | | +| env[10].name | string | `"L2GETH_ACCOUNT_QUEUE"` | | +| env[10].value | string | `"256"` | | +| env[11].name | string | `"L2GETH_GLOBAL_SLOTS"` | | +| env[11].value | string | `"40960"` | | +| env[12].name | string | `"L2GETH_ACCOUNT_SLOTS"` | | +| env[12].value | string | `"128"` | | +| env[13].name | string | `"VERBOSITY"` | | +| env[13].value | string | `"3"` | | | env[1].name | string | `"L2GETH_LOCALS"` | | | env[1].value | string | `""` | | | env[2].name | string | `"L2GETH_CCC_FLAG"` | | | env[2].value | string | `"--ccc"` | | -| 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"` | | +| env[3].name | string | `"L2GETH_CCC_NUMWORKERS"` | | +| env[3].value | string | `"5"` | | +| 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 | `"L2GETH_GLOBAL_QUEUE"` | | +| env[9].value | string | `"4096"` | | | global.fullnameOverride | string | `"l2-sequencer"` | | | global.nameOverride | string | `"l2-sequencer"` | | | image.pullPolicy | string | `"Always"` | | diff --git a/charts/l2-sequencer/values.yaml b/charts/l2-sequencer/values.yaml index 0461227a..f522f085 100644 --- a/charts/l2-sequencer/values.yaml +++ b/charts/l2-sequencer/values.yaml @@ -20,6 +20,8 @@ env: value: "" - name: L2GETH_CCC_FLAG value: "--ccc" + - name: L2GETH_CCC_NUMWORKERS + value: "5" - name: L2GETH_MINER_GASLIMIT value: "10000000" - name: L2GETH_RPC_HTTP_PORT @@ -30,6 +32,14 @@ env: value: "30303" - name: L2GETH_MIN_GAS_PRICE value: "1000000" + - name: L2GETH_GLOBAL_QUEUE + value: "4096" + - name: L2GETH_ACCOUNT_QUEUE + value: "256" + - name: L2GETH_GLOBAL_SLOTS + value: "40960" + - name: L2GETH_ACCOUNT_SLOTS + value: "128" - name: VERBOSITY value: "3" @@ -59,10 +69,11 @@ command: --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 \ + --txpool.globalqueue \"$L2GETH_GLOBAL_QUEUE\" --txpool.accountqueue \"$L2GETH_ACCOUNT_QUEUE\" \ + --txpool.globalslots \"$L2GETH_GLOBAL_SLOTS\" --txpool.accountslots \"$L2GETH_ACCOUNT_SLOTS\" \ + --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 \ diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 35e76e3b..742fc3ac 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.51 +version: 0.0.52 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -66,11 +66,11 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l1-explorer.enabled - name: l2-bootnode - version: 0.0.14 + version: 0.0.15 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l2-bootnode.enabled - name: l2-rpc - version: 0.0.14 + version: 0.0.15 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l2-rpc.enabled - name: grafana @@ -78,7 +78,7 @@ dependencies: version: 7.3.11 condition: grafana.enabled - name: l2-sequencer - version: 0.0.12 + version: 0.0.13 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 index 14305464..262bc735 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.51](https://img.shields.io/badge/Version-0.0.51-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.52](https://img.shields.io/badge/Version-0.0.52-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.10 | | 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.14 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.14 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.12 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.0.15 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.15 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.13 | | 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.12 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rpc-gateway | 0.0.2 | diff --git a/charts/scroll-sdk/config.toml b/charts/scroll-sdk/config.toml index 41105455..2ef72d85 100644 --- a/charts/scroll-sdk/config.toml +++ b/charts/scroll-sdk/config.toml @@ -59,7 +59,6 @@ L2GETH_KEYSTORE = '{"address":"756ea06bdee36de11f22dcca45a31d8a178ef3c6","crypto L2GETH_PASSWORD = "scroll2022" L2GETH_NODEKEY = "2f59ff2fdee1c42a3d8c8980c313bc8d6c2557463f7bb92b0f0bc89a6d3cbf01" L2_GETH_STATIC_PEERS = '["enode://848a7d59dd8f60dd1a51160e6bc15c194937855443de9be4b2abd83e11a5c4ac21d61d065448c5c520826fe83f1f29eb5a452daccca27b8113aa897074132507@l2-sequencer:30303"]' -L2GETH_CCC_NUMWORKERS = 5 [rollup] diff --git a/devnet/Makefile b/devnet/Makefile index 4f6fcd0a..2f536424 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -7,7 +7,7 @@ L1_RPC_HOST := l1-devnet.scrollsdk bootstrap: echo "Pulling helm chart..." - helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.51 + helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.52 echo "Extracting helm chart..." tar -xvf *.tgz $(MAKE) config diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index dc216fd4..838b7bc0 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -58,13 +58,13 @@ 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 L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2GETH_CCC_NUMWORKERS:L2GETH_CCC_NUMWORKERS" + 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 L2GETH_CCC_NUMWORKERS:L2GETH_CCC_NUMWORKERS" + 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 L2_GETH_STATIC_PEERS:L2GETH_PEER_LIST L2GETH_CCC_NUMWORKERS:L2GETH_CCC_NUMWORKERS" + 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_SIGNER_CONFIG_PRIVATE_KEY_SIGNER_CONFIG_PRIVATE_KEY L1_FINALIZE_SENDER_PRIVATE_KEY:SCROLL_ROLLUP_L2_CONFIG_RELAYER_CONFIG_FINALIZE_SENDER_SIGNER_CONFIG_PRIVATE_KEY_SIGNER_CONFIG_PRIVATE_KEY" diff --git a/examples/config.toml.example b/examples/config.toml.example index 4e12bdec..75383920 100644 --- a/examples/config.toml.example +++ b/examples/config.toml.example @@ -59,8 +59,6 @@ L2GETH_KEYSTORE = '' L2GETH_PASSWORD = "" L2GETH_NODEKEY = "" -L2GETH_CCC_NUMWORKERS = 5 - [bootnode.bootnode-0] L2GETH_NODEKEY=""