|
@@ -26,6 +26,7 @@ use darkfi::{
|
|
|
jsonrpc::{ErrorCode, JsonError, JsonRequest, JsonResponse, JsonResult},
|
|
jsonrpc::{ErrorCode, JsonError, JsonRequest, JsonResponse, JsonResult},
|
|
|
server::RequestHandler,
|
|
server::RequestHandler,
|
|
|
},
|
|
},
|
|
|
|
|
+ util::time::Timestamp,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
use crate::Darkfid;
|
|
use crate::Darkfid;
|
|
@@ -42,10 +43,33 @@ impl RequestHandler for Darkfid {
|
|
|
debug!(target: "RPC", "--> {}", serde_json::to_string(&req).unwrap());
|
|
debug!(target: "RPC", "--> {}", serde_json::to_string(&req).unwrap());
|
|
|
|
|
|
|
|
match req.method.as_str() {
|
|
match req.method.as_str() {
|
|
|
- Some("ping") => self.pong(req.id, params).await,
|
|
|
|
|
|
|
+ // =====================
|
|
|
|
|
+ // Miscellaneous methods
|
|
|
|
|
+ // =====================
|
|
|
|
|
+ Some("ping") => return self.pong(req.id, params).await,
|
|
|
|
|
+ Some("clock") => return self.clock(req.id, params).await,
|
|
|
|
|
+ Some("sync_dnet_switch") => return self.sync_dnet_switch(req.id, params).await,
|
|
|
|
|
+ Some("sync_dnet_info") => return self.sync_dnet_info(req.id, params).await,
|
|
|
|
|
+ Some("consensus_dnet_switch") => {
|
|
|
|
|
+ return self.consensus_dnet_switch(req.id, params).await
|
|
|
|
|
+ }
|
|
|
|
|
+ Some("consensus_dnet_info") => return self.consensus_dnet_info(req.id, params).await,
|
|
|
|
|
|
|
|
- Some("dnet_switch") => self.dnet_switch(req.id, params).await,
|
|
|
|
|
- Some("dnet_info") => self.dnet_info(req.id, params).await,
|
|
|
|
|
|
|
+ // ==================
|
|
|
|
|
+ // Blockchain methods
|
|
|
|
|
+ // ==================
|
|
|
|
|
+ Some("blockchain.get_slot") => return self.blockchain_get_slot(req.id, params).await,
|
|
|
|
|
+ Some("blockchain.get_tx") => return self.blockchain_get_tx(req.id, params).await,
|
|
|
|
|
+ Some("blockchain.last_known_slot") => {
|
|
|
|
|
+ return self.blockchain_last_known_slot(req.id, params).await
|
|
|
|
|
+ }
|
|
|
|
|
+ Some("blockchain.lookup_zkas") => {
|
|
|
|
|
+ return self.blockchain_lookup_zkas(req.id, params).await
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // ==============
|
|
|
|
|
+ // Invalid method
|
|
|
|
|
+ // ==============
|
|
|
Some(_) | None => JsonError::new(ErrorCode::MethodNotFound, None, req.id).into(),
|
|
Some(_) | None => JsonError::new(ErrorCode::MethodNotFound, None, req.id).into(),
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -61,42 +85,79 @@ impl Darkfid {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// RPCAPI:
|
|
// RPCAPI:
|
|
|
- // Activate or deactivate dnet in the P2P stack.
|
|
|
|
|
|
|
+ // Returns current system clock in `Timestamp` format.
|
|
|
|
|
+ //
|
|
|
|
|
+ // --> {"jsonrpc": "2.0", "method": "clock", "params": [], "id": 1}
|
|
|
|
|
+ // <-- {"jsonrpc": "2.0", "result": {...}, "id": 1}
|
|
|
|
|
+ async fn clock(&self, id: Value, _params: &[Value]) -> JsonResult {
|
|
|
|
|
+ JsonResponse::new(json!(Timestamp::current_time()), id).into()
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // RPCAPI:
|
|
|
|
|
+ // Activate or deactivate dnet in the sync P2P stack.
|
|
|
// By sending `true`, dnet will be activated, and by sending `false` dnet
|
|
// By sending `true`, dnet will be activated, and by sending `false` dnet
|
|
|
// will be deactivated. Returns `true` on success.
|
|
// will be deactivated. Returns `true` on success.
|
|
|
//
|
|
//
|
|
|
- // --> {"jsonrpc": "2.0", "method": "dnet_switch", "params": [true], "id": 42}
|
|
|
|
|
|
|
+ // --> {"jsonrpc": "2.0", "method": "sync_dnet_switch", "params": [true], "id": 42}
|
|
|
// <-- {"jsonrpc": "2.0", "result": true, "id": 42}
|
|
// <-- {"jsonrpc": "2.0", "result": true, "id": 42}
|
|
|
- async fn dnet_switch(&self, id: Value, params: &[Value]) -> JsonResult {
|
|
|
|
|
|
|
+ async fn sync_dnet_switch(&self, id: Value, params: &[Value]) -> JsonResult {
|
|
|
if params.len() != 1 && params[0].as_bool().is_none() {
|
|
if params.len() != 1 && params[0].as_bool().is_none() {
|
|
|
return JsonError::new(ErrorCode::InvalidParams, None, id).into()
|
|
return JsonError::new(ErrorCode::InvalidParams, None, id).into()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if params[0].as_bool().unwrap() {
|
|
if params[0].as_bool().unwrap() {
|
|
|
self.sync_p2p.dnet_enable().await;
|
|
self.sync_p2p.dnet_enable().await;
|
|
|
- if self.consensus_p2p.is_some() {
|
|
|
|
|
- self.consensus_p2p.clone().unwrap().dnet_enable().await;
|
|
|
|
|
- }
|
|
|
|
|
} else {
|
|
} else {
|
|
|
self.sync_p2p.dnet_disable().await;
|
|
self.sync_p2p.dnet_disable().await;
|
|
|
- if self.consensus_p2p.is_some() {
|
|
|
|
|
- self.consensus_p2p.clone().unwrap().dnet_disable().await;
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
JsonResponse::new(json!(true), id).into()
|
|
JsonResponse::new(json!(true), id).into()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// RPCAPI:
|
|
// RPCAPI:
|
|
|
- // Retrieves P2P network information.
|
|
|
|
|
|
|
+ // Retrieves sync P2P network information.
|
|
|
//
|
|
//
|
|
|
- // --> {"jsonrpc": "2.0", "method": "dnet_info", "params": [], "id": 42}
|
|
|
|
|
|
|
+ // --> {"jsonrpc": "2.0", "method": "sync_dnet_info", "params": [], "id": 42}
|
|
|
// <-- {"jsonrpc": "2.0", result": {"nodeID": [], "nodeinfo": [], "id": 42}
|
|
// <-- {"jsonrpc": "2.0", result": {"nodeID": [], "nodeinfo": [], "id": 42}
|
|
|
- async fn dnet_info(&self, id: Value, _params: &[Value]) -> JsonResult {
|
|
|
|
|
- let mut dnet_info = self.sync_p2p.dnet_info().await;
|
|
|
|
|
|
|
+ async fn sync_dnet_info(&self, id: Value, _params: &[Value]) -> JsonResult {
|
|
|
|
|
+ let dnet_info = self.sync_p2p.dnet_info().await;
|
|
|
|
|
+ JsonResponse::new(net::P2p::map_dnet_info(dnet_info), id).into()
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // RPCAPI:
|
|
|
|
|
+ // Activate or deactivate dnet in the consensus P2P stack.
|
|
|
|
|
+ // By sending `true`, dnet will be activated, and by sending `false` dnet
|
|
|
|
|
+ // will be deactivated. Returns `true` on success.
|
|
|
|
|
+ //
|
|
|
|
|
+ // --> {"jsonrpc": "2.0", "method": "consensus_dnet_switch", "params": [true], "id": 42}
|
|
|
|
|
+ // <-- {"jsonrpc": "2.0", "result": true, "id": 42}
|
|
|
|
|
+ async fn consensus_dnet_switch(&self, id: Value, params: &[Value]) -> JsonResult {
|
|
|
|
|
+ if params.len() != 1 && params[0].as_bool().is_none() {
|
|
|
|
|
+ return JsonError::new(ErrorCode::InvalidParams, None, id).into()
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if self.consensus_p2p.is_some() {
|
|
if self.consensus_p2p.is_some() {
|
|
|
- dnet_info.extend(self.consensus_p2p.clone().unwrap().dnet_info().await);
|
|
|
|
|
|
|
+ if params[0].as_bool().unwrap() {
|
|
|
|
|
+ self.consensus_p2p.clone().unwrap().dnet_enable().await;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ self.consensus_p2p.clone().unwrap().dnet_disable().await;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ JsonResponse::new(json!(true), id).into()
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // RPCAPI:
|
|
|
|
|
+ // Retrieves consensus P2P network information.
|
|
|
|
|
+ //
|
|
|
|
|
+ // --> {"jsonrpc": "2.0", "method": "consensus_dnet_info", "params": [], "id": 42}
|
|
|
|
|
+ // <-- {"jsonrpc": "2.0", result": {"nodeID": [], "nodeinfo": [], "id": 42}
|
|
|
|
|
+ async fn consensus_dnet_info(&self, id: Value, _params: &[Value]) -> JsonResult {
|
|
|
|
|
+ let dnet_info = if self.consensus_p2p.is_some() {
|
|
|
|
|
+ self.consensus_p2p.clone().unwrap().dnet_info().await
|
|
|
|
|
+ } else {
|
|
|
|
|
+ vec![]
|
|
|
|
|
+ };
|
|
|
JsonResponse::new(net::P2p::map_dnet_info(dnet_info), id).into()
|
|
JsonResponse::new(net::P2p::map_dnet_info(dnet_info), id).into()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|