Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Temporarily remove sov-rollup-interface dependency from sov-celestia-client-types #135

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions clients/sov-celestia/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ tendermint = { workspace = true }
tendermint-proto = { workspace = true }
tendermint-light-client-verifier = { workspace = true }

# sovereign dependencies
sov-rollup-interface = { workspace = true }

[features]
default = ["std"]
std = [
Expand Down
45 changes: 0 additions & 45 deletions clients/sov-celestia/types/src/client_message/aggregated_proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ use core::fmt::{Display, Error as FmtError, Formatter};
use ibc_core::client::types::Height;
use ibc_core::primitives::prelude::*;
use ibc_core::primitives::proto::Protobuf;
use sov_rollup_interface::zk::aggregated_proof::{
AggregatedProof as SovAggregatedProof,
AggregatedProofPublicData as SovAggregatedProofPublicData, CodeCommitment as SovCodeCommitment,
SerializedAggregatedProof as SovSerializedAggregatedProof,
};

use crate::client_message::pretty::PrettySlice;
use crate::error::Error;
Expand Down Expand Up @@ -126,12 +121,6 @@ impl From<AggregatedProof> for RawAggregatedProof {
}
}

impl From<AggregatedProof> for SovAggregatedProof {
fn from(value: AggregatedProof) -> Self {
Self::new(value.serialized_proof.into(), value.public_data.into())
}
}

/// Defines the public properties of the AggregatedProof for the Sovereign SDK
/// rollups, utilized for verifying the proof.
#[derive(Clone, Debug, PartialEq, Eq)]
Expand Down Expand Up @@ -201,26 +190,6 @@ impl Display for AggregatedProofPublicData {
}
}

impl From<AggregatedProofPublicData> for SovAggregatedProofPublicData {
fn from(value: AggregatedProofPublicData) -> Self {
Self {
validity_conditions: value
.validity_conditions
.into_iter()
.map(|vc| vc.0)
.collect(),
initial_slot_number: value.initial_slot_number.revision_height(),
final_slot_number: value.final_slot_number.revision_height(),
genesis_state_root: value.genesis_state_root.into(),
initial_state_root: value.initial_state_root.into(),
final_state_root: value.final_state_root.into(),
initial_slot_hash: value.initial_slot_hash,
final_slot_hash: value.final_slot_hash,
code_commitment: value.code_commitment.into(),
}
}
}

impl Protobuf<RawAggregatedProofPublicData> for AggregatedProofPublicData {}

impl TryFrom<RawAggregatedProofPublicData> for AggregatedProofPublicData {
Expand Down Expand Up @@ -372,12 +341,6 @@ impl From<CodeCommitment> for RawCodeCommitment {
}
}

impl From<CodeCommitment> for SovCodeCommitment {
fn from(value: CodeCommitment) -> Self {
Self(value.0)
}
}

#[derive(Clone, Debug, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct SerializedAggregatedProof(Vec<u8>);
Expand Down Expand Up @@ -427,14 +390,6 @@ impl From<SerializedAggregatedProof> for RawSerializedAggregatedProof {
}
}

impl From<SerializedAggregatedProof> for SovSerializedAggregatedProof {
fn from(value: SerializedAggregatedProof) -> Self {
Self {
raw_aggregated_proof: value.0,
}
}
}

/// Defines the root hash of the aggregated proof
#[derive(Clone, Debug, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
Expand Down
Loading