Remove caching challenge_code (#1326)

* remove `challenge_code` cache

* fix unit tests

* minor update

---------

Co-authored-by: BillyWooo <thedreamofbilly@gmail.com>

Author: zhizming-zhong

tee-worker/Cargo.lock

@@ -39,7 +39,6 @@ sp-core = { default-features = false, features = ["full_crypto"], git = "https:/
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
 
 # litentry
-lc-challenge-code-cache = { path = "../../litentry/core/challenge-code-cache", default-features = false }
 lc-stf-task-sender = { path = "../../litentry/core/stf-task/sender", default-features = false }
 litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 pallet-parentchain = { path = "../../../pallets/parentchain", default-features = false }
@@ -67,7 +66,6 @@ sgx = [
     "itp-node-api/sgx",
     "litentry-primitives/sgx",
     "lc-stf-task-sender/sgx",
-    "lc-challenge-code-cache/sgx",
     "rand-sgx",
 ]
 std = [
@@ -100,7 +98,6 @@ std = [
     "litentry-primitives/std",
     "parentchain-primitives/std",
     "lc-stf-task-sender/std",
-    "lc-challenge-code-cache/std",
     "rand",
 ]
 test = []

tee-worker/app-libs/stf/Cargo.toml

@@ -25,7 +25,6 @@ use crate::{
 use frame_support::dispatch::UnfilteredDispatchable;
 use itp_stf_primitives::types::ShardIdentifier;
 use itp_utils::stringify::account_id_to_string;
-use lc_challenge_code_cache::GLOBAL_CHALLENGE_CODE_CACHE;
 use lc_stf_task_sender::{
 	stf_task_sender::{SendStfRequest, StfRequestSender},
 	AssertionBuildRequest, MaxIdentityLength, RequestType, SetUserShieldingKeyRequest,
@@ -93,8 +92,6 @@ impl TrustedCallSigned {
 
 		// generate challenge code
 		let code = generate_challenge_code();
-		// only works if mockserver is enabled
-		GLOBAL_CHALLENGE_CODE_CACHE.insert_challenge_code(identity.clone(), code);
 
 		ita_sgx_runtime::IdentityManagementCall::<Runtime>::set_challenge_code {
 			who,

tee-worker/app-libs/stf/src/trusted_call_litentry.rs

@@ -6,11 +6,11 @@ use itc_rpc_client::direct_client::{DirectApi, DirectClient};
 use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
 use itp_types::DirectRequestStatus;
 use itp_utils::FromHexPrefixed;
-use log::{debug, error, warn};
+use log::{error, warn};
 use my_node_runtime::Hash;
 use scale_value::{scale::TypeId, Value};
 use sp_application_crypto::scale_info::TypeDef;
-use std::{format, sync::mpsc::channel};
+use std::format;
 
 /// Usage:
 ///    Plain Storage: ./integritee-cli trusted --mrenclave $mrenclave get-storage Parentchain Number
@@ -138,19 +138,13 @@ fn send_get_storage_request(
 	mrenclave: String,
 	storage_entry_key: &Vec<u8>,
 ) -> Option<Vec<u8>> {
-	let (sender, receiver) = channel();
-
 	let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
 		"state_getStorage".to_string(),
 		vec![mrenclave, format!("0x{}", hex::encode(storage_entry_key))],
 	)
 	.unwrap();
 
-	direct_api.watch(jsonrpc_call, sender);
-
-	debug!("waiting for rpc response");
-
-	let value = match receiver.recv() {
+	let value = match direct_api.get(jsonrpc_call.as_str()) {
 		Ok(response) => {
 			let response: RpcResponse = serde_json::from_str(&response).unwrap();
 			if let Ok(return_value) = RpcReturnValue::from_hex(&response.result) {
@@ -176,7 +170,7 @@ fn send_get_storage_request(
 			}
 		},
 		Err(e) => {
-			error!("failed to receive rpc response: {:?}", e);
+			error!("failed to send request: {:?}", e);
 			None
 		},
 	};

tee-worker/cli/src/trusted_base_cli/commands/get_storage.rs

@@ -181,18 +181,4 @@ extern "C" {
 		data_providers_static: *const u8,
 		data_providers_static_size: usize,
 	) -> sgx_status_t;
-
-	pub fn enable_challenge_code_cache(
-		eid: sgx_enclave_id_t,
-		retval: *mut sgx_status_t,
-	) -> sgx_status_t;
-
-	pub fn get_challenge_code(
-		eid: sgx_enclave_id_t,
-		retval: *mut sgx_status_t,
-		identity: *const u8,
-		identity_size: u32,
-		code: *mut u8,
-		code_size: u32,
-	) -> sgx_status_t;
 }

tee-worker/core-primitives/enclave-api/ffi/src/lib.rs

@@ -16,7 +16,6 @@ use crate::error::Error;
 use sgx_types::*;
 use sgx_urts::SgxEnclave;
 
-pub mod challenge_code_cache;
 pub mod direct_request;
 pub mod enclave_base;
 pub mod enclave_test;

tee-worker/core-primitives/enclave-api/src/challenge_code_cache.rs

@@ -128,7 +128,6 @@ its-primitives = { path = "../sidechain/primitives", default-features = false }
 its-sidechain = { path = "../sidechain/sidechain-crate", default-features = false, features = ["sgx"] }
 
 # litentry
-lc-challenge-code-cache = { path = "../litentry/core/challenge-code-cache", default-features = false, features = ["sgx"] }
 lc-data-providers = { path = "../litentry/core/data-providers", default-features = false, features = ["sgx"] }
 lc-stf-task-receiver = { path = "../litentry/core/stf-task/receiver", default-features = false, features = ["sgx"] }
 lc-stf-task-sender = { path = "../litentry/core/stf-task/sender", default-features = false, features = ["sgx"] }

tee-worker/core-primitives/enclave-api/src/lib.rs

@@ -131,14 +131,6 @@ enclave {
 		public size_t run_stf_task_handler(
 			[in, size=data_providers_static_len] uint8_t* data_providers_static, uint32_t data_providers_static_len
 		);
-
-		public sgx_status_t enable_challenge_code_cache();
-
-		public sgx_status_t get_challenge_code(
-			[in, size=identity_size] uint8_t* identity, uint32_t identity_size,
-			[out, size=code_size] uint8_t* code, uint32_t code_size
-		);
-
 	};
 
 	untrusted {