feat: Add FRI-based commitment scheme

Cargo.toml

@@ -31,10 +31,12 @@ homepage = "https://www.availproject.org/"
 
 
 [workspace.dependencies]
-avail-core = { git = "https://github.com/availproject/avail-core.git", branch = "ghali/infinity-da", default-features = false, features = [ "runtime"] }
-kate = { git = "https://github.com/availproject/avail-core", branch = "ghali/infinity-da", default-features = false }
-kate-recovery = { git = "https://github.com/availproject/avail-core", branch = "ghali/infinity-da", default-features = false  }
+avail-core = { git = "https://github.com/availproject/avail-core.git", rev = "8d018ba7485406cf6f81ee97a8c0eb6238f65a59", default-features = false, features = [ "runtime"] }
+avail-fri = { git = "https://github.com/availproject/avail-core.git", rev = "8d018ba7485406cf6f81ee97a8c0eb6238f65a59", default-features = false, features = [ "runtime"] }
+kate = { git = "https://github.com/availproject/avail-core", rev = "8d018ba7485406cf6f81ee97a8c0eb6238f65a59", default-features = false }
+kate-recovery = { git = "https://github.com/availproject/avail-core", rev = "8d018ba7485406cf6f81ee97a8c0eb6238f65a59", default-features = false  }
 # avail-core = { path = "../avail-core/core", default-features = false, features = [ "runtime"] }
+# avail-fri = { path = "../avail-core/fri", default-features = false }
 # kate = { path = "../avail-core/kate/", default-features = false }
 # kate-recovery = { path = "../avail-core/kate/recovery/", default-features = false}
 
@@ -64,7 +66,7 @@ iai-callgrind = "0.7.3"
 divan = "0.1.11"
 
 # Logging and testing
-log = "0.4.20"
+log = { version = "0.4.20", default-features = false }
 test-case = "1.2.3"
 hex = "0.4"
 const-hex = { version = "1.14.1", default-features = false, features = ["alloc"] }
@@ -360,3 +362,4 @@ zeroize = { opt-level = 3 }
 [profile.release]
 # Substrate runtime requires unwinding.
 panic = "unwind"
+lto = "thin"

base/Cargo.toml

@@ -26,7 +26,7 @@ frame-support = { workspace = true, default-features = false }
 binary-merkle-tree = { workspace = true, default-features = false }
 
 # 3rd-party
-log.workspace = true
+log = { workspace = true, default-features = false }
 derive_more.workspace = true
 itertools = { workspace = true, default-features = false }
 
@@ -41,8 +41,9 @@ std = [
 	"binary-merkle-tree/std",
 	"codec/std",
 	"frame-support/std",
-	"sp-authority-discovery/std",
+	"log/std",
 	"sp-api/std",
+	"sp-authority-discovery/std",
 	"sp-core/std",
 	"sp-runtime-interface/std",
 	"sp-runtime/std",

base/src/header_extension/builder_data.rs

@@ -10,6 +10,7 @@ use derive_more::Constructor;
 use sp_core::H256;
 use sp_runtime::OpaqueExtrinsic;
 use sp_runtime_interface::pass_by::PassByCodec;
+use sp_std::collections::btree_map::BTreeMap;
 use sp_std::{iter::repeat, vec::Vec};
 
 #[derive(Constructor, Debug, Encode, Decode, Clone, PartialEq, Eq)]
@@ -18,12 +19,16 @@ pub struct BridgedData {
 	pub addr_msg: AddressedMessage,
 }
 
-#[derive(Debug, Constructor, Encode, Decode, PartialEq, Eq, Clone)]
+#[derive(Debug, Constructor, Encode, Decode, Default, PartialEq, Eq, Clone)]
 pub struct SubmittedData {
 	pub id: AppId,
 	pub tx_index: u32,
 	pub hash: H256,
+	pub size_bytes: u64,
 	pub commitments: Vec<u8>,
+	pub eval_point_seed: Option<[u8; 32]>,
+	pub eval_claim: Option<[u8; 16]>,
+	pub eval_proof: Option<Vec<u8>>,
 }
 
 impl GetAppId for SubmittedData {
@@ -44,34 +49,36 @@ pub struct HeaderExtensionBuilderData {
 	pub bridge_messages: Vec<BridgedData>,
 }
 
+#[derive(Clone, Debug, Default)]
+pub struct PostInherentInfo {
+	pub eval_proofs: BTreeMap<u32, Vec<u8>>,
+	pub failed: Vec<u32>,
+}
+
 impl HeaderExtensionBuilderData {
 	pub fn from_raw_extrinsics<F: HeaderExtensionDataFilter>(
 		block: u32,
 		extrinsics: &[Vec<u8>],
-		cols: u32,
-		rows: u32,
 	) -> Self {
 		let opaques: Vec<OpaqueExtrinsic> = extrinsics
 			.iter()
 			.filter_map(|e| OpaqueExtrinsic::from_bytes(e).ok())
 			.collect();
 
-		Self::from_opaque_extrinsics::<F>(block, &opaques, cols, rows)
+		Self::from_opaque_extrinsics::<F>(block, &opaques)
 	}
 
 	pub fn from_opaque_extrinsics<F: HeaderExtensionDataFilter>(
 		block: u32,
 		opaques: &[OpaqueExtrinsic],
-		cols: u32,
-		rows: u32,
 	) -> Self {
-		let failed_transactions = F::get_failed_transaction_ids(opaques);
+		let post_inherent_info = F::get_data_from_post_inherents(opaques);
 
 		let extracted_tx_datas: Vec<ExtractedTxData> = opaques
 			.into_iter()
 			.enumerate()
 			.filter_map(|(idx, opaque)| {
-				F::filter(&failed_transactions, opaque.clone(), block, idx, cols, rows)
+				F::filter(post_inherent_info.clone(), opaque.clone(), block, idx)
 			})
 			.collect();
 
@@ -260,8 +267,7 @@ mod tests {
 	#[test]
 	fn test_from_raw_extrinsics() {
 		let extrinsics: Vec<Vec<u8>> = vec![vec![1, 2, 3], vec![4, 5, 6]];
-		let builder_data =
-			HeaderExtensionBuilderData::from_raw_extrinsics::<()>(1, &extrinsics, 1024, 4096);
+		let builder_data = HeaderExtensionBuilderData::from_raw_extrinsics::<()>(1, &extrinsics);
 		assert_eq!(builder_data.data_submissions.len(), 0);
 		assert_eq!(builder_data.bridge_messages.len(), 0);
 	}
@@ -273,7 +279,9 @@ mod tests {
 				id: AppId::default(),
 				tx_index: 0,
 				commitments: vec![],
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![1, 2, 3])),
+				..Default::default()
 			}],
 			bridge_messages: vec![],
 		};
@@ -290,7 +298,9 @@ mod tests {
 				id: AppId::default(),
 				tx_index: 0,
 				hash: H256::from(keccak_256(&vec![1, 2, 3])),
+				size_bytes: 0,
 				commitments: vec![],
+				..Default::default()
 			}],
 			bridge_messages: vec![],
 		};
@@ -306,8 +316,10 @@ mod tests {
 			data_submissions: vec![SubmittedData {
 				id: AppId::default(),
 				tx_index: 0,
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![1, 2, 3])),
 				commitments: vec![],
+				..Default::default()
 			}],
 			bridge_messages: vec![],
 		};
@@ -320,26 +332,34 @@ mod tests {
 			SubmittedData {
 				id: AppId(3),
 				tx_index: 0,
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![1, 2, 3])),
 				commitments: vec![],
+				..Default::default()
 			},
 			SubmittedData {
 				id: AppId(1),
 				tx_index: 1,
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![4, 5, 6])),
 				commitments: vec![],
+				..Default::default()
 			},
 			SubmittedData {
 				id: AppId(2),
 				tx_index: 2,
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![7, 8, 9])),
 				commitments: vec![],
+				..Default::default()
 			},
 			SubmittedData {
 				id: AppId(1),
 				tx_index: 3,
+				size_bytes: 0,
 				hash: H256::from(keccak_256(&vec![7, 8, 9])),
 				commitments: vec![],
+				..Default::default()
 			},
 		];
 

base/src/header_extension/mod.rs

@@ -3,5 +3,7 @@ pub mod builder_data;
 pub mod traits;
 
 // Reexport
-pub use builder_data::{BridgedData, ExtractedTxData, HeaderExtensionBuilderData, SubmittedData};
+pub use builder_data::{
+	BridgedData, ExtractedTxData, HeaderExtensionBuilderData, PostInherentInfo, SubmittedData,
+};
 pub use traits::HeaderExtensionDataFilter;

base/src/header_extension/traits.rs

@@ -1,51 +1,44 @@
-use super::ExtractedTxData;
+use super::{ExtractedTxData, PostInherentInfo};
 use sp_runtime::OpaqueExtrinsic;
-use sp_std::vec::Vec;
 
 pub trait HeaderExtensionDataFilter {
 	fn filter(
-		failed_transactions: &[u32],
+		post_inherent_info: PostInherentInfo,
 		opaque: OpaqueExtrinsic,
 		block: u32,
 		tx_idx: usize,
-		cols: u32,
-		rows: u32,
 	) -> Option<ExtractedTxData>;
 
-	fn get_failed_transaction_ids(opaques: &[OpaqueExtrinsic]) -> Vec<u32>;
+	fn get_data_from_post_inherents(opaques: &[OpaqueExtrinsic]) -> PostInherentInfo;
 }
 
 #[cfg(feature = "std")]
 impl HeaderExtensionDataFilter for () {
 	fn filter(
-		_: &[u32],
+		_: PostInherentInfo,
 		_: OpaqueExtrinsic,
 		_: u32,
 		_: usize,
-		_: u32,
-		_: u32,
 	) -> Option<ExtractedTxData> {
 		None
 	}
 
-	fn get_failed_transaction_ids(_: &[OpaqueExtrinsic]) -> Vec<u32> {
-		Vec::new()
+	fn get_data_from_post_inherents(_: &[OpaqueExtrinsic]) -> PostInherentInfo {
+		PostInherentInfo::default()
 	}
 }
 #[cfg(not(feature = "std"))]
 impl HeaderExtensionDataFilter for () {
 	fn filter(
-		_: &[u32],
+		_: PostInherentInfo,
 		_: OpaqueExtrinsic,
 		_: u32,
 		_: usize,
-		_: u32,
-		_: u32,
 	) -> Option<ExtractedTxData> {
 		None
 	}
 
-	fn get_failed_transaction_ids(_: &[OpaqueExtrinsic]) -> Vec<u32> {
-		Vec::new()
+	fn get_data_from_post_inherents(_: &[OpaqueExtrinsic]) -> PostInherentInfo {
+		PostInherentInfo::default()
 	}
 }

base/src/post_inherents.rs

@@ -68,6 +68,7 @@ decl_runtime_apis! {
 			bool,
 			Option<String>,
 			Vec<(sp_runtime::AccountId32, AuthorityId, String, Vec<u8>)>,
+			Option<Vec<u8>>,
 		)>, total_blob_size: u64) -> Vec<<Block as BlockT>::Extrinsic>;
 	}
 }

blob/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 da-runtime = { workspace = true, default-features = false }
 da-control = { workspace = true, default-features = false }
 avail-core = { workspace = true, default-features = false }
+avail-fri = { workspace = true, default-features = false, features = ["serde"]}
 pallet-staking = { workspace = true, default-features = false }
 sp-consensus-babe = { workspace = true, default-features = false }
 sc-transaction-pool = { workspace = true, default-features = false }
@@ -70,6 +71,7 @@ avail-rust = { package = "avail-rust-client", version = "0.4.0", default-feature
 default = ["std"]
 std = [
     "avail-core/std",
+    "avail-fri/std",
     "kate/std",
     "kate-recovery/std",
     "frame-benchmarking/std",

blob/benches/submit_data.rs

@@ -8,8 +8,8 @@ use avail_blob::traits::*;
 use avail_blob::types::CompressedBlob;
 use avail_blob::utils::CommitmentQueue;
 use avail_rust::prelude::*;
-use da_commitment::build_da_commitments;
-use da_commitment::build_da_commitments::build_da_commitments;
+use da_commitment::build_kzg_commitments;
+use da_commitment::build_kzg_commitments::build_da_commitments;
 use da_runtime::AccountId;
 use da_runtime::UncheckedExtrinsic;
 use da_runtime::AVAIL;
@@ -108,6 +108,13 @@ impl RuntimeApiT for DummyRuntimeApi {
 	fn get_blob_vouch_fee_reserve(&self, _block_hash: H256) -> Result<u128, ApiError> {
 		Ok(AVAIL)
 	}
+
+	fn commitment_scheme(
+		&self,
+		_block_hash: H256,
+	) -> Result<avail_core::header::extension::CommitmentScheme, ApiError> {
+		Ok(avail_core::header::extension::CommitmentScheme::Fri)
+	}
 }
 
 struct BuildTxOutput {
@@ -215,7 +222,7 @@ mod validation {
 		let queue: Arc<dyn CommitmentQueueApiT> = Arc::new(queue);
 
 		// grid & Commitment
-		let grid = build_da_commitments::build_polynomial_grid(
+		let grid = build_kzg_commitments::build_polynomial_grid(
 			&*tx.data,
 			DEFAULT_ROWS,
 			DEFAULT_COLS,
@@ -228,7 +235,7 @@ mod validation {
 			.bench_local_refs(|params| {
 				let runtime = tokio::runtime::Runtime::new().unwrap();
 				runtime.block_on(async {
-					avail_blob::validation::commitment_validation(
+					avail_blob::validation::validate_kzg_commitment(
 						tx.data_hash,
 						&params.0,
 						params.1.clone(),
@@ -246,7 +253,7 @@ mod validation {
 		let tx = build_transaction(data);
 
 		bencher.with_inputs(|| &tx).bench_local_refs(|tx| {
-			build_da_commitments::build_polynomial_grid(
+			build_kzg_commitments::build_polynomial_grid(
 				&*tx.data,
 				DEFAULT_ROWS,
 				DEFAULT_COLS,