undo chart changes

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

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 }}"

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: {}
+  metrics: 6060

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 \

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

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: [
-          "[email protected]:26656",
-          "[email protected]:26656",
-          "[email protected]:26656",
-          "[email protected]: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

crates/astria-composer/src/executor/simulator.rs

@@ -136,7 +136,7 @@ impl BundleSimulator {
         bundle: Vec<Vec<u8>>,
         block: Block,
         timestamp: Option<Timestamp>,
-        simulate_only: bool
+        simulate_only: bool,
     ) -> eyre::Result<BundleSimulationResult> {
         // convert the sized bundle actions to a list of Vec<u8>
         // as long as the timestamp > parent block timestamp, the block will be successfully

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,

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<Self, Error>
-        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");
     }
-}
+}

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,
+        },
     }
 }