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

package/scripts/build.sh

@@ -8,14 +8,20 @@ if [[ "${SKIP_GRPC_PROTO_BUILD}" == "1" ]]; then
   exit 0
 fi
 
+PROTOS_PATH="$PWD/protos"
+
 CORE_PROTO_PATH="$PWD/protos/core/v0"
 CORE_CLIENTS_PATH="$PWD/clients/core/v0"
 
 PLATFORM_PROTO_PATH="$PWD/protos/platform/v0"
 PLATFORM_CLIENTS_PATH="$PWD/clients/platform/v0"
 
+DRIVE_PROTO_PATH="$PWD/protos/drive/v0"
+DRIVE_CLIENTS_PATH="$PWD/clients/drive/v0"
+
 CORE_WEB_OUT_PATH="$CORE_CLIENTS_PATH/web"
 PLATFORM_WEB_OUT_PATH="$PLATFORM_CLIENTS_PATH/web"
+DRIVE_WEB_OUT_PATH="$DRIVE_CLIENTS_PATH/web"
 
 CORE_JAVA_OUT_PATH="$CORE_CLIENTS_PATH/java"
 PLATFORM_JAVA_OUT_PATH="$PLATFORM_CLIENTS_PATH/java"
@@ -62,6 +68,40 @@ pbjs \
   -o "$CORE_CLIENTS_PATH/nodejs/core_pbjs.js" \
   "$CORE_PROTO_PATH/core.proto"
 
+#####################################################
+# Generate JavaScript client for `DriveInternal` service #
+#####################################################
+
+rm -rf "${DRIVE_WEB_OUT_PATH:?}/*" || true
+
+docker run -v "$DRIVE_PROTO_PATH:$DRIVE_PROTO_PATH" \
+  -v "$DRIVE_WEB_OUT_PATH:$DRIVE_WEB_OUT_PATH" \
+  -v "$PROTOS_PATH:$PROTOS_PATH" \
+  --rm \
+  "$PROTOC_IMAGE" \
+  --js_out="import_style=commonjs:$DRIVE_WEB_OUT_PATH" \
+  --ts_out="service=grpc-web:$DRIVE_WEB_OUT_PATH" \
+  -I="$DRIVE_PROTO_PATH" \
+  -I="$PROTOS_PATH" \
+  "drive.proto"
+
+# Clean node message classes
+
+rm -rf "$DRIVE_CLIENTS_PATH/nodejs/*_protoc.js" || true
+rm -rf "$DRIVE_CLIENTS_PATH/nodejs/*_pbjs.js" || true
+
+# Copy compiled modules with message classes
+
+cp "$DRIVE_WEB_OUT_PATH/drive_pb.js" "$DRIVE_CLIENTS_PATH/nodejs/drive_protoc.js"
+
+pbjs \
+  -t static-module \
+  -w commonjs \
+  -r platform_root \
+  -p "$PROTOS_PATH" \
+  -o "$DRIVE_CLIENTS_PATH/nodejs/drive_pbjs.js" \
+  "$DRIVE_PROTO_PATH/drive.proto"
+
 #####################################################
 # Generate JavaScript client for `Platform` service #
 #####################################################
@@ -70,11 +110,13 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_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" \
+  -I="$PROTOS_PATH" \
   "platform.proto"
 
 # Clean node message classes
@@ -91,6 +133,7 @@ pbjs \
   -w commonjs \
   -r platform_root \
   -o "$PLATFORM_CLIENTS_PATH/nodejs/platform_pbjs.js" \
+  -p "$PROTOS_PATH" \
   "$PLATFORM_PROTO_PATH/platform.proto"
 
 ###################################
@@ -101,12 +144,14 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_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" \
+  -I="$PROTOS_PATH" \
   "core.proto"
 
 #######################################
@@ -117,12 +162,14 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_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" \
+  -I="$PROTOS_PATH" \
   "platform.proto"
 
 ##########################################
@@ -133,6 +180,7 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_PATH" \
   --rm \
   "$PROTOC_IMAGE" \
   --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
@@ -140,6 +188,7 @@ docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
   --grpc_out="$CORE_OBJ_C_OUT_PATH" \
   --proto_path="$CORE_PROTO_PATH" \
   -I="$CORE_PROTO_PATH" \
+  -I="$PROTOS_PATH" \
   "core.proto"
 
 ##############################################
@@ -150,6 +199,7 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_PATH" \
   --rm \
   "$PROTOC_IMAGE" \
   --plugin=protoc-gen-grpc=/usr/bin/grpc_objective_c_plugin \
@@ -157,6 +207,7 @@ docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
   --grpc_out="$PLATFORM_OBJ_C_OUT_PATH" \
   --proto_path="$PLATFORM_PROTO_PATH" \
   -I="$PLATFORM_PROTO_PATH" \
+  -I="$PROTOS_PATH" \
   "platform.proto"
 
 #####################################
@@ -167,6 +218,7 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_PATH" \
   --rm \
   "$PROTOC_IMAGE" \
   --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
@@ -174,6 +226,7 @@ docker run -v "$CORE_PROTO_PATH:$CORE_PROTO_PATH" \
   --grpc_out="$CORE_PYTHON_OUT_PATH" \
   --proto_path="$CORE_PROTO_PATH" \
   -I="$CORE_PROTO_PATH" \
+  -I="$PROTOS_PATH" \
   "core.proto"
 
 #########################################
@@ -184,6 +237,7 @@ 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" \
+  -v "$PROTOS_PATH:$PROTOS_PATH" \
   --rm \
   "$PROTOC_IMAGE" \
   --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin \
@@ -191,6 +245,7 @@ docker run -v "$PLATFORM_PROTO_PATH:$PLATFORM_PROTO_PATH" \
   --grpc_out="$PLATFORM_PYTHON_OUT_PATH" \
   --proto_path="$PLATFORM_PROTO_PATH" \
   -I="$PLATFORM_PROTO_PATH" \
+  -I="$PROTOS_PATH" \
   "platform.proto"
 
 # Patch generated protobuf files

package/scripts/patch-protobuf-js.sh

@@ -2,8 +2,7 @@
 # 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)
+files=$(find "$PWD/clients/core/v0/web" "$PWD/clients/core/v0/nodejs" "$PWD/clients/platform/v0/web" "$PWD/clients/platform/v0/nodejs" "$PWD/clients/drive/v0/web" "$PWD/clients/drive/v0/nodejs" -name "*_pb.js" -o -name "*_protoc.js") OS=$(uname)
 
 function replace_in_file() {
   if [[ "$OS" = 'Darwin' ]]; then
@@ -28,4 +27,6 @@ for file in $files; do
     echo "Error: global still present"
   fi
 
+  replace_in_file 's/require('\''.\/platform\/v0\/platform_pb.js'\'')/require('\''..\/..\/..\/platform\/v0\/web\/platform_pb.js'\'')/g' "$file"
+
 done

package/src/lib.rs

@@ -46,6 +46,29 @@ pub mod platform {
     pub use versioning::{VersionedGrpcMessage, VersionedGrpcResponse};
 }
 
+#[cfg(all(feature = "drive", feature = "platform"))]
+pub(crate) mod dapi {
+    pub(crate) use crate::platform::*;
+}
+
+#[cfg(feature = "drive")]
+pub mod drive {
+    pub mod v0 {
+        #[cfg(all(feature = "server", not(target_arch = "wasm32")))]
+        include!("drive/server/org.dash.platform.drive.v0.rs");
+
+        #[cfg(all(
+            feature = "client",
+            not(feature = "server"),
+            not(target_arch = "wasm32")
+        ))]
+        include!("drive/client/org.dash.platform.drive.v0.rs");
+    }
+
+    #[cfg(feature = "tenderdash-proto")]
+    pub use tenderdash_proto as proto;
+}
+
 #[cfg(feature = "serde")]
 // Serde deserialization logic
 pub mod deserialization;