Skip to content

feat: add an RFC 6962 compliant Merkle tree with flat memory representation #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperFluffy merged 3 commits into from
Nov 17, 2023
Merged

feat: add an RFC 6962 compliant Merkle tree with flat memory representation #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b0b82d
Implement a RFC 6962 compliant merkle tree with a flat memory represe…
SuperFluffy Oct 30, 2023
2ce3333
clippy
SuperFluffy Nov 10, 2023
5796f0e
update spec to mention merkle::Proof
SuperFluffy Nov 17, 2023
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
44 changes: 14 additions & 30 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ members = [
"crates/astria-conductor",
"crates/astria-config",
"crates/astria-cli",
"crates/astria-merkle",
"crates/astria-proto",
"crates/astria-sequencer",
"crates/astria-sequencer-client",
"crates/astria-sequencer-relayer",
"crates/astria-sequencer-types",
"crates/astria-sequencer-utils",
"crates/astria-sequencer-validation",
"crates/astria-telemetry",
"crates/astria-test-utils",
]
Expand All @@ -30,6 +30,7 @@ ed25519-consensus = "2.1.0"
eyre = "0.6"
futures = "0.3"
hex = "0.4"
hex-literal = "0.4.1"
humantime = "2.1.0"
hyper = "0.14"
jsonrpsee = { version = "0.20" }
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-celestia-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sha2 = "0.10"
tendermint = { workspace = true }
thiserror = { workspace = true }

sequencer-validation = { package = "astria-sequencer-validation", path = "../astria-sequencer-validation" }
merkle = { package = "astria-merkle", path = "../astria-merkle" }
sequencer-types = { package = "astria-sequencer-types", path = "../astria-sequencer-types" }

### Celestia specific imports
Expand Down
31 changes: 19 additions & 12 deletions crates/astria-celestia-client/src/blob_space.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use celestia_types::nmt::{
NS_ID_V0_SIZE,
};
use sequencer_types::ChainId;
use sequencer_validation::InclusionProof;
use serde::{
Deserialize,
Serialize,
Expand Down Expand Up @@ -46,9 +45,9 @@ pub struct SequencerNamespaceData {
pub header: Header,
pub rollup_chain_ids: Vec<ChainId>,
pub action_tree_root: [u8; 32],
pub action_tree_root_inclusion_proof: InclusionProof,
pub action_tree_root_inclusion_proof: merkle::Proof,
pub chain_ids_commitment: [u8; 32],
pub chain_ids_commitment_inclusion_proof: InclusionProof,
pub chain_ids_commitment_inclusion_proof: merkle::Proof,
}

#[derive(Debug, thiserror::Error)]
Expand All @@ -57,8 +56,7 @@ pub struct SequencerNamespaceData {
against the provided root hash"
)]
pub struct RollupVerificationFailure {
#[from]
source: sequencer_validation::VerificationFailure,
_private: (),
}

/// Data that is serialized and submitted to celestia as a blob under rollup-specific namespaces.
Expand All @@ -67,7 +65,7 @@ pub struct RollupNamespaceData {
pub block_hash: Hash,
pub chain_id: ChainId,
pub rollup_txs: Vec<Vec<u8>>,
pub inclusion_proof: InclusionProof,
pub inclusion_proof: merkle::Proof,
}

impl RollupNamespaceData {
Expand All @@ -80,12 +78,21 @@ impl RollupNamespaceData {
&self,
root_hash: [u8; 32],
) -> Result<(), RollupVerificationFailure> {
use sequencer_validation::MerkleTree;
let rollup_data_tree = MerkleTree::from_leaves(self.rollup_txs.clone());
let rollup_data_root = rollup_data_tree.root();
let mut leaf = self.chain_id.as_ref().to_vec();
leaf.append(&mut rollup_data_root.to_vec());
self.inclusion_proof.verify(&leaf, root_hash)?;
let rollup_data_root = merkle::Tree::from_leaves(&self.rollup_txs).root();
if !self
.inclusion_proof
.audit()
.with_root(root_hash)
.with_leaf_builder()
.write(self.chain_id.as_ref())
.write(&rollup_data_root)
.finish_leaf()
.perform()
{
return Err(RollupVerificationFailure {
_private: (),
});
}
Ok(())
}
}
32 changes: 13 additions & 19 deletions crates/astria-celestia-client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use sequencer_types::{
RawSequencerBlockData,
SequencerBlockData,
};
use sequencer_validation::IndexOutOfBounds;

use crate::{
blob_space::{
Expand Down Expand Up @@ -206,21 +205,16 @@ pub enum BlobAssemblyError {
source: serde_json::Error,
index: usize,
},
#[error("failed to generate inclusion proof for the transaction at index `{index}`")]
GenerateInclusionProof {
source: IndexOutOfBounds,
index: usize,
},
#[error(
"failed to construct inclusion proof for the transaction at index `{index}` because its \
index was outside the tree"
)]
ConstructProof { index: usize },
}

fn assemble_blobs_from_sequencer_block_data(
block_data: SequencerBlockData,
) -> Result<Vec<Blob>, BlobAssemblyError> {
use sequencer_validation::{
generate_action_tree_leaves,
MerkleTree,
};

let mut blobs = Vec::with_capacity(block_data.rollup_data().len() + 1);
let mut chain_ids = Vec::with_capacity(block_data.rollup_data().len());

Expand All @@ -234,16 +228,16 @@ fn assemble_blobs_from_sequencer_block_data(
chain_ids_commitment_inclusion_proof,
} = block_data.into_raw();

let action_tree_leaves = generate_action_tree_leaves(rollup_data.clone());
let action_tree = MerkleTree::from_leaves(action_tree_leaves);
let action_tree =
sequencer_types::sequencer_block_data::generate_merkle_tree_from_grouped_txs(&rollup_data);

for (i, (chain_id, transactions)) in rollup_data.into_iter().enumerate() {
let inclusion_proof = action_tree.prove_inclusion(i).map_err(|source| {
BlobAssemblyError::GenerateInclusionProof {
source,
index: i,
}
})?;
let inclusion_proof =
action_tree
.construct_proof(i)
.ok_or(BlobAssemblyError::ConstructProof {
index: i,
})?;

let rollup_namespace_data = RollupNamespaceData {
block_hash,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ tryhard = { workspace = true }

celestia-client = { package = "astria-celestia-client", path = "../astria-celestia-client" }
config = { package = "astria-config", path = "../astria-config" }
merkle = { package = "astria-merkle", path = "../astria-merkle" }
proto = { package = "astria-proto", path = "../astria-proto", features = [
"client",
] }
sequencer-client = { package = "astria-sequencer-client", path = "../astria-sequencer-client", features = [
"websocket",
] }
astria-sequencer-types = { path = "../astria-sequencer-types" }
sequencer-validation = { package = "astria-sequencer-validation", path = "../astria-sequencer-validation" }
telemetry = { package = "astria-telemetry", path = "../astria-telemetry" }

[dev-dependencies]
Expand Down
Loading