@dashevo/dapi-grpc 1.0.0-dev.3 → 1.0.0-dev.5

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.0.0-dev.3"
+version = "1.0.0-dev.5"
 authors = [
     "Samuel Westrich <sam@dash.org>",
     "Igor Markin <igor.markin@dash.org>",
@@ -21,6 +21,7 @@ platform = []
 tenderdash-proto = []
 client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
 serde = ["dep:serde", "dep:serde_bytes"]
+mocks = ["dep:serde_json"]
 
 [dependencies]
 prost = { version = "0.11.9" }
@@ -30,7 +31,8 @@ tonic = { version = "0.9.2", features = [
 ], default-features = false }
 serde = { version = "1.0.171", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci" }
+serde_json = { version = "1.0", optional = true }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.6" }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 

package/build.rs

@@ -6,7 +6,21 @@ use std::{
 use tonic_build::Builder;
 
 fn main() {
-    generate().expect("failed to compile protobuf definitions");
+    let core = MappingConfig::new(
+        PathBuf::from("protos/core/v0/core.proto"),
+        PathBuf::from("src/core/proto"),
+    );
+    configure_core(core)
+        .generate()
+        .expect("generate core proto");
+
+    let platform = MappingConfig::new(
+        PathBuf::from("protos/platform/v0/platform.proto"),
+        PathBuf::from("src/platform/proto"),
+    );
+    configure_platform(platform)
+        .generate()
+        .expect("generate platform proto");
 
     println!("cargo:rerun-if-changed=./protos");
     println!("cargo:rerun-if-env-changed=CARGO_FEATURE_SERDE");
@@ -18,29 +32,20 @@ struct MappingConfig {
     builder: Builder,
     proto_includes: Vec<PathBuf>,
 }
-/// Generate Rust definitions from Protobuf definitions
-pub fn generate() -> Result<(), std::io::Error> {
-    let core = MappingConfig::new(
-        PathBuf::from("protos/core/v0/core.proto"),
-        PathBuf::from("src/core/proto"),
-    );
-    core.generate().unwrap();
-
-    let mut platform = MappingConfig::new(
-        PathBuf::from("protos/platform/v0/platform.proto"),
-        PathBuf::from("src/platform/proto"),
-    );
 
+fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
     // Derive features for versioned messages
     //
     // "GetConsensusParamsRequest" is excluded as this message does not support proofs
-    const VERSIONED_REQUESTS: [&str; 15] = [
+    const VERSIONED_REQUESTS: [&str; 17] = [
         "GetDataContractHistoryRequest",
         "GetDataContractRequest",
         "GetDataContractsRequest",
         "GetDocumentsRequest",
         "GetIdentitiesByPublicKeyHashesRequest",
         "GetIdentitiesRequest",
+        "GetIdentityNonceRequest",
+        "GetIdentityContractNonceRequest",
         "GetIdentityBalanceAndRevisionRequest",
         "GetIdentityBalanceRequest",
         "GetIdentityByPublicKeyHashRequest",
@@ -53,7 +58,7 @@ pub fn generate() -> Result<(), std::io::Error> {
     ];
 
     //  "GetConsensusParamsResponse" is excluded as this message does not support proofs
-    const VERSIONED_RESPONSES: [&str; 16] = [
+    const VERSIONED_RESPONSES: [&str; 18] = [
         "GetDataContractHistoryResponse",
         "GetDataContractResponse",
         "GetDataContractsResponse",
@@ -62,6 +67,8 @@ pub fn generate() -> Result<(), std::io::Error> {
         "GetIdentitiesResponse",
         "GetIdentityBalanceAndRevisionResponse",
         "GetIdentityBalanceResponse",
+        "GetIdentityNonceResponse",
+        "GetIdentityContractNonceResponse",
         "GetIdentityByPublicKeyHashResponse",
         "GetIdentityKeysResponse",
         "GetIdentityResponse",
@@ -92,6 +99,9 @@ pub fn generate() -> Result<(), std::io::Error> {
             .message_attribute(msg, r#"#[grpc_versions(0)]"#);
     }
 
+    // All messages can be mocked.
+    platform = platform.message_attribute(".", r#"#[derive( ::dapi_grpc_macros::Mockable)]"#);
+
     #[cfg(feature = "serde")]
     let platform = platform
         .type_attribute(
@@ -132,9 +142,21 @@ pub fn generate() -> Result<(), std::io::Error> {
         .field_attribute("Proof.signature", r#"#[serde(with = "serde_bytes")]"#)
         .field_attribute("Proof.block_id_hash", r#"#[serde(with = "serde_bytes")]"#);
 
-    platform.generate().unwrap();
+    platform
+}
+
+fn configure_core(mut core: MappingConfig) -> MappingConfig {
+    // All messages can be mocked.
+    core = core.message_attribute(".", r#"#[derive( ::dapi_grpc_macros::Mockable)]"#);
+
+    // Serde support
+    #[cfg(feature = "serde")]
+    let core = core.type_attribute(
+        ".",
+        r#"#[derive(::serde::Serialize, ::serde::Deserialize)]"#,
+    );
 
-    Ok(())
+    core
 }
 
 impl MappingConfig {

package/clients/core/v0/rust/core_example.rs

@@ -1,5 +1,5 @@
 use dapi_grpc::core::v0 as core;
-use prost::Message;
+use dapi_grpc::Message;
 
 fn main() {
     let request = core::GetBlockRequest {

package/clients/platform/v0/nodejs/PlatformPromiseClient.js

@@ -48,6 +48,10 @@ const {
               PBJSGetProtocolVersionUpgradeVoteStatusResponse,
             GetProtocolVersionUpgradeStateRequest: PBJSGetProtocolVersionUpgradeStateRequest,
             GetProtocolVersionUpgradeStateResponse: PBJSGetProtocolVersionUpgradeStateResponse,
+            GetIdentityContractNonceRequest: PBJSGetIdentityContractNonceRequest,
+            GetIdentityContractNonceResponse: PBJSGetIdentityContractNonceResponse,
+            GetIdentityNonceRequest: PBJSGetIdentityNonceRequest,
+            GetIdentityNonceResponse: PBJSGetIdentityNonceResponse,
           },
         },
       },
@@ -67,6 +71,8 @@ const {
   GetEpochsInfoResponse: ProtocGetEpochsInfoResponse,
   GetProtocolVersionUpgradeVoteStatusResponse: ProtocGetProtocolVersionUpgradeVoteStatusResponse,
   GetProtocolVersionUpgradeStateResponse: ProtocGetProtocolVersionUpgradeStateResponse,
+  GetIdentityContractNonceResponse: ProtocGetIdentityContractNonceResponse,
+  GetIdentityNonceResponse: ProtocGetIdentityNonceResponse,
 } = require('./platform_protoc');
 
 const getPlatformDefinition = require('../../../../lib/getPlatformDefinition');
@@ -137,6 +143,14 @@ class PlatformPromiseClient {
       this.client.getProtocolVersionUpgradeState.bind(this.client),
     );
 
+    this.client.getIdentityContractNonce = promisify(
+      this.client.getIdentityContractNonce.bind(this.client),
+    );
+
+    this.client.getIdentityNonce = promisify(
+      this.client.getIdentityNonce.bind(this.client),
+    );
+
     this.protocolVersion = undefined;
   }
 
@@ -496,6 +510,70 @@ class PlatformPromiseClient {
     );
   }
 
+  /**
+   * @param {!PBJSGetIdentityContractNonceRequest} getIdentityContractNonceRequest
+   * @param {?Object<string, string>} metadata
+   * @param {CallOptions} [options={}]
+   * @return {Promise<!GetIdentityContractNonceResponse>}
+   */
+  getIdentityContractNonce(
+    getIdentityContractNonceRequest,
+    metadata = {},
+    options = {},
+  ) {
+    if (!isObject(metadata)) {
+      throw new Error('metadata must be an object');
+    }
+
+    return this.client.getIdentityContractNonce(
+      getIdentityContractNonceRequest,
+      convertObjectToMetadata(metadata),
+      {
+        interceptors: [
+          jsonToProtobufInterceptorFactory(
+            jsonToProtobufFactory(
+              ProtocGetIdentityContractNonceResponse,
+              PBJSGetIdentityContractNonceResponse,
+            ),
+            protobufToJsonFactory(
+              PBJSGetIdentityContractNonceRequest,
+            ),
+          ),
+        ],
+        ...options,
+      },
+    );
+  }
+
+  getIdentityNonce(
+    getIdentityNonceRequest,
+    metadata = {},
+    options = {},
+  ) {
+    if (!isObject(metadata)) {
+      throw new Error('metadata must be an object');
+    }
+
+    return this.client.getIdentityNonce(
+      getIdentityNonceRequest,
+      convertObjectToMetadata(metadata),
+      {
+        interceptors: [
+          jsonToProtobufInterceptorFactory(
+            jsonToProtobufFactory(
+              ProtocGetIdentityNonceResponse,
+              PBJSGetIdentityNonceResponse,
+            ),
+            protobufToJsonFactory(
+              PBJSGetIdentityNonceRequest,
+            ),
+          ),
+        ],
+        ...options,
+      },
+    );
+  }
+
   /**
    * @param {string} protocolVersion
    */