@dashevo/dapi-grpc 0.24.0-dev.6 → 0.25.0-dev.2

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

@@ -0,0 +1,301 @@
+// package: org.dash.platform.dapi.v0
+// file: platform.proto
+
+var platform_pb = require("./platform_pb");
+var grpc = require("@improbable-eng/grpc-web").grpc;
+
+var Platform = (function () {
+  function Platform() {}
+  Platform.serviceName = "org.dash.platform.dapi.v0.Platform";
+  return Platform;
+}());
+
+Platform.broadcastStateTransition = {
+  methodName: "broadcastStateTransition",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.BroadcastStateTransitionRequest,
+  responseType: platform_pb.BroadcastStateTransitionResponse
+};
+
+Platform.getIdentity = {
+  methodName: "getIdentity",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.GetIdentityRequest,
+  responseType: platform_pb.GetIdentityResponse
+};
+
+Platform.getDataContract = {
+  methodName: "getDataContract",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.GetDataContractRequest,
+  responseType: platform_pb.GetDataContractResponse
+};
+
+Platform.getDocuments = {
+  methodName: "getDocuments",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.GetDocumentsRequest,
+  responseType: platform_pb.GetDocumentsResponse
+};
+
+Platform.getIdentitiesByPublicKeyHashes = {
+  methodName: "getIdentitiesByPublicKeyHashes",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.GetIdentitiesByPublicKeyHashesRequest,
+  responseType: platform_pb.GetIdentitiesByPublicKeyHashesResponse
+};
+
+Platform.waitForStateTransitionResult = {
+  methodName: "waitForStateTransitionResult",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.WaitForStateTransitionResultRequest,
+  responseType: platform_pb.WaitForStateTransitionResultResponse
+};
+
+Platform.getConsensusParams = {
+  methodName: "getConsensusParams",
+  service: Platform,
+  requestStream: false,
+  responseStream: false,
+  requestType: platform_pb.GetConsensusParamsRequest,
+  responseType: platform_pb.GetConsensusParamsResponse
+};
+
+exports.Platform = Platform;
+
+function PlatformClient(serviceHost, options) {
+  this.serviceHost = serviceHost;
+  this.options = options || {};
+}
+
+PlatformClient.prototype.broadcastStateTransition = function broadcastStateTransition(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.broadcastStateTransition, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.getIdentity = function getIdentity(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.getIdentity, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.getDataContract = function getDataContract(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.getDataContract, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.getDocuments = function getDocuments(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.getDocuments, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.getIdentitiesByPublicKeyHashes = function getIdentitiesByPublicKeyHashes(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.getIdentitiesByPublicKeyHashes, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.waitForStateTransitionResult = function waitForStateTransitionResult(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.waitForStateTransitionResult, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+PlatformClient.prototype.getConsensusParams = function getConsensusParams(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(Platform.getConsensusParams, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
+exports.PlatformClient = PlatformClient;
+

package/lib/utils/parseMetadata.js

@@ -0,0 +1,27 @@
+const { Metadata: MetadataGrpcJS } = require('@grpc/grpc-js/build/src/metadata');
+const { grpc: { Metadata: MetadataGrpcWeb } } = require('@improbable-eng/grpc-web');
+
+/**
+ *
+ * @param {MetadataGrpcJS|MetadataGrpcWeb} metadata
+ * @return {{}|{[p: string]: string}}
+ */
+const parseMetadata = (metadata) => {
+  if (metadata instanceof MetadataGrpcJS) {
+    return metadata.getMap();
+  } if (metadata instanceof MetadataGrpcWeb) {
+    const parsedMetadata = {};
+    metadata.forEach((key, values) => {
+      // Mapping each key to the first value associated with it.
+      // This corresponds to the getMap() behaviour of the grpc-js Metadata class.
+      const [value] = values;
+      parsedMetadata[key] = value;
+    });
+
+    return parsedMetadata;
+  }
+
+  return metadata;
+};
+
+module.exports = parseMetadata;

package/node.js

@@ -1,3 +1,4 @@
+const { Metadata } = require('@grpc/grpc-js/build/src/metadata');
 const CorePromiseClient = require('./clients/core/v0/nodejs/CorePromiseClient');
 const PlatformPromiseClient = require('./clients/platform/v0/nodejs/PlatformPromiseClient');
 
@@ -6,6 +7,7 @@ const protocPlatformMessages = require('./clients/platform/v0/nodejs/platform_pr
 
 const getCoreDefinition = require('./lib/getCoreDefinition');
 const getPlatformDefinition = require('./lib/getPlatformDefinition');
+const parseMetadata = require('./lib/utils/parseMetadata');
 
 const {
   org: {
@@ -45,4 +47,6 @@ module.exports = {
     ...protocCoreMessages,
     ...protocPlatformMessages,
   },
+  parseMetadata,
+  Metadata,
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "0.24.0-dev.6",
+  "version": "0.25.0-dev.2",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
   "scripts": {
-    "build": "yarn exec scripts/build.sh",
+    "build": "yarn exec scripts/build.sh && yarn exec scripts/patch-protobuf-js.sh",
     "lint": "eslint .",
     "prepublishOnly": "yarn run build",
     "test": "yarn run test:unit",
@@ -33,11 +33,11 @@
   },
   "homepage": "https://github.com/dashevo/dapi-grpc#readme",
   "dependencies": {
-    "@dashevo/grpc-common": "0.24.0-dev.6",
+    "@dashevo/grpc-common": "0.25.0-dev.2",
     "@dashevo/protobufjs": "6.10.5",
     "@grpc/grpc-js": "^1.3.7",
+    "@improbable-eng/grpc-web": "^0.15.0",
     "google-protobuf": "^3.12.2",
-    "grpc-web": "1.2.1",
     "long": "^5.2.0"
   },
   "devDependencies": {

package/protos/platform/v0/platform.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package org.dash.platform.dapi.v0;
 
+import "google/protobuf/timestamp.proto";
+
 service Platform {
   rpc broadcastStateTransition (BroadcastStateTransitionRequest) returns (BroadcastStateTransitionResponse);
   rpc getIdentity (GetIdentityRequest) returns (GetIdentityResponse);
@@ -14,13 +16,16 @@ service Platform {
 
 message Proof {
   bytes merkle_proof = 1;
-  bytes signature_llmq_hash = 2;
+  bytes quorum_hash = 2;
   bytes signature = 3;
+  uint32 round = 4;
 }
 
 message ResponseMetadata {
   int64 height = 1;
   uint32 core_chain_locked_height = 2;
+  uint64 time_ms = 3;
+  uint32 protocol_version = 4;
 }
 
 message StateTransitionBroadcastError {

package/scripts/build.sh

@@ -18,7 +18,7 @@ PLATFORM_OBJ_C_OUT_PATH="$PLATFORM_CLIENTS_PATH/objective-c"
 CORE_PYTHON_OUT_PATH="$CORE_CLIENTS_PATH/python"
 PLATFORM_PYTHON_OUT_PATH="$PLATFORM_CLIENTS_PATH/python"
 
-PROTOC_IMAGE="strophy/protoc:4.0.0"
+PROTOC_IMAGE="rvolosatovs/protoc:4.0.0"
 
 #################################################
 # Generate JavaScript client for `Core` service #
@@ -31,7 +31,7 @@ docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
            --rm \
            "$PROTOC_IMAGE" \
            --js_out="import_style=commonjs:$CORE_WEB_OUT_PATH" \
-           --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CORE_WEB_OUT_PATH" \
+           --ts_out="service=grpc-web:$CORE_WEB_OUT_PATH" \
            -I="$CORE_PROTO_PATH" \
            "core.proto"
 
@@ -63,7 +63,7 @@ docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
            --rm \
            "$PROTOC_IMAGE" \
            --js_out="import_style=commonjs:$PLATFORM_WEB_OUT_PATH" \
-           --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$PLATFORM_WEB_OUT_PATH" \
+           --ts_out="service=grpc-web:$PLATFORM_WEB_OUT_PATH" \
            -I="$PLATFORM_PROTO_PATH" \
            "platform.proto"
 

package/scripts/patch-protobuf-js.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+files=$(find "$PWD/clients/core/v0/web" "$PWD/clients/core/v0/nodejs" "$PWD/clients/platform/v0/web" "$PWD/clients/platform/v0/nodejs" -name "*_pb.js" -o -name "*_protoc.js")
+OS=$(uname)
+
+function replace_in_file() {
+    if [ "$OS" = 'Darwin' ]; then
+        # for MacOS
+        sed -i '' -e "$1" "$2"
+    else
+        # for Linux and Windows
+        sed -i'' -e "$1" "$2"
+    fi
+}
+
+# Loop over the files
+for file in $files
+do
+
+  replace_in_file 's/var global = Function('\''return this'\'')();/const proto = {};/g' "$file"
+  if grep -qrE "[^a-zA-Z]Function\(" "$file"; then
+    echo "Error: Function( still present"
+  fi
+
+  replace_in_file 's/, global);/, { proto });/g' "$file"
+  if grep -qrE '(^|[^a-zA-Z."])global([^a-zA-Z]|$)' "$file"; then
+    echo "Error: global still present"
+  fi
+
+done