diem-rest-client: introduce a new rest client

Closes: aptos-labs#9823

Cargo.toml

@@ -43,6 +43,7 @@ members = [
     "crates/diem-crypto-derive",
     "crates/diem-faucet",
     "crates/diem-json-rpc-client",
+    "crates/diem-rest-client",
     "crates/proxy",
     "crates/swiss-knife",
     "crates/transaction-emitter",

api/types/src/transaction.rs

@@ -94,7 +94,7 @@ impl<T: TransactionInfoTrait>
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Transaction {
     PendingTransaction(PendingTransaction),
@@ -179,7 +179,7 @@ impl From<(&SignedTransaction, TransactionPayload)> for UserTransactionRequest {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct TransactionInfo {
     pub version: U64,
     pub hash: HashValue,
@@ -190,14 +190,14 @@ pub struct TransactionInfo {
     pub vm_status: String,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct PendingTransaction {
     pub hash: HashValue,
     #[serde(flatten)]
     pub request: UserTransactionRequest,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct UserTransaction {
     #[serde(flatten)]
     pub info: TransactionInfo,
@@ -219,15 +219,15 @@ pub struct UserTransactionRequest {
     pub signature: Option<TransactionSignature>,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct GenesisTransaction {
     #[serde(flatten)]
     pub info: TransactionInfo,
     pub payload: GenesisPayload,
     pub events: Vec<Event>,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct BlockMetadataTransaction {
     #[serde(flatten)]
     pub info: TransactionInfo,
@@ -260,7 +260,7 @@ impl From<(&ContractEvent, serde_json::Value)> for Event {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum GenesisPayload {
     WriteSetPayload(WriteSetPayload),

crates/diem-client/Cargo.toml

@@ -23,6 +23,7 @@ hex = "0.4.3"
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
 tracing = "0.1.26"
+url = "2.2.2"
 
 diem-crypto = { path = "../diem-crypto", version = "0.0.3" }
 diem-json-rpc-types = { path = "../../json-rpc/types", version = "0.0.3" }

crates/diem-client/src/response.rs

@@ -51,6 +51,14 @@ impl<T> Response<T> {
             Err(err) => Err(err),
         }
     }
+
+    pub fn map<U, F>(self, f: F) -> Response<U>
+    where
+        F: FnOnce(T) -> U,
+    {
+        let (inner, state) = self.into_parts();
+        Response::new(f(inner), state)
+    }
 }
 
 #[allow(clippy::large_enum_variant)]

crates/diem-client/src/state.rs

@@ -1,7 +1,9 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use diem_json_rpc_types::response::JsonRpcResponse;
+use diem_json_rpc_types::response::{
+    JsonRpcResponse, X_DIEM_CHAIN_ID, X_DIEM_TIMESTAMP_USEC_ID, X_DIEM_VERSION_ID,
+};
 use std::cmp::max;
 
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
@@ -19,6 +21,35 @@ impl State {
             timestamp_usecs: resp.diem_ledger_timestampusec,
         }
     }
+
+    pub fn from_headers(headers: &reqwest::header::HeaderMap) -> anyhow::Result<Self> {
+        let maybe_chain_id = headers
+            .get(X_DIEM_CHAIN_ID)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let maybe_version = headers
+            .get(X_DIEM_VERSION_ID)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let maybe_timestamp = headers
+            .get(X_DIEM_TIMESTAMP_USEC_ID)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+
+        let state = if let (Some(chain_id), Some(version), Some(timestamp_usecs)) =
+            (maybe_chain_id, maybe_version, maybe_timestamp)
+        {
+            Self {
+                chain_id,
+                version,
+                timestamp_usecs,
+            }
+        } else {
+            todo!()
+        };
+
+        Ok(state)
+    }
 }
 
 cfg_async_or_blocking! {

crates/diem-rest-client/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "diem-rest-client"
+version = "0.0.0"
+authors = ["Diem Association <[email protected]>"]
+description = "Diem Rest client"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0.38"
+bcs = "0.1.2"
+hex = "0.4.3"
+reqwest = { version = "0.11.2", features = ["json"] }
+serde = { version = "1.0.124", features = ["derive"] }
+serde_json = "1.0.64"
+tokio = { version = "1.8.1", features = ["full"] }
+url = "2.2.2"
+
+diem-api-types = { path = "../../api/types" }
+diem-client = { path = "../diem-client" }
+diem-crypto = { path = "../diem-crypto" }
+diem-json-rpc-types = { path = "../../json-rpc/types" }
+diem-types = { path = "../../types" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+move-core-types = { path = "../../language/move-core/types" }