TOP pool synchronization

tee-worker/Cargo.toml

@@ -5,7 +5,9 @@ members = [
     "app-libs/sgx-runtime",
     "app-libs/stf",
     "cli",
+    "core/direct-rpc-client",
     "core/direct-rpc-server",
+    "core/peer-top-broadcaster",
     "core/offchain-worker-executor",
     "core/parentchain/block-import-dispatcher",
     "core/parentchain/block-importer",

tee-worker/cli/src/attesteer/commands/send_dcap_quote.rs

@@ -17,7 +17,7 @@
 
 use crate::{command_utils::get_worker_api_direct, Cli};
 use itc_rpc_client::direct_client::DirectApi;
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
+use itp_rpc::{Id, RpcRequest, RpcResponse, RpcReturnValue};
 use itp_types::DirectRequestStatus;
 use itp_utils::FromHexPrefixed;
 use log::*;
@@ -39,8 +39,12 @@ impl SendDcapQuoteCmd {
 		};
 
 		let rpc_method = "attesteer_forwardDcapQuote".to_owned();
-		let jsonrpc_call: String =
-			RpcRequest::compose_jsonrpc_call(rpc_method, vec![hex_encoded_quote]).unwrap();
+		let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
+			Id::Text("1".to_string()),
+			rpc_method,
+			vec![hex_encoded_quote],
+		)
+		.unwrap();
 
 		let rpc_response_str = direct_api.get(&jsonrpc_call).unwrap();
 

tee-worker/cli/src/attesteer/commands/send_ias_attestation.rs

@@ -16,7 +16,7 @@
 */
 
 use itc_rpc_client::direct_client::DirectApi;
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
+use itp_rpc::{Id, RpcRequest, RpcResponse, RpcReturnValue};
 use itp_types::DirectRequestStatus;
 use itp_utils::FromHexPrefixed;
 use log::*;
@@ -40,8 +40,12 @@ impl SendIasAttestationReportCmd {
 		};
 
 		let rpc_method = "attesteer_forwardIasAttestationReport".to_owned();
-		let jsonrpc_call: String =
-			RpcRequest::compose_jsonrpc_call(rpc_method, vec![hex_encoded_report]).unwrap();
+		let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
+			Id::Text("1".to_string()),
+			rpc_method,
+			vec![hex_encoded_report],
+		)
+		.unwrap();
 
 		let rpc_response_str = direct_api.get(&jsonrpc_call).unwrap();
 

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

@@ -7,7 +7,7 @@ use codec::Decode;
 use frame_metadata::{RuntimeMetadata, StorageEntryType, StorageHasher};
 use ita_sgx_runtime::Runtime;
 use itc_rpc_client::direct_client::{DirectApi, DirectClient};
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
+use itp_rpc::{Id, RpcRequest, RpcResponse, RpcReturnValue};
 use itp_types::DirectRequestStatus;
 use itp_utils::FromHexPrefixed;
 use log::{error, warn};
@@ -144,6 +144,7 @@ fn send_get_storage_request(
 	storage_entry_key: &Vec<u8>,
 ) -> Option<Vec<u8>> {
 	let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
+		Id::Text("1".to_string()),
 		"state_getStorage".to_string(),
 		vec![mrenclave, format!("0x{}", hex::encode(storage_entry_key))],
 	)

tee-worker/cli/src/trusted_command_utils.rs

@@ -25,7 +25,7 @@ use base58::{FromBase58, ToBase58};
 use codec::{Decode, Encode};
 use ita_stf::{TrustedGetter, TrustedOperation};
 use itc_rpc_client::direct_client::DirectApi;
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
+use itp_rpc::{Id, RpcRequest, RpcResponse, RpcReturnValue};
 use itp_stf_primitives::types::{AccountId, KeyPair, ShardIdentifier};
 use itp_types::DirectRequestStatus;
 use itp_utils::{FromHexPrefixed, ToHexPrefixed};
@@ -147,6 +147,7 @@ pub(crate) fn get_pending_trusted_calls_for(
 	let direct_api = get_worker_api_direct(cli);
 	let rpc_method = "author_pendingTrustedCallsFor".to_owned();
 	let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
+		Id::Text("1".to_string()),
 		rpc_method,
 		vec![shard.encode().to_base58(), who.to_hex()],
 	)

tee-worker/cli/src/trusted_operation.rs

@@ -26,7 +26,7 @@ use codec::{Decode, Encode};
 use ita_stf::{Getter, StfError, TrustedCall, TrustedOperation};
 use itc_rpc_client::direct_client::{DirectApi, DirectClient};
 use itp_node_api::api_client::{ParentchainApi, TEEREX};
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
+use itp_rpc::{Id, RpcRequest, RpcResponse, RpcReturnValue};
 use itp_sgx_crypto::ShieldingCryptoEncrypt;
 use itp_stf_primitives::types::ShardIdentifier;
 use itp_types::{BlockNumber, DirectRequestStatus, RsaRequest, TrustedOperationStatus};
@@ -105,8 +105,12 @@ pub(crate) fn get_state<T: Decode>(
 	// Compose jsonrpc call.
 	let data = RsaRequest::new(shard, getter.encode());
 	let rpc_method = "state_executeGetter".to_owned();
-	let jsonrpc_call: String =
-		RpcRequest::compose_jsonrpc_call(rpc_method, vec![data.to_hex()]).unwrap();
+	let jsonrpc_call: String = RpcRequest::compose_jsonrpc_call(
+		Id::Text("1".to_string()),
+		rpc_method,
+		vec![data.to_hex()],
+	)
+	.unwrap();
 
 	let rpc_response_str = direct_api.get(&jsonrpc_call).unwrap();
 
@@ -437,8 +441,12 @@ pub(crate) fn get_vc_json_request(
 
 	// compose jsonrpc call
 	let request = AesRequest { shard, payload: operation_call_encrypted, key: encrypted_key };
-	RpcRequest::compose_jsonrpc_call("author_submitVCRequest".to_string(), vec![request.to_hex()])
-		.unwrap()
+	RpcRequest::compose_jsonrpc_call(
+		Id::Number(1),
+		"author_submitVCRequest".to_string(),
+		vec![request.to_hex()],
+	)
+	.unwrap()
 }
 
 pub(crate) fn get_json_request(
@@ -451,6 +459,7 @@ pub(crate) fn get_json_request(
 	// compose jsonrpc call
 	let request = RsaRequest::new(shard, operation_call_encrypted);
 	RpcRequest::compose_jsonrpc_call(
+		Id::Text("1".to_string()),
 		"author_submitAndWatchRsaRequest".to_string(),
 		vec![request.to_hex()],
 	)

tee-worker/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts

@@ -61,6 +61,7 @@ export default {
                 Usurped: null,
                 Dropped: null,
                 Invalid: null,
+                TopExecuted: "Bytes",
             },
         },
     },

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

@@ -19,7 +19,7 @@
 
 pub extern crate alloc;
 
-use alloc::vec::Vec;
+use alloc::{string::String, vec::Vec};
 use codec::{Decode, Encode};
 use core::result::Result as StdResult;
 use derive_more::{Display, From};
@@ -142,6 +142,8 @@ pub trait EnclaveSidechainOCallApi: Clone + Send + Sync {
 		maybe_until_block_hash: Option<BlockHash>,
 		shard_identifier: ShardIdentifier,
 	) -> SgxResult<Vec<SignedSidechainBlock>>;
+
+	fn get_trusted_peers_urls(&self) -> SgxResult<Vec<String>>;
 }
 
 /// Newtype for IPFS CID

tee-worker/core-primitives/rpc/src/lib.rs

@@ -28,7 +28,7 @@ use itp_types::DirectRequestStatus;
 use serde::{Deserialize, Serialize};
 use std::{borrow::ToOwned, string::String, vec::Vec};
 
-#[derive(Encode, Decode, Debug)]
+#[derive(Encode, Decode, Debug, Eq, PartialEq)]
 pub struct RpcReturnValue {
 	pub value: Vec<u8>,
 	pub do_watch: bool,
@@ -48,7 +48,7 @@ impl RpcReturnValue {
 	}
 }
 
-#[derive(Clone, Encode, Decode, Debug, Serialize, Deserialize)]
+#[derive(Clone, Encode, Decode, Debug, Serialize, Deserialize, Eq, PartialEq, Hash)]
 #[serde(untagged)]
 pub enum Id {
 	#[codec(index = 0)]
@@ -74,15 +74,11 @@ pub struct RpcRequest {
 
 impl RpcRequest {
 	pub fn compose_jsonrpc_call(
+		id: Id,
 		method: String,
 		params: Vec<String>,
 	) -> Result<String, serde_json::Error> {
-		serde_json::to_string(&RpcRequest {
-			jsonrpc: "2.0".to_owned(),
-			method,
-			params,
-			id: Id::Number(1),
-		})
+		serde_json::to_string(&RpcRequest { jsonrpc: "2.0".to_owned(), method, params, id })
 	}
 }
 

tee-worker/core-primitives/test/src/mock/onchain_mock.rs

@@ -32,7 +32,7 @@ use sgx_types::*;
 use sp_core::H256;
 use sp_runtime::{traits::Header as HeaderTrait, AccountId32, OpaqueExtrinsic};
 use sp_std::prelude::*;
-use std::collections::HashMap;
+use std::{collections::HashMap, string::String};
 
 #[derive(Default, Clone, Debug)]
 pub struct OnchainMock {
@@ -158,6 +158,10 @@ impl EnclaveSidechainOCallApi for OnchainMock {
 	) -> SgxResult<Vec<SignedSidechainBlock>> {
 		Ok(Vec::new())
 	}
+
+	fn get_trusted_peers_urls(&self) -> SgxResult<Vec<String>> {
+		Ok(Vec::default())
+	}
 }
 
 impl EnclaveMetricsOCallApi for OnchainMock {

tee-worker/core-primitives/test/src/mock/sidechain_ocall_api_mock.rs

@@ -26,7 +26,7 @@ use core::marker::PhantomData;
 use itp_ocall_api::EnclaveSidechainOCallApi;
 use itp_types::{BlockHash, ShardIdentifier};
 use sgx_types::{sgx_status_t, SgxResult};
-use std::vec::Vec;
+use std::{string::String, vec::Vec};
 
 pub struct SidechainOCallApiMock<SignedSidechainBlockType> {
 	fetch_from_peer_blocks: Option<Vec<SignedSidechainBlockType>>,
@@ -107,4 +107,8 @@ where
 			None => Err(sgx_status_t::SGX_ERROR_UNEXPECTED),
 		}
 	}
+
+	fn get_trusted_peers_urls(&self) -> SgxResult<Vec<String>> {
+		Ok(Vec::default())
+	}
 }

tee-worker/core-primitives/top-pool-author/Cargo.toml

@@ -18,6 +18,10 @@ itp-stf-state-handler = { path = "../stf-state-handler", default-features = fals
 itp-test = { path = "../test", default-features = false, optional = true }
 itp-top-pool = { path = "../top-pool", default-features = false }
 itp-types = { path = "../types", default-features = false }
+itp-utils = { path = "../utils", default-features = false }
+
+# litentry
+litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 
 # sgx enabled external libraries
 jsonrpc-core_sgx = { package = "jsonrpc-core", git = "https://github.com/scs/jsonrpc", branch = "no_std_v18", default-features = false, optional = true }
@@ -42,8 +46,6 @@ itp-test = { path = "../test" }
 itp-top-pool = { path = "../top-pool", features = ["mocks"] }
 sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_crypto_helper", default-features = false }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
-# litentry
-litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 
 
 [features]
@@ -56,6 +58,7 @@ std = [
     "itp-stf-state-handler/std",
     "itp-top-pool/std",
     "itp-types/std",
+    "itp-utils/std",
     "jsonrpc-core",
     "log/std",
     # litentry
@@ -69,6 +72,7 @@ sgx = [
     "itp-sgx-crypto/sgx",
     "itp-stf-state-handler/sgx",
     "itp-top-pool/sgx",
+    "itp-utils/sgx",
     "thiserror_sgx",
     # litentry
     "litentry-primitives/sgx",