Merge pull request #87 from maticnetwork/develop

Data root, nomad primitives and executive pallet tests
availproject · Sep 21, 2022 · 062d946 · 062d946
2 parents 76e2b45 + 86af7d1
commit 062d946
Show file tree

Hide file tree

Showing 63 changed files with 5,897 additions and 540 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,11 @@ members = [
 	"kate/recovery",
 	"kate/proof",
 	"fuzzing",
-	"primitives",
+	"primitives/avail",
+	"primitives/nomad/merkle",
+	"primitives/nomad/signature",
+	"primitives/nomad/nomad-core",
+	"primitives/nomad/nomad-base",
 	"pallets/executive",
 	"pallets/system",
 	"pallets/dactr",
@@ -22,6 +26,10 @@ dusk-plonk = { git = "https://github.com/maticnetwork/plonk.git", branch = "v0.8
 frame-system = { path = "pallets/system" }
 frame-executive = { path = "pallets/executive" }
 frame-system-rpc-runtime-api = { path = "pallets/system/rpc/runtime-api" }
+syn = { git = "https://github.com/dtolnay/syn.git", tag = "1.0.96" }
+tokio = { git = "https://github.com/tokio-rs/tokio", tag = "tokio-1.19.2" }
+primitive-types = { git = "https://github.com/paritytech/parity-common.git", tag = "parity-util-mem-v0.10.1" }
+parity-db = { git = "https://github.com/paritytech/parity-db.git", tag = "v0.3.12" }
 
 # Substrate  (polkadot-v0.9.13).
 sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.13" }

diff --git a/avail-subxt/src/lib.rs b/avail-subxt/src/lib.rs
@@ -225,6 +225,9 @@ pub struct KateCommitment {
 	pub rows: u16,
 	/// Cols
 	pub cols: u16,
+	/// The merkle root of the data submissions
+	#[serde(rename = "dataRoot")]
+	pub data_root: H256,
 }
 
 impl MallocSizeOf for KateCommitment {
@@ -233,6 +236,7 @@ impl MallocSizeOf for KateCommitment {
 			+ self.commitment.size_of(ops)
 			+ self.rows.size_of(ops)
 			+ self.cols.size_of(ops)
+			+ self.data_root.size_of(ops)
 	}
 }
 
@@ -301,6 +305,7 @@ impl Header for DaHeader {
 				commitment: vec![],
 				rows: 0,
 				cols: 0,
+				data_root: H256([0; 32]),
 			},
 			digest,
 			app_data_lookup: DataLookup {

diff --git a/fuzzing/Cargo.toml b/fuzzing/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 afl = "*"
 kate-recovery = {path = "../kate/recovery"}
 kate = {path = "../kate"}
-da-primitives = { path = "../primitives", default-features = false }
+da-primitives = { path = "../primitives/avail", default-features = false }
 hex-literal = "0.3.1"
 
 [[bin]]

diff --git a/kate/Cargo.toml b/kate/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-da-primitives = { path = "../primitives", default-features = false }
+da-primitives = { path = "../primitives/avail", default-features = false }
 
 # Others
 dusk-plonk = { git = "https://github.com/maticnetwork/plonk.git", branch = "v0.8.2-polygon-5", optional = true }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "data-avail"
-version = "1.0.0"
+version = "1.1.0"
 description = "Polygon Data Avilability Node."
 authors = ["Anonymous"]
 homepage = "https://polygon.technology/"
@@ -18,7 +18,7 @@ name = "data-avail"
 
 [dependencies]
 # Internals
-da-primitives= { path = "../primitives" }
+da-primitives= { path = "../primitives/avail" }
 da-runtime = { path = "../runtime" }
 da-control = { path = "../pallets/dactr" }
 kate = { path = "../kate" }

diff --git a/pallets/dactr/Cargo.toml b/pallets/dactr/Cargo.toml
@@ -12,7 +12,7 @@ description = "Data Avail Control Module"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-da-primitives = { path = "../../primitives", default-features = false }
+da-primitives = { path = "../../primitives/avail", default-features = false }
 kate = { path = "../../kate", default-features = false }
 
 # Substrate

diff --git a/pallets/dactr/src/extensions/check_app_id.rs b/pallets/dactr/src/extensions/check_app_id.rs
@@ -11,6 +11,11 @@ use sp_runtime::{
 		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
 	},
 };
+use sp_std::{
+	default::Default,
+	fmt::{self, Debug, Formatter},
+	marker::PhantomData,
+};
 
 use crate::{Call as DACall, Config, Pallet};
 
@@ -58,18 +63,19 @@ where
 		Ok(ValidTransaction::default())
 	}
 }
+impl<T: Config + Send + Sync> Default for CheckAppId<T> {
+	fn default() -> Self { Self(AppId::default(), PhantomData) }
+}
 
-impl<T> sp_std::fmt::Debug for CheckAppId<T>
+impl<T> Debug for CheckAppId<T>
 where
 	T: Config + Send + Sync,
 {
 	#[cfg(feature = "std")]
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-		write!(f, "CheckAppId: {}", self.0)
-	}
+	fn fmt(&self, f: &mut Formatter) -> fmt::Result { write!(f, "CheckAppId: {}", self.0) }
 
 	#[cfg(not(feature = "std"))]
-	fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { Ok(()) }
+	fn fmt(&self, _: &mut Formatter) -> fmt::Result { Ok(()) }
 }
 
 impl<T> SignedExtension for CheckAppId<T>

diff --git a/pallets/executive/Cargo.toml b/pallets/executive/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-da-primitives = { path = "../../primitives", default-features = false }
+da-primitives = { path = "../../primitives/avail", default-features = false }
 
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
@@ -36,6 +36,9 @@ pallet-balances = "4.0.0-dev"
 pallet-transaction-payment = "4.0.0-dev"
 sp-version = "4.0.0-dev"
 sp-inherents = "4.0.0-dev"
+pallet-babe = "4.0.0-dev"
+mocked-runtime = { path = "../mocked_runtime" }
+da-control = { path = "../dactr" }
 
 [features]
 default = ["std"]