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

package/protos/platform/v0/platform.proto

@@ -1,26 +1,40 @@
 syntax = "proto3";
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/struct.proto";
 
 package org.dash.platform.dapi.v0;
 
+import "google/protobuf/timestamp.proto";
+
 service Platform {
   rpc broadcastStateTransition (BroadcastStateTransitionRequest) returns (BroadcastStateTransitionResponse);
   rpc getIdentity (GetIdentityRequest) returns (GetIdentityResponse);
+  rpc getIdentityKeys (GetIdentityKeysRequest) returns (GetIdentityKeysResponse);
+//  rpc getIdentitiesKeys (GetIdentitiesKeysRequest) returns (GetIdentitiesKeysResponse);
+  rpc getIdentityBalance(GetIdentityRequest) returns (GetIdentityBalanceResponse);
+  rpc getIdentityBalanceAndRevision(GetIdentityRequest)
+          returns (GetIdentityBalanceAndRevisionResponse);
   rpc getDataContract (GetDataContractRequest) returns (GetDataContractResponse);
+  rpc getDataContracts (GetDataContractsRequest) returns (GetDataContractsResponse);
   rpc getDocuments (GetDocumentsRequest) returns (GetDocumentsResponse);
   rpc getIdentitiesByPublicKeyHashes (GetIdentitiesByPublicKeyHashesRequest) returns (GetIdentitiesByPublicKeyHashesResponse);
+  rpc getIdentityByPublicKeyHashes (GetIdentityByPublicKeyHashesRequest) returns (GetIdentityByPublicKeyHashesResponse);
   rpc waitForStateTransitionResult (WaitForStateTransitionResultRequest) returns (WaitForStateTransitionResultResponse);
   rpc getConsensusParams (GetConsensusParamsRequest) returns (GetConsensusParamsResponse);
 }
 
 message Proof {
-  bytes merkle_proof = 1;
-  bytes signature_llmq_hash = 2;
+  bytes grovedb_proof = 1;
+  bytes quorum_hash = 2;
   bytes signature = 3;
+  uint32 round = 4;
 }
 
 message ResponseMetadata {
-  int64 height = 1;
+  uint64 height = 1;
   uint32 core_chain_locked_height = 2;
+  uint64 time_ms = 3;
+  uint32 protocol_version = 4;
 }
 
 message StateTransitionBroadcastError {
@@ -48,7 +62,104 @@ message GetIdentityResponse {
   ResponseMetadata metadata = 3;
 }
 
- message GetDataContractRequest {
+message GetIdentityBalanceResponse {
+  google.protobuf.UInt64Value balance = 1;
+  Proof proof = 2;
+  ResponseMetadata metadata = 3;
+}
+
+message GetIdentityBalanceAndRevisionResponse {
+  google.protobuf.UInt64Value  balance = 1;
+  google.protobuf.UInt64Value  revision = 2;
+  Proof proof = 3;
+  ResponseMetadata metadata = 4;
+}
+
+message KeyRequestType {
+  oneof request {
+    AllKeys all_keys = 1;
+    SpecificKeys specific_keys = 2;
+    SearchKey search_key = 3;
+  }
+}
+
+message AllKeys {
+}
+
+message SpecificKeys {
+  repeated uint32 key_ids = 1;
+}
+
+message SearchKey {
+  map<uint32, SecurityLevelMap> purpose_map = 1;
+}
+
+message SecurityLevelMap {
+  enum KeyKindRequestType {
+    CURRENT_KEY_OF_KIND_REQUEST = 0;
+    ALL_KEYS_OF_KIND_REQUEST = 1;
+  }
+  map<uint32, KeyKindRequestType> security_level_map = 1;
+}
+
+message GetIdentityKeysRequest {
+  bytes identity_id = 1;
+  KeyRequestType request_type = 2;
+  google.protobuf.UInt32Value limit = 3;
+  google.protobuf.UInt32Value offset = 4;
+  bool prove = 5;
+}
+
+message GetIdentityKeysResponse {
+  message Keys {
+    repeated bytes keys_bytes = 1;
+  }
+  oneof result {
+    Keys keys = 1;
+    Proof proof = 2;
+  }
+  ResponseMetadata metadata = 3;
+}
+
+
+message GetIdentitiesKeysRequest {
+  repeated bytes identity_ids = 1;
+  KeyRequestType request_type = 2;
+  google.protobuf.UInt32Value limit = 3;
+  google.protobuf.UInt32Value offset = 4;
+  bool prove = 5;
+
+  message SecurityLevelMap {
+    enum KeyKindRequestType {
+      CURRENT_KEY_OF_KIND_REQUEST = 0;
+    }
+    map<uint32, KeyKindRequestType> security_level_map = 1;
+  }
+}
+
+message GetIdentitiesKeysResponse {
+  message PublicKey {
+    bytes value = 1;
+  }
+
+  message PublicKeyEntry {
+    bytes key = 1;
+    PublicKey value = 2;
+  }
+
+  message PublicKeyEntries {
+    repeated PublicKeyEntry public_key_entries = 1;
+  }
+
+  oneof result {
+    PublicKeyEntries public_keys = 1;
+    Proof proof = 2;
+  }
+  ResponseMetadata metadata = 3;
+}
+
+
+message GetDataContractRequest {
   bytes id = 1;
   bool prove = 2;
 }
@@ -59,6 +170,31 @@ message GetDataContractResponse {
   ResponseMetadata metadata = 3;
 }
 
+message GetDataContractsRequest {
+  repeated bytes ids = 1;
+  bool prove = 2;
+}
+
+message GetDataContractsResponse {
+  message DataContractValue {
+    bytes value = 1;
+  }
+
+  message DataContractEntry {
+    bytes key = 1;
+    DataContractValue value = 2;
+  }
+
+  message DataContracts {
+    repeated DataContractEntry data_contract_entries = 1;
+  }
+
+  oneof result {
+    DataContracts data_contracts = 1;
+    Proof proof = 2;
+  }
+  ResponseMetadata metadata = 3;
+}
 message GetDocumentsRequest {
   bytes data_contract_id = 1;
   string document_type = 2;
@@ -68,10 +204,10 @@ message GetDocumentsRequest {
 
   uint32 limit = 5;
 
-    oneof start {
-      bytes start_after = 6;
-      bytes start_at = 7;
-    }
+  oneof start {
+    bytes start_after = 6;
+    bytes start_at = 7;
+  }
 
   bool prove = 8;
 }
@@ -93,6 +229,19 @@ message GetIdentitiesByPublicKeyHashesResponse {
   ResponseMetadata metadata = 3;
 }
 
+message GetIdentityByPublicKeyHashesRequest {
+  bytes public_key_hash = 1;
+  bool prove = 2;
+}
+
+message GetIdentityByPublicKeyHashesResponse {
+  oneof result {
+    bytes identity = 1;
+    Proof proof = 2;
+  }
+  ResponseMetadata metadata = 3;
+}
+
 message WaitForStateTransitionResultRequest {
   bytes state_transition_hash = 1;
   bool prove = 2;

package/scripts/build.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2250
 
 CORE_PROTO_PATH="$PWD/protos/core/v0"
 CORE_CLIENTS_PATH="$PWD/clients/core/v0"
@@ -18,27 +19,29 @@ 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"
+
+set -ex
 
 #################################################
 # Generate JavaScript client for `Core` service #
 #################################################
 
-rm -rf "$CORE_WEB_OUT_PATH/*"
+rm -rf "${CORE_WEB_OUT_PATH:?}/*" || true
 
 docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
-           -v "$CORE_WEB_OUT_PATH:$CORE_WEB_OUT_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" \
-           -I="$CORE_PROTO_PATH" \
-           "core.proto"
+  -v "$CORE_WEB_OUT_PATH:$CORE_WEB_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --js_out="import_style=commonjs:$CORE_WEB_OUT_PATH" \
+  --ts_out="service=grpc-web:$CORE_WEB_OUT_PATH" \
+  -I="$CORE_PROTO_PATH" \
+  "core.proto"
 
 # Clean node message classes
 
-rm -rf "$CORE_CLIENTS_PATH/nodejs/*_protoc.js"
-rm -rf "$CORE_CLIENTS_PATH/nodejs/*_pbjs.js"
+rm -rf "$CORE_CLIENTS_PATH/nodejs/*_protoc.js" || true
+rm -rf "$CORE_CLIENTS_PATH/nodejs/*_pbjs.js" || true
 
 # Copy compiled modules with message classes
 
@@ -56,21 +59,21 @@ pbjs \
 # Generate JavaScript client for `Platform` service #
 #####################################################
 
-rm -rf "$PLATFORM_WEB_OUT_PATH/*"
+rm -rf "${PLATFORM_WEB_OUT_PATH:?}/*" || true
 
 docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
-           -v "$PLATFORM_WEB_OUT_PATH:$PLATFORM_WEB_OUT_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" \
-           -I="$PLATFORM_PROTO_PATH" \
-           "platform.proto"
+  -v "$PLATFORM_WEB_OUT_PATH:$PLATFORM_WEB_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --js_out="import_style=commonjs:$PLATFORM_WEB_OUT_PATH" \
+  --ts_out="service=grpc-web:$PLATFORM_WEB_OUT_PATH" \
+  -I="$PLATFORM_PROTO_PATH" \
+  "platform.proto"
 
 # Clean node message classes
 
-rm -rf "$PLATFORM_CLIENTS_PATH/nodejs/*_protoc.js"
-rm -rf "$PLATFORM_CLIENTS_PATH/nodejs/*_pbjs.js"
+rm -rf "$PLATFORM_CLIENTS_PATH/nodejs/*_protoc.js" || true
+rm -rf "$PLATFORM_CLIENTS_PATH/nodejs/*_pbjs.js" || true
 
 # Copy compiled modules with message classes
 
@@ -87,98 +90,101 @@ pbjs \
 # Generate Java client for `Core` #
 ###################################
 
-rm -rf "$CORE_JAVA_OUT_PATH/*"
+rm -rf "${CORE_JAVA_OUT_PATH:?}/*" || true
 
 docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
-           -v "$CORE_JAVA_OUT_PATH:$CORE_JAVA_OUT_PATH" \
-           --rm \
-           "$PROTOC_IMAGE" \
-           --plugin=protoc-gen-grpc=/usr/bin/protoc-gen-grpc-java \
-           --grpc-java_out="$CORE_JAVA_OUT_PATH" \
-           --proto_path="$CORE_PROTO_PATH" \
-           -I="$CORE_PROTO_PATH" \
-           "core.proto"
+  -v "$CORE_JAVA_OUT_PATH:$CORE_JAVA_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/protoc-gen-grpc-java \
+  --grpc-java_out="$CORE_JAVA_OUT_PATH" \
+  --proto_path="$CORE_PROTO_PATH" \
+  -I="$CORE_PROTO_PATH" \
+  "core.proto"
 
 #######################################
 # Generate Java client for `Platform` #
 #######################################
 
-rm -rf "$PLATFORM_JAVA_OUT_PATH/*"
+rm -rf "${PLATFORM_JAVA_OUT_PATH:?}/*" || true
 
 docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
-           -v "$PLATFORM_JAVA_OUT_PATH:$PLATFORM_JAVA_OUT_PATH" \
-           --rm \
-           "$PROTOC_IMAGE" \
-           --plugin=protoc-gen-grpc=/usr/bin/protoc-gen-grpc-java \
-           --grpc-java_out="$PLATFORM_JAVA_OUT_PATH" \
-           --proto_path="$PLATFORM_PROTO_PATH" \
-           -I="$PLATFORM_PROTO_PATH" \
-           "platform.proto"
+  -v "$PLATFORM_JAVA_OUT_PATH:$PLATFORM_JAVA_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/protoc-gen-grpc-java \
+  --grpc-java_out="$PLATFORM_JAVA_OUT_PATH" \
+  --proto_path="$PLATFORM_PROTO_PATH" \
+  -I="$PLATFORM_PROTO_PATH" \
+  "platform.proto"
 
 ##########################################
 # Generate Objective-C client for `Core` #
 ##########################################
 
-rm -rf "$CORE_OBJ_C_OUT_PATH/*"
+rm -rf "${CORE_OBJ_C_OUT_PATH:?}/*" || true
 
 docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
-           -v "$CORE_OBJ_C_OUT_PATH:$CORE_OBJ_C_OUT_PATH" \
-           --rm \
-           "$PROTOC_IMAGE" \
-           --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
-           --objc_out="$CORE_OBJ_C_OUT_PATH" \
-           --grpc_out="$CORE_OBJ_C_OUT_PATH" \
-           --proto_path="$CORE_PROTO_PATH" \
-           -I="$CORE_PROTO_PATH" \
-           "core.proto"
+  -v "$CORE_OBJ_C_OUT_PATH:$CORE_OBJ_C_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
+  --objc_out="$CORE_OBJ_C_OUT_PATH" \
+  --grpc_out="$CORE_OBJ_C_OUT_PATH" \
+  --proto_path="$CORE_PROTO_PATH" \
+  -I="$CORE_PROTO_PATH" \
+  "core.proto"
 
 ##############################################
 # Generate Objective-C client for `Platform` #
 ##############################################
 
-rm -rf "$PLATFORM_OBJ_C_OUT_PATH/*"
+rm -rf "${PLATFORM_OBJ_C_OUT_PATH:?}/*" || true
 
 docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
-           -v "$PLATFORM_OBJ_C_OUT_PATH:$PLATFORM_OBJ_C_OUT_PATH" \
-           --rm \
-           "$PROTOC_IMAGE" \
-           --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
-           --objc_out="$PLATFORM_OBJ_C_OUT_PATH" \
-           --grpc_out="$PLATFORM_OBJ_C_OUT_PATH" \
-           --proto_path="$PLATFORM_PROTO_PATH" \
-           -I="$PLATFORM_PROTO_PATH" \
-           "platform.proto"
+  -v "$PLATFORM_OBJ_C_OUT_PATH:$PLATFORM_OBJ_C_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
+  --objc_out="$PLATFORM_OBJ_C_OUT_PATH" \
+  --grpc_out="$PLATFORM_OBJ_C_OUT_PATH" \
+  --proto_path="$PLATFORM_PROTO_PATH" \
+  -I="$PLATFORM_PROTO_PATH" \
+  "platform.proto"
 
 #####################################
 # Generate Python client for `Core` #
 #####################################
 
-rm -rf "$CORE_PYTHON_OUT_PATH/*"
+rm -rf "${CORE_PYTHON_OUT_PATH:?}/*" || true
 
 docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
-           -v "$CORE_PYTHON_OUT_PATH:$CORE_PYTHON_OUT_PATH" \
-           --rm \
-           "$PROTOC_IMAGE" \
-           --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
-           --python_out="$CORE_PYTHON_OUT_PATH" \
-           --grpc_out="$CORE_PYTHON_OUT_PATH" \
-           --proto_path="$CORE_PROTO_PATH" \
-           -I="$CORE_PROTO_PATH" \
-           "core.proto"
+  -v "$CORE_PYTHON_OUT_PATH:$CORE_PYTHON_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
+  --python_out="$CORE_PYTHON_OUT_PATH" \
+  --grpc_out="$CORE_PYTHON_OUT_PATH" \
+  --proto_path="$CORE_PROTO_PATH" \
+  -I="$CORE_PROTO_PATH" \
+  "core.proto"
 
 #########################################
 # Generate Python client for `Platform` #
 #########################################
 
-rm -rf "$PLATFORM_PYTHON_OUT_PATH/*"
+rm -rf "${PLATFORM_PYTHON_OUT_PATH:?}/*" || true
 
 docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
-          -v "$PLATFORM_PYTHON_OUT_PATH:$PLATFORM_PYTHON_OUT_PATH" \
-          --rm \
-          "$PROTOC_IMAGE" \
-          --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
-          --python_out="$PLATFORM_PYTHON_OUT_PATH" \
-          --grpc_out="$PLATFORM_PYTHON_OUT_PATH" \
-          --proto_path="$PLATFORM_PROTO_PATH" \
-          -I="$PLATFORM_PROTO_PATH" \
-          "platform.proto"
+  -v "$PLATFORM_PYTHON_OUT_PATH:$PLATFORM_PYTHON_OUT_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
+  --python_out="$PLATFORM_PYTHON_OUT_PATH" \
+  --grpc_out="$PLATFORM_PYTHON_OUT_PATH" \
+  --proto_path="$PLATFORM_PROTO_PATH" \
+  -I="$PLATFORM_PROTO_PATH" \
+  "platform.proto"
+
+# Patch generated protobuf files
+exec "${PWD}/scripts/patch-protobuf-js.sh"

package/scripts/patch-protobuf-js.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# shellcheck disable=SC2250
+set -e
+
+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

package/src/lib.rs

@@ -0,0 +1,15 @@
+pub use prost::Message;
+
+pub mod core {
+    #[cfg(feature = "core_v0")]
+    pub mod v0 {
+        include!("core/proto/org.dash.platform.dapi.v0.rs");
+    }
+}
+
+pub mod platform {
+    #[cfg(feature = "platform_v0")]
+    pub mod v0 {
+        include!("platform/proto/org.dash.platform.dapi.v0.rs");
+    }
+}