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

package/Cargo.toml

@@ -1,38 +1,45 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.0.0-dev.5"
+version = "1.0.0-dev.7"
 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`
 tenderdash-proto = []
 client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
+server = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "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_bytes = { version = "0.11.12", optional = true }
 serde_json = { version = "1.0", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.6" }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "81d28aa0b15fc0844dfa7f7251f6949f6c6c405a", features = [
+  "grpc-server",
+] }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 

package/build.rs

@@ -10,6 +10,7 @@ fn main() {
         PathBuf::from("protos/core/v0/core.proto"),
         PathBuf::from("src/core/proto"),
     );
+
     configure_core(core)
         .generate()
         .expect("generate core proto");
@@ -18,6 +19,7 @@ fn main() {
         PathBuf::from("protos/platform/v0/platform.proto"),
         PathBuf::from("src/platform/proto"),
     );
+
     configure_platform(platform)
         .generate()
         .expect("generate platform proto");
@@ -164,16 +166,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/platform/v0/nodejs/PlatformPromiseClient.js

@@ -48,10 +48,14 @@ const {
               PBJSGetProtocolVersionUpgradeVoteStatusResponse,
             GetProtocolVersionUpgradeStateRequest: PBJSGetProtocolVersionUpgradeStateRequest,
             GetProtocolVersionUpgradeStateResponse: PBJSGetProtocolVersionUpgradeStateResponse,
+            GetProofsRequest: PBJSGetProofsRequest,
+            GetProofsResponse: PBJSGetProofsResponse,
             GetIdentityContractNonceRequest: PBJSGetIdentityContractNonceRequest,
             GetIdentityContractNonceResponse: PBJSGetIdentityContractNonceResponse,
             GetIdentityNonceRequest: PBJSGetIdentityNonceRequest,
             GetIdentityNonceResponse: PBJSGetIdentityNonceResponse,
+            GetIdentityKeysRequest: PBJSGetIdentityKeysRequest,
+            GetIdentityKeysResponse: PBJSGetIdentityKeysResponse,
           },
         },
       },
@@ -71,8 +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');
@@ -143,6 +149,10 @@ 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),
     );
@@ -151,6 +161,10 @@ class PlatformPromiseClient {
       this.client.getIdentityNonce.bind(this.client),
     );
 
+    this.client.getIdentityKeys = promisify(
+      this.client.getIdentityKeys.bind(this.client),
+    );
+
     this.protocolVersion = undefined;
   }
 
@@ -510,6 +524,38 @@ 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
@@ -574,6 +620,35 @@ class PlatformPromiseClient {
     );
   }
 
+  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
    */

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

@@ -204,6 +204,20 @@ class PlatformPromiseClient {
     );
   }
 
+  /**
+   * @param {!GetIdentityKeysRequest} getIdentityKeysRequest
+   * @param {?Object<string, string>} metadata
+   * @return {Promise<!GetIdentityKeysResponse>}
+   */
+  getIdentityKeys(getIdentityKeysRequest, metadata = {}) {
+    return promisify(
+      this.client.getIdentityKeys.bind(this.client),
+    )(
+      getIdentityKeysRequest,
+      metadata,
+    );
+  }
+
   /**
    * @param {string} protocolVersion
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "1.0.0-dev.5",
+  "version": "1.0.0-dev.7",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
@@ -45,7 +45,7 @@
   },
   "homepage": "https://github.com/dashevo/dapi-grpc#readme",
   "dependencies": {
-    "@dashevo/grpc-common": "1.0.0-dev.5",
+    "@dashevo/grpc-common": "1.0.0-dev.7",
     "@dashevo/protobufjs": "6.10.5",
     "@grpc/grpc-js": "1.4.4",
     "@improbable-eng/grpc-web": "^0.15.0",