From 19e56af6024294f311448552ce9c8f98d5364b59 Mon Sep 17 00:00:00 2001 From: Bharath Date: Fri, 6 Sep 2024 20:41:29 +0530 Subject: [PATCH] undo chart changes --- charts/celestia-node/values.yaml | 14 ++-- charts/composer/templates/configmap.yaml | 28 -------- charts/composer/templates/ingress.yaml | 71 ------------------- charts/composer/values.yaml | 37 ++-------- charts/deploy.just | 2 - charts/evm-rollup/values.yaml | 21 ++++-- charts/sequencer/values.yaml | 17 ++--- .../astria-composer/src/executor/simulator.rs | 2 +- crates/astria-composer/src/executor/tests.rs | 2 +- crates/astria-composer/src/metrics.rs | 12 ++-- .../tests/blackbox/helper/mod.rs | 15 ++-- crates/astria-conductor/src/conductor.rs | 2 + dev/values/rollup/dev.yaml | 4 +- 13 files changed, 57 insertions(+), 170 deletions(-) delete mode 100644 charts/composer/templates/ingress.yaml diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index 8a4cbe0642..3749172aa8 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -25,13 +25,13 @@ ports: celestia: rpc: 26658 -resources: {} -# requests: -# cpu: 1 -# memory: 4Gi -# limits: -# cpu: 2 -# memory: 8Gi +resources: + requests: + cpu: 1 + memory: 4Gi + limits: + cpu: 2 + memory: 8Gi # When deploying in a production environment should use a secret provider # This is configured for use with GCP, need to set own resource names diff --git a/charts/composer/templates/configmap.yaml b/charts/composer/templates/configmap.yaml index b41e008d28..a2a47e792c 100644 --- a/charts/composer/templates/configmap.yaml +++ b/charts/composer/templates/configmap.yaml @@ -4,34 +4,6 @@ metadata: name: composer-env namespace: {{ include "composer.namespace" . }} data: -{{/* ASTRIA_COMPOSER_LOG: "astria_composer={{ .Values.config.logLevel }}"*/}} -{{/* ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:{{ .Values.ports.healthApi }}"*/}} -{{/* ASTRIA_COMPOSER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.grpc }}"*/}} -{{/* ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID: "{{ tpl .Values.config.sequencerChainId . }}"*/}} -{{/* ASTRIA_COMPOSER_SEQUENCER_URL: "{{ tpl .Values.config.sequencerRpc . }}"*/}} -{{/* ASTRIA_COMPOSER_ROLLUPS: "{{ include "composer.rollups" . }}"*/}} -{{/* ASTRIA_COMPOSER_PRIVATE_KEY_FILE: "/var/secrets/{{ .Values.config.privateKey.secret.filename }}"*/}} -{{/* ASTRIA_COMPOSER_MAX_BYTES_PER_BUNDLE: "{{ .Values.config.maxBytesPerBundle }}"*/}} -{{/* ASTRIA_COMPOSER_BUNDLE_QUEUE_CAPACITY: "{{ .Values.config.bundleQueueCapacity }}"*/}} -{{/* ASTRIA_COMPOSER_MAX_SUBMIT_INTERVAL_MS: "{{ .Values.config.maxSubmitInterval }}"*/}} -{{/* ASTRIA_COMPOSER_SEQUENCER_ADDRESS_PREFIX: "{{ .Values.config.sequencerAddressPrefix}}"*/}} -{{/* ASTRIA_COMPOSER_FEE_ASSET: "{{ .Values.config.sequencerNativeAssetBaseDenomination }}"*/}} -{{/* ASTRIA_COMPOSER_NO_METRICS: "{{ not .Values.metrics.enabled }}"*/}} -{{/* ASTRIA_COMPOSER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.metrics }}"*/}} -{{/* ASTRIA_COMPOSER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"*/}} -{{/* ASTRIA_COMPOSER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"*/}} -{{/* NO_COLOR: "{{ .Values.global.useTTY }}"*/}} -{{/* ASTRIA_COMPOSER_NO_OTEL: "{{ not .Values.otel.enabled }}"*/}} -{{/* OTEL_EXPORTER_OTLP_ENDPOINT: "{{ tpl .Values.otel.endpoint . }}"*/}} -{{/* OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "{{ tpl .Values.otel.tracesEndpoint . }}"*/}} -{{/* OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "{{ tpl .Values.otel.tracesTimeout . }}"*/}} -{{/* OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ tpl .Values.otel.tracesCompression . }}"*/}} -{{/* OTEL_EXPORTER_OTLP_HEADERS: "{{ tpl .Values.otel.otlpHeaders . }}"*/}} -{{/* OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ tpl .Values.otel.traceHeaders . }}"*/}} -{{/* OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceName . }}"*/}} -{{/* {{- if not .Values.global.dev }}*/}} -{{/* {{- else }}*/}} -{{/* {{- end }}*/}} ASTRIA_COMPOSER_LOG: "astria_composer={{ .Values.config.logLevel }}" ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:{{ .Values.ports.healthApi }}" ASTRIA_COMPOSER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.grpc }}" diff --git a/charts/composer/templates/ingress.yaml b/charts/composer/templates/ingress.yaml deleted file mode 100644 index 65ccb0bb58..0000000000 --- a/charts/composer/templates/ingress.yaml +++ /dev/null @@ -1,71 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $ingressApiIsStable := eq (include "rollup.ingress.isStable" .) "true" -}} -{{- $ingressSupportsIngressClassName := eq (include "rollup.ingress.supportsIngressClassName" .) "true" -}} -{{- $ingressSupportsPathType := eq (include "rollup.ingress.supportsPathType" .) "true" -}} - -{{- range $service, $ingress := .Values.ingress.services }} -{{- if $ingress.enabled -}} -{{- $servicePort := $ingress.service.port -}} -{{- $serviceName := tpl $ingress.service.name $ -}} -{{- $ingressPath := $ingress.path -}} -{{- $ingressPathType := $ingress.pathType -}} -{{- $extraPaths := $ingress.extraPaths }} ---- -apiVersion: {{ include "rollup.ingress.apiVersion" $ }} -kind: Ingress -metadata: - name: astria-local-{{ $service }}-ingress - namespace: {{ include "rollup.namespace" $ }} - labels: - {{- with $ingress.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - annotations: - nginx.ingress.kubernetes.io/backend-protocol: "GRPC" - {{- if not $ingressSupportsIngressClassName }} - kubernetes.io/ingress.class: {{ $.Values.ingress.className }} - {{- end }} - {{- if $ingressApiIsStable }} - {{- range $key, $value := $ingress.annotations }} - {{ $key }}: {{ tpl $value $ | quote }} - {{- end }} - {{- end }} -spec: - {{- if $ingressSupportsIngressClassName }} - ingressClassName: {{ $.Values.ingress.className }} - {{- end -}} - {{- with $ingress.service }} - defaultBackend: - service: - {{- tpl (toYaml .) $ | nindent 6 }} - {{- end }} - rules: - {{- with $ingress.hosts }} - {{- range $host := . }} - - host: {{ tpl $host $ }} - http: - paths: - {{- with $extraPaths }} - {{- toYaml . | nindent 10 }} - {{- end }} - - path: {{ $ingressPath }} - {{- if $ingressSupportsPathType }} - pathType: {{ $ingressPathType }} - {{- end }} - backend: - {{- if $ingressApiIsStable }} - service: - {{- tpl (toYaml $ingress.service) $ | nindent 16 }} - {{- else }} - serviceName: {{ tpl $serviceName $ }} - servicePort: {{ tpl $servicePort $ }} - {{- end }} - {{- end }} - {{- end }} - {{- if $ingress.tls }} - tls: - {{- tpl (toYaml $ingress.tls) $ | nindent 4 }} - {{- end }} -{{- end }} -{{- end }} -{{- end }} diff --git a/charts/composer/values.yaml b/charts/composer/values.yaml index 8d5ca4b112..dedf8f58e3 100644 --- a/charts/composer/values.yaml +++ b/charts/composer/values.yaml @@ -3,26 +3,26 @@ global: replicaCount: 1 # Whether to use tty readable logging for astria services, when false use json. useTTY: false - dev: true + dev: false images: composer: - repo: astria-composer + repo: ghcr.io/astriaorg/composer tag: "0.8.2" - devTag: tb + devTag: latest config: - logLevel: "info" + logLevel: "debug" maxBytesPerBundle: 200000 maxBundleSize: 200000 bundleQueueCapacity: 40000 - maxSubmitInterval: 1800 + maxSubmitInterval: 2000 sequencerAddressPrefix: astria sequencerNativeAssetBaseDenomination: "nria" sequencerRpc: "" sequencerChainId: "" privateKey: - devContent: "e315da1eafadb1e323a53244bdca8365437c643f0977de9ecf44cc926538f918" + devContent: "" secret: filename: "key.hex" resourceName: "projects/$PROJECT_ID/secrets/sequencerPrivateKey/versions/latest" @@ -71,27 +71,4 @@ resources: ports: grpc: 50052 healthApi: 2450 - metrics: 6060 - - -ingress: - enabled: true - labels: {} - hostname: localdev.me - className: nginx - services: - rpc: - enabled: true - hosts: - - 'composer.astria-local.{{ .Values.ingress.hostname }}' - path: / - pathType: Prefix - service: - name: 'composer-service' - port: - name: grpc - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - labels: {} - tls: {} \ No newline at end of file + metrics: 6060 \ No newline at end of file diff --git a/charts/deploy.just b/charts/deploy.just index 382b2c1711..5b7954130d 100644 --- a/charts/deploy.just +++ b/charts/deploy.just @@ -80,8 +80,6 @@ deploy-sequencer name=validatorName: -n astria-validator-{{name}} --create-namespace \ {{name}}-sequencer-chart ./charts/sequencer deploy-sequencers: (deploy-sequencer "node0") (deploy-sequencer "node1") (deploy-sequencer "node2") -#deploy-sequencers: (deploy-sequencer "node0") (deploy-sequencer "node1") - deploy-hermes-local: helm install hermes-local-chart ./charts/hermes \ diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 648f8a665c..bf71b70fdf 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -4,17 +4,17 @@ global: # Whether to use tty readable logging for astria services, when false use json. # Best to be false in production environments, true for clean logs on local dev. useTTY: false - dev: true + dev: false images: geth: - repo: ghcr.io/astriaorg/go-ethereum + repo: ghcr.io/astriaorg/astria-geth tag: 0.14.0 - devTag: tb + devTag: latest conductor: repo: astria-conductor tag: "0.20.0" - devTag: tb + devTag: latest genesis: @@ -293,7 +293,18 @@ ingress: # Default persistent storage values # NOTE - `rollupName` will be used with `persistentVolumeName` to generate names for kubernetes resources. # e.g. astria-executor-pv, astria-executor-pvc -resources: {} +resources: + conductor: + requests: + cpu: 100m + memory: 200Mi + limits: + cpu: 1000m + memory: 2Gi + geth: + requests: + cpu: 16000m + memory: 32Gi storage: enabled: false diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index f423551e94..85f5b4696a 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -7,7 +7,7 @@ global: # Whether to use tty readable logging for astria services, when false use json. # Best to be false in production environments, true for clean logs on local dev. useTTY: true - dev: true + dev: false # sequencer core images images: @@ -16,9 +16,9 @@ images: tag: v0.38.8 devTag: v0.38.8 sequencer: - repo: astria-sequencer + repo: ghcr.io/astriaorg/sequencer tag: "0.16.0" - devTag: tb + devTag: latest moniker: "" genesis: @@ -77,8 +77,6 @@ sequencer: tracesTimeout: 10 otlpHeaders: traceHeaders: - composerHook: - enabled: false cometbft: config: @@ -109,13 +107,6 @@ cometbft: # List of seeds to connect to seeds: [] - # List of nodes to keep persistent connections to - persistentPeers: [ - "f4b8a8dcfc5a142bd00aadab71f39dbfe7091d13@35.236.107.39:26656", - "ca3bc3562919b82575fe3ac5b11fa5962ce8cd3b@34.118.249.169:26656", - "4418000e355967ecc8e03004f5850dfde51c410b@34.94.177.254:26656", - "7a117e7906d8428ad20341aca94af03c980c11d8@34.102.55.164:26656", - ] # 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) @@ -126,7 +117,7 @@ cometbft: 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: true + seedMode: false # Maximum number of inbound and outbound peers maxInboundPeers: 100 maxOutboundPeers: 40 diff --git a/crates/astria-composer/src/executor/simulator.rs b/crates/astria-composer/src/executor/simulator.rs index d4004a529e..ca9633b3ad 100644 --- a/crates/astria-composer/src/executor/simulator.rs +++ b/crates/astria-composer/src/executor/simulator.rs @@ -136,7 +136,7 @@ impl BundleSimulator { bundle: Vec>, block: Block, timestamp: Option, - simulate_only: bool + simulate_only: bool, ) -> eyre::Result { // convert the sized bundle actions to a list of Vec // as long as the timestamp > parent block timestamp, the block will be successfully diff --git a/crates/astria-composer/src/executor/tests.rs b/crates/astria-composer/src/executor/tests.rs index 9dd9205075..9d8828f6be 100644 --- a/crates/astria-composer/src/executor/tests.rs +++ b/crates/astria-composer/src/executor/tests.rs @@ -14,6 +14,7 @@ use astria_core::{ sequencerblock::v1alpha1 as raw_sequencer, }, primitive::v1::{ + asset, asset::{ Denom, IbcPrefixed, @@ -70,7 +71,6 @@ use wiremock::{ Request, ResponseTemplate, }; -use astria_core::primitive::v1::asset; use crate::{ executor, diff --git a/crates/astria-composer/src/metrics.rs b/crates/astria-composer/src/metrics.rs index bc70849e66..039dd7b125 100644 --- a/crates/astria-composer/src/metrics.rs +++ b/crates/astria-composer/src/metrics.rs @@ -109,14 +109,16 @@ impl telemetry::Metrics for Metrics { type Config = crate::Config; fn register(builder: &mut RegisteringBuilder, config: &Self::Config) -> Result - where - Self: Sized, + where + Self: Sized, { let rollup = config.rollup.clone(); let (geth_txs_received, grpc_txs_received) = register_txs_received(builder, vec![rollup.clone()].iter())?; - let (geth_txs_dropped, grpc_txs_dropped) = register_txs_dropped(builder, vec![rollup.clone()].iter())?; - let txs_dropped_too_large = register_txs_dropped_too_large(builder, vec![rollup.clone()].iter())?; + let (geth_txs_dropped, grpc_txs_dropped) = + register_txs_dropped(builder, vec![rollup.clone()].iter())?; + let txs_dropped_too_large = + register_txs_dropped_too_large(builder, vec![rollup.clone()].iter())?; let nonce_fetch_count = builder .new_counter_factory( @@ -337,4 +339,4 @@ mod tests { assert_const(TRANSACTIONS_PER_SUBMISSION, "transactions_per_submission"); assert_const(BYTES_PER_SUBMISSION, "bytes_per_submission"); } -} \ No newline at end of file +} diff --git a/crates/astria-composer/tests/blackbox/helper/mod.rs b/crates/astria-composer/tests/blackbox/helper/mod.rs index a4e139afae..9fc036922c 100644 --- a/crates/astria-composer/tests/blackbox/helper/mod.rs +++ b/crates/astria-composer/tests/blackbox/helper/mod.rs @@ -16,7 +16,13 @@ use astria_composer::{ use astria_core::{ composer::v1alpha1::BuilderBundle, generated::composer::v1alpha1::BuilderBundlePacket, - primitive::v1::RollupId, + primitive::v1::{ + asset::{ + Denom, + IbcPrefixed, + }, + RollupId, + }, protocol::{ abci::AbciErrorCode, transaction::v1alpha1::SignedTransaction, @@ -44,7 +50,6 @@ use wiremock::{ Request, ResponseTemplate, }; -use astria_core::primitive::v1::asset::{Denom, IbcPrefixed}; use crate::helper::mock_grpc::{ MockGrpc, @@ -106,7 +111,7 @@ pub struct TestComposer { pub setup_guard: MockGuard, pub grpc_collector_addr: SocketAddr, pub metrics_handle: metrics::Handle, - pub test_executor: TestExecutor + pub test_executor: TestExecutor, } /// Spawns composer in a test environment. @@ -178,8 +183,8 @@ pub async fn spawn_composer(rollup_name: &str) -> TestComposer { grpc_collector_addr, metrics_handle, test_executor: TestExecutor { - mock_grpc: mock_execution_api_server - } + mock_grpc: mock_execution_api_server, + }, } } diff --git a/crates/astria-conductor/src/conductor.rs b/crates/astria-conductor/src/conductor.rs index 2fc3ac7b96..8d3e01358c 100644 --- a/crates/astria-conductor/src/conductor.rs +++ b/crates/astria-conductor/src/conductor.rs @@ -161,6 +161,8 @@ impl Conductor { tasks.spawn(Self::CELESTIA, reader.run_until_stopped()); }; + info!("BHARATH: CONDUCTOR INITED!"); + Ok(Self { shutdown, tasks, diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index d5f92cc690..40b00b2f49 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -23,7 +23,7 @@ evm-rollup: ## no defaults as they are unique to each chain # Block height to start syncing rollup from, lowest possible is 2 - sequencerInitialHeight: 264188 + sequencerInitialHeight: 2 # The first Celestia height to utilize when looking for rollup data celestiaInitialHeight: 2 # The variance in Celestia height to allow before halting the chain @@ -102,7 +102,7 @@ evm-rollup: config: # The level at which core astria components will log out # Options are: error, warn, info, and debug - logLevel: "error" + logLevel: "debug" conductor: # Determines what will drive block execution, options are: