Fix wrong from_date and to_date in assertions (#1342)

zTgx · web-flow · commit 926fc9f5dc3e · 2023-02-17T16:27:40.000+08:00
* add upate holder

* add tests

* update 4/7/10

* update test case
diff --git a/tee-worker/litentry/core/assertion-build/src/a10.rs b/tee-worker/litentry/core/assertion-build/src/a10.rs
@@ -48,17 +48,23 @@ pub fn build(
 	let q_min_balance: f64 = (min_balance / (10 ^ 8)) as f64;
 
 	let mut client = GraphQLClient::new();
-	let mut flag = false;
+	let mut found = false;
+	let mut from_date_index = 0_usize;
 
 	for id in identities {
+		if found {
+			break
+		}
+
 		if let Identity::Evm { network, address } = id {
 			if matches!(network, EvmNetwork::Ethereum) {
 				if let Ok(addr) = from_utf8(address.as_ref()) {
 					let addresses = vec![addr.to_string()];
 
-					for from_date in ASSERTION_FROM_DATE.iter() {
-						// if flag is true, no need to check it continually
-						if flag {
+					for (index, from_date) in ASSERTION_FROM_DATE.iter().enumerate() {
+						// if found is true, no need to check it continually
+						if found {
+							from_date_index = index + 1;
 							break
 						}
 						let credentials = VerifiedCredentialsIsHodlerIn::new(
@@ -73,7 +79,7 @@ pub fn build(
 							.check_verified_credentials_is_hodler(credentials)
 							.map_err(from_data_provider_error)?;
 						for hodler in is_hodler_out.verified_credentials_is_hodler.iter() {
-							flag = flag || hodler.is_hodler;
+							found = found || hodler.is_hodler;
 						}
 					}
 				};
@@ -84,8 +90,7 @@ pub fn build(
 	let a10 = Assertion::A10(min_balance);
 	match Credential::generate_unsigned_credential(&a10, who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			credential_unsigned.credential_subject.values.push(flag);
-
+			credential_unsigned.update_holder(from_date_index, min_balance);
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {
diff --git a/tee-worker/litentry/core/assertion-build/src/a11.rs b/tee-worker/litentry/core/assertion-build/src/a11.rs
@@ -49,17 +49,23 @@ pub fn build(
 	let q_min_balance: f64 = (min_balance / (10 ^ 18)) as f64;
 
 	let mut client = GraphQLClient::new();
-	let mut flag = false;
+	let mut found = false;
+	let mut from_date_index = 0_usize;
 
 	for id in identities {
+		if found {
+			break
+		}
+
 		if let Identity::Evm { network, address } = id {
 			if matches!(network, EvmNetwork::Ethereum) {
 				let address = from_utf8(address.as_ref()).unwrap().to_string();
 				let addresses = vec![address];
 
-				for from_date in ASSERTION_FROM_DATE.iter() {
-					// if flag is true, no need to check it continually
-					if flag {
+				for (index, from_date) in ASSERTION_FROM_DATE.iter().enumerate() {
+					// if found is true, no need to check it continually
+					if found {
+						from_date_index = index + 1;
 						break
 					}
 
@@ -74,7 +80,7 @@ pub fn build(
 						.check_verified_credentials_is_hodler(credentials)
 						.map_err(from_data_provider_error)?;
 					for hodler in is_hodler_out.verified_credentials_is_hodler.iter() {
-						flag = flag || hodler.is_hodler;
+						found = found || hodler.is_hodler;
 					}
 				}
 			}
@@ -84,8 +90,7 @@ pub fn build(
 	let a11 = Assertion::A11(min_balance);
 	match Credential::generate_unsigned_credential(&a11, who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			credential_unsigned.credential_subject.values.push(flag);
-
+			credential_unsigned.update_holder(from_date_index, min_balance);
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {
diff --git a/tee-worker/litentry/core/assertion-build/src/a4.rs b/tee-worker/litentry/core/assertion-build/src/a4.rs
@@ -49,9 +49,14 @@ pub fn build(
 	bn: ParentchainBlockNumber,
 ) -> Result<Credential> {
 	let mut client = GraphQLClient::new();
-	let mut flag = false;
+	let mut found = false;
+	let mut from_date_index = 0_usize;
 
 	for identity in identities.iter() {
+		if found {
+			break
+		}
+
 		let mut verified_network = VerifiedCredentialsNetwork::Polkadot;
 		if identity.is_web3() {
 			match identity {
@@ -88,9 +93,10 @@ pub fn build(
 				tmp_token_addr = LIT_TOKEN_ADDRESS.to_string();
 			}
 
-			for from_date in ASSERTION_FROM_DATE.iter() {
-				// if flag is true, no need to check it continually
-				if flag {
+			for (index, from_date) in ASSERTION_FROM_DATE.iter().enumerate() {
+				// if found is true, no need to check it continually
+				if found {
+					from_date_index = index + 1;
 					break
 				}
 
@@ -106,7 +112,7 @@ pub fn build(
 					.map_err(from_data_provider_error)?;
 
 				for holder in is_hodler_out.verified_credentials_is_hodler.iter() {
-					flag = flag || holder.is_hodler;
+					found = found || holder.is_hodler;
 				}
 			}
 		}
@@ -115,7 +121,7 @@ pub fn build(
 	let a4 = Assertion::A4(min_balance);
 	match Credential::generate_unsigned_credential(&a4, who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			credential_unsigned.credential_subject.values.push(flag);
+			credential_unsigned.update_holder(from_date_index, min_balance);
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {
diff --git a/tee-worker/litentry/core/assertion-build/src/a7.rs b/tee-worker/litentry/core/assertion-build/src/a7.rs
@@ -48,17 +48,23 @@ pub fn build(
 	let q_min_balance: f64 = (min_balance / (10 ^ 12)) as f64;
 
 	let mut client = GraphQLClient::new();
-	let mut flag = false;
+	let mut found = false;
+	let mut from_date_index = 0_usize;
 
 	for id in identities {
+		if found {
+			break
+		}
+
 		if let Identity::Substrate { network, address } = id {
 			if matches!(network, SubstrateNetwork::Polkadot) {
 				let address = from_utf8(address.as_ref()).unwrap().to_string();
 				let addresses = vec![address];
 
-				for from_date in ASSERTION_FROM_DATE.iter() {
-					// if flag is true, no need to check it continually
-					if flag {
+				for (index, from_date) in ASSERTION_FROM_DATE.iter().enumerate() {
+					// if found is true, no need to check it continually
+					if found {
+						from_date_index = index + 1;
 						break
 					}
 
@@ -73,7 +79,7 @@ pub fn build(
 						.check_verified_credentials_is_hodler(credentials)
 						.map_err(from_data_provider_error)?;
 					for hodler in is_hodler_out.verified_credentials_is_hodler.iter() {
-						flag = flag || hodler.is_hodler;
+						found = found || hodler.is_hodler;
 					}
 				}
 			}
@@ -83,8 +89,7 @@ pub fn build(
 	let a7 = Assertion::A7(min_balance);
 	match Credential::generate_unsigned_credential(&a7, who, &shard.clone(), bn) {
 		Ok(mut credential_unsigned) => {
-			credential_unsigned.credential_subject.values.push(flag);
-
+			credential_unsigned.update_holder(from_date_index, min_balance);
 			return Ok(credential_unsigned)
 		},
 		Err(e) => {
diff --git a/tee-worker/litentry/core/credentials/src/lib.rs b/tee-worker/litentry/core/credentials/src/lib.rs
diff --git a/tee-worker/litentry/primitives/src/assertion.rs b/tee-worker/litentry/primitives/src/assertion.rs
