Refactor assertion jsonfile

pallets/vc-management/src/tests.rs

@@ -42,7 +42,7 @@ fn vc_issued_works() {
 			1,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert!(VCManagement::vc_registry(VC_INDEX).is_some());
 		let context = VCManagement::vc_registry(VC_INDEX).unwrap();
@@ -60,7 +60,7 @@ fn vc_issued_with_unpriviledged_origin_fails() {
 				1,
 				H256::default(),
 				H256::default(),
-				AesOutput::default()
+				AesOutput::default(),
 			),
 			sp_runtime::DispatchError::BadOrigin
 		);
@@ -75,15 +75,15 @@ fn vc_issued_with_duplicated_index_fails() {
 			1,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert_noop!(
 			VCManagement::vc_issued(
 				RuntimeOrigin::signed(1),
 				1,
 				VC_INDEX,
 				VC_HASH,
-				AesOutput::default()
+				AesOutput::default(),
 			),
 			Error::<Test>::VCAlreadyExists
 		);
@@ -98,7 +98,7 @@ fn disable_vc_works() {
 			2,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert!(VCManagement::vc_registry(VC_INDEX).is_some());
 		assert_ok!(VCManagement::disable_vc(RuntimeOrigin::signed(2), VC_INDEX));
@@ -127,7 +127,7 @@ fn disable_vc_with_other_subject_fails() {
 			2,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert_noop!(
 			VCManagement::disable_vc(RuntimeOrigin::signed(1), VC_HASH),
@@ -146,7 +146,7 @@ fn revoke_vc_works() {
 			2,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert!(VCManagement::vc_registry(VC_INDEX).is_some());
 		assert_ok!(VCManagement::revoke_vc(RuntimeOrigin::signed(2), VC_INDEX));
@@ -173,7 +173,7 @@ fn revoke_vc_with_other_subject_fails() {
 			2,
 			VC_INDEX,
 			VC_HASH,
-			AesOutput::default()
+			AesOutput::default(),
 		));
 		assert_noop!(
 			VCManagement::revoke_vc(RuntimeOrigin::signed(1), VC_HASH),

tee-worker/litentry/core/assertion-build/src/a1.rs

@@ -26,10 +26,13 @@ use itp_types::AccountId;
 use itp_utils::stringify::account_id_to_string;
 use lc_credentials::Credential;
 use lc_stf_task_sender::MaxIdentityLength;
-use litentry_primitives::{Assertion, Identity, ParentchainBlockNumber, VCMPError};
+use litentry_primitives::{Identity, ParentchainBlockNumber, VCMPError};
 use log::*;
 use sp_runtime::BoundedVec;
 
+const VC_SUBJECT_DESCRIPTION: &str = "Identity Linked And Verified";
+const VC_SUBJECT_TYPE: &str = "IdentityLinkedVerified";
+
 pub fn build(
 	identities: BoundedVec<Identity, MaxIdentityLength>,
 	shard: &ShardIdentifier,
@@ -49,10 +52,15 @@ pub fn build(
 		}
 	}
 
-	match Credential::generate_unsigned_credential(&Assertion::A1, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			// add subject info
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
+
+			// add assertion
 			let flag = web2_cnt != 0 && web3_cnt != 0;
-			credential_unsigned.credential_subject.values.push(flag);
+			credential_unsigned.add_assertion_a1(flag);
+
 			Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a10.rs

@@ -29,13 +29,15 @@ use lc_data_providers::graphql::{
 	GraphQLClient, VerifiedCredentialsIsHodlerIn, VerifiedCredentialsNetwork,
 };
 use litentry_primitives::{
-	Assertion, EvmNetwork, Identity, ParentchainBalance, ParentchainBlockNumber, VCMPError,
+	EvmNetwork, Identity, ParentchainBalance, ParentchainBlockNumber, VCMPError,
 	ASSERTION_FROM_DATE,
 };
 use log::*;
 use std::{str::from_utf8, string::ToString, vec, vec::Vec};
 
 const WBTC_TOKEN_ADDRESS: &str = "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599";
+const VC_SUBJECT_DESCRIPTION: &str = "The user held Wrapped BTC every day from a specific date";
+const VC_SUBJECT_TYPE: &str = "BTC Hodler";
 
 // WBTC holder
 pub fn build(
@@ -101,10 +103,11 @@ pub fn build(
 		}
 	}
 
-	let a10 = Assertion::A10(min_balance);
-	match Credential::generate_unsigned_credential(&a10, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.update_holder(from_date_index, min_balance);
+
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a11.rs

@@ -29,8 +29,7 @@ use lc_data_providers::graphql::{
 	GraphQLClient, VerifiedCredentialsIsHodlerIn, VerifiedCredentialsNetwork,
 };
 use litentry_primitives::{
-	Assertion, EvmNetwork, Identity, ParentchainBalance, ParentchainBlockNumber,
-	ASSERTION_FROM_DATE,
+	EvmNetwork, Identity, ParentchainBalance, ParentchainBlockNumber, ASSERTION_FROM_DATE,
 };
 use log::*;
 use std::{
@@ -40,6 +39,9 @@ use std::{
 	vec::Vec,
 };
 
+const VC_SUBJECT_DESCRIPTION: &str = "The user held ETH before a specific date/year";
+const VC_SUBJECT_TYPE: &str = "ETH Hodler";
+
 pub fn build(
 	identities: Vec<Identity>,
 	min_balance: ParentchainBalance,
@@ -103,10 +105,11 @@ pub fn build(
 		}
 	}
 
-	let a11 = Assertion::A11(min_balance);
-	match Credential::generate_unsigned_credential(&a11, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.update_holder(from_date_index, min_balance);
+
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a2.rs

@@ -27,11 +27,15 @@ use itp_utils::stringify::account_id_to_string;
 use lc_credentials::Credential;
 use lc_data_providers::{discord_litentry::DiscordLitentryClient, vec_to_string};
 use litentry_primitives::{
-	Assertion, Identity, ParameterString, ParentchainBlockNumber, VCMPError, Web2Network,
+	Identity, ParameterString, ParentchainBlockNumber, VCMPError, Web2Network,
 };
 use log::*;
 use std::vec::Vec;
 
+const VC_SUBJECT_DESCRIPTION: &str =
+	"Becoming an ID-Hubber: if user has a Discord account verified and joined Litentry guild";
+const VC_SUBJECT_TYPE: &str = "ID-Hubber";
+
 pub fn build(
 	identities: Vec<Identity>,
 	guild_id: ParameterString,
@@ -77,19 +81,12 @@ pub fn build(
 		}
 	}
 
-	match Credential::generate_unsigned_credential(
-		&Assertion::A2(guild_id),
-		who,
-		&shard.clone(),
-		bn,
-	) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			if discord_cnt > 0 && has_joined {
-				credential_unsigned.credential_subject.values.push(true);
-			} else {
-				credential_unsigned.credential_subject.values.push(false);
-			}
-			credential_unsigned.add_assertion_a2(guild_id_s);
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
+
+			let value = discord_cnt > 0 && has_joined;
+			credential_unsigned.add_assertion_a2(value, guild_id_s);
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a3.rs

@@ -27,11 +27,14 @@ use itp_utils::stringify::account_id_to_string;
 use lc_credentials::Credential;
 use lc_data_providers::{discord_litentry::DiscordLitentryClient, vec_to_string};
 use litentry_primitives::{
-	Assertion, Identity, ParameterString, ParentchainBlockNumber, VCMPError, Web2Network,
+	Identity, ParameterString, ParentchainBlockNumber, VCMPError, Web2Network,
 };
 use log::*;
 use std::vec::Vec;
 
+const VC_SUBJECT_DESCRIPTION: &str = "User has commented on Discord channel with ID-Hubber role";
+const VC_SUBJECT_TYPE: &str = "ID-Hubber";
+
 pub fn build(
 	identities: Vec<Identity>,
 	guild_id: ParameterString,
@@ -73,19 +76,16 @@ pub fn build(
 		}
 	}
 
-	match Credential::generate_unsigned_credential(
-		&Assertion::A3(guild_id, channel_id, role_id),
-		who,
-		&shard.clone(),
-		bn,
-	) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			if has_commented {
-				credential_unsigned.credential_subject.values.push(true);
-			} else {
-				credential_unsigned.credential_subject.values.push(false);
-			}
-			credential_unsigned.add_assertion_a3(guild_id_s, channel_id_s, role_id_s);
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
+			credential_unsigned.add_assertion_a3(
+				has_commented,
+				guild_id_s,
+				channel_id_s,
+				role_id_s,
+			);
+
 			Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a4.rs

@@ -29,7 +29,7 @@ use lc_data_providers::graphql::{
 	GraphQLClient, VerifiedCredentialsIsHodlerIn, VerifiedCredentialsNetwork,
 };
 use litentry_primitives::{
-	Assertion, Identity, ParentchainBalance, ParentchainBlockNumber, ASSERTION_FROM_DATE,
+	Identity, ParentchainBalance, ParentchainBlockNumber, ASSERTION_FROM_DATE,
 };
 use log::*;
 use std::{
@@ -41,6 +41,9 @@ use std::{
 
 // ERC20 LIT token address
 const LIT_TOKEN_ADDRESS: &str = "0xb59490aB09A0f526Cc7305822aC65f2Ab12f9723";
+const VC_SUBJECT_DESCRIPTION: &str =
+	"Check whether any of the linked accounts hold a minimum amount of LIT NOW";
+const VC_SUBJECT_TYPE: &str = "LIT Holder";
 
 pub fn build(
 	identities: Vec<Identity>,
@@ -139,10 +142,11 @@ pub fn build(
 		}
 	}
 
-	let a4 = Assertion::A4(min_balance);
-	match Credential::generate_unsigned_credential(&a4, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.update_holder(from_date_index, min_balance);
+
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a6.rs

@@ -26,10 +26,13 @@ use itp_types::AccountId;
 use itp_utils::stringify::account_id_to_string;
 use lc_credentials::Credential;
 use lc_data_providers::twitter_official::TwitterOfficialClient;
-use litentry_primitives::{Assertion, Identity, ParentchainBlockNumber, VCMPError, Web2Network};
+use litentry_primitives::{Identity, ParentchainBlockNumber, VCMPError, Web2Network};
 use log::*;
 use std::vec::Vec;
 
+const VC_SUBJECT_DESCRIPTION: &str = "User has at least X amount of followers";
+const VC_SUBJECT_TYPE: &str = "Total Twitter Followers";
+
 /// Following ranges:
 ///
 ///    * 1+ follower
@@ -102,10 +105,11 @@ pub fn build(
 		},
 	}
 
-	match Credential::generate_unsigned_credential(&Assertion::A6, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.add_assertion_a6(min, max);
-			credential_unsigned.credential_subject.values.push(true);
+
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {

tee-worker/litentry/core/assertion-build/src/a7.rs

@@ -29,8 +29,7 @@ use lc_data_providers::graphql::{
 	GraphQLClient, VerifiedCredentialsIsHodlerIn, VerifiedCredentialsNetwork,
 };
 use litentry_primitives::{
-	Assertion, Identity, ParentchainBalance, ParentchainBlockNumber, SubstrateNetwork,
-	ASSERTION_FROM_DATE,
+	Identity, ParentchainBalance, ParentchainBlockNumber, SubstrateNetwork, ASSERTION_FROM_DATE,
 };
 use log::*;
 use std::{
@@ -40,6 +39,9 @@ use std::{
 	vec::Vec,
 };
 
+const VC_SUBJECT_DESCRIPTION: &str = "The user held DOT every day from a specific date";
+const VC_SUBJECT_TYPE: &str = "DOT Hodler";
+
 pub fn build(
 	identities: Vec<Identity>,
 	min_balance: ParentchainBalance,
@@ -102,9 +104,9 @@ pub fn build(
 		}
 	}
 
-	let a7 = Assertion::A7(min_balance);
-	match Credential::generate_unsigned_credential(&a7, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.update_holder(from_date_index, min_balance);
 			return Ok(credential_unsigned)
 		},

tee-worker/litentry/core/assertion-build/src/a8.rs

@@ -30,12 +30,15 @@ use lc_data_providers::graphql::{
 	GraphQLClient, VerifiedCredentialsNetwork, VerifiedCredentialsTotalTxs,
 };
 use litentry_primitives::{
-	Assertion, AssertionNetworks, EvmNetwork, Identity, ParentchainBlockNumber, SubstrateNetwork,
+	AssertionNetworks, EvmNetwork, Identity, ParentchainBlockNumber, SubstrateNetwork,
 	ASSERTION_NETWORKS,
 };
 use log::*;
 use std::{collections::HashSet, str::from_utf8, string::ToString, vec, vec::Vec};
 
+const VC_SUBJECT_DESCRIPTION: &str = "User has over X number of transactions";
+const VC_SUBJECT_TYPE: &str = "Total EVM and Substrate Transactions";
+
 lazy_static! {
 	pub static ref NETWORK_HASHSET: HashSet<VerifiedCredentialsNetwork> = {
 		let mut m = HashSet::new();
@@ -266,11 +269,11 @@ pub fn build(
 		},
 	}
 
-	let a8 = Assertion::A8(networks);
-	match Credential::generate_unsigned_credential(&a8, who, &shard.clone(), bn) {
+	match Credential::new_default(who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
+			credential_unsigned.add_subject_info(VC_SUBJECT_DESCRIPTION, VC_SUBJECT_TYPE);
 			credential_unsigned.add_assertion_a8(vc_network_to_vec(target_networks?), min, max);
-			credential_unsigned.credential_subject.values.push(true);
+
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {