@dashevo/dapi-grpc 1.0.0-pr.1545.7 → 1.0.0-pr.1621.0

package/.mocharc.yml

@@ -1,3 +1,2 @@
-file:
-  - lib/test/bootstrap.js
+require: lib/test/bootstrap.js
 recursive: true

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "0.25.0"
+version = "1.0.0-pr.1621.0"
 authors = [
     "Samuel Westrich <sam@dash.org>",
     "Igor Markin <igor.markin@dash.org>",
@@ -13,26 +13,30 @@ edition = "2021"
 rust-version = "1.73"
 license = "MIT"
 
+[features]
+default = ["core", "platform", "client", "serde"]
+core = []
+platform = []
+# Re-export Dash Platform protobuf types as `dapi_grpc::platform::proto`
+tenderdash-proto = []
+client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
+serde = ["dep:serde", "dep:serde_bytes"]
+
 [dependencies]
 prost = { version = "0.11.9" }
-prost-types = { version = "0.11.9" }
 tonic = { version = "0.9.2", features = [
     "codegen",
     "prost",
 ], default-features = false }
+serde = { version = "1.0.171", optional = true, features = ["derive"] }
+serde_bytes = { version = "0.11.12", optional = true }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v0.14.0-dev.5" }
+dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
+platform-version = { path = "../rs-platform-version" }
 
 [build-dependencies]
 tonic-build = { version = "0.9.2" }
 
-[features]
-default = ["core", "platform", "client"]
-core = ["core_v0"]
-platform = ["platform_v0"]
-client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
-
-core_v0 = []
-platform_v0 = []
-
 [lib]
 
 [[example]]
@@ -43,3 +47,6 @@ path = "clients/core/v0/rust/core_example.rs"
 [[example]]
 name = "platform_example"
 path = "clients/platform/v0/rust/platform_example.rs"
+
+[package.metadata.cargo-machete]
+ignored = ["platform-version", "serde_bytes"]

package/build.rs

@@ -1,63 +1,200 @@
 use std::{
-    collections::HashMap,
     fs::{create_dir_all, remove_dir_all},
     path::PathBuf,
 };
 
+use tonic_build::Builder;
+
 fn main() {
     generate().expect("failed to compile protobuf definitions");
 
     println!("cargo:rerun-if-changed=./protos");
+    println!("cargo:rerun-if-env-changed=CARGO_FEATURE_SERDE");
 }
 
+struct MappingConfig {
+    protobuf_file: PathBuf,
+    out_dir: PathBuf,
+    builder: Builder,
+    proto_includes: Vec<PathBuf>,
+}
 /// Generate Rust definitions from Protobuf definitions
 pub fn generate() -> Result<(), std::io::Error> {
-    // Mapping between protobuf files => output directory
-    let mut input = HashMap::<PathBuf, PathBuf>::new();
-    input.insert(
+    let core = MappingConfig::new(
         PathBuf::from("protos/core/v0/core.proto"),
         PathBuf::from("src/core/proto"),
     );
-    input.insert(
+    core.generate().unwrap();
+
+    let mut platform = MappingConfig::new(
         PathBuf::from("protos/platform/v0/platform.proto"),
         PathBuf::from("src/platform/proto"),
     );
 
-    let proto_includes = vec![abs_path(&PathBuf::from("protos"))];
+    // Derive features for versioned messages
+    //
+    // "GetConsensusParamsRequest" is excluded as this message does not support proofs
+    const VERSIONED_REQUESTS: [&str; 15] = [
+        "GetDataContractHistoryRequest",
+        "GetDataContractRequest",
+        "GetDataContractsRequest",
+        "GetDocumentsRequest",
+        "GetIdentitiesByPublicKeyHashesRequest",
+        "GetIdentitiesRequest",
+        "GetIdentityBalanceAndRevisionRequest",
+        "GetIdentityBalanceRequest",
+        "GetIdentityByPublicKeyHashRequest",
+        "GetIdentityKeysRequest",
+        "GetIdentityRequest",
+        "GetProofsRequest",
+        "WaitForStateTransitionResultRequest",
+        "GetProtocolVersionUpgradeStateRequest",
+        "GetProtocolVersionUpgradeVoteStatusRequest",
+    ];
 
-    for (proto, dest) in input {
-        let proto = abs_path(&proto);
-        let dest = abs_path(&dest);
-        // Remove old compiled files; ignore errors
-        if dest.exists() {
-            remove_dir_all(&dest)?;
-        }
-        create_dir_all(&dest)?;
+    //  "GetConsensusParamsResponse" is excluded as this message does not support proofs
+    const VERSIONED_RESPONSES: [&str; 16] = [
+        "GetDataContractHistoryResponse",
+        "GetDataContractResponse",
+        "GetDataContractsResponse",
+        "GetDocumentsResponse",
+        "GetIdentitiesByPublicKeyHashesResponse",
+        "GetIdentitiesResponse",
+        "GetIdentityBalanceAndRevisionResponse",
+        "GetIdentityBalanceResponse",
+        "GetIdentityByPublicKeyHashResponse",
+        "GetIdentityKeysResponse",
+        "GetIdentityResponse",
+        "GetProofsResponse",
+        "WaitForStateTransitionResultResponse",
+        "GetEpochsInfoResponse",
+        "GetProtocolVersionUpgradeStateResponse",
+        "GetProtocolVersionUpgradeVoteStatusResponse",
+    ];
+
+    // Derive VersionedGrpcMessage on requests
+    for msg in VERSIONED_REQUESTS {
+        platform = platform
+            .message_attribute(
+                msg,
+                r#"#[derive(::dapi_grpc_macros::VersionedGrpcMessage)]"#,
+            )
+            .message_attribute(msg, r#"#[grpc_versions(0)]"#);
+    }
 
-        generate1(&[proto], &proto_includes, &dest)?;
+    // Derive VersionedGrpcMessage and VersionedGrpcResponse on responses
+    for msg in VERSIONED_RESPONSES {
+        platform = platform
+            .message_attribute(
+                msg,
+                r#"#[derive(::dapi_grpc_macros::VersionedGrpcMessage,::dapi_grpc_macros::VersionedGrpcResponse)]"#,
+            )
+            .message_attribute(msg, r#"#[grpc_versions(0)]"#);
     }
 
+    #[cfg(feature = "serde")]
+    let platform = platform
+        .type_attribute(
+            ".",
+            r#"#[derive(::serde::Serialize, ::serde::Deserialize)]"#,
+        )
+        .type_attribute(".", r#"#[serde(rename_all = "snake_case")]"#)
+        .field_attribute("id", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("identity_id", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute(
+            "ids",
+            r#"#[serde(with = "crate::deserialization::vec_base64string")]"#,
+        )
+        .field_attribute(
+            "ResponseMetadata.height",
+            r#"#[serde(with = "crate::deserialization::from_to_string")]"#,
+        )
+        .field_attribute(
+            "ResponseMetadata.time_ms",
+            r#"#[serde(with = "crate::deserialization::from_to_string")]"#,
+        )
+        .field_attribute(
+            "start_at_ms",
+            r#"#[serde(with = "crate::deserialization::from_to_string")]"#,
+        )
+        .field_attribute("public_key_hash", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute(
+            "public_key_hashes",
+            r#"#[serde(with = "crate::deserialization::vec_base64string")]"#,
+        )
+        // Get documents fields
+        .field_attribute("data_contract_id", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("where", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("order_by", r#"#[serde(with = "serde_bytes")]"#)
+        // Proof fields
+        .field_attribute("Proof.grovedb_proof", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("Proof.quorum_hash", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("Proof.signature", r#"#[serde(with = "serde_bytes")]"#)
+        .field_attribute("Proof.block_id_hash", r#"#[serde(with = "serde_bytes")]"#);
+
+    platform.generate().unwrap();
+
     Ok(())
 }
 
-/// Run single generation process.
-///
-/// All paths must be absolute
-fn generate1(
-    files: &[PathBuf],
-    proto_includes: &[PathBuf],
-    out_dir: &PathBuf,
-) -> Result<(), std::io::Error> {
-    let pb = tonic_build::configure()
-        .build_server(false)
-        .out_dir(out_dir)
-        .protoc_arg("--experimental_allow_proto3_optional");
-    #[cfg(feature = "client")]
-    let pb = pb.build_client(true).build_transport(true);
-    #[cfg(not(feature = "client"))]
-    let pb = pb.build_client(false).build_transport(false);
-
-    pb.compile(files, proto_includes)
+impl MappingConfig {
+    fn new(protobuf_file: PathBuf, out_dir: PathBuf) -> Self {
+        let protobuf_file = abs_path(&protobuf_file);
+        let out_dir = abs_path(&out_dir);
+
+        let builder = tonic_build::configure()
+            .build_server(false)
+            .out_dir(out_dir.clone())
+            .protoc_arg("--experimental_allow_proto3_optional");
+
+        #[cfg(feature = "client")]
+        let builder = builder.build_client(true).build_transport(true);
+        #[cfg(not(feature = "client"))]
+        let builder = builder.build_client(false).build_transport(false);
+
+        Self {
+            protobuf_file,
+            out_dir,
+            builder,
+            proto_includes: vec![abs_path(&PathBuf::from("protos"))],
+        }
+    }
+
+    #[allow(unused)]
+    fn type_attribute(mut self, path: &str, attribute: &str) -> Self {
+        self.builder = self.builder.type_attribute(path, attribute);
+        self
+    }
+
+    #[allow(unused)]
+    fn field_attribute(mut self, path: &str, attribute: &str) -> Self {
+        self.builder = self.builder.field_attribute(path, attribute);
+        self
+    }
+
+    #[allow(unused)]
+    fn enum_attribute(mut self, path: &str, attribute: &str) -> Self {
+        self.builder = self.builder.enum_attribute(path, attribute);
+        self
+    }
+
+    #[allow(unused)]
+    fn message_attribute(mut self, path: &str, attribute: &str) -> Self {
+        self.builder = self.builder.message_attribute(path, attribute);
+        self
+    }
+
+    /// Run single generation process.
+    fn generate(self) -> Result<(), std::io::Error> {
+        // Remove old compiled files; ignore errors
+        if self.out_dir.exists() {
+            remove_dir_all(&self.out_dir)?;
+        }
+        create_dir_all(&self.out_dir)?;
+
+        self.builder
+            .compile(&[self.protobuf_file], &self.proto_includes)
+    }
 }
 
 fn abs_path(path: &PathBuf) -> PathBuf {

package/clients/platform/v0/nodejs/PlatformPromiseClient.js

@@ -305,7 +305,9 @@ class PlatformPromiseClient {
    * @returns {Promise<!GetIdentitiesByPublicKeyHashesResponse>}
    */
   getIdentitiesByPublicKeyHashes(
-    getIdentitiesByPublicKeyHashesRequest, metadata = {}, options = {},
+    getIdentitiesByPublicKeyHashesRequest,
+    metadata = {},
+    options = {},
   ) {
     if (!isObject(metadata)) {
       throw new Error('metadata must be an object');
@@ -337,9 +339,7 @@ class PlatformPromiseClient {
    * @param {CallOptions} [options={}]
    * @returns {Promise<!WaitForStateTransitionResultResponse>}
    */
-  waitForStateTransitionResult(
-    waitForStateTransitionResultRequest, metadata = {}, options = {},
-  ) {
+  waitForStateTransitionResult(waitForStateTransitionResultRequest, metadata = {}, options = {}) {
     if (!isObject(metadata)) {
       throw new Error('metadata must be an object');
     }
@@ -370,9 +370,7 @@ class PlatformPromiseClient {
    * @param {CallOptions} [options={}]
    * @returns {Promise<!GetConsensusParamsResponse>}
    */
-  getConsensusParams(
-    getConsensusParamsRequest, metadata = {}, options = {},
-  ) {
+  getConsensusParams(getConsensusParamsRequest, metadata = {}, options = {}) {
     if (!isObject(metadata)) {
       throw new Error('metadata must be an object');
     }

package/clients/platform/v0/nodejs/platform_pbjs.js

@@ -10286,6 +10286,20 @@ $root.org = (function() {
                              */
                             GetProofsResponseV0.prototype.metadata = null;
 
+                            // OneOf field names bound to virtual getters and setters
+                            var $oneOfFields;
+
+                            /**
+                             * GetProofsResponseV0 result.
+                             * @member {"proof"|undefined} result
+                             * @memberof org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0
+                             * @instance
+                             */
+                            Object.defineProperty(GetProofsResponseV0.prototype, "result", {
+                                get: $util.oneOfGetter($oneOfFields = ["proof"]),
+                                set: $util.oneOfSetter($oneOfFields)
+                            });
+
                             /**
                              * Creates a new GetProofsResponseV0 instance using the specified properties.
                              * @function create
@@ -10389,10 +10403,14 @@ $root.org = (function() {
                             GetProofsResponseV0.verify = function verify(message) {
                                 if (typeof message !== "object" || message === null)
                                     return "object expected";
+                                var properties = {};
                                 if (message.proof != null && message.hasOwnProperty("proof")) {
-                                    var error = $root.org.dash.platform.dapi.v0.Proof.verify(message.proof);
-                                    if (error)
-                                        return "proof." + error;
+                                    properties.result = 1;
+                                    {
+                                        var error = $root.org.dash.platform.dapi.v0.Proof.verify(message.proof);
+                                        if (error)
+                                            return "proof." + error;
+                                    }
                                 }
                                 if (message.metadata != null && message.hasOwnProperty("metadata")) {
                                     var error = $root.org.dash.platform.dapi.v0.ResponseMetadata.verify(message.metadata);
@@ -10440,12 +10458,13 @@ $root.org = (function() {
                                 if (!options)
                                     options = {};
                                 var object = {};
-                                if (options.defaults) {
-                                    object.proof = null;
+                                if (options.defaults)
                                     object.metadata = null;
-                                }
-                                if (message.proof != null && message.hasOwnProperty("proof"))
+                                if (message.proof != null && message.hasOwnProperty("proof")) {
                                     object.proof = $root.org.dash.platform.dapi.v0.Proof.toObject(message.proof, options);
+                                    if (options.oneofs)
+                                        object.result = "proof";
+                                }
                                 if (message.metadata != null && message.hasOwnProperty("metadata"))
                                     object.metadata = $root.org.dash.platform.dapi.v0.ResponseMetadata.toObject(message.metadata, options);
                                 return object;

package/clients/platform/v0/nodejs/platform_protoc.js

@@ -140,6 +140,7 @@ goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsRequest.GetProofsReq
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsRequest.VersionCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0', null, { proto });
+goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.VersionCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProtocolVersionUpgradeStateRequest', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProtocolVersionUpgradeStateRequest.GetProtocolVersionUpgradeStateRequestV0', null, { proto });
@@ -1047,7 +1048,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0 = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_);
 };
 goog.inherits(proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -10562,6 +10563,31 @@ proto.org.dash.platform.dapi.v0.GetProofsResponse.serializeBinaryToWriter = func
 
 
 
+/**
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
+ * @const
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_ = [[1]];
+
+/**
+ * @enum {number}
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase = {
+  RESULT_NOT_SET: 0,
+  PROOF: 1
+};
+
+/**
+ * @return {proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase}
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.getResultCase = function() {
+  return /** @type {proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase} */(jspb.Message.computeOneofCase(this, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_[0]));
+};
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -10704,7 +10730,7 @@ proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.
  * @return {!proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0} returns this
 */
 proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.setProof = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+  return jspb.Message.setOneofWrapperField(this, 1, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_[0], value);
 };
 
 

package/clients/platform/v0/rust/platform_example.rs

@@ -6,8 +6,8 @@ fn main() {
     let request = platform::GetConsensusParamsRequest {
         version: Some(platform::get_consensus_params_request::Version::V0(
             GetConsensusParamsRequestV0 {
-                height: 123,
                 prove: true,
+                height: 123,
             },
         )),
     };

package/clients/platform/v0/web/platform_pb.d.ts

@@ -1231,6 +1231,7 @@ export namespace GetProofsResponse {
     getMetadata(): ResponseMetadata | undefined;
     setMetadata(value?: ResponseMetadata): void;
 
+    getResultCase(): GetProofsResponseV0.ResultCase;
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): GetProofsResponseV0.AsObject;
     static toObject(includeInstance: boolean, msg: GetProofsResponseV0): GetProofsResponseV0.AsObject;
@@ -1246,6 +1247,11 @@ export namespace GetProofsResponse {
       proof?: Proof.AsObject,
       metadata?: ResponseMetadata.AsObject,
     }
+
+    export enum ResultCase {
+      RESULT_NOT_SET = 0,
+      PROOF = 1,
+    }
   }
 
   export enum VersionCase {

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

@@ -140,6 +140,7 @@ goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsRequest.GetProofsReq
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsRequest.VersionCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0', null, { proto });
+goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProofsResponse.VersionCase', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProtocolVersionUpgradeStateRequest', null, { proto });
 goog.exportSymbol('proto.org.dash.platform.dapi.v0.GetProtocolVersionUpgradeStateRequest.GetProtocolVersionUpgradeStateRequestV0', null, { proto });
@@ -1047,7 +1048,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0 = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_);
 };
 goog.inherits(proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -10562,6 +10563,31 @@ proto.org.dash.platform.dapi.v0.GetProofsResponse.serializeBinaryToWriter = func
 
 
 
+/**
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
+ * @const
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_ = [[1]];
+
+/**
+ * @enum {number}
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase = {
+  RESULT_NOT_SET: 0,
+  PROOF: 1
+};
+
+/**
+ * @return {proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase}
+ */
+proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.getResultCase = function() {
+  return /** @type {proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.ResultCase} */(jspb.Message.computeOneofCase(this, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_[0]));
+};
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -10704,7 +10730,7 @@ proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.
  * @return {!proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0} returns this
 */
 proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.prototype.setProof = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+  return jspb.Message.setOneofWrapperField(this, 1, proto.org.dash.platform.dapi.v0.GetProofsResponse.GetProofsResponseV0.oneofGroups_[0], value);
 };
 
 

package/lib/test/bootstrap.js

@@ -10,16 +10,18 @@ use(dirtyChai);
 
 process.env.NODE_ENV = 'test';
 
-beforeEach(function beforeEach() {
-  if (!this.sinon) {
-    this.sinon = sinon.createSandbox();
-  } else {
-    this.sinon.restore();
-  }
-});
+exports.mochaHooks = {
+  beforeEach() {
+    if (!this.sinon) {
+      this.sinon = sinon.createSandbox();
+    } else {
+      this.sinon.restore();
+    }
+  },
 
-afterEach(function afterEach() {
-  this.sinon.restore();
-});
+  afterEach() {
+    this.sinon.restore();
+  },
+};
 
 global.expect = expect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "1.0.0-pr.1545.7",
+  "version": "1.0.0-pr.1621.0",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
@@ -45,23 +45,23 @@
   },
   "homepage": "https://github.com/dashevo/dapi-grpc#readme",
   "dependencies": {
-    "@dashevo/grpc-common": "1.0.0-pr.1545.7",
+    "@dashevo/grpc-common": "1.0.0-pr.1621.0",
     "@dashevo/protobufjs": "6.10.5",
-    "@grpc/grpc-js": "^1.3.7",
+    "@grpc/grpc-js": "1.4.4",
     "@improbable-eng/grpc-web": "^0.15.0",
     "google-protobuf": "^3.12.2",
     "long": "^5.2.0"
   },
   "devDependencies": {
-    "chai": "^4.3.9",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.24.2",
-    "mocha": "^9.1.2",
+    "eslint": "^8.53.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "mocha": "^10.2.0",
     "mocha-sinon": "^2.1.2",
-    "sinon": "^11.1.2",
+    "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
 }