@dashevo/dapi-grpc 3.0.1-hotfix.4 → 3.1.0-dev.1

package/Cargo.toml

@@ -39,7 +39,7 @@ 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", tag = "v1.5.0-dev.2", default-features = false }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v1.5.0", default-features = false }
 
 prost = { version = "0.14" }
 futures-core = "0.3.30"
@@ -83,6 +83,6 @@ ignored = [
   "platform-version",
   "futures-core",
   "tonic-prost-build",
-  "getrandom", # Ignore getrandom as we need it to enable `js` feature
+  "getrandom",            # Ignore getrandom as we need it to enable `js` feature
   "dash-platform-macros", # used in build.rs
 ]

package/build.rs

@@ -1,7 +1,8 @@
 use std::{
     collections::HashSet,
+    env,
     fs::{create_dir_all, remove_dir_all},
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 use tonic_prost_build::Builder;
@@ -13,23 +14,32 @@ const SERDE_WITH_STRING: &str =
     r#"#[cfg_attr(feature = "serde", serde(with = "crate::deserialization::from_to_string"))]"#;
 
 fn main() {
+    let output_base = resolve_output_base().unwrap_or_else(|e| {
+        eprintln!("[error] => resolve output base failed: {e}");
+        std::process::exit(1);
+    });
+    println!(
+        "cargo:rustc-env=DAPI_GRPC_OUT_DIR={}",
+        output_base.display()
+    );
+
     #[cfg(feature = "server")]
-    generate_code(ImplType::Server);
+    generate_code(ImplType::Server, &output_base);
     #[cfg(feature = "client")]
-    generate_code(ImplType::Client);
+    generate_code(ImplType::Client, &output_base);
 
     if std::env::var("CARGO_CFG_TARGET_ARCH")
         .unwrap_or_default()
         .eq("wasm32")
     {
-        generate_code(ImplType::Wasm);
+        generate_code(ImplType::Wasm, &output_base);
     }
 }
 
-fn generate_code(typ: ImplType) {
+fn generate_code(typ: ImplType, output_base: &Path) {
     let core = MappingConfig::new(
         PathBuf::from("protos/core/v0/core.proto"),
-        PathBuf::from("src/core"),
+        output_base.join("core"),
         &typ,
     );
 
@@ -39,7 +49,7 @@ fn generate_code(typ: ImplType) {
 
     let platform = MappingConfig::new(
         PathBuf::from("protos/platform/v0/platform.proto"),
-        PathBuf::from("src/platform"),
+        output_base.join("platform"),
         &typ,
     );
 
@@ -49,7 +59,7 @@ fn generate_code(typ: ImplType) {
 
     let drive = MappingConfig::new(
         PathBuf::from("protos/drive/v0/drive.proto"),
-        PathBuf::from("src/drive"),
+        output_base.join("drive"),
         &typ,
     );
 
@@ -60,6 +70,7 @@ fn generate_code(typ: ImplType) {
     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");
+    println!("cargo:rerun-if-env-changed=DAPI_GRPC_OUT_DIR");
 }
 
 struct MappingConfig {
@@ -462,3 +473,13 @@ fn abs_path(path: &PathBuf) -> PathBuf {
 
     PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(path)
 }
+
+/// Resolve output base directory for generated files.
+fn resolve_output_base() -> Result<PathBuf, String> {
+    env::var("DAPI_GRPC_OUT_DIR")
+        .map(PathBuf::from)
+        .or_else(|_| env::var("OUT_DIR").map(|out_dir| PathBuf::from(out_dir).join("dapi_grpc")))
+        .map_err(|_| {
+            "OUT_DIR should be provided by Cargo; set DAPI_GRPC_OUT_DIR to override it".to_string()
+        })
+}

package/eslint.config.mjs

@@ -0,0 +1,11 @@
+import baseConfig from '../../eslint/base.mjs';
+import mochaTestConfig from '../../eslint/mocha-tests.mjs';
+
+export default [
+  ...baseConfig,
+  mochaTestConfig,
+  {
+    // Generated protobuf code - ignore clients and src generated directories
+    ignores: ['dist/**', 'node_modules/**', 'clients/**', 'src/**'],
+  },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "3.0.1-hotfix.4",
+  "version": "3.1.0-dev.1",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
@@ -45,9 +45,9 @@
   },
   "homepage": "https://github.com/dashevo/dapi-grpc#readme",
   "dependencies": {
-    "@dashevo/grpc-common": "3.0.1-hotfix.4",
+    "@dashevo/grpc-common": "3.1.0-dev.1",
     "@dashevo/protobufjs": "6.10.5",
-    "@grpc/grpc-js": "1.4.4",
+    "@grpc/grpc-js": "^1.14.3",
     "@improbable-eng/grpc-web": "^0.15.0",
     "google-protobuf": "^3.12.2",
     "long": "^5.2.0"
@@ -56,9 +56,7 @@
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "eslint": "^8.53.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint": "^9.18.0",
     "mocha": "^11.1.0",
     "mocha-sinon": "^2.1.2",
     "sinon": "^17.0.1",

package/src/lib.rs

@@ -6,17 +6,26 @@ pub mod core {
     pub mod v0 {
         // Note: only one of the features can be analyzed at a time
         #[cfg(all(feature = "server", not(target_arch = "wasm32")))]
-        include!("core/server/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/core/server/org.dash.platform.dapi.v0.rs"
+        ));
 
         #[cfg(all(
             feature = "client",
             not(feature = "server"),
             not(target_arch = "wasm32")
         ))]
-        include!("core/client/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/core/client/org.dash.platform.dapi.v0.rs"
+        ));
 
         #[cfg(target_arch = "wasm32")]
-        include!("core/wasm/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/core/wasm/org.dash.platform.dapi.v0.rs"
+        ));
     }
 }
 
@@ -24,17 +33,26 @@ pub mod core {
 pub mod platform {
     pub mod v0 {
         #[cfg(all(feature = "server", not(target_arch = "wasm32")))]
-        include!("platform/server/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/platform/server/org.dash.platform.dapi.v0.rs"
+        ));
 
         #[cfg(all(
             feature = "client",
             not(feature = "server"),
             not(target_arch = "wasm32")
         ))]
-        include!("platform/client/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/platform/client/org.dash.platform.dapi.v0.rs"
+        ));
 
         #[cfg(target_arch = "wasm32")]
-        include!("platform/wasm/org.dash.platform.dapi.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/platform/wasm/org.dash.platform.dapi.v0.rs"
+        ));
     }
 
     #[cfg(feature = "tenderdash-proto")]
@@ -57,14 +75,20 @@ pub(crate) mod dapi {
 pub mod drive {
     pub mod v0 {
         #[cfg(all(feature = "server", not(target_arch = "wasm32")))]
-        include!("drive/server/org.dash.platform.drive.v0.rs");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/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");
+        include!(concat!(
+            env!("DAPI_GRPC_OUT_DIR"),
+            "/drive/client/org.dash.platform.drive.v0.rs"
+        ));
     }
 
     #[cfg(feature = "tenderdash-proto")]

package/.eslintignore

@@ -1,3 +0,0 @@
-clients/*/v*/web/
-clients/*/v*/nodejs/*_protoc.js
-clients/*/v*/nodejs/*_pbjs.js

package/.eslintrc

@@ -1,19 +0,0 @@
-{
-  "extends": "airbnb-base",
-  "env": {
-    "es2020": true
-  },
-  "rules": {
-    "import/no-extraneous-dependencies": ["error", { "packageDir": "." }],
-    "no-plusplus": 0,
-    "eol-last": [
-      "error",
-      "always"
-    ],
-    "class-methods-use-this": "off",
-    "curly": [
-      "error",
-      "all"
-    ]
-  }
-}

package/lib/test/.eslintrc

@@ -1,9 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "mocha": true
-  },
-  "globals": {
-    "expect": true
-  }
-}