@dashevo/dapi-grpc 1.0.0-pr.1694.9 → 1.0.0-pr.1825.10

package/Cargo.toml

@@ -1,26 +1,37 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.0.0-pr.1694.9"
+version = "1.0.0-pr.1825.10"
 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.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"]
-server = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
+client = [
+  "tonic/channel",
+  "tonic/transport",
+  "tonic/tls",
+  "tonic/tls-roots",
+  "tonic/tls-webpki-roots",
+  "platform",
+]
+server = ["tonic/channel", "tonic/transport", "platform"]
 serde = ["dep:serde", "dep:serde_bytes"]
 mocks = ["dep:serde_json"]
 
@@ -28,15 +39,13 @@ mocks = ["dep:serde_json"]
 prost = { version = "0.12.3" }
 futures-core = "0.3.30"
 tonic = { version = "0.11", features = [
-    "codegen",
-    "prost",
+  "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 }
 serde_json = { version = "1.0", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "47d4105a49a4a332d5578a91371333686c7c5b1a", features = [
-    "grpc-server",
-] }
+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" }
 
@@ -55,4 +64,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

@@ -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");
@@ -37,13 +39,15 @@ 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",
@@ -53,10 +57,11 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "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",
@@ -65,6 +70,8 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetIdentitiesResponse",
         "GetIdentityBalanceAndRevisionResponse",
         "GetIdentityBalanceResponse",
+        "GetIdentityNonceResponse",
+        "GetIdentityContractNonceResponse",
         "GetIdentityByPublicKeyHashResponse",
         "GetIdentityKeysResponse",
         "GetIdentityResponse",
@@ -73,6 +80,7 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetEpochsInfoResponse",
         "GetProtocolVersionUpgradeStateResponse",
         "GetProtocolVersionUpgradeVoteStatusResponse",
+        "GetPathElementsResponse",
     ];
 
     // Derive VersionedGrpcMessage on requests

package/clients/core/v0/nodejs/CorePromiseClient.js

@@ -24,8 +24,10 @@ const {
       platform: {
         dapi: {
           v0: {
-            GetStatusRequest: PBJSGetStatusRequest,
-            GetStatusResponse: PBJSGetStatusResponse,
+            GetBlockchainStatusRequest: PBJSGetBlockchainStatusRequest,
+            GetBlockchainStatusResponse: PBJSGetBlockchainStatusResponse,
+            GetMasternodeStatusRequest: PBJSGetMasternodeStatusRequest,
+            GetMasternodeStatusResponse: PBJSGetMasternodeStatusResponse,
             GetBlockRequest: PBJSGetBlockRequest,
             GetBlockResponse: PBJSGetBlockResponse,
             BroadcastTransactionRequest: PBJSBroadcastTransactionRequest,
@@ -46,7 +48,8 @@ const {
 } = require('./core_pbjs');
 
 const {
-  GetStatusResponse: ProtocGetStatusResponse,
+  GetBlockchainStatusResponse: ProtocGetBlockchainStatusResponse,
+  GetMasternodeStatusResponse: ProtocGetMasternodeStatusResponse,
   GetBlockResponse: ProtocGetBlockResponse,
   BroadcastTransactionResponse: ProtocBroadcastTransactionResponse,
   GetTransactionResponse: ProtocGetTransactionResponse,
@@ -79,8 +82,12 @@ class CorePromiseClient {
 
     this.client = new CoreNodeJSClient(strippedHostname, credentials, options);
 
-    this.client.getStatus = promisify(
-      this.client.getStatus.bind(this.client),
+    this.client.getBlockchainStatus = promisify(
+      this.client.getBlockchainStatus.bind(this.client),
+    );
+
+    this.client.getMasternodeStatus = promisify(
+      this.client.getMasternodeStatus.bind(this.client),
     );
 
     this.client.getBlock = promisify(
@@ -101,28 +108,28 @@ class CorePromiseClient {
   }
 
   /**
-   * @param {!GetStatusRequest} getStatusRequest
+   * @param {!GetBlockchainStatusRequest} getBlockchainStatusRequest
    * @param {?Object<string, string>} metadata
    * @param {CallOptions} [options={}]
-   * @return {Promise<!GetStatusResponse>}
+   * @return {Promise<!GetBlockchainStatusResponse>}
    */
-  getStatus(getStatusRequest, metadata = {}, options = {}) {
+  getBlockchainStatus(getBlockchainStatusRequest, metadata = {}, options = {}) {
     if (!isObject(metadata)) {
       throw new Error('metadata must be an object');
     }
 
-    return this.client.getStatus(
-      getStatusRequest,
+    return this.client.getBlockchainStatus(
+      getBlockchainStatusRequest,
       convertObjectToMetadata(metadata),
       {
         interceptors: [
           jsonToProtobufInterceptorFactory(
             jsonToProtobufFactory(
-              ProtocGetStatusResponse,
-              PBJSGetStatusResponse,
+              ProtocGetBlockchainStatusResponse,
+              PBJSGetBlockchainStatusResponse,
             ),
             protobufToJsonFactory(
-              PBJSGetStatusRequest,
+              PBJSGetBlockchainStatusRequest,
             ),
           ),
         ],
@@ -162,6 +169,37 @@ class CorePromiseClient {
     );
   }
 
+  /**
+   * @param {!GetMasternodeStatusRequest} getMasternodeStatusRequest
+   * @param {?Object<string, string>} metadata
+   * @param {CallOptions} [options={}]
+   * @return {Promise<!GetMasternodeStatusResponse>}
+   */
+  getMasternodeStatus(getMasternodeStatusRequest, metadata = {}, options = {}) {
+    if (!isObject(metadata)) {
+      throw new Error('metadata must be an object');
+    }
+
+    return this.client.getMasternodeStatus(
+      getMasternodeStatusRequest,
+      convertObjectToMetadata(metadata),
+      {
+        interceptors: [
+          jsonToProtobufInterceptorFactory(
+            jsonToProtobufFactory(
+              ProtocGetMasternodeStatusResponse,
+              PBJSGetMasternodeStatusResponse,
+            ),
+            protobufToJsonFactory(
+              PBJSGetMasternodeStatusRequest,
+            ),
+          ),
+        ],
+        ...options,
+      },
+    );
+  }
+
   /**
    * @param {!BroadcastTransactionRequest} broadcastTransactionRequest
    * @param {?Object<string, string>} metadata