@dashevo/dapi-grpc 1.0.0-dev.1 → 1.0.0-dev.11

package/Cargo.toml

@@ -1,36 +1,50 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.0.0-dev.1"
+version = "1.0.0-dev.11"
 authors = [
-    "Samuel Westrich <sam@dash.org>",
-    "Igor Markin <igor.markin@dash.org>",
-    "Łukasz Klimek <lukasz.klimek@dash.org>",
-    "Anton Suprunchuk <anton.suprunchuk@dash.org>",
-    "Ivan Shumkov <shumkov@dash.org>",
+  "Samuel Westrich <sam@dash.org>",
+  "Igor Markin <igor.markin@dash.org>",
+  "Łukasz Klimek <lukasz.klimek@dash.org>",
+  "Anton Suprunchuk <anton.suprunchuk@dash.org>",
+  "Ivan Shumkov <shumkov@dash.org>",
 ]
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.76"
 license = "MIT"
 
 [features]
-default = ["core", "platform", "client", "serde"]
+# Enable all features by default, otherwise different crates
+# triggier bulding proto with different feature set that overwrites
+# previous results and causes build errors
+default = ["core", "platform", "client", "serde", "server"]
 core = []
 platform = []
 # Re-export Dash Platform protobuf types as `dapi_grpc::platform::proto`
+# Note: client needs tls and tls-roots to connect to testnet which uses TLS.
 tenderdash-proto = []
-client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
+client = [
+  "tonic/channel",
+  "tonic/transport",
+  "tonic/tls",
+  "tonic/tls-roots",
+  "platform",
+]
+server = ["tonic/channel", "tonic/transport", "platform"]
 serde = ["dep:serde", "dep:serde_bytes"]
+mocks = ["dep:serde_json"]
 
 [dependencies]
-prost = { version = "0.11.9" }
-tonic = { version = "0.9.2", features = [
-    "codegen",
-    "prost",
+prost = { version = "0.12.3" }
+futures-core = "0.3.30"
+tonic = { version = "0.11", features = [
+  "codegen",
+  "prost",
 ], default-features = false }
-serde = { version = "1.0.171", optional = true, features = ["derive"] }
+serde = { version = "1.0.197", 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.12", default-features = false }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 
@@ -49,4 +63,4 @@ name = "platform_example"
 path = "clients/platform/v0/rust/platform_example.rs"
 
 [package.metadata.cargo-machete]
-ignored = ["platform-version", "serde_bytes"]
+ignored = ["platform-version", "serde_bytes", "futures-core"]

package/build.rs

@@ -6,7 +6,23 @@ 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 +34,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; 18] = [
         "GetDataContractHistoryRequest",
         "GetDataContractRequest",
         "GetDataContractsRequest",
         "GetDocumentsRequest",
         "GetIdentitiesByPublicKeyHashesRequest",
         "GetIdentitiesRequest",
+        "GetIdentityNonceRequest",
+        "GetIdentityContractNonceRequest",
         "GetIdentityBalanceAndRevisionRequest",
         "GetIdentityBalanceRequest",
         "GetIdentityByPublicKeyHashRequest",
@@ -50,10 +57,11 @@ pub fn generate() -> Result<(), std::io::Error> {
         "WaitForStateTransitionResultRequest",
         "GetProtocolVersionUpgradeStateRequest",
         "GetProtocolVersionUpgradeVoteStatusRequest",
+        "GetPathElementsRequest",
     ];
 
     //  "GetConsensusParamsResponse" is excluded as this message does not support proofs
-    const VERSIONED_RESPONSES: [&str; 16] = [
+    const VERSIONED_RESPONSES: [&str; 19] = [
         "GetDataContractHistoryResponse",
         "GetDataContractResponse",
         "GetDataContractsResponse",
@@ -62,6 +70,8 @@ pub fn generate() -> Result<(), std::io::Error> {
         "GetIdentitiesResponse",
         "GetIdentityBalanceAndRevisionResponse",
         "GetIdentityBalanceResponse",
+        "GetIdentityNonceResponse",
+        "GetIdentityContractNonceResponse",
         "GetIdentityByPublicKeyHashResponse",
         "GetIdentityKeysResponse",
         "GetIdentityResponse",
@@ -70,6 +80,7 @@ pub fn generate() -> Result<(), std::io::Error> {
         "GetEpochsInfoResponse",
         "GetProtocolVersionUpgradeStateResponse",
         "GetProtocolVersionUpgradeVoteStatusResponse",
+        "GetPathElementsResponse",
     ];
 
     // Derive VersionedGrpcMessage on requests
@@ -92,6 +103,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 +146,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
+}
 
-    Ok(())
+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)]"#,
+    );
+
+    core
 }
 
 impl MappingConfig {
@@ -142,16 +168,16 @@ impl MappingConfig {
         let protobuf_file = abs_path(&protobuf_file);
         let out_dir = abs_path(&out_dir);
 
+        let build_server = cfg!(feature = "server");
+        let build_client = cfg!(feature = "client");
+
         let builder = tonic_build::configure()
-            .build_server(false)
+            .build_server(build_server)
+            .build_client(build_client)
+            .build_transport(build_server || build_client)
             .out_dir(out_dir.clone())
             .protoc_arg("--experimental_allow_proto3_optional");
 
-        #[cfg(feature = "client")]
-        let builder = builder.build_client(true).build_transport(true);
-        #[cfg(not(feature = "client"))]
-        let builder = builder.build_client(false).build_transport(false);
-
         Self {
             protobuf_file,
             out_dir,

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,14 @@ const {
               PBJSGetProtocolVersionUpgradeVoteStatusResponse,
             GetProtocolVersionUpgradeStateRequest: PBJSGetProtocolVersionUpgradeStateRequest,
             GetProtocolVersionUpgradeStateResponse: PBJSGetProtocolVersionUpgradeStateResponse,
+            GetProofsRequest: PBJSGetProofsRequest,
+            GetProofsResponse: PBJSGetProofsResponse,
+            GetIdentityContractNonceRequest: PBJSGetIdentityContractNonceRequest,
+            GetIdentityContractNonceResponse: PBJSGetIdentityContractNonceResponse,
+            GetIdentityNonceRequest: PBJSGetIdentityNonceRequest,
+            GetIdentityNonceResponse: PBJSGetIdentityNonceResponse,
+            GetIdentityKeysRequest: PBJSGetIdentityKeysRequest,
+            GetIdentityKeysResponse: PBJSGetIdentityKeysResponse,
           },
         },
       },
@@ -67,6 +75,10 @@ const {
   GetEpochsInfoResponse: ProtocGetEpochsInfoResponse,
   GetProtocolVersionUpgradeVoteStatusResponse: ProtocGetProtocolVersionUpgradeVoteStatusResponse,
   GetProtocolVersionUpgradeStateResponse: ProtocGetProtocolVersionUpgradeStateResponse,
+  GetProofsResponse: ProtocGetProofsResponse,
+  GetIdentityContractNonceResponse: ProtocGetIdentityContractNonceResponse,
+  GetIdentityNonceResponse: ProtocGetIdentityNonceResponse,
+  GetIdentityKeysResponse: ProtocGetIdentityKeysResponse,
 } = require('./platform_protoc');
 
 const getPlatformDefinition = require('../../../../lib/getPlatformDefinition');
@@ -137,6 +149,22 @@ class PlatformPromiseClient {
       this.client.getProtocolVersionUpgradeState.bind(this.client),
     );
 
+    this.client.getProofs = promisify(
+      this.client.getProofs.bind(this.client),
+    );
+
+    this.client.getIdentityContractNonce = promisify(
+      this.client.getIdentityContractNonce.bind(this.client),
+    );
+
+    this.client.getIdentityNonce = promisify(
+      this.client.getIdentityNonce.bind(this.client),
+    );
+
+    this.client.getIdentityKeys = promisify(
+      this.client.getIdentityKeys.bind(this.client),
+    );
+
     this.protocolVersion = undefined;
   }
 
@@ -496,6 +524,131 @@ class PlatformPromiseClient {
     );
   }
 
+  /**
+   *
+   * @param {!GetProofsRequest} request
+   * @param {?Object<string, string>} metadata
+   * @param {CallOptions} [options={}]
+   * @returns {Promise<!GetProofsResponse>}
+   */
+  getProofs(request, metadata = {}, options = {}) {
+    if (!isObject(metadata)) {
+      throw new Error('metadata must be an object');
+    }
+
+    return this.client.getProofs(
+      request,
+      convertObjectToMetadata(metadata),
+      {
+        interceptors: [
+          jsonToProtobufInterceptorFactory(
+            jsonToProtobufFactory(
+              ProtocGetProofsResponse,
+              PBJSGetProofsResponse,
+            ),
+            protobufToJsonFactory(
+              PBJSGetProofsRequest,
+            ),
+          ),
+        ],
+        ...options,
+      },
+    );
+  }
+
+  /**
+   * @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,
+      },
+    );
+  }
+
+  getIdentityKeys(
+    getIdentityKeysRequest,
+    metadata = {},
+    options = {},
+  ) {
+    if (!isObject(metadata)) {
+      throw new Error('metadata must be an object');
+    }
+
+    return this.client.getIdentityKeys(
+      getIdentityKeysRequest,
+      convertObjectToMetadata(metadata),
+      {
+        interceptors: [
+          jsonToProtobufInterceptorFactory(
+            jsonToProtobufFactory(
+              ProtocGetIdentityKeysResponse,
+              PBJSGetIdentityKeysResponse,
+            ),
+            protobufToJsonFactory(
+              PBJSGetIdentityKeysRequest,
+            ),
+          ),
+        ],
+        ...options,
+      },
+    );
+  }
+
   /**
    * @param {string} protocolVersion
    */