Use arkworks to compile in no_std

Author: iquerejeta

Cargo.lock

@@ -345,3 +345,9 @@ partner-chains-demo-runtime = { path = "demo/runtime" }
 # Schnorr experiments
 schnorr_jubjub = { path = "toolkit/utils/schnorr_jubjub", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
+ark-ed-on-bls12-381 = { version = "0.5.0", default-features = false }
+ark-ff = { version = "0.5.0", default-features = false }
+ark-ec = { version = "0.5.0", default-features = false }
+ark-serialize = { version = "0.5.0", default-features = false }
+rand_core = {version = "0.6.4", default-features = false }
+sha2 = {version = "0.10.9", default-features = false }

Cargo.toml

@@ -99,12 +99,7 @@ sp-block-producer-fees = { workspace = true }
 pallet-block-producer-fees = { workspace = true }
 
 sp-io = { workspace = true }
-schnorr_jubjub = { workspace = true }
-midnight-circuits = { git = "https://github.com/midnightntwrk/midnight-circuits", branch = "iquerejeta/committee_proof"}
-halo2curves = { version = "0.7.0", features = ["derive_serde"] }
-blstrs = { git = "https://github.com/davidnevadoc/blstrs", rev = "3dfe5bf" }
-group = "0.13"
-ff = "0.13"
+#schnorr_jubjub = { workspace = true }
 
 [dev-dependencies]
 sp-keyring = { workspace = true }
@@ -187,6 +182,7 @@ std = [
 	"sp-block-participation/std",
 	"pallet-governed-map/std",
 	"sp-governed-map/std",
+#	"schnorr_jubjub/std",
 ]
 
 runtime-benchmarks = [

demo/runtime/Cargo.toml

@@ -54,7 +54,6 @@ use sp_core::ByteArray;
 use sp_core::{OpaqueMetadata, crypto::KeyTypeId};
 use sp_governed_map::MainChainScriptsV1;
 use sp_inherents::InherentIdentifier;
-use sp_runtime::traits::Keccak256;
 use sp_runtime::{
 	ApplyExtrinsicResult, MultiSignature, Perbill, generic, impl_opaque_keys,
 	traits::{
@@ -67,6 +66,8 @@ use sp_sidechain::SidechainStatus;
 use sp_std::prelude::*;
 use sp_version::RuntimeVersion;
 use sp_weights::Weight;
+use schnorr_jubjub::PoseidonJubjub;
+use crate::mmr::Hashing;
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
@@ -662,8 +663,10 @@ parameter_types! {
 	pub const BeefySetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get();
 }
 
+
 impl pallet_beefy::Config for Runtime {
 	type BeefyId = BeefyId;
+	type SignatureHasher = PoseidonJubjub;
 	type MaxAuthorities = MaxValidators;
 	type MaxNominators = ConstU32<0>;
 	type MaxSetIdSessionEntries = BeefySetIdSessionEntries;
@@ -689,7 +692,8 @@ mod mmr {
 
 impl pallet_mmr::Config for Runtime {
 	const INDEXING_PREFIX: &'static [u8] = b"mmr";
-	type Hashing = Keccak256;
+	// TODO: Think about changing the leaf data (so that encode/decode can be efficient)
+	type Hashing = PoseidonJubjub;
 	type LeafData = pallet_mmr::ParentNumberAndHash<Self>;
 	type OnNewRoot = pallet_beefy_mmr::DepositBeefyDigest<Runtime>;
 	type BlockHashProvider = pallet_mmr::DefaultBlockHashProvider<Runtime>;

demo/runtime/src/lib.rs

@@ -5,7 +5,7 @@ use frame_support::pallet_prelude::TypeInfo;
 use parity_scale_codec::{Decode, Encode};
 use plutus::*;
 use plutus_datum_derive::ToDatum;
-use schnorr_jubjub;
+// use schnorr_jubjub;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sidechain_domain::*;
@@ -107,7 +107,7 @@ pub fn filter_trustless_candidates_registrations<TAccountId, TAccountKeys>(
 	genesis_utxo: UtxoId,
 ) -> Vec<(Candidate<TAccountId, TAccountKeys>, selection::Weight)>
 where
-	TAccountKeys: From<(sr25519::Public, schnorr_jubjub::Public, ed25519::Public)>,
+	TAccountKeys: From<(sr25519::Public, ed25519::Public, ed25519::Public)>,
 	TAccountId: From<ecdsa::Public>,
 {
 	candidate_registrations
@@ -126,7 +126,7 @@ pub fn filter_invalid_permissioned_candidates<TAccountId, TAccountKeys>(
 	permissioned_candidates: Vec<PermissionedCandidateData>,
 ) -> Vec<Candidate<TAccountId, TAccountKeys>>
 where
-	TAccountKeys: From<(sr25519::Public, schnorr_jubjub::Public, ed25519::Public)>,
+	TAccountKeys: From<(sr25519::Public, ed25519::Public, ed25519::Public)>,
 	TAccountId: TryFrom<sidechain_domain::SidechainPublicKey>,
 {
 	permissioned_candidates
@@ -146,7 +146,7 @@ fn select_latest_valid_candidate<TAccountId, TAccountKeys>(
 ) -> Option<CandidateWithStake<TAccountId, TAccountKeys>>
 where
 	TAccountId: From<ecdsa::Public>,
-	TAccountKeys: From<(sr25519::Public, schnorr_jubjub::Public, ed25519::Public)>,
+	TAccountKeys: From<(sr25519::Public, ed25519::Public, ed25519::Public)>,
 {
 	let stake_delegation = validate_stake(candidate_registrations.stake_delegation).ok()?;
 	let stake_pool_pub_key = candidate_registrations.stake_pool_public_key;
@@ -241,7 +241,7 @@ pub enum PermissionedCandidateDataError {
 pub fn validate_permissioned_candidate_data<AccountId: TryFrom<SidechainPublicKey>>(
 	candidate: PermissionedCandidateData,
 ) -> Result<
-	(AccountId, sr25519::Public, schnorr_jubjub::Public, ed25519::Public),
+	(AccountId, sr25519::Public, ed25519::Public, ed25519::Public),
 	PermissionedCandidateDataError,
 > {
 	Ok((
@@ -255,7 +255,7 @@ pub fn validate_permissioned_candidate_data<AccountId: TryFrom<SidechainPublicKe
 			.ok_or(PermissionedCandidateDataError::InvalidAuraKey)?,
 		candidate
 			.beefy_public_key
-			.try_into_schnorr()
+			.try_into_ed25519()
 			.ok_or(PermissionedCandidateDataError::InvalidBeefyKey)?,
 		candidate
 			.grandpa_public_key
@@ -276,7 +276,7 @@ pub fn validate_registration_data(
 	registration_data: &RegistrationData,
 	genesis_utxo: UtxoId,
 ) -> Result<
-	(ecdsa::Public, (sr25519::Public, schnorr_jubjub::Public, ed25519::Public)),
+	(ecdsa::Public, (sr25519::Public, ed25519::Public, ed25519::Public)),
 	RegistrationDataError,
 > {
 	let aura_pub_key = registration_data
@@ -285,7 +285,7 @@ pub fn validate_registration_data(
 		.ok_or(RegistrationDataError::InvalidAuraKey)?;
 	let beefy_pub_key = registration_data
 		.beefy_pub_key
-		.try_into_schnorr()
+		.try_into_ed25519()
 		.ok_or(RegistrationDataError::InvalidBeefyKey)?;
 	let grandpa_pub_key = registration_data
 		.grandpa_pub_key

toolkit/committee-selection/authority-selection-inherents/src/filter_invalid_candidates.rs

@@ -14,7 +14,7 @@ use sp_core::{U256, ecdsa, ed25519, sr25519};
 /// Seed is constructed from the MC epoch nonce and the sidechain epoch.
 pub fn select_authorities<
 	TAccountId: Clone + Ord + TryFrom<sidechain_domain::SidechainPublicKey> + From<ecdsa::Public>,
-	TAccountKeys: Clone + Ord + From<(sr25519::Public, schnorr_jubjub::Public, ed25519::Public)>,
+	TAccountKeys: Clone + Ord + From<(sr25519::Public, ed25519::Public, ed25519::Public)>,
 >(
 	genesis_utxo: UtxoId,
 	input: AuthoritySelectionInputs,

toolkit/committee-selection/authority-selection-inherents/src/select_authorities.rs

@@ -1051,8 +1051,8 @@ impl From<sr25519::Public> for AuraPublicKey {
 pub struct BeefyPublicKey(pub Vec<u8>);
 impl BeefyPublicKey {
 	/// Attempts to cast this public key to a valid [ecdsa::Public]
-	pub fn try_into_schnorr(&self) -> Option<schnorr_jubjub::Public> {
-		Some(schnorr_jubjub::Public::try_from(self.0.as_slice()).ok()?)
+	pub fn try_into_ed25519(&self) -> Option<ed25519::Public> {
+		Some(ed25519::Public::try_from(self.0.as_slice()).ok()?)
 	}
 }
 

toolkit/sidechain/domain/src/lib.rs

@@ -7,30 +7,63 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-midnight-circuits = { git = "https://github.com/midnightntwrk/midnight-circuits", branch = "iquerejeta/committee_proof"}
-halo2curves = { version = "0.7.0", features = ["derive_serde"] }
-blstrs = { git = "https://github.com/davidnevadoc/blstrs", rev = "3dfe5bf" }
-group = "0.13"
-ff = "0.13"
 frame-support = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 parity-scale-codec = { workspace = true }
-rand_core = "0.6.4"
+rand_core = { workspace = true }
 scale-info = {workspace = true}
 sc-keystore = { workspace = true }
-sp-core = { workspace = true }
+sp-core = { workspace = true, features = ["serde"] }
 sp-application-crypto = { workspace = true }
 sp-consensus-beefy = { workspace = true }
 sp-runtime = { workspace = true }
 sp-runtime-interface = { workspace = true }
 sp-io = { workspace = true }
 sp-keystore = { workspace = true }
 sp-externalities = { workspace = true }
-sha2 = "0.10.9"
+sha2 = { workspace = true }
 serde = {workspace = true }
 hex = {workspace = true }
 hash256-std-hasher = { workspace = true }
 sp-trie = { workspace = true }
+rand = { version = "0.8.5", default-features = false }
+rand_chacha = { version = "0.3.1", default-features = false }
+#rand = { workspace = true }
+#rand_chacha = { workspace = true }
+ark-ed-on-bls12-381 = { workspace = true }
+ark-ff = { workspace = true }
+ark-ec = { workspace = true }
+ark-serialize = { workspace = true }
+
+
+[features]
+default = ["std"]
+std = [
+    "ark-ed-on-bls12-381/std",
+    "ark-ff/std",
+    "ark-ec/std",
+    "ark-serialize/std",
+    "frame-support/std",
+    "pallet-beefy-mmr/std",
+    "parity-scale-codec/std",
+    "rand_core/std",
+    "scale-info/std",
+    "sp-core/std",
+    "sp-application-crypto/std",
+    "sp-consensus-beefy/std",
+    "sp-runtime/std",
+    "sp-runtime-interface/std",
+    "sp-io/std",
+    "sp-keystore/std",
+    "sp-externalities/std",
+    "sha2/std",
+    "serde/std",
+    "hex/std",
+    "hash256-std-hasher/std",
+    "sp-trie/std",
+    "rand/std",
+    "rand_chacha/std",
+]
 
 [lints]
 workspace = true

toolkit/utils/schnorr_jubjub/Cargo.toml

@@ -6,16 +6,19 @@
 //! protocol, ensuring compatibility with Substrate's runtime and cryptographic
 //! infrastructure.
 
-use core::fmt::{Debug, Formatter};
-use std::{convert::TryInto, fmt::Display, hash::Hash};
+use alloc::vec::Vec;
+use core::fmt::{Debug, Display, Formatter};
+// use std::{convert::TryInto, fmt::Display, hash::Hash};
 
 use crate::poseidon::PoseidonJubjub;
-use blstrs::{Fr, JubjubSubgroup};
-use group::{Group, GroupEncoding};
+use ark_ed_on_bls12_381::{Fr, EdwardsAffine};
+use ark_ff::fields::Field;
+use ark_ec::AffineRepr;
+use ark_serialize::CanonicalSerialize;
 use rand_core::OsRng;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use sha2::Digest;
-use sp_consensus_beefy::{AuthorityIdBound, BeefyAuthorityId, BeefySignatureHasher};
+use sp_consensus_beefy::{AuthorityIdBound, BeefyAuthorityId};
 use sp_core::{
 	ByteArray, Decode, DecodeWithMemTracking, DeriveJunction, Encode, MaxEncodedLen,
 	Pair as TraitPair,
@@ -29,6 +32,7 @@ use sp_runtime::{
 	app_crypto::{AppCrypto, AppPair, AppPublic, AppSignature},
 	traits::Convert,
 };
+use sp_runtime::biguint::BigUint;
 
 use crate::primitive::{SchnorrSignature, VerifyingKey};
 
@@ -69,7 +73,7 @@ pub type InnerPublicBytes = PublicBytes<PUBLIC_SERIALIZED_SIZE, SchnorrJubJubTag
 pub struct Public(pub InnerPublicBytes);
 
 impl Display for Public {
-	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
 		write!(f, "0x{}", hex::encode(self.as_slice()))
 	}
 }
@@ -108,6 +112,7 @@ impl Debug for Public {
 }
 
 impl AuthorityIdBound for Public {
+	type SignatureHasher = PoseidonJubjub;
 	type BoundedSignature = Signature;
 }
 
@@ -269,8 +274,8 @@ impl TraitPair for crate::primitive::KeyPair {
 
 		let h = sha2::Sha512::digest(&seed);
 
-		let secret = Fr::from_bytes_wide(&h.as_slice().try_into().unwrap());
-		Ok(Self { 0: secret, 1: JubjubSubgroup::generator() * &secret })
+		let secret = Fr::from_random_bytes(h.as_slice()).expect("Failed to deserialize random bytes. This is a bug.");
+		Ok(Self { 0: secret, 1: (EdwardsAffine::generator() * &secret).into() })
 	}
 
 	fn sign(&self, message: &[u8]) -> Self::Signature {
@@ -297,15 +302,17 @@ impl TraitPair for crate::primitive::KeyPair {
 	}
 
 	fn public(&self) -> Self::Public {
-		let bytes: [u8; 32] = self.1.to_bytes().try_into().unwrap();
+		let mut writer = Vec::new();
+		self.1.serialize_compressed(&mut writer).expect("Serialisation should not fail - writer is big enough");
+		let bytes: [u8; 32] = writer.try_into().unwrap();
 
 		Public(PublicBytes::from(bytes))
 	}
 
 	fn to_raw_vec(&self) -> Vec<u8> {
 		let mut res = Vec::with_capacity(64);
-		res.extend_from_slice(&self.0.to_bytes());
-		res.extend_from_slice(&self.1.to_bytes());
+		self.0.serialize_compressed(&mut res);
+		self.1.serialize_compressed(&mut res);
 
 		res
 	}
@@ -339,7 +346,7 @@ impl AppPair for crate::primitive::KeyPair {
 /// [`crate::primitive::KeyPair`].
 type Seed = [u8; SEED_SERIALIZED_SIZE];
 
-impl BeefyAuthorityId<BeefySignatureHasher> for Public {
+impl BeefyAuthorityId<PoseidonJubjub> for Public {
 	fn verify(&self, signature: &<Self as RuntimeAppPublic>::Signature, msg: &[u8]) -> bool {
 		<crate::primitive::KeyPair as TraitPair>::verify(signature, msg, self)
 	}

toolkit/utils/schnorr_jubjub/src/beefy_structures.rs

@@ -5,6 +5,7 @@
 //! signatures over the JubJub curve, which the default implementation does not
 //! support due to lack of genericity.
 
+use alloc::vec::Vec;
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::Pair as TraitPair;
 use sp_core::{