From b1cb1d12072fefb0e2a6b59a76d84a4dd004bcd2 Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Thu, 27 Jun 2024 20:17:05 +0000 Subject: [PATCH] Update from https://github.com/astriaorg/astria/commit/811c95dc918461c42d689749385ef07db2cc45b1 --- charts/evm-rollup/Chart.yaml | 2 +- charts/evm-rollup/values.yaml | 6 +- charts/sequencer/Chart.lock | 2 +- charts/sequencer/Chart.yaml | 5 +- .../files/cometbft/config/config.toml | 88 +++---- .../files/cometbft/config/genesis.json | 114 ++++----- charts/sequencer/templates/_helpers.tpl | 4 +- charts/sequencer/templates/configmaps.yaml | 38 +-- charts/sequencer/templates/ingress.yaml | 8 +- charts/sequencer/templates/service.yaml | 32 +-- .../sequencer/templates/servicemonitor.yaml | 4 +- charts/sequencer/templates/statefulsets.yaml | 36 +-- .../sequencer/templates/storageclasses.yaml | 2 +- charts/sequencer/templates/volumes.yaml | 10 +- charts/sequencer/values.yaml | 237 +++++++++++------- 15 files changed, 326 insertions(+), 262 deletions(-) diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index a689d45..c394466 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.20.2 +version: 0.20.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 351ea28..124de8b 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -10,7 +10,7 @@ images: geth: repo: ghcr.io/astriaorg/astria-geth tag: 0.11.0 - devTag: pr-30 + devTag: latest conductor: repo: ghcr.io/astriaorg/conductor tag: "0.17.0" @@ -332,8 +332,8 @@ resources: memory: 1Gi geth: requests: - cpu: 4 - memory: 16Gi + cpu: 16 + memory: 32Gi storage: enabled: false diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index 77611f5..2dc237c 100644 --- a/charts/sequencer/Chart.lock +++ b/charts/sequencer/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: file://../sequencer-relayer version: 0.8.5 digest: sha256:66ce8c4cd8500a63282f7ab112682f8cd50c2253a0b046ec41e0c637c9b66bd9 -generated: "2024-06-10T13:21:58.112283375+01:00" +generated: "2024-06-12T20:19:19.560729+03:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index d65d5b1..4b43ab2 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,8 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.16.0 - +version: 0.16.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. @@ -32,7 +31,7 @@ dependencies: maintainers: - name: wafflesvonmaple url: astria.org - - name: steezeburger + - name: quasystaty1 url: astria.org - name: joroshiba url: astria.org diff --git a/charts/sequencer/files/cometbft/config/config.toml b/charts/sequencer/files/cometbft/config/config.toml index 929a77d..d0f5bd3 100644 --- a/charts/sequencer/files/cometbft/config/config.toml +++ b/charts/sequencer/files/cometbft/config/config.toml @@ -19,7 +19,7 @@ version = "0.38.6" proxy_app = "tcp://127.0.0.1:{{ .Values.ports.sequencerABCI }}" # A custom human readable name for this node -moniker = "{{ .Values.config.moniker }}" +moniker = "{{ .Values.moniker }}" # Database backend: goleveldb | cleveldb | boltdb | rocksdb | badgerdb # * goleveldb (github.com/syndtr/goleveldb - most popular implementation) @@ -45,11 +45,11 @@ db_backend = "goleveldb" # Database directory db_dir = "data" -# Output level for logging, including package level options -log_level = "info" +# Output level for logging, including package level options, defaults to info +log_level = "{{ .Values.cometbft.config.logLevel }}" -# Output format: 'plain' (colored text) or 'json' -log_format = "plain" +# Output format: 'plain' (colored text) or 'json', default to plain +log_format = "{{ .Values.cometbft.config.logFormat }}" ##### additional base config options ##### @@ -57,7 +57,7 @@ log_format = "plain" genesis_file = "config/genesis.json" # Path to the JSON file containing the private key to use as a validator in the consensus protocol -priv_validator_key_file = "/secrets/{{ .Values.config.cometBFT.secrets.privValidatorKey.filename }}" +priv_validator_key_file = "/secrets/{{ .Values.cometbft.secrets.privValidatorKey.filename }}" # Path to the JSON file containing the last sign state of a validator priv_validator_state_file = "data/priv_validator_state.json" @@ -67,7 +67,7 @@ priv_validator_state_file = "data/priv_validator_state.json" priv_validator_laddr = "" # Path to the JSON file containing the private key to use for node authentication in the p2p protocol -node_key_file = "/secrets/{{ .Values.config.cometBFT.secrets.nodeKey.filename }}" +node_key_file = "/secrets/{{ .Values.cometbft.secrets.nodeKey.filename }}" # Mechanism to connect to the ABCI application: socket | grpc abci = "socket" @@ -87,7 +87,7 @@ filter_peers = false [rpc] # TCP or UNIX socket address for the RPC server to listen on -laddr = "tcp://0.0.0.0:{{ .Values.ports.cometBFTRPC }}" +laddr = "tcp://0.0.0.0:{{ .Values.ports.cometbftRpc }}" # A list of origins a cross-domain request can be executed from # Default value '[]' disables cors support @@ -111,7 +111,7 @@ grpc_laddr = "" # 0 - unlimited. # Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} # 1024 - 40 - 10 - 50 = 924 = ~900 -grpc_max_open_connections = 900 +grpc_max_open_connections = {{ .Values.cometbft.config.grpc.maxOpenConnections }} # Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool unsafe = false @@ -123,17 +123,17 @@ unsafe = false # 0 - unlimited. # Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} # 1024 - 40 - 10 - 50 = 924 = ~900 -max_open_connections = 900 +max_open_connections = {{ .Values.cometbft.config.rpc.maxOpenConnections }} # Maximum number of unique clientIDs that can /subscribe # If you're using /broadcast_tx_commit, set to the estimated maximum number # of broadcast_tx_commit calls per block. -max_subscription_clients = 100 +max_subscription_clients = {{ .Values.cometbft.config.rpc.maxSubscriptionClients }} # Maximum number of unique queries a given client can /subscribe to # If you're using GRPC (or Local RPC client) and /broadcast_tx_commit, set to # the estimated # maximum number of broadcast_tx_commit calls per block. -max_subscriptions_per_client = 5 +max_subscriptions_per_client = {{ .Values.cometbft.config.rpc.maxSubscriptionsPerClient }} # Experimental parameter to specify the maximum number of events a node will # buffer, per subscription, before returning an error and closing the @@ -169,10 +169,10 @@ experimental_close_on_slow_client = false timeout_broadcast_tx_commit = "10s" # Maximum size of request body, in bytes -max_body_bytes = 1000000 +max_body_bytes = 1_000_000 # Maximum size of request header, in bytes -max_header_bytes = 1048576 +max_header_bytes = 1_048_576 # The path to a file containing certificate that is used to create the HTTPS server. # Might be either absolute path or path related to CometBFT's config directory. @@ -198,18 +198,18 @@ pprof_laddr = "" [p2p] # Address to listen for incoming connections -laddr = "{{ .Values.config.cometBFT.p2p.laddr }}:{{ .Values.ports.cometBFTP2P }}" +laddr = "{{ .Values.cometbft.config.p2p.laddr }}:{{ .Values.ports.cometbftP2P }}" # Address to advertise to peers for them to dial. If empty, will use the same # port as the laddr, and will introspect on the listener to figure out the # address. IP and port are required. Example: 159.89.10.97:26656 -external_address = "{{ .Values.config.cometBFT.p2p.externalAddress }}" +external_address = "{{ .Values.cometbft.config.p2p.externalAddress }}" # Comma separated list of seed nodes to connect to -seeds = "{{ join "," .Values.config.cometBFT.p2p.seeds }}" +seeds = "{{ join "," .Values.cometbft.config.p2p.seeds }}" # Comma separated list of nodes to keep persistent connections to -persistent_peers = "{{ join "," .Values.config.cometBFT.p2p.persistentPeers }}" +persistent_peers = "{{ join "," .Values.cometbft.config.p2p.persistentPeers }}" # Path to address book addr_book_file = "config/addrbook.json" @@ -219,16 +219,16 @@ addr_book_file = "config/addrbook.json" addr_book_strict = true # Maximum number of inbound peers -max_num_inbound_peers = 40 +max_num_inbound_peers = {{ .Values.cometbft.config.p2p.maxInboundPeers }} # Maximum number of outbound peers to connect to, excluding persistent peers -max_num_outbound_peers = 10 +max_num_outbound_peers = {{ .Values.cometbft.config.p2p.maxOutboundPeers }} # List of node IDs, to which a connection will be (re)established ignoring any existing limits -unconditional_peer_ids = "{{ join "," .Values.config.cometBFT.p2p.unconditionalPeers }}" +unconditional_peer_ids = "{{ join "," .Values.cometbft.config.p2p.unconditionalPeers }}" # Maximum pause when redialing a persistent peer (if zero, exponential backoff is used) -persistent_peers_max_dial_period = "0s" +persistent_peers_max_dial_period = "{{ .Values.cometbft.config.p2p.persistentPeersMaxDialPeriod }}" # Time to wait before flushing messages out on the connection flush_throttle_timeout = "100ms" @@ -237,10 +237,10 @@ flush_throttle_timeout = "100ms" max_packet_msg_payload_size = 1024 # Rate at which packets can be sent, in bytes/second -send_rate = 5120000 +send_rate = {{ .Values.cometbft.config.p2p.sendRate }} # Rate at which packets can be received, in bytes/second -recv_rate = 5120000 +recv_rate = {{ .Values.cometbft.config.p2p.recvRate }} # Set true to enable the peer-exchange reactor pex = true @@ -249,17 +249,17 @@ pex = true # peers. If another node asks it for addresses, it responds and disconnects. # # Does not work if the peer-exchange reactor is disabled. -seed_mode = {{ .Values.config.cometBFT.p2p.seedMode }} +seed_mode = "{{ .Values.cometbft.config.p2p.seedMode }}" # Comma separated list of peer IDs to keep private (will not be gossiped to other peers) -private_peer_ids = "{{ join "," .Values.config.cometBFT.p2p.privatePeers }}" +private_peer_ids = "{{ join "," .Values.cometbft.config.p2p.privatePeers }}" # Toggle to disable guard against peers connecting from the same ip. -allow_duplicate_ip = false +allow_duplicate_ip = "{{ .Values.cometbft.config.p2p.allowDuplicateIp }}" # Peer connection configuration. -handshake_timeout = "20s" -dial_timeout = "3s" +handshake_timeout = "{{ .Values.cometbft.config.p2p.handshakeTimeout }}" +dial_timeout = "{{ .Values.cometbft.config.p2p.dialTimeout }}" ####################################################### ### Mempool Configuration Option ### @@ -297,15 +297,15 @@ broadcast = true wal_dir = "" # Maximum number of transactions in the mempool -size = 5000 +size = {{ .Values.cometbft.config.mempool.size }} # Limit the total size of all txs in the mempool. # This only accounts for raw transactions (e.g. given 1MB transactions and # max_txs_bytes=5MB, mempool will only accept 5 transactions). -max_txs_bytes = 1073741824 +max_txs_bytes = {{ .Values.cometbft.config.mempool.maxTxsBytes}} # Size of the cache (used to filter transactions we saw earlier) in transactions -cache_size = 10000 +cache_size = {{ .Values.cometbft.config.mempool.cacheSize}} # Do not remove invalid transactions from the cache (default: false) # Set to true if it's not possible for any invalid transaction to become valid @@ -314,7 +314,7 @@ keep-invalid-txs-in-cache = false # Maximum size of a single transaction. # NOTE: the max size of a tx transmitted over the network is {max_tx_bytes}. -max_tx_bytes = 1048576 +max_tx_bytes = {{ .Values.cometbft.config.mempool.maxTxBytes}} # Maximum size of a batch of transactions to send to a peer # Including space needed by encoding (one varint per transaction). @@ -393,21 +393,21 @@ version = "v0" wal_file = "data/cs.wal/wal" # How long we wait for a proposal block before prevoting nil -timeout_propose = "3s" +timeout_propose = "{{ .Values.cometbft.config.consensus.timeoutPropose }}" # How much timeout_propose increases with each round -timeout_propose_delta = "500ms" +timeout_propose_delta = "{{ .Values.cometbft.config.consensus.timeoutProposeDelta }}" # How long we wait after receiving +2/3 prevotes for “anything” (ie. not a single block or nil) -timeout_prevote = "1s" +timeout_prevote = "{{ .Values.cometbft.config.consensus.timeoutPrevote }}" # How much the timeout_prevote increases with each round -timeout_prevote_delta = "500ms" +timeout_prevote_delta = "{{ .Values.cometbft.config.consensus.timeoutPrevoteDelta }}" # How long we wait after receiving +2/3 precommits for “anything” (ie. not a single block or nil) -timeout_precommit = "1s" +timeout_precommit = "{{ .Values.cometbft.config.consensus.timeoutPrecommit }}" # How much the timeout_precommit increases with each round -timeout_precommit_delta = "500ms" +timeout_precommit_delta = "{{ .Values.cometbft.config.consensus.timeoutPrecommitDelta }}" # How long we wait after committing a block, before starting on the new # height (this gives us a chance to receive some more precommits, even # though we already have +2/3). -timeout_commit = "2s" +timeout_commit = "{{ .Values.cometbft.config.consensus.timeoutCommit }}" # How many blocks to look back to check existence of the node's consensus votes before joining consensus # When non-zero, the node will panic upon restart @@ -453,7 +453,7 @@ discard_abci_responses = false # - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed. # 3) "psql" - the indexer services backed by PostgreSQL. # When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed. -{{- if .Values.config.cometBFT.psql.enabled }} +{{- if .Values.cometbft.config.psql.enabled }} indexer = "psql" {{- else }} indexer = "kv" @@ -461,8 +461,8 @@ indexer = "kv" # The PostgreSQL connection configuration, the connection format: # postgresql://:@:/? -{{- if .Values.config.cometBFT.psql.enabled }} -psql-conn = "{{ .Values.config.cometBFt.psql.conn }}" +{{- if .Values.cometbft.config.psql.enabled }} +psql-conn = "{{ .Values.cometbft.config.psql.conn }}" {{- else }} psql-conn = "" {{- end }} @@ -486,4 +486,4 @@ prometheus_listen_addr = ":26660" max_open_connections = 3 # Instrumentation namespace -namespace = "cometbft" +namespace = "{{ .Values.cometbft.config.instrumentation.namespace }}" diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json index f549699..2d3d17d 100644 --- a/charts/sequencer/files/cometbft/config/genesis.json +++ b/charts/sequencer/files/cometbft/config/genesis.json @@ -1,78 +1,78 @@ { "app_hash": "", "app_state": { - "native_asset_base_denomination": "{{ .Values.config.sequencer.nativeAssetBaseDenomination }}", + "native_asset_base_denomination": "{{ .Values.genesis.nativeAssetBaseDenomination }}", "fees": { - "transfer_base_fee": 12, - "sequence_base_fee": 32, - "sequence_byte_cost_multiplier": 1, - "init_bridge_account_base_fee": 48, - "bridge_lock_byte_cost_multiplier": 1, - "bridge_sudo_change_fee": 24, - "ics20_withdrawal_base_fee": 24 + "transfer_base_fee": {{ .Values.genesis.fees.transferBaseFee }}, + "sequence_base_fee": {{ .Values.genesis.fees.sequenceBaseFee }}, + "sequence_byte_cost_multiplier": {{ .Values.genesis.fees.sequenceByteCostMultiplier }}, + "init_bridge_account_base_fee": {{ .Values.genesis.fees.initBridgeAccountBaseFee }}, + "bridge_lock_byte_cost_multiplier": {{ .Values.genesis.fees.bridgeLockByteCostMultiplier }}, + "bridge_sudo_change_fee": {{ .Values.genesis.fees.bridgeSudoChangeFee }}, + "ics20_withdrawal_base_fee": {{ .Values.genesis.fees.ics20WithdrawalBaseFee }} }, "allowed_fee_assets": [ - {{- range $index, $value := .Values.config.sequencer.allowedFeeAssets }} + {{- range $index, $value := .Values.genesis.allowedFeeAssets }} {{- if $index }},{{- end }} "{{ $value }}" {{- end }} ], "ibc_params": { - "ibc_enabled": {{ .Values.config.sequencer.ibc.enabled }}, - "inbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.inboundEnabled }}, - "outbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.outboundEnabled }} + "ibc_enabled": {{ .Values.genesis.ibc.enabled }}, + "inbound_ics20_transfers_enabled": {{ .Values.genesis.ibc.inboundEnabled }}, + "outbound_ics20_transfers_enabled": {{ .Values.genesis.ibc.outboundEnabled }} }, {{- if not .Values.global.dev }} - "accounts": [ - {{- range $index, $value := .Values.config.sequencer.genesisAccounts }} - {{- if $index }},{{- end }} - { - "address": "{{ $value.address }}", - "balance": {{ toString $value.balance | replace "\"" "" }} - } - {{- end }} - ], - "authority_sudo_address": "{{ .Values.config.sequencer.authoritySudoAddress }}", - "ibc_sudo_address": "{{ .Values.config.sequencer.ibc.sudoAddress }}", - "ibc_relayer_addresses": [ - {{- range $index, $value := .Values.config.sequencer.ibc.relayerAddresses }} - {{- if $index }},{{- end }} - "{{ $value }}" - {{- end }} - ] + "accounts": [ + {{- range $index, $value := .Values.genesis.genesisAccounts }} + {{- if $index }},{{- end }} + { + "address": "{{ $value.address }}", + "balance": {{ toString $value.balance | replace "\"" "" }} + } + {{- end }} + ], + "authority_sudo_address": "{{ .Values.genesis.authoritySudoAddress }}", + "ibc_sudo_address": "{{ .Values.genesis.ibc.sudoAddress }}", + "ibc_relayer_addresses": [ + {{- range $index, $value := .Values.genesis.ibc.relayerAddresses }} + {{- if $index }},{{- end }} + "{{ $value }}" + {{- end }} + ] {{- else }} - "address_prefixes": { - "base": "{{ .Values.config.sequencer.addressPrefixes.base }}" - }, - "accounts": [ - {{- range $index, $value := .Values.config.sequencer.genesisAccounts }} - {{- if $index }},{{- end }} - { - "address": {{ include "sequencer.address" $value.address }}, - "balance": {{ toString $value.balance | replace "\"" "" }} - } - {{- end }} - ], - "authority_sudo_address": {{ include "sequencer.address" .Values.config.sequencer.authoritySudoAddress }}, - "ibc_sudo_address": {{ include "sequencer.address" .Values.config.sequencer.ibc.sudoAddress }}, - "ibc_relayer_addresses": [ - {{- range $index, $value := .Values.config.sequencer.ibc.relayerAddresses }} - {{- if $index }},{{- end }} - {{ include "sequencer.address" $value }} - {{- end }} - ] + "address_prefixes": { + "base": "{{ .Values.genesis.addressPrefixes.base }}" + }, + "accounts": [ + {{- range $index, $value := .Values.genesis.genesisAccounts }} + {{- if $index }},{{- end }} + { + "address": {{ include "sequencer.address" $value.address }}, + "balance": {{ toString $value.balance | replace "\"" "" }} + } + {{- end }} + ], + "authority_sudo_address": {{ include "sequencer.address" .Values.genesis.authoritySudoAddress }}, + "ibc_sudo_address": {{ include "sequencer.address" .Values.genesis.ibc.sudoAddress }}, + "ibc_relayer_addresses": [ + {{- range $index, $value := .Values.genesis.ibc.relayerAddresses }} + {{- if $index }},{{- end }} + {{ include "sequencer.address" $value }} + {{- end }} + ] {{- end}} }, - "chain_id": "{{ .Values.config.cometBFT.chainId }}", + "chain_id": "{{ .Values.genesis.chainId }}", "consensus_params": { "block": { - "max_bytes": "22020096", - "max_gas": "-1" + "max_bytes": " {{ .Values.genesis.consensusParams.blockMaxBytes }}", + "max_gas": "{{ .Values.genesis.consensusParams.blockMaxGas }}" }, "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" + "max_age_duration": "{{ .Values.genesis.consensusParams.maxAgeDuration }}", + "max_age_num_blocks": " {{ .Values.genesis.consensusParams.maxAgeNumBlocks }}", + "max_bytes": "{{ .Values.genesis.consensusParams.maxBytes }}" }, "validator": { "pub_key_types": [ @@ -83,10 +83,10 @@ "app": "0" } }, - "genesis_time": "{{ .Values.config.cometBFT.genesisTime }}", + "genesis_time": "{{ .Values.genesis.genesisTime }}", "initial_height": "0", "validators": [ - {{- range $index, $value := .Values.config.cometBFT.validators }} + {{- range $index, $value := .Values.genesis.validators }} {{- if $index }},{{- end }} { "address": "{{ $value.address }}", diff --git a/charts/sequencer/templates/_helpers.tpl b/charts/sequencer/templates/_helpers.tpl index d0eae4a..bab0a23 100644 --- a/charts/sequencer/templates/_helpers.tpl +++ b/charts/sequencer/templates/_helpers.tpl @@ -50,7 +50,7 @@ Return the appropriate apiVersion for ingress. Expand the name of the chart. */}} {{- define "sequencer.name" -}} -{{- default .Values.config.moniker | trunc 63 | trimSuffix "-" }}-sequencer +{{- default .Values.moniker | trunc 63 | trimSuffix "-" }}-sequencer {{- end }} {{/* @@ -65,7 +65,7 @@ Selector labels */}} {{- define "sequencer.selectorLabels" -}} app: {{ include "sequencer.name" . }} -name: {{ .Values.config.moniker }}-sequencer-metrics +name: {{ .Values.moniker }}-sequencer-metrics {{- end }} {{/* New sequencer address */}} diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index 5c2fb9b..34725df 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-cometbft-config + name: {{ .Values.moniker }}-cometbft-config namespace: {{ include "sequencer.namespace" . }} data: genesis.json: | @@ -13,10 +13,10 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-cometbft-secrets + name: {{ .Values.moniker }}-cometbft-secrets namespace: {{ include "sequencer.namespace" . }} data: - {{- range $secret := .Values.config.cometBFT.secrets }} + {{- range $secret := .Values.cometbft.secrets }} {{ $secret.filename }}: | {{- toJson $secret.devContent | nindent 4 }} {{- end }} @@ -25,7 +25,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-cometbft-init-scripts + name: {{ .Values.moniker }}-cometbft-init-scripts namespace: {{ include "sequencer.namespace" . }} data: init-cometbft.sh: | @@ -34,7 +34,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-cometbft-data + name: {{ .Values.moniker }}-cometbft-data namespace: {{ include "sequencer.namespace" . }} data: priv_validator_state.json: | @@ -43,35 +43,35 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-cometbft-env + name: {{ .Values.moniker }}-cometbft-env namespace: {{ include "sequencer.namespace" . }} data: - COMET_BFT_RPC_PORT: "{{ .Values.ports.cometBFTRPC }}" + COMET_BFT_RPC_PORT: "{{ .Values.ports.cometbftRpc }}" --- apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.moniker }}-sequencer-env + name: {{ .Values.moniker }}-sequencer-env namespace: {{ include "sequencer.namespace" . }} data: ASTRIA_SEQUENCER_LOG: "astria_sequencer=debug" ASTRIA_SEQUENCER_LISTEN_ADDR: "127.0.0.1:{{ .Values.ports.sequencerABCI }}" ASTRIA_SEQUENCER_DB_FILEPATH: "/sequencer/penumbra.db" ASTRIA_SEQUENCER_ENABLE_MINT: "false" - # Socket address for gRPC server - ASTRIA_SEQUENCER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.sequencerGRPC }}" - ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.config.sequencer.metrics.enabled }}" + # Socket address for GRPC server + ASTRIA_SEQUENCER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.sequencerGrpc }}" + ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.sequencer.metrics.enabled }}" ASTRIA_SEQUENCER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.sequencerMetrics }}" ASTRIA_SEQUENCER_FORCE_STDOUT: "{{ .Values.global.useTTY }}" ASTRIA_SEQUENCER_PRETTY_PRINT: "{{ .Values.global.useTTY }}" - ASTRIA_SEQUENCER_NO_OTEL: "{{ not .Values.config.sequencer.otel.enabled }}" - OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.config.sequencer.otel.endpoint }}" - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "{{ .Values.config.sequencer.otel.tracesEndpoint }}" - OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "{{ .Values.config.sequencer.otel.tracesTimeout }}" - OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.sequencer.otel.tracesCompression }}" - OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.sequencer.otel.otlpHeaders }}" - OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.sequencer.otel.traceHeaders }}" - OTEL_SERVICE_NAME: "{{ tpl .Values.config.sequencer.otel.serviceName . }}" + ASTRIA_SEQUENCER_NO_OTEL: "{{ not .Values.sequencer.otel.enabled }}" + OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sequencer.otel.endpoint }}" + OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "{{ .Values.sequencer.otel.tracesEndpoint }}" + OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "{{ .Values.sequencer.otel.tracesTimeout }}" + OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.sequencer.otel.tracesCompression }}" + OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.sequencer.otel.otlpHeaders }}" + OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.sequencer.otel.traceHeaders }}" + OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}" {{- if not .Values.global.dev }} {{- else }} {{- end }} diff --git a/charts/sequencer/templates/ingress.yaml b/charts/sequencer/templates/ingress.yaml index 371a90d..cbaf651 100644 --- a/charts/sequencer/templates/ingress.yaml +++ b/charts/sequencer/templates/ingress.yaml @@ -12,7 +12,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ .Values.config.moniker }}-sequencer-rpc-ingress + name: {{ .Values.moniker }}-sequencer-rpc-ingress namespace: {{ include "sequencer.namespace" . }} labels: {{- with $ingress.labels }} @@ -71,7 +71,7 @@ spec: pathType: Prefix backend: service: - name: {{ $.Values.config.moniker }}-sequencer-rpc-service + name: {{ $.Values.moniker }}-sequencer-rpc-service port: name: cometbft-rpc {{- end }} @@ -87,7 +87,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ .Values.config.moniker }}-sequencer-grpc-ingress + name: {{ .Values.moniker }}-sequencer-grpc-ingress namespace: {{ include "sequencer.namespace" . }} labels: {{- with $ingress.labels }} @@ -147,7 +147,7 @@ spec: pathType: Prefix backend: service: - name: {{ .Values.config.moniker }}-sequencer-grpc-service + name: {{ .Values.moniker }}-sequencer-grpc-service port: name: sequencer-grpc {{- end }} diff --git a/charts/sequencer/templates/service.yaml b/charts/sequencer/templates/service.yaml index 1844285..9ae814b 100644 --- a/charts/sequencer/templates/service.yaml +++ b/charts/sequencer/templates/service.yaml @@ -1,66 +1,68 @@ kind: Service apiVersion: v1 metadata: - name: {{ .Values.config.moniker }}-sequencer-rpc-service + name: {{ .Values.moniker }}-sequencer-rpc-service namespace: {{ include "sequencer.namespace" . }} spec: selector: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer ports: - name: cometbft-rpc - port: {{ .Values.ports.cometBFTRPC }} + port: {{ .Values.ports.cometbftRpc }} targetPort: cometbft-rpc --- kind: Service apiVersion: v1 metadata: - name: {{ .Values.config.moniker }}-sequencer-p2p-service + name: {{ .Values.moniker }}-sequencer-p2p-service namespace: {{ include "sequencer.namespace" . }} spec: selector: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer ports: - name: cometbft-p2p targetPort: cometbft-p2p - {{- if and .Values.config.cometBFT.p2p.externalAddress (not .Values.ingress.p2p.enabled)}} - {{- $parsedExternal := splitList ":" .Values.config.cometBFT.p2p.externalAddress }} + {{- if and .Values.cometbft.config.p2p.externalAddress (not .Values.ingress.p2p.enabled)}} + {{- $parsedExternal := splitList ":" .Values.cometbft.config.p2p.externalAddress }} {{- $externalAddress := index $parsedExternal 0 }} {{- $externalPort := index $parsedExternal 1 }} port: {{ $externalPort }} type: LoadBalancer loadBalancerIP: {{ $externalAddress }} {{- else }} - port: {{ .Values.ports.cometBFTP2P }} + port: {{ .Values.ports.cometbftP2P }} type: NodePort {{- end }} --- kind: Service apiVersion: v1 metadata: - name: {{ .Values.config.moniker }}-sequencer-grpc-service + name: {{ .Values.moniker }}-sequencer-grpc-service namespace: {{ include "sequencer.namespace" . }} spec: selector: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer ports: - name: sequencer-grpc - port: {{ .Values.ports.sequencerGRPC }} + port: {{ .Values.ports.sequencerGrpc }} targetPort: sequencer-grpc --- {{- if .Values.serviceMonitor.enabled }} kind: Service apiVersion: v1 metadata: - name: {{ .Values.config.moniker }}-sequencer-metrics + name: {{ .Values.moniker }}-sequencer-metrics namespace: {{ include "sequencer.namespace" . }} + labels: + app: {{ .Values.moniker }}-sequencer spec: selector: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer ports: - name: cometbft-metric - port: {{ .Values.ports.cometBFTMETRICS }} + port: {{ .Values.ports.cometbftMetrics }} targetPort: cometbft-metric - {{- if .Values.config.sequencer.metrics.enabled }} + {{- if .Values.sequencer.metrics.enabled }} - name: seq-metric port: {{ .Values.ports.sequencerMetrics }} targetPort: seq-metric diff --git a/charts/sequencer/templates/servicemonitor.yaml b/charts/sequencer/templates/servicemonitor.yaml index 914406e..5eb681a 100644 --- a/charts/sequencer/templates/servicemonitor.yaml +++ b/charts/sequencer/templates/servicemonitor.yaml @@ -15,7 +15,7 @@ spec: - {{ include "sequencer.namespace" . }} selector: matchLabels: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer endpoints: - port: cometbft-metric path: /metrics @@ -25,7 +25,7 @@ spec: {{- with .Values.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - {{- if .Values.config.sequencer.metrics.enabled }} + {{- if .Values.sequencer.metrics.enabled }} - port: seq-metric path: / {{- with .Values.serviceMonitor.interval }} diff --git a/charts/sequencer/templates/statefulsets.yaml b/charts/sequencer/templates/statefulsets.yaml index 74f1b0f..588f75a 100644 --- a/charts/sequencer/templates/statefulsets.yaml +++ b/charts/sequencer/templates/statefulsets.yaml @@ -3,18 +3,18 @@ kind: StatefulSet metadata: name: sequencer labels: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer namespace: {{ include "sequencer.namespace" . }} spec: replicas: {{ .Values.global.replicaCount }} selector: matchLabels: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer template: metadata: name: astria-sequencer labels: - app: {{ .Values.config.moniker }}-sequencer + app: {{ .Values.moniker }}-sequencer spec: initContainers: - command: [ "/scripts/init-cometbft.sh" ] @@ -29,7 +29,7 @@ spec: name: cometbft-init-scripts-volume - mountPath: /cometbft name: sequencer-shared-storage-vol - subPath: {{ .Values.config.moniker }}/cometbft + subPath: {{ .Values.moniker }}/cometbft containers: - name: sequencer image: {{ include "sequencer.image" . }} @@ -38,17 +38,17 @@ spec: tty: {{ .Values.global.useTTY }} envFrom: - configMapRef: - name: {{ .Values.config.moniker }}-sequencer-env + name: {{ .Values.moniker }}-sequencer-env volumeMounts: - mountPath: /sequencer name: sequencer-shared-storage-vol - subPath: {{ .Values.config.moniker }}/sequencer + subPath: {{ .Values.moniker }}/sequencer ports: - containerPort: {{ .Values.ports.sequencerABCI }} name: sequencer-abci - - containerPort: {{ .Values.ports.sequencerGRPC }} + - containerPort: {{ .Values.ports.sequencerGrpc }} name: sequencer-grpc - {{- if .Values.config.sequencer.metrics.enabled }} + {{- if .Values.sequencer.metrics.enabled }} - containerPort: {{ .Values.ports.sequencerMetrics }} name: seq-metric {{- end }} @@ -61,40 +61,40 @@ spec: image: "{{ include "cometBFT.image" . }}" envFrom: - configMapRef: - name: {{ .Values.config.moniker }}-cometbft-env + name: {{ .Values.moniker }}-cometbft-env volumeMounts: - mountPath: /cometbft name: sequencer-shared-storage-vol - subPath: {{ .Values.config.moniker }}/cometbft + subPath: {{ .Values.moniker }}/cometbft - mountPath: /secrets readOnly: true name: sequencer-secret-keys-vol ports: - - containerPort: {{ .Values.ports.cometBFTP2P }} + - containerPort: {{ .Values.ports.cometbftP2P }} name: cometbft-p2p - - containerPort: {{ .Values.ports.cometBFTRPC }} + - containerPort: {{ .Values.ports.cometbftRpc }} name: cometbft-rpc {{- if .Values.serviceMonitor.enabled }} - - containerPort: {{ .Values.ports.cometBFTMETRICS }} + - containerPort: {{ .Values.ports.cometbftMetrics }} name: cometbft-metric {{- end }} volumes: - name: cometbft-config-volume configMap: - name: {{ .Values.config.moniker }}-cometbft-config + name: {{ .Values.moniker }}-cometbft-config defaultMode: 0700 - name: cometbft-data-volume configMap: - name: {{ .Values.config.moniker }}-cometbft-data + name: {{ .Values.moniker }}-cometbft-data defaultMode: 0700 - name: cometbft-init-scripts-volume configMap: - name: {{ .Values.config.moniker }}-cometbft-init-scripts + name: {{ .Values.moniker }}-cometbft-init-scripts defaultMode: 0777 - name: sequencer-shared-storage-vol {{- if .Values.storage.enabled }} persistentVolumeClaim: - claimName: {{ .Values.config.moniker }}-{{ .Values.storage.entities.sequencerSharedStorage.persistentVolumeName }}-pvc + claimName: {{ .Values.moniker }}-{{ .Values.storage.entities.sequencerSharedStorage.persistentVolumeName }}-pvc {{- else }} emptyDir: {} {{- end }} @@ -107,5 +107,5 @@ spec: secretProviderClass: sequencer-keys-provider {{- else }} configMap: - name: {{ .Values.config.moniker }}-cometbft-secrets + name: {{ .Values.moniker }}-cometbft-secrets {{- end }} diff --git a/charts/sequencer/templates/storageclasses.yaml b/charts/sequencer/templates/storageclasses.yaml index 60bdb19..5b55e63 100644 --- a/charts/sequencer/templates/storageclasses.yaml +++ b/charts/sequencer/templates/storageclasses.yaml @@ -5,7 +5,7 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: {{ $.Values.config.moniker }}-{{ $value.persistentVolumeName }}-local + name: {{ $.Values.moniker }}-{{ $value.persistentVolumeName }}-local provisioner: kubernetes.io/no-provisioner volumeBindingMode: WaitForFirstConsumer reclaimPolicy: Retain diff --git a/charts/sequencer/templates/volumes.yaml b/charts/sequencer/templates/volumes.yaml index 93e7773..1fc9e37 100644 --- a/charts/sequencer/templates/volumes.yaml +++ b/charts/sequencer/templates/volumes.yaml @@ -6,7 +6,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: {{ $.Values.config.moniker }}-{{ $value.persistentVolumeName }}-pv + name: {{ $.Values.moniker }}-{{ $value.persistentVolumeName }}-pv spec: capacity: storage: {{ $value.size }} @@ -14,7 +14,7 @@ spec: accessModes: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain - storageClassName: {{ $.Values.config.moniker }}-{{ $value.persistentVolumeName }}-local + storageClassName: {{ $.Values.moniker }}-{{ $value.persistentVolumeName }}-local local: path: {{ $value.path }} nodeAffinity: @@ -31,15 +31,15 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ $.Values.config.moniker }}-{{ $value.persistentVolumeName }}-pvc + name: {{ $.Values.moniker }}-{{ $value.persistentVolumeName }}-pvc namespace: {{ include "sequencer.namespace" $ }} labels: - "app.kubernetes.io/name": "{{$.Values.config.moniker}}-{{ $.Chart.Name }}" + "app.kubernetes.io/name": "{{$.Values.moniker}}-{{ $.Chart.Name }}" "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }} spec: {{- if $.Values.storage.local }} - storageClassName: {{ $.Values.config.moniker }}-{{ $value.persistentVolumeName }}-local + storageClassName: {{ $.Values.moniker }}-{{ $value.persistentVolumeName }}-local {{- end }} {{- if $value.storageClassName }} storageClassName: {{ $value.storageClassName }} diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 4e02449..aca8105 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -17,60 +17,94 @@ images: devTag: v0.38.6 sequencer: repo: ghcr.io/astriaorg/sequencer - tag: 0.13.0 + tag: "0.13.0" devTag: latest -config: - moniker: "node" - sequencer: - addressPrefixes: - base: "astria" - authoritySudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 - nativeAssetBaseDenomination: nria - allowedFeeAssets: - - nria - ibc: - enabled: true - inboundEnabled: true - outboundEnabled: true - sudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 - relayerAddresses: - - 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 - - 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a - # Note large balances must be strings support templating with the u128 size account balances - genesisAccounts: - - address: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 - balance: "333333333333333333" - - address: 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a - balance: "333333333333333333" - - address: 60709e2d391864b732b4f0f51e387abb76743871 - balance: "333333333333333333" - # NOTE - the following address matches the privKey that funds the sequencer-faucet - - address: 00d75b270542084a54fcf0d0f6eab0402982d156 - balance: "333333333333333333" +moniker: "node" +genesis: + chainId: 'sequencer-test-chain-0' + genesisTime: '2023-09-22T17:22:35.092832Z' + addressPrefixes: + base: "astria" + authoritySudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 + nativeAssetBaseDenomination: nria + allowedFeeAssets: + - nria + ibc: + enabled: true + inboundEnabled: true + outboundEnabled: true + sudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 + relayerAddresses: + - 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 + - 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a + # Note large balances must be strings support templating with the u128 size account balances + genesisAccounts: + - address: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 + balance: "333333333333333333" + - address: 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a + balance: "333333333333333333" + - address: 60709e2d391864b732b4f0f51e387abb76743871 + balance: "333333333333333333" + # NOTE - the following address matches the privKey that funds the sequencer-faucet + - address: 00d75b270542084a54fcf0d0f6eab0402982d156 + balance: "333333333333333333" - metrics: - enabled: false + consensusParams: + blockMaxBytes: "1048576" + blockMaxGas: "-1" + maxAgeDuration: "1209600000000000" + maxAgeNumBlocks: "4000000" + maxBytes: "1048576" - otel: - enabled: false - serviceName: |- - {{ include "sequencer.name" . }} - endpoint: - tracesEndpoint: - tracesCompression: gzip - tracesTimeout: 10 - otlpHeaders: - traceHeaders: + fees: + transferBaseFee: "12" + sequenceBaseFee: "32" + sequenceByteCostMultiplier: "1" + initBridgeAccountBaseFee: "48" + bridgeLockByteCostMultiplier: "1" + bridgeSudoChangeFee: "24" + ics20WithdrawalBaseFee: "24" + + validators: [] + # - name: core + # power: '1' + # address: 091E47761C58C474534F4D414AF104A6CAF90C22 + # pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + +sequencer: + metrics: + enabled: false + otel: + enabled: false + serviceName: |- + {{ include "sequencer.name" . }} + endpoint: + tracesEndpoint: + tracesCompression: gzip + tracesTimeout: 10 + otlpHeaders: + traceHeaders: + +cometbft: + config: + # Log configurations + logLevel: "info" + logFormat: "plain" + # Grpc server configuration + grpc: + # Maximum number of simultaneous GRPC connections + maxOpenConnections: 900 + rpc: + # Maximum number of simultaneous RPC connections + maxOpenConnections: 900 + maxSubscriptionClients: 100 + maxSubscriptionsPerClient: 10 - # Values for CometBFT node configuration - cometBFT: - chainId: 'sequencer-test-chain-0' - genesisTime: '2023-09-22T17:22:35.092832Z' - # If using postgres for indexing, update to enabled and set the connection psql: enabled: false conn: postgresql://:@:/? + p2p: # Address to listen for incoming connections, port is inferred from ports.cometBFTP2P laddr: "tcp://0.0.0.0" @@ -85,45 +119,74 @@ config: persistentPeers: [] # List of node IDs, to which a connection will be (re)established ignoring any existing limits unconditionalPeers: [] + # Maximum pause when redialing a persistent peer (if zero, exponential backoff is used) + persistentPeersMaxDialPeriod: "0s" # List of peer IDs to keep private (will not be gossiped to other peers) privatePeers: [] + # Toggle to disable guard against peers connecting from the same ip. + allowDuplicateIP: false # Seed mode, in which node constantly crawls the network and looks for # peers. If another node asks it for addresses, it responds and disconnects. seedMode: false - # These secrets will be generated using the devContent values turned into JSON - # and stored unsafely as config maps. Unless SecretProvider is enabled. - # Where the secret parameters should be then updated to suit your secret provider - # parameter template. - secrets: - nodeKey: - filename: nodeKey.json - devContent: - priv_key: - type: tendermint/PrivKeyEd25519 - value: "" # can override with a value for local testing - secret: - resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" - privValidatorKey: - filename: privValidatorKey.json - devContent: - # Ed25519 address of validator - address: "" # can override with a value for local testing - # public key for the validator address - pub_key: - type: tendermint/PubKeyEd25519 - value: "" # can override with a value for local testing - # private key for the validator address - # This is a secret key, should use a secret manager for production deployments - priv_key: - type: tendermint/PrivKeyEd25519 - value: "" # can override with a value for local testing - secret: - resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" - validators: [] - # - name: core - # power: '1' - # address: 091E47761C58C474534F4D414AF104A6CAF90C22 - # pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + # Maximum number of inbound and outbound peers + maxInboundPeers: 100 + maxOutboundPeers: 40 + # Rate at which packets can be sent/receved, in bytes/second + sendRate: 5120000 + recvRate: 5120000 + # p2p connection configurations + handshakeTimeout: 20s + dialTimeout: 3s + + mempool: + # Maximum number of transactions in the mempool + size: 2000 + # Maximum size of a single transaction in the mempool + maxTxBytes: 250000 + # Maximum size of all transactions in the mempool + maxTxsBytes: 100000000 + cacheSize: 10000 + + consensus: + timeoutPropose: 2s + timeoutProposeDelta: 500ms + timeoutPrevote: 1s + timeoutPrevoteDelta: 500ms + timeoutPrecommit: 1s + timeoutPrecommitDelta: 500ms + timeoutCommit: 1500ms + + instrumentation: + namespace: "astria_cometbft" + # These secrets will be generated using the devContent values turned into JSON + # and stored unsafely as config maps. Unless SecretProvider is enabled. + # Where the secret parameters should be then updated to suit your secret provider + # parameter template. + secrets: + nodeKey: + filename: nodeKey.json + devContent: + priv_key: + type: tendermint/PrivKeyEd25519 + value: "" # can override with a value for local testing + secret: + resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" + privValidatorKey: + filename: privValidatorKey.json + devContent: + # Ed25519 address of validator + address: "" # can override with a value for local testing + # public key for the validator address + pub_key: + type: tendermint/PubKeyEd25519 + value: "" # can override with a value for local testing + # private key for the validator address + # This is a secret key, should use a secret manager for production deployments + priv_key: + type: tendermint/PrivKeyEd25519 + value: "" # can override with a value for local testing + secret: + resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" sequencer-relayer: enabled: false @@ -147,18 +210,18 @@ secretProvider: # The secret file must be mapped to the .filename value. parametersTemplate: |- secrets: | - {{- range $value := .Values.config.cometBFT.secrets }} + {{- range $value := .Values.cometbft.secrets }} - resourceName: {{ $value.secret.resourceName }} fileName: "{{ $value.filename }}" {{- end }} ports: - cometBFTP2P: 26656 - cometBFTRPC: 26657 - cometBFTMETRICS: 26660 + cometbftP2P: 26656 + cometbftRpc: 26657 + cometbftMetrics: 26660 sequencerABCI: 26658 - sequencerGRPC: 8080 - relayerRPC: 2450 + sequencerGrpc: 8080 + relayerRpc: 2450 sequencerMetrics: 9000 # ServiceMonitor configuration @@ -203,7 +266,7 @@ storage: ingress: rpc: - enabled: true + enabled: false hostname: sequencer.localdev.me ingressClassName: nginx # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName