[Sidechain] Peer block fetching o-call implementation (#619)

* introduce o-call for fetching sidechain blocks from peer
* re-name api-client-extensions to node-api-extensions

Sub-task of #567

Author: Felix Müller

Cargo.lock

@@ -2019,7 +2019,7 @@ dependencies = [
  "integritee-node-runtime",
  "ita-stf",
  "itc-rpc-client",
- "itp-api-client-extensions",
+ "itp-node-api-extensions",
  "itp-types",
  "json",
  "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2105,12 +2105,13 @@ dependencies = [
  "ita-stf",
  "itc-rpc-client",
  "itc-rpc-server",
- "itp-api-client-extensions",
  "itp-enclave-api",
+ "itp-node-api-extensions",
  "itp-settings",
  "itp-test",
  "itp-types",
  "its-consensus-slots",
+ "its-peer-fetch",
  "its-primitives",
  "its-storage",
  "its-test",
@@ -2445,18 +2446,6 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
-[[package]]
-name = "itp-api-client-extensions"
-version = "0.8.0"
-dependencies = [
- "itp-types",
- "parity-scale-codec",
- "sp-core",
- "sp-finality-grandpa",
- "sp-runtime",
- "substrate-api-client",
-]
-
 [[package]]
 name = "itp-component-container"
 version = "0.8.0"
@@ -2509,6 +2498,19 @@ dependencies = [
  "thiserror 1.0.9",
 ]
 
+[[package]]
+name = "itp-node-api-extensions"
+version = "0.8.0"
+dependencies = [
+ "itp-types",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "substrate-api-client",
+ "thiserror 1.0.30",
+]
+
 [[package]]
 name = "itp-nonce-cache"
 version = "0.8.0"
@@ -2826,7 +2828,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "itc-rpc-client",
- "itp-api-client-extensions",
+ "itp-node-api-extensions",
  "itp-test",
  "its-primitives",
  "its-storage",

Cargo.toml

@@ -14,7 +14,7 @@ members = [
     "core/rpc-client",
     "core/rpc-server",
     "core/tls-websocket-server",
-    "core-primitives/api-client-extensions",
+    "core-primitives/node-api-extensions",
     "core-primitives/component-container",
     "core-primitives/enclave-api",
     "core-primitives/enclave-api/ffi",

cli/Cargo.toml

@@ -41,6 +41,6 @@ sp-core = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrat
 
 #local dependencies
 itp-types = { path = "../core-primitives/types" }
-itp-api-client-extensions = { path = "../core-primitives/api-client-extensions" }
+itp-node-api-extensions = { path = "../core-primitives/node-api-extensions" }
 ita-stf = { path = "../app-libs/stf" }
 itc-rpc-client = { path = "../core/rpc-client" }

cli/src/main.rs

@@ -56,7 +56,7 @@ use teerex_primitives::Request;
 
 use ita_stf::{ShardIdentifier, TrustedCallSigned, TrustedOperation};
 use itc_rpc_client::direct_client::{DirectApi, DirectClient as DirectWorkerApi};
-use itp_api_client_extensions::{PalletTeerexApi, TEEREX};
+use itp_node_api_extensions::{PalletTeerexApi, TEEREX};
 use itp_types::{DirectRequestStatus, RpcRequest, RpcResponse, RpcReturnValue};
 use substrate_client_keystore::{KeystoreExt, LocalKeystore};
 

core-primitives/api-client-extensions/Cargo.toml renamed to core-primitives/node-api-extensions/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "itp-api-client-extensions"
+name = "itp-node-api-extensions"
 version = "0.8.0"
 authors = ["Integritee AG <[email protected]>"]
 edition = "2018"
 
 [dependencies]
+# crates.io
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+thiserror = "1.0"
 
 # substrate
 sp-core = { version = "4.1.0-dev",  git = "https://github.com/paritytech/substrate.git", branch = "master" }

core-primitives/api-client-extensions/src/account.rs renamed to core-primitives/node-api-extensions/src/account.rs

@@ -21,6 +21,7 @@ pub use substrate_api_client::ApiClientError;
 
 pub mod account;
 pub mod chain;
+pub mod node_api_factory;
 pub mod pallet_teerex;
 
 #[cfg(feature = "mocks")]

core-primitives/api-client-extensions/src/chain.rs renamed to core-primitives/node-api-extensions/src/chain.rs

@@ -0,0 +1,56 @@
+/*
+	Copyright 2021 Integritee AG and Supercomputing Systems AG
+	Copyright (C) 2017-2019 Baidu, Inc. All Rights Reserved.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+
+*/
+
+use sp_core::sr25519;
+use substrate_api_client::{rpc::WsRpcClient, Api};
+
+/// Trait to create a node API, based on a node URL and signer.
+pub trait CreateNodeApi {
+	fn create_api(&self) -> Result<Api<sr25519::Pair, WsRpcClient>>;
+}
+
+/// Node API factory error.
+#[derive(Debug, thiserror::Error)]
+pub enum NodeApiFactoryError {
+	#[error("Failed to create a node API: {0}")]
+	FailedToCreateNodeApi(#[from] substrate_api_client::ApiClientError),
+	#[error(transparent)]
+	Other(#[from] Box<dyn std::error::Error + Sync + Send + 'static>),
+}
+
+pub type Result<T> = std::result::Result<T, NodeApiFactoryError>;
+
+/// Node API factory implementation.
+pub struct NodeApiFactory {
+	node_url: String,
+	signer: sr25519::Pair,
+}
+
+impl NodeApiFactory {
+	pub fn new(url: String, signer: sr25519::Pair) -> Self {
+		NodeApiFactory { node_url: url, signer }
+	}
+}
+
+impl CreateNodeApi for NodeApiFactory {
+	fn create_api(&self) -> Result<Api<sr25519::Pair, WsRpcClient>> {
+		Api::<sr25519::Pair, WsRpcClient>::new(WsRpcClient::new(self.node_url.as_str()))
+			.map_err(NodeApiFactoryError::FailedToCreateNodeApi)
+			.map(|a| a.set_signer(self.signer.clone()))
+	}
+}