feat: get tests working and cleanup

charts/composer/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.1.4
+version: 0.1.5
 
 # 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

charts/composer/templates/configmap.yaml

@@ -8,7 +8,8 @@ data:
   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_SEQUENCER_HTTP_URL: "{{ tpl .Values.config.sequencerRpc . }}"
+  ASTRIA_COMPOSER_SEQUENCER_GRPC_URL: "{{ tpl .Values.config.sequencerGrpc . }}"
   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 }}"

charts/composer/values.yaml

@@ -7,10 +7,10 @@ global:
 
 images:
   composer:
-    repo: ghcr.io/astriaorg/composer
+    repo: ghcr.io/astriaorg/astria-composer
     pullPolicy: IfNotPresent
-    tag: "0.8.3"
-    devTag: latest
+    tag: "0.8.4"
+    devTag: local
 
 config:
   logLevel: "debug"
@@ -20,6 +20,7 @@ config:
   sequencerAddressPrefix: astria
   sequencerNativeAssetBaseDenomination: "nria"
   sequencerRpc: ""
+  sequencerGrpc: ""
   sequencerChainId: ""
   privateKey:
     devContent: ""

charts/evm-stack/Chart.lock

@@ -7,7 +7,7 @@ dependencies:
   version: 0.27.5
 - name: composer
   repository: file://../composer
-  version: 0.1.4
+  version: 0.1.5
 - name: evm-faucet
   repository: file://../evm-faucet
   version: 0.1.2
@@ -20,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:2d7e2f23cd9bbdb43b7cf42112db9ede0a7d5eee9e426b0b2344e43fcf52e1b1
-generated: "2024-10-02T09:43:51.238571-04:00"
+digest: sha256:84cd9e57ee284191d1637ce8fac850a3403932521c0d23a18f0beb0eb27dd398
+generated: "2024-10-08T18:13:14.539588+02:00"

charts/evm-stack/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.6.2
+version: 0.6.3
 
 dependencies:
   - name: celestia-node
@@ -26,7 +26,7 @@ dependencies:
     version: 0.27.5
     repository: "file://../evm-rollup"
   - name: composer
-    version: 0.1.4
+    version: 0.1.5
     repository: "file://../composer"
     condition: composer.enabled
   - name: evm-faucet

crates/astria-composer/Cargo.toml

@@ -12,8 +12,14 @@ homepage = "https://astria.org"
 name = "astria-composer"
 
 [dependencies]
+http = "0.2.9"
+
 astria-build-info = { path = "../astria-build-info", features = ["runtime"] }
-astria-core = { path = "../astria-core", features = ["serde", "server"] }
+astria-core = { path = "../astria-core", features = [
+  "client",
+  "serde",
+  "server",
+] }
 astria-eyre = { path = "../astria-eyre" }
 config = { package = "astria-config", path = "../astria-config" }
 telemetry = { package = "astria-telemetry", path = "../astria-telemetry", features = [
@@ -59,6 +65,7 @@ path = "../astria-sequencer-client"
 features = ["http"]
 
 [dev-dependencies]
+astria-grpc-mock = { path = "../astria-grpc-mock" }
 config = { package = "astria-config", path = "../astria-config", features = [
   "tests",
 ] }

crates/astria-composer/local.env.example

@@ -25,7 +25,10 @@ NO_COLOR=
 ASTRIA_COMPOSER_API_LISTEN_ADDR="0.0.0.0:0"
 
 # Address of the RPC server for the sequencer chain
-ASTRIA_COMPOSER_SEQUENCER_URL="http://127.0.0.1:26657"
+ASTRIA_COMPOSER_SEQUENCER_HTTP_URL="http://127.0.0.1:26657"
+
+# Address of the RPC server for the sequencer chain
+ASTRIA_COMPOSER_SEQUENCER_GRPC_URL="http://127.0.0.1:8080"
 
 # Chain ID of the sequencer chain which transactions are submitted to.
 ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID="astria-dev-1"

crates/astria-composer/src/composer.rs

@@ -124,7 +124,8 @@ impl Composer {
         let shutdown_token = CancellationToken::new();
 
         let (executor, executor_handle) = executor::Builder {
-            sequencer_url: cfg.sequencer_url.clone(),
+            sequencer_http_url: cfg.sequencer_http_url.clone(),
+            sequencer_grpc_url: cfg.sequencer_grpc_url.clone(),
             sequencer_chain_id: cfg.sequencer_chain_id.clone(),
             private_key_file: cfg.private_key_file.clone(),
             sequencer_address_prefix: cfg.sequencer_address_prefix.clone(),

crates/astria-composer/src/config.rs

@@ -27,7 +27,10 @@ pub struct Config {
     pub api_listen_addr: SocketAddr,
 
     /// Address of the RPC server for the sequencer chain
-    pub sequencer_url: String,
+    pub sequencer_http_url: String,
+
+    /// Address of the GRPC server for the sequencer chain
+    pub sequencer_grpc_url: String,
 
     /// The chain ID of the sequencer chain
     pub sequencer_chain_id: String,

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

@@ -6,6 +6,7 @@ use std::{
 
 use astria_core::{
     crypto::SigningKey,
+    generated::sequencerblock::v1alpha1::sequencer_service_client::SequencerServiceClient,
     primitive::v1::Address,
     protocol::transaction::v1alpha1::action::SequenceAction,
 };
@@ -14,6 +15,7 @@ use astria_eyre::eyre::{
     eyre,
     WrapErr as _,
 };
+use http::Uri;
 use tokio::sync::watch;
 use tokio_util::sync::CancellationToken;
 
@@ -24,7 +26,8 @@ use crate::{
 };
 
 pub(crate) struct Builder {
-    pub(crate) sequencer_url: String,
+    pub(crate) sequencer_http_url: String,
+    pub(crate) sequencer_grpc_url: String,
     pub(crate) sequencer_chain_id: String,
     pub(crate) private_key_file: String,
     pub(crate) sequencer_address_prefix: String,
@@ -38,7 +41,8 @@ pub(crate) struct Builder {
 impl Builder {
     pub(crate) fn build(self) -> eyre::Result<(super::Executor, executor::Handle)> {
         let Self {
-            sequencer_url,
+            sequencer_http_url,
+            sequencer_grpc_url,
             sequencer_chain_id,
             private_key_file,
             sequencer_address_prefix,
@@ -48,8 +52,14 @@ impl Builder {
             shutdown_token,
             metrics,
         } = self;
-        let sequencer_client = sequencer_client::HttpClient::new(sequencer_url.as_str())
-            .wrap_err("failed constructing sequencer client")?;
+        let sequencer_http_client = sequencer_client::HttpClient::new(sequencer_http_url.as_str())
+            .wrap_err("failed constructing sequencer http client")?;
+
+        let sequencer_grpc_client = connect_sequencer_grpc(sequencer_grpc_url.as_str())
+            .wrap_err_with(|| {
+                format!("failed to connect to sequencer over gRPC at `{sequencer_grpc_url}`")
+            })?;
+
         let (status, _) = watch::channel(Status::new());
 
         let sequencer_key = read_signing_key_from_file(&private_key_file).wrap_err_with(|| {
@@ -69,7 +79,8 @@ impl Builder {
             super::Executor {
                 status,
                 serialized_rollup_transactions: serialized_rollup_transaction_rx,
-                sequencer_client,
+                sequencer_http_client,
+                sequencer_grpc_client,
                 sequencer_chain_id,
                 sequencer_key,
                 address: sequencer_address,
@@ -91,3 +102,14 @@ fn read_signing_key_from_file<P: AsRef<Path>>(path: P) -> eyre::Result<SigningKe
         .map_err(|_| eyre!("invalid private key length; must be 32 bytes"))?;
     Ok(SigningKey::from(private_key_bytes))
 }
+
+fn connect_sequencer_grpc(
+    sequencer_grpc_endpoint: &str,
+) -> eyre::Result<SequencerServiceClient<tonic::transport::Channel>> {
+    let uri: Uri = sequencer_grpc_endpoint
+        .parse()
+        .wrap_err("failed to parse endpoint as URI")?;
+    Ok(SequencerServiceClient::new(
+        tonic::transport::Endpoint::from(uri).connect_lazy(),
+    ))
+}