-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
156 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| use std::result::Result as StdResult; | ||
|
|
||
| use nmt_rs::NamespaceMerkleHasher; | ||
|
|
||
| use crate::namespaced_data::{NamespacedData, NamespacedDataId}; | ||
| use crate::nmt::{Namespace, NamespacedSha2Hasher, Nmt}; | ||
| use crate::{DataAvailabilityHeader, Share}; | ||
| use crate::{Error, Result}; | ||
|
|
||
| /// Represents either Column or Row of the Data Square. | ||
| #[derive(Copy, Clone, Debug, PartialEq, Eq)] | ||
| #[repr(u8)] | ||
| pub enum AxisType { | ||
| Row = 0, | ||
| Col, | ||
| } | ||
|
|
||
| impl TryFrom<u8> for AxisType { | ||
| type Error = Error; | ||
|
|
||
| fn try_from(value: u8) -> StdResult<Self, Self::Error> { | ||
| match value { | ||
| 0 => Ok(AxisType::Row), | ||
| 1 => Ok(AxisType::Col), | ||
| n => Err(Error::InvalidAxis(n.into())), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Represents valid ExtendedDataSquare | ||
| pub struct ExtendedDataSquare { | ||
| shares: Vec<Share>, | ||
| square_len: usize, | ||
| } | ||
|
|
||
| impl ExtendedDataSquare { | ||
| pub fn new(shares: Vec<Share>) -> Result<Self> { | ||
| let square_len = f64::sqrt(shares.len() as f64) as usize; | ||
| if square_len * square_len != shares.len() { | ||
| return Err(Error::EdsInvalidDimentions); | ||
| } | ||
|
|
||
| Ok(Self { shares, square_len }) | ||
| } | ||
|
|
||
| pub fn row(&self, index: usize, square_len: usize) -> Vec<Share> { | ||
| self.shares[index * square_len..(index + 1) * square_len].to_vec() | ||
| } | ||
|
|
||
| pub fn column(&self, mut index: usize, square_len: usize) -> Vec<Share> { | ||
| let mut r = Vec::with_capacity(square_len); | ||
| while index < self.shares.len() { | ||
| r.push(self.shares[index].clone()); | ||
| index += square_len; | ||
| } | ||
| r | ||
| } | ||
|
|
||
| pub fn axis(&self, axis: AxisType, index: usize, square_len: usize) -> Vec<Share> { | ||
| match axis { | ||
| AxisType::Col => self.column(index, square_len), | ||
| AxisType::Row => self.row(index, square_len), | ||
| } | ||
| } | ||
|
|
||
| pub fn square_len(&self) -> usize { | ||
| self.square_len | ||
| } | ||
|
|
||
| pub fn get_namespaced_data( | ||
| &self, | ||
| namespace: Namespace, | ||
| dah: &DataAvailabilityHeader, | ||
| height: u64, | ||
| ) -> Result<Vec<NamespacedData>> { | ||
| let square_len = dah.square_len(); | ||
|
|
||
| let mut data = Vec::new(); | ||
|
|
||
| for i in 0..square_len { | ||
| let row_root = dah.row_root(i).unwrap(); | ||
| if !row_root.contains::<NamespacedSha2Hasher>(*namespace) { | ||
| continue; | ||
| } | ||
|
|
||
| let mut shares = Vec::with_capacity(square_len); | ||
|
|
||
| let mut tree = Nmt::with_hasher(NamespacedSha2Hasher::with_ignore_max_ns(true)); | ||
| for s in &self.shares { | ||
| tree.push_leaf(s.data(), *s.namespace()) | ||
| .map_err(Error::Nmt)?; | ||
| if s.namespace() == namespace { | ||
| shares.push(s.clone()); | ||
| } | ||
| } | ||
|
|
||
| let proof = tree.get_namespace_proof(*namespace); | ||
| let namespaced_data_id = NamespacedDataId { | ||
| row_index: i.try_into().unwrap(), | ||
| namespace, | ||
| hash: dah.hash().as_ref().try_into().unwrap(), | ||
| block_height: height, | ||
| }; | ||
|
|
||
| data.push(NamespacedData { | ||
| namespaced_data_id, | ||
| proof: proof.into(), | ||
| shares, | ||
| }) | ||
| } | ||
|
|
||
| Ok(data) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn axis_type_serialization() { | ||
| assert_eq!(AxisType::Row as u8, 0); | ||
| assert_eq!(AxisType::Col as u8, 1); | ||
| } | ||
|
|
||
| #[test] | ||
| fn axis_type_deserialization() { | ||
| assert_eq!(AxisType::try_from(0).unwrap(), AxisType::Row); | ||
| assert_eq!(AxisType::try_from(1).unwrap(), AxisType::Col); | ||
|
|
||
| let axis_type_err = AxisType::try_from(2).unwrap_err(); | ||
| assert!(matches!(axis_type_err, Error::InvalidAxis(2))); | ||
| let axis_type_err = AxisType::try_from(99).unwrap_err(); | ||
| assert!(matches!(axis_type_err, Error::InvalidAxis(99))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,8 @@ | ||
| use std::result::Result as StdResult; | ||
|
|
||
| use nmt_rs::NamespaceMerkleHasher; | ||
| use serde::{Deserialize, Serialize}; | ||
|
|
||
| use crate::namespaced_data::{NamespacedData, NamespacedDataId}; | ||
| use crate::nmt::{Namespace, NamespacedSha2Hasher, Nmt}; | ||
| use crate::{DataAvailabilityHeader, Share}; | ||
| use crate::{Error, Result}; | ||
|
|
||
| /// Represents either Column or Row of the Data Square. | ||
| #[derive(Copy, Clone, Debug, PartialEq, Eq)] | ||
| #[repr(u8)] | ||
| pub enum AxisType { | ||
| Row = 0, | ||
| Col, | ||
| } | ||
|
|
||
| impl TryFrom<u8> for AxisType { | ||
| type Error = Error; | ||
|
|
||
| fn try_from(value: u8) -> StdResult<Self, Self::Error> { | ||
| match value { | ||
| 0 => Ok(AxisType::Row), | ||
| 1 => Ok(AxisType::Col), | ||
| n => Err(Error::InvalidAxis(n.into())), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] | ||
| pub struct ExtendedDataSquare { | ||
| #[serde(with = "tendermint_proto::serializers::bytes::vec_base64string")] | ||
| pub data_square: Vec<Vec<u8>>, | ||
| pub codec: String, | ||
| } | ||
|
|
||
| impl ExtendedDataSquare { | ||
| pub fn new(shares: Vec<Vec<u8>>, codec: String) -> Self { | ||
| // TODO: validation | ||
| Self { | ||
| data_square: shares, | ||
| codec, | ||
| } | ||
| } | ||
|
|
||
| pub fn row(&self, index: usize, square_len: usize) -> Vec<Share> { | ||
| self.data_square[index * square_len..(index + 1) * square_len] | ||
| .iter() | ||
| .map(|s| Share::from_raw(s)) | ||
| .collect::<Result<_, _>>() | ||
| .unwrap() | ||
| } | ||
|
|
||
| pub fn column(&self, mut index: usize, square_len: usize) -> Vec<Share> { | ||
| let mut r = Vec::with_capacity(square_len); | ||
| while index < self.data_square.len() { | ||
| r.push(Share::from_raw(&self.data_square[index]).unwrap()); | ||
| index += square_len; | ||
| } | ||
| r | ||
| } | ||
|
|
||
| pub fn axis(&self, axis: AxisType, index: usize, square_len: usize) -> Vec<Share> { | ||
| match axis { | ||
| AxisType::Col => self.column(index, square_len), | ||
| AxisType::Row => self.row(index, square_len), | ||
| } | ||
| } | ||
|
|
||
| pub fn square_len(&self) -> usize { | ||
| f64::sqrt(self.data_square.len() as f64) as usize + 1 | ||
| } | ||
|
|
||
| pub fn get_namespaced_data( | ||
| &self, | ||
| namespace: Namespace, | ||
| dah: &DataAvailabilityHeader, | ||
| height: u64, | ||
| ) -> Result<Vec<NamespacedData>> { | ||
| let square_len = dah.square_len(); | ||
|
|
||
| let mut data = Vec::new(); | ||
|
|
||
| for i in 0..square_len { | ||
| let row_root = dah.row_root(i).unwrap(); | ||
| if !row_root.contains::<NamespacedSha2Hasher>(*namespace) { | ||
| continue; | ||
| } | ||
|
|
||
| let mut shares = Vec::with_capacity(square_len); | ||
|
|
||
| let mut tree = Nmt::with_hasher(NamespacedSha2Hasher::with_ignore_max_ns(true)); | ||
| for s in &self.data_square { | ||
| let s = Share::from_raw(s).unwrap(); // TODO: swap entire tree to shares? | ||
| tree.push_leaf(s.data(), *s.namespace()) | ||
| .map_err(Error::Nmt)?; | ||
| if s.namespace() == namespace { | ||
| shares.push(s); | ||
| } | ||
| } | ||
|
|
||
| let proof = tree.get_namespace_proof(*namespace); | ||
| let namespaced_data_id = NamespacedDataId { | ||
| row_index: i.try_into().unwrap(), | ||
| namespace, | ||
| hash: dah.hash().as_ref().try_into().unwrap(), | ||
| block_height: height, | ||
| }; | ||
|
|
||
| data.push(NamespacedData { | ||
| namespaced_data_id, | ||
| proof: proof.into(), | ||
| shares, | ||
| }) | ||
| } | ||
|
|
||
| Ok(data) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn axis_type_serialization() { | ||
| assert_eq!(AxisType::Row as u8, 0); | ||
| assert_eq!(AxisType::Col as u8, 1); | ||
| } | ||
|
|
||
| #[test] | ||
| fn axis_type_deserialization() { | ||
| assert_eq!(AxisType::try_from(0).unwrap(), AxisType::Row); | ||
| assert_eq!(AxisType::try_from(1).unwrap(), AxisType::Col); | ||
|
|
||
| let axis_type_err = AxisType::try_from(2).unwrap_err(); | ||
| assert!(matches!(axis_type_err, Error::InvalidAxis(2))); | ||
| let axis_type_err = AxisType::try_from(99).unwrap_err(); | ||
| assert!(matches!(axis_type_err, Error::InvalidAxis(99))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters