@dashevo/dapi-grpc 2.0.0-dev.1 → 2.0.0-rc.2

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "2.0.0-dev.1"
+version = "2.0.0-rc.2"
 authors = [
   "Samuel Westrich <sam@dash.org>",
   "Igor Markin <igor.markin@dash.org>",
@@ -15,6 +15,8 @@ license = "MIT"
 
 [features]
 default = ["core", "platform", "client"]
+# Internal Drive endpoints. Used by DAPI
+drive = ["platform"]
 core = []
 platform = []
 # Re-export Dash Platform protobuf types as `dapi_grpc::platform::proto`
@@ -25,21 +27,28 @@ tenderdash-proto = []
 client = ["platform"]
 
 # Build tonic server code. Includes all client features and adds server-specific dependencies.
-server = ["platform", "tenderdash-proto/server", "client"]
+server = [
+  "platform",
+  "tenderdash-proto/server",
+  "client",
+  "drive",
+  "tonic/router",
+]
 
 serde = ["dep:serde", "dep:serde_bytes", "tenderdash-proto/serde"]
 mocks = ["serde", "dep:serde_json"]
 
 [dependencies]
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.3.0", tag = "v1.3.0+1.3.0", default-features = false }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.4.0", tag = "v1.4.0", default-features = false }
 
 prost = { version = "0.13" }
 futures-core = "0.3.30"
-tonic = { version = "0.12.3", features = [
+tonic = { version = "0.13.0", features = [
   "codegen",
   "prost",
+  "tls-ring",
 ], default-features = false }
-serde = { version = "1.0.197", optional = true, features = ["derive"] }
+serde = { version = "1.0.219", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
 serde_json = { version = "1.0", optional = true }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
@@ -49,18 +58,18 @@ platform-version = { path = "../rs-platform-version" }
 getrandom = { version = "0.2", features = ["js"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tonic = { version = "0.12.3", features = [
+tonic = { version = "0.13.0", features = [
   "codegen",
   "prost",
   "channel",
   "transport",
-  "tls",
-  "tls-roots",
+  "tls-native-roots",
   "tls-webpki-roots",
+  "tls-ring",
 ], default-features = false }
 
 [build-dependencies]
-tonic-build = { version = "0.12.3" }
+tonic-build = { version = "0.13.0" }
 
 [lib]
 

package/build.rs

@@ -47,6 +47,16 @@ fn generate_code(typ: ImplType) {
         .generate()
         .expect("generate platform proto");
 
+    let drive = MappingConfig::new(
+        PathBuf::from("protos/drive/v0/drive.proto"),
+        PathBuf::from("src/drive"),
+        &typ,
+    );
+
+    configure_drive(drive)
+        .generate()
+        .expect("generate platform proto");
+
     println!("cargo:rerun-if-changed=./protos");
     println!("cargo:rerun-if-env-changed=CARGO_FEATURE_SERDE");
     println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_ARCH");
@@ -63,7 +73,7 @@ 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; 40] = [
+    const VERSIONED_REQUESTS: [&str; 42] = [
         "GetDataContractHistoryRequest",
         "GetDataContractRequest",
         "GetDataContractsRequest",
@@ -75,10 +85,10 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetIdentityContractNonceRequest",
         "GetIdentityBalanceAndRevisionRequest",
         "GetIdentityBalanceRequest",
+        "GetIdentityByNonUniquePublicKeyHashRequest",
         "GetIdentityByPublicKeyHashRequest",
         "GetIdentityKeysRequest",
         "GetIdentityRequest",
-        "GetProofsRequest",
         "WaitForStateTransitionResultRequest",
         "GetProtocolVersionUpgradeStateRequest",
         "GetProtocolVersionUpgradeVoteStatusRequest",
@@ -96,8 +106,10 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetStatusRequest",
         "GetIdentityTokenBalancesRequest",
         "GetIdentitiesTokenBalancesRequest",
+        "GetTokenPerpetualDistributionLastClaimRequest",
         "GetIdentityTokenInfosRequest",
         "GetIdentitiesTokenInfosRequest",
+        "GetTokenDirectPurchasePricesRequest",
         "GetTokenStatusesRequest",
         "GetTokenTotalSupplyRequest",
         "GetGroupInfoRequest",
@@ -110,8 +122,11 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
     // - "GetConsensusParamsResponse"
     // - "GetStatusResponse"
     //
+    // The following responses are excluded as they need custom proof handling:
+    // - "GetIdentityByNonUniquePublicKeyHashResponse"
+    //
     //  "GetEvonodesProposedEpochBlocksResponse" is used for 2 Requests
-    const VERSIONED_RESPONSES: [&str; 39] = [
+    const VERSIONED_RESPONSES: [&str; 40] = [
         "GetDataContractHistoryResponse",
         "GetDataContractResponse",
         "GetDataContractsResponse",
@@ -126,7 +141,6 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetIdentityByPublicKeyHashResponse",
         "GetIdentityKeysResponse",
         "GetIdentityResponse",
-        "GetProofsResponse",
         "WaitForStateTransitionResultResponse",
         "GetEpochsInfoResponse",
         "GetProtocolVersionUpgradeStateResponse",
@@ -143,8 +157,10 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
         "GetEvonodesProposedEpochBlocksResponse",
         "GetIdentityTokenBalancesResponse",
         "GetIdentitiesTokenBalancesResponse",
+        "GetTokenPerpetualDistributionLastClaimResponse",
         "GetIdentityTokenInfosResponse",
         "GetIdentitiesTokenInfosResponse",
+        "GetTokenDirectPurchasePricesResponse",
         "GetTokenStatusesResponse",
         "GetTokenTotalSupplyResponse",
         "GetGroupInfoResponse",
@@ -210,6 +226,19 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
     platform
 }
 
+fn configure_drive(drive: MappingConfig) -> MappingConfig {
+    drive
+        .message_attribute(".", r#"#[derive( ::dapi_grpc_macros::Mockable)]"#)
+        .type_attribute(
+            ".",
+            r#"#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]"#,
+        )
+        .type_attribute(
+            ".",
+            r#"#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]"#,
+        )
+}
+
 /// Check for duplicate messages in the list.
 fn check_unique(messages: &[&'static str]) -> Result<(), String> {
     let mut hashset: HashSet<&'static str> = HashSet::new();
@@ -322,6 +351,14 @@ impl MappingConfig {
         self
     }
 
+    #[allow(unused)]
+    fn includes(mut self, includes: &[PathBuf]) -> Self {
+        for include in includes {
+            self.proto_includes.push(abs_path(include));
+        }
+        self
+    }
+
     #[allow(unused)]
     fn field_attribute(mut self, path: &str, attribute: &str) -> Self {
         self.builder = self.builder.field_attribute(path, attribute);

package/clients/drive/v0/nodejs/DrivePromiseClient.js

@@ -0,0 +1,111 @@
+const grpc = require('@grpc/grpc-js');
+const { promisify } = require('util');
+
+const {
+  convertObjectToMetadata,
+  utils: {
+    isObject,
+  },
+  client: {
+    interceptors: {
+      jsonToProtobufInterceptorFactory,
+    },
+    converters: {
+      jsonToProtobufFactory,
+      protobufToJsonFactory,
+    },
+  },
+} = require('@dashevo/grpc-common');
+
+const { URL } = require('url');
+const {
+  org: {
+    dash: {
+      platform: {
+        drive: {
+          v0: {
+            GetProofsRequest: PBJSGetProofsRequest,
+            GetProofsResponse: PBJSGetProofsResponse,
+          },
+        },
+      },
+    },
+  },
+} = require('./drive_pbjs');
+
+const {
+  GetProofsResponse: ProtocGetProofsResponse,
+} = require('./drive_protoc');
+
+const getDriveDefinition = require('../../../../lib/getDriveDefinition');
+
+const DriveNodeJSClient = getDriveDefinition(0);
+
+class DrivePromiseClient {
+  /**
+   * @param {string} hostname
+   * @param {?Object} credentials
+   * @param {?Object} options
+   */
+  constructor(hostname, credentials, options = {}) {
+    if (credentials !== undefined) {
+      throw new Error('"credentials" option is not supported yet');
+    }
+
+    const url = new URL(hostname);
+    const { protocol, host: strippedHostname } = url;
+
+    // See this issue https://github.com/nodejs/node/issues/3176
+    // eslint-disable-next-line no-param-reassign
+    credentials = protocol.replace(':', '') === 'https' ? grpc.credentials.createSsl() : grpc.credentials.createInsecure();
+
+    this.client = new DriveNodeJSClient(strippedHostname, credentials, options);
+
+    this.client.getProofs = promisify(
+      this.client.getProofs.bind(this.client),
+    );
+
+    this.protocolVersion = undefined;
+  }
+
+  /**
+   *
+   * @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 {string} protocolVersion
+   */
+  setProtocolVersion(protocolVersion) {
+    this.protocolVersion = protocolVersion;
+  }
+}
+
+module.exports = DrivePromiseClient;