ZKSaaS pallet (#321)

tangle-network · Dec 8, 2023 · 7e33732 · 7e33732
1 parent 9c0589b
commit 7e33732
Show file tree

Hide file tree

Showing 35 changed files with 2,318 additions and 680 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,8 +20,6 @@ members = [
   "runtime/testnet/evm_tracer",
   "runtime/mainnet",
   "pallets/*",
-  "pallets/claims",
-  "pallets/roles",
   "pallets/jobs/rpc",
   "pallets/jobs/rpc/runtime-api",
   "precompiles/utils",
@@ -71,7 +69,7 @@ syn = { version = "1.0" }
 hex = { version = "0.4.3", default-features = false }
 paste = "1.0.6"
 slices = "0.2.0"
-schnorrkel = { verison = "11.4", default-features = false }
+schnorrkel = { version = "0.9.1", default-features = false }
 
 # DKG Substrate Dependencies
 dkg-runtime-primitives = { git = "https://github.com/webb-tools/dkg-substrate.git", tag = "v0.4.7", default-features = false }
@@ -87,6 +85,22 @@ webb-relayer-gadget-cli = { git = "https://github.com/webb-tools/dkg-substrate.g
 tangle-testnet-runtime = { package = "tangle-testnet-runtime", path = "runtime/testnet" }
 tangle-mainnet-runtime = { package = "tangle-mainnet-runtime", path = "runtime/mainnet" }
 
+# Arkworks
+ark-ec = { version = "^0.4.0", default-features = false }
+ark-ff = { version = "^0.4.0", default-features = false }
+ark-relations = { version = "^0.4.0", default-features = false }
+ark-serialize = { version = "^0.4.0", default-features = false, features = ["derive"] }
+ark-std = { version = "^0.4.0", default-features = false }
+ark-groth16 = { version = "0.4.0", default-features = false }
+
+# Ark Curves
+ark-bls12-381 = { version = "^0.4.0", default-features = false, features = ["curve"] }
+ark-bn254 = { version = "^0.4.0", default-features = false, features = ["curve"] }
+
+ark-crypto-primitives = { version = "^0.4.0", default-features = false }
+
+ethabi = { version = "15.0.0", default-features = false }
+
 # Tangle Dependencies
 pallet-airdrop-claims = { path = "pallets/claims", default-features = false }
 pallet-jobs = { path = "pallets/jobs", default-features = false }

diff --git a/client/rpc/txpool/src/lib.rs b/client/rpc/txpool/src/lib.rs
@@ -25,7 +25,7 @@ use sha3::{Digest, Keccak256};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::Block as BlockT;
-use std::{collections::HashMap, marker::PhantomData, sync::Arc};
+use std::{marker::PhantomData, sync::Arc};
 
 use rpc_primitives_txpool::{Transaction as TransactionV2, TxPoolResponse, TxPoolRuntimeApi};
 
@@ -106,7 +106,7 @@ where
 			};
 			pending
 				.entry(from_address)
-				.or_insert_with(HashMap::new)
+				.or_default()
 				.insert(nonce, T::get(hash, from_address, txn));
 		}
 		let mut queued = TransactionMap::<T>::new();
@@ -123,7 +123,7 @@ where
 			};
 			queued
 				.entry(from_address)
-				.or_insert_with(HashMap::new)
+				.or_default()
 				.insert(nonce, T::get(hash, from_address, txn));
 		}
 		Ok(TxPoolResult { pending, queued })

diff --git a/flake.lock b/flake.lock
diff --git a/pallets/dkg/src/functions.rs b/pallets/dkg/src/functions.rs
@@ -69,8 +69,8 @@ impl<T: Config> Pallet<T> {
 	/// an error.
 	pub fn verify(data: JobResult) -> DispatchResult {
 		match data {
-			JobResult::DKG(info) => Self::verify_generated_dkg_key(info),
-			JobResult::DKGSignature(info) => Self::verify_dkg_signature(info),
+			JobResult::DKGPhaseOne(info) => Self::verify_generated_dkg_key(info),
+			JobResult::DKGPhaseTwo(info) => Self::verify_dkg_signature(info),
 			_ => Err(Error::<T>::InvalidJobType.into()), // this should never happen
 		}
 	}

diff --git a/pallets/dkg/src/tests.rs b/pallets/dkg/src/tests.rs
@@ -66,7 +66,7 @@ fn dkg_key_verifcation_works() {
 
 		// should fail for empty participants
 		assert_noop!(
-			DKG::verify(JobResult::DKG(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),
 			Error::<Runtime>::NoParticipantsFound
 		);
 
@@ -79,7 +79,7 @@ fn dkg_key_verifcation_works() {
 
 		// should fail for empty keys/signatures
 		assert_noop!(
-			DKG::verify(JobResult::DKG(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),
 			Error::<Runtime>::NoSignaturesFound
 		);
 
@@ -96,7 +96,7 @@ fn dkg_key_verifcation_works() {
 
 		// should fail for less than threshold
 		assert_noop!(
-			DKG::verify(JobResult::DKG(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),
 			Error::<Runtime>::NotEnoughSigners
 		);
 
@@ -109,7 +109,7 @@ fn dkg_key_verifcation_works() {
 
 		// should fail for duplicate signers
 		assert_noop!(
-			DKG::verify(JobResult::DKG(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),
 			Error::<Runtime>::DuplicateSignature
 		);
 
@@ -122,7 +122,7 @@ fn dkg_key_verifcation_works() {
 
 		// should fail for signing different keys
 		assert_noop!(
-			DKG::verify(JobResult::DKG(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),
 			Error::<Runtime>::InvalidSignatureData
 		);
 
@@ -139,7 +139,7 @@ fn dkg_key_verifcation_works() {
 		};
 
 		// should fail for signing different keys
-		assert_ok!(DKG::verify(JobResult::DKG(job_to_verify)),);
+		assert_ok!(DKG::verify(JobResult::DKGPhaseOne(job_to_verify)),);
 	});
 }
 
@@ -158,7 +158,7 @@ fn dkg_signature_verifcation_works() {
 
 		// should fail for invalid keys
 		assert_noop!(
-			DKG::verify(JobResult::DKGSignature(job_to_verify)),
+			DKG::verify(JobResult::DKGPhaseTwo(job_to_verify)),
 			Error::<Runtime>::SigningKeyMismatch
 		);
 
@@ -170,6 +170,6 @@ fn dkg_signature_verifcation_works() {
 		};
 
 		// should work with correct params
-		assert_ok!(DKG::verify(JobResult::DKGSignature(job_to_verify)));
+		assert_ok!(DKG::verify(JobResult::DKGPhaseTwo(job_to_verify)));
 	});
 }