From 62ce540a8e2e36dd5aac02ae11cb01e9ee5dffbf Mon Sep 17 00:00:00 2001 From: Denis Policastro Date: Wed, 18 Dec 2024 18:22:38 -0300 Subject: [PATCH] feat: update aztec sequencer values (#45) * feat: update aztec sequencer values * feat: update values --- charts/aztec-sequencer/Chart.yaml | 2 +- charts/aztec-sequencer/README.md | 29 +++++++++-------- charts/aztec-sequencer/files/init.sh | 1 + .../aztec-sequencer/templates/configmap.yaml | 1 + charts/aztec-sequencer/values.yaml | 32 +++++++++++-------- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/charts/aztec-sequencer/Chart.yaml b/charts/aztec-sequencer/Chart.yaml index e415b063..ce34435c 100644 --- a/charts/aztec-sequencer/Chart.yaml +++ b/charts/aztec-sequencer/Chart.yaml @@ -3,6 +3,6 @@ name: aztec-sequencer description: A Helm chart for deploying an Aztec sequencer type: application home: https://docs.aztec.network/ -version: 0.0.1 +version: 0.0.2 maintainers: - name: 0xDones diff --git a/charts/aztec-sequencer/README.md b/charts/aztec-sequencer/README.md index 177a36a4..b25d83f3 100644 --- a/charts/aztec-sequencer/README.md +++ b/charts/aztec-sequencer/README.md @@ -1,6 +1,6 @@ # aztec-sequencer -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying an Aztec sequencer @@ -32,38 +32,39 @@ helm install aztec-sequencer nethermind/aztec-sequencer | config.AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS | string | `"13"` | | | config.AZTEC_PORT | string | `"8080"` | | | config.AZTEC_SLOT_DURATION | string | `"36"` | | -| config.BOOTSTRAP_NODES | string | `"enr:-Jq4QO_3szmgtG2cbEdnFDIhpGAQkc1HwfNy4-M6sG9QmQbPTmp9PMOHR3xslfR23hORiU-GpA7uM9uXw49lFcnuuvYGjWF6dGVjX25ldHdvcmsBgmlkgnY0gmlwhCIwTIOJc2VjcDI1NmsxoQKQTN17XKCwjYSSwmTc-6YzCMhd3v6Ofl8TS-WunX6LCoN0Y3CCndCDdWRwgp3Q"` | | +| config.BOOTSTRAP_NODES | string | `""` | | | config.COINBASE | string | `"0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"` | | -| config.COIN_ISSUER_CONTRACT_ADDRESS | string | `"0xdc64a140aa3e981100a9beca4e685f962f0cf6c9"` | | +| config.COIN_ISSUER_CONTRACT_ADDRESS | string | `""` | | | config.DATA_DIRECTORY | string | `"/local-data"` | | | config.DEBUG | string | `"aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-aztec:libp2p_service,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*"` | | -| config.ETHEREUM_HOST | string | `"http://34.48.76.131:8545"` | | +| config.ETHEREUM_HOST | string | `""` | | | config.ETHEREUM_SLOT_DURATION | string | `"6sec"` | | -| config.FEE_JUICE_CONTRACT_ADDRESS | string | `"0xe7f1725e7734ce288f8367e1bb143e90bb3f0512"` | | -| config.FEE_JUICE_PORTAL_CONTRACT_ADDRESS | string | `"0x0165878a594ca255338adfa4d48449f69242eb8f"` | | -| config.GOVERNANCE_CONTRACT_ADDRESS | string | `"0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9"` | | -| config.GOVERNANCE_PROPOSER_CONTRACT_ADDRESS | string | `"0x9fe46736679d2d9a65f0992f2272de9f3c7fa6e0"` | | -| config.INBOX_CONTRACT_ADDRESS | string | `"0xed179b78d5781f93eb169730d8ad1be7313123f4"` | | +| config.FEE_JUICE_CONTRACT_ADDRESS | string | `""` | | +| config.FEE_JUICE_PORTAL_CONTRACT_ADDRESS | string | `""` | | +| config.GOVERNANCE_CONTRACT_ADDRESS | string | `""` | | +| config.GOVERNANCE_PROPOSER_CONTRACT_ADDRESS | string | `""` | | +| config.INBOX_CONTRACT_ADDRESS | string | `""` | | | config.L1_CHAIN_ID | string | `"1337"` | | | config.LOG_LEVEL | string | `"debug"` | | -| config.OUTBOX_CONTRACT_ADDRESS | string | `"0x1016b5aaa3270a65c315c664ecb238b6db270b64"` | | +| config.OUTBOX_CONTRACT_ADDRESS | string | `""` | | | config.P2P_ENABLED | string | `"true"` | | | config.P2P_TCP_LISTEN_ADDR | string | `"0.0.0.0:40400"` | | | config.P2P_UDP_LISTEN_ADDR | string | `"0.0.0.0:40400"` | | | config.PROVER_REAL_PROOFS | string | `"true"` | | | config.PXE_PROVER_ENABLED | string | `"true"` | | -| config.REGISTRY_CONTRACT_ADDRESS | string | `"0x5fbdb2315678afecb367f032d93f642f64180aa3"` | | -| config.REWARD_DISTRIBUTOR_CONTRACT_ADDRESS | string | `"0x5fc8d32690cc91d4c39d9d3abcbd16989f875707"` | | -| config.ROLLUP_CONTRACT_ADDRESS | string | `"0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6"` | | +| config.REGISTRY_CONTRACT_ADDRESS | string | `""` | | +| config.REWARD_DISTRIBUTOR_CONTRACT_ADDRESS | string | `""` | | +| config.ROLLUP_CONTRACT_ADDRESS | string | `""` | | | config.VALIDATOR_DISABLED | string | `"false"` | | | env | list | `[]` | | | envFrom | list | `[]` | | | extraInitContainers | list | `[]` | | +| extraInitScript | string | `"echo \"Running extra init script\"\necho 'test -z \"$PEER_ID_PRIVATE_KEY\" && export PEER_ID_PRIVATE_KEY=$(cat /var/lib/aztec/p2p-private-key)' >> /shared/env\necho \"Done\"\n"` | | | extraObjects | list | `[]` | | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"aztecprotocol/aztec"` | | -| image.tag | string | `"698cd3d62680629a3f1bfc0f82604534cedbccf3-x86_64"` | | +| image.tag | string | `"0.67.1"` | | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | | ingress.className | string | `""` | | diff --git a/charts/aztec-sequencer/files/init.sh b/charts/aztec-sequencer/files/init.sh index f42af020..9882d6d9 100755 --- a/charts/aztec-sequencer/files/init.sh +++ b/charts/aztec-sequencer/files/init.sh @@ -28,4 +28,5 @@ echo "export P2P_TCP_ANNOUNCE_ADDR=${EXTERNAL_NODE_IP}:${EXTERNAL_NODE_PORT}" >> echo "export VALIDATOR_PRIVATE_KEY=${PRIVATE_KEY}" >> /shared/env echo "export SEQ_PUBLISHER_PRIVATE_KEY=${PRIVATE_KEY}" >> /shared/env echo "export L1_PRIVATE_KEY=${PRIVATE_KEY}" >> /shared/env +echo 'test -z "$PEER_ID_PRIVATE_KEY" && export PEER_ID_PRIVATE_KEY=$(cat /var/lib/aztec/p2p-private-key)' >> /shared/env echo "Init script finished" diff --git a/charts/aztec-sequencer/templates/configmap.yaml b/charts/aztec-sequencer/templates/configmap.yaml index 1b642ffc..f9be38a6 100644 --- a/charts/aztec-sequencer/templates/configmap.yaml +++ b/charts/aztec-sequencer/templates/configmap.yaml @@ -19,3 +19,4 @@ metadata: data: init.sh: |- {{- .Files.Get "files/init.sh" | nindent 4 }} + {{- .Values.extraInitScript | nindent 4 }} diff --git a/charts/aztec-sequencer/values.yaml b/charts/aztec-sequencer/values.yaml index 4ae0c9b5..af9b1b77 100644 --- a/charts/aztec-sequencer/values.yaml +++ b/charts/aztec-sequencer/values.yaml @@ -8,7 +8,7 @@ image: repository: aztecprotocol/aztec pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "698cd3d62680629a3f1bfc0f82604534cedbccf3-x86_64" + tag: "0.67.1" imagePullSecrets: [] nameOverride: "" @@ -22,7 +22,7 @@ args: config: DATA_DIRECTORY: /local-data - ETHEREUM_HOST: "http://34.48.76.131:8545" + ETHEREUM_HOST: "" P2P_TCP_LISTEN_ADDR: 0.0.0.0:40400 P2P_UDP_LISTEN_ADDR: 0.0.0.0:40400 COINBASE: "0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -38,21 +38,27 @@ config: AZTEC_SLOT_DURATION: "36" AZTEC_EPOCH_DURATION: "32" AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS: "13" - BOOTSTRAP_NODES: "enr:-Jq4QO_3szmgtG2cbEdnFDIhpGAQkc1HwfNy4-M6sG9QmQbPTmp9PMOHR3xslfR23hORiU-GpA7uM9uXw49lFcnuuvYGjWF6dGVjX25ldHdvcmsBgmlkgnY0gmlwhCIwTIOJc2VjcDI1NmsxoQKQTN17XKCwjYSSwmTc-6YzCMhd3v6Ofl8TS-WunX6LCoN0Y3CCndCDdWRwgp3Q" - REGISTRY_CONTRACT_ADDRESS: "0x5fbdb2315678afecb367f032d93f642f64180aa3" - GOVERNANCE_PROPOSER_CONTRACT_ADDRESS: "0x9fe46736679d2d9a65f0992f2272de9f3c7fa6e0" - FEE_JUICE_CONTRACT_ADDRESS: "0xe7f1725e7734ce288f8367e1bb143e90bb3f0512" - ROLLUP_CONTRACT_ADDRESS: "0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6" - REWARD_DISTRIBUTOR_CONTRACT_ADDRESS: "0x5fc8d32690cc91d4c39d9d3abcbd16989f875707" - GOVERNANCE_CONTRACT_ADDRESS: "0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9" - COIN_ISSUER_CONTRACT_ADDRESS: "0xdc64a140aa3e981100a9beca4e685f962f0cf6c9" - FEE_JUICE_PORTAL_CONTRACT_ADDRESS: "0x0165878a594ca255338adfa4d48449f69242eb8f" - INBOX_CONTRACT_ADDRESS: "0xed179b78d5781f93eb169730d8ad1be7313123f4" - OUTBOX_CONTRACT_ADDRESS: "0x1016b5aaa3270a65c315c664ecb238b6db270b64" + BOOTSTRAP_NODES: "" + REGISTRY_CONTRACT_ADDRESS: "" + GOVERNANCE_PROPOSER_CONTRACT_ADDRESS: "" + FEE_JUICE_CONTRACT_ADDRESS: "" + ROLLUP_CONTRACT_ADDRESS: "" + REWARD_DISTRIBUTOR_CONTRACT_ADDRESS: "" + GOVERNANCE_CONTRACT_ADDRESS: "" + COIN_ISSUER_CONTRACT_ADDRESS: "" + FEE_JUICE_PORTAL_CONTRACT_ADDRESS: "" + INBOX_CONTRACT_ADDRESS: "" + OUTBOX_CONTRACT_ADDRESS: "" # Secret containing the validator keys validatorKeysSecret: "aztec-validator-keys" +# Additional commands to setup environment variables before starting the app +extraInitScript: | + echo "Running extra init script" + echo 'test -z "$PEER_ID_PRIVATE_KEY" && export PEER_ID_PRIVATE_KEY=$(cat /var/lib/aztec/p2p-private-key)' >> /shared/env + echo "Done" + env: []