wip

Author: benluelo

Cargo.lock

@@ -192,6 +192,7 @@ members = [
   "voyager/modules/finality/tendermint",
   "voyager/modules/finality/trusted-evm",
   "voyager/modules/finality/sui",
+  "voyager/modules/finality/attested-evm",
 
   "voyager/plugins/client-update/base",
   "voyager/plugins/client-update/bob",

Cargo.toml

@@ -9,7 +9,7 @@ use crate::{
     client::AttestedLightClient,
     contract::{
         execute::{add_attestor, attest, confirm_attestation, remove_attestor, set_quorum},
-        query::{attested_value, attestors, quorum, timestamp_at_height},
+        query::{attested_value, attestors, latest_height, quorum, timestamp_at_height},
     },
     errors::Error,
     msg::{ExecuteMsg, QueryMsg, RestrictedExecuteMsg},
@@ -64,6 +64,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, Error> {
         QueryMsg::TimestampAtHeight { chain_id, height } => Ok(to_json_binary(
             &timestamp_at_height(deps, chain_id, height)?,
         )?),
+        QueryMsg::LatestHeight { chain_id } => Ok(to_json_binary(&latest_height(deps, chain_id)?)?),
         QueryMsg::LightClient(msg) => {
             ibc_union_light_client::query::<AttestedLightClient>(deps, env, msg)
                 .map_err(StdError::from)

cosmwasm/ibc-union/lightclient/attested/src/contract.rs

@@ -3,6 +3,7 @@ use std::{collections::BTreeSet, num::NonZero};
 use cosmwasm_std::{Deps, Order};
 use depolama::{Bytes, StorageExt};
 use ibc_union_light_client::spec::Timestamp;
+use serde::{Deserialize, Serialize};
 use unionlabs::primitives::H256;
 
 use crate::{
@@ -52,3 +53,22 @@ pub fn timestamp_at_height(
         .maybe_read::<HeightTimestamps>(&(chain_id, height))
         .map_err(Into::into)
 }
+
+pub fn latest_height(deps: Deps, chain_id: String) -> Result<Option<LatestHeight>, Error> {
+    deps.storage
+        .iter_range::<HeightTimestamps>(
+            Order::Descending,
+            (chain_id.clone(), 0)..=(chain_id.clone(), u64::MAX),
+        )
+        .next()
+        .map(|r| r.map(|((_, height), timestamp)| LatestHeight { height, timestamp }))
+        .transpose()
+        .map_err(Into::into)
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields, rename_all = "snake_case")]
+pub struct LatestHeight {
+    pub height: u64,
+    pub timestamp: Timestamp,
+}

cosmwasm/ibc-union/lightclient/attested/src/contract/query.rs

@@ -67,6 +67,8 @@ pub enum QueryMsg {
         #[serde(with = "serde_utils::string")]
         height: u64,
     },
+    /// Returns the latest height and timestamp attested to for `chain_id`.
+    LatestHeight { chain_id: String },
     #[serde(untagged)]
     LightClient(ibc_union_light_client::msg::QueryMsg),
 }

cosmwasm/ibc-union/lightclient/attested/src/msg.rs

@@ -21,7 +21,7 @@ use unionlabs::{
 
 use crate::{
     client::{verify_attestation, verify_header},
-    contract::{execute, migrate, query},
+    contract::{execute, migrate, query, query::LatestHeight},
     errors::Error,
     msg::{ExecuteMsg, QueryMsg, RestrictedExecuteMsg},
     types::{Attestation, AttestationValue},
@@ -993,3 +993,93 @@ fn attestors_unique_per_chain() {
             .collect::<BTreeSet<_>>(),
     );
 }
+
+#[test]
+fn latest_height() {
+    let (mut deps, env) = setup();
+
+    reach_quorum(
+        &mut deps,
+        &env,
+        Attestation {
+            chain_id: CHAIN_ID.to_owned(),
+            height: 1,
+            timestamp: Timestamp::from_secs(1),
+            key: b"key".into(),
+            value: AttestationValue::NonExistence,
+        },
+        [&*ATTESTOR_1, &*ATTESTOR_2],
+    );
+
+    // no heights attested to for this chain
+    assert_query_result(
+        deps.as_ref(),
+        &env,
+        QueryMsg::LatestHeight {
+            chain_id: "998".to_owned(),
+        },
+        &None::<LatestHeight>,
+    );
+
+    assert_query_result(
+        deps.as_ref(),
+        &env,
+        QueryMsg::LatestHeight {
+            chain_id: CHAIN_ID.to_owned(),
+        },
+        &Some(LatestHeight {
+            height: 1,
+            timestamp: Timestamp::from_secs(1),
+        }),
+    );
+
+    reach_quorum(
+        &mut deps,
+        &env,
+        Attestation {
+            chain_id: CHAIN_ID.to_owned(),
+            height: 2,
+            timestamp: Timestamp::from_secs(1),
+            key: b"key".into(),
+            value: AttestationValue::NonExistence,
+        },
+        [&*ATTESTOR_1, &*ATTESTOR_2],
+    );
+
+    assert_query_result(
+        deps.as_ref(),
+        &env,
+        QueryMsg::LatestHeight {
+            chain_id: CHAIN_ID.to_owned(),
+        },
+        &Some(LatestHeight {
+            height: 2,
+            timestamp: Timestamp::from_secs(1),
+        }),
+    );
+
+    reach_quorum(
+        &mut deps,
+        &env,
+        Attestation {
+            chain_id: CHAIN_ID.to_owned(),
+            height: u64::MAX,
+            timestamp: Timestamp::from_secs(1),
+            key: b"key".into(),
+            value: AttestationValue::NonExistence,
+        },
+        [&*ATTESTOR_1, &*ATTESTOR_2],
+    );
+
+    assert_query_result(
+        deps.as_ref(),
+        &env,
+        QueryMsg::LatestHeight {
+            chain_id: CHAIN_ID.to_owned(),
+        },
+        &Some(LatestHeight {
+            height: u64::MAX,
+            timestamp: Timestamp::from_secs(1),
+        }),
+    );
+}

cosmwasm/ibc-union/lightclient/attested/src/tests.rs

@@ -257,6 +257,9 @@ impl ConsensusType {
     /// [L2 settlement]: https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts-bedrock
     pub const OPTIMISM: &'static str = "optimism";
 
+    /// An attested client.
+    pub const ATTESTED: &'static str = "attested";
+
     // lots more to come - near, linea, polygon - stay tuned
 }
 

lib/voyager-primitives/src/lib.rs

@@ -0,0 +1,31 @@
+[package]
+name    = "voyager-finality-module-attested-evm"
+version = "0.0.0"
+
+authors      = { workspace = true }
+edition      = { workspace = true }
+license-file = { workspace = true }
+publish      = { workspace = true }
+repository   = { workspace = true }
+
+[lints]
+workspace = true
+
+[dependencies]
+alloy                       = { workspace = true, features = ["rpc", "rpc-types", "transports", "transport-http", "transport-ws", "reqwest", "reqwest-rustls-tls", "provider-ws"] }
+attested-light-client       = { workspace = true }
+attested-light-client-types = { workspace = true, features = ["serde"] }
+clap                        = { workspace = true, features = ["derive"] }
+cometbft-rpc                = { workspace = true }
+embed-commit                = { workspace = true }
+ibc-union-spec              = { workspace = true, features = ["serde"] }
+jsonrpsee                   = { workspace = true, features = ["macros", "server", "tracing"] }
+prost                       = { workspace = true }
+protos                      = { workspace = true }
+serde                       = { workspace = true, features = ["derive"] }
+serde_json                  = { workspace = true }
+thiserror                   = { workspace = true }
+tokio                       = { workspace = true }
+tracing                     = { workspace = true }
+unionlabs                   = { workspace = true }
+voyager-sdk                 = { workspace = true }