dashpay · QuantumExplorer · Mar 22, 2023 · Feb 15, 2023 · Feb 16, 2023 · Feb 16, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/js-dpp/CHANGELOG.md b/packages/js-dpp/CHANGELOG.md
@@ -288,7 +288,7 @@
 ### Bug Fixes
 
 * do not allow to change `ownerId` and `entropy` ([bff5807](https://github.com/dashevo/js-dpp/commit/bff580701322e2100e484989c476d583d26af38a))
-* json schema for `signaturePublicKeyId` ([#161](https://github.com/dashevo/js-dpp/issues/161))
+* json schema for `signature_public_key_id` ([#161](https://github.com/dashevo/js-dpp/issues/161))
 * wrong entropy size ([#157](https://github.com/dashevo/js-dpp/issues/157))
 * data contract definitions might be `null` or `undefined` ([#153](https://github.com/dashevo/js-dpp/issues/153))
 * identity existence validation in data contract structure validation ([#149](https://github.com/dashevo/js-dpp/issues/149))

diff --git a/packages/js-dpp/lib/test/fixtures/getIdentityUpdateTransitionFixture.js b/packages/js-dpp/lib/test/fixtures/getIdentityUpdateTransitionFixture.js
@@ -9,7 +9,8 @@ module.exports = function getIdentityUpdateTransitionFixture() {
   const rawStateTransition = {
     protocolVersion: protocolVersion.latestVersion,
     type: stateTransitionTypes.IDENTITY_UPDATE,
-    assetLockProof: getInstantAssetLockProofFixture().toObject(),
+    assetLockProof: getInstantAssetLockProofFixture()
+      .toObject(),
     identityId: generateRandomIdentifier(),
     revision: 0,
     addPublicKeys: [

diff --git a/packages/js-dpp/lib/test/mocks/createStateRepositoryMock.js b/packages/js-dpp/lib/test/mocks/createStateRepositoryMock.js
@@ -6,6 +6,7 @@
  *    createDataContract: *,
  *    updateDataContract: *,
  *     fetchDocuments: *,
+ *     fetchExtendedDocuments: *,
  *     createDocument: *,
  *     updateDocument: *,
  *     removeDocument: *,
@@ -37,6 +38,7 @@ module.exports = function createStateRepositoryMock(sinonSandbox) {
     createDataContract: sinonSandbox.stub(),
     updateDataContract: sinonSandbox.stub(),
     fetchDocuments: sinonSandbox.stub(),
+    fetchExtendedDocuments: sinonSandbox.stub(),
     createDocument: sinonSandbox.stub(),
     updateDocument: sinonSandbox.stub(),
     removeDocument: sinonSandbox.stub(),

diff --git a/packages/js-drive/test/integration/document/DocumentRepository.spec.js b/packages/js-drive/test/integration/document/DocumentRepository.spec.js
@@ -83,14 +83,6 @@ const nonNumberTestCases = [
   typesTestCases.buffer,
 ];
 
-const nonNumberAndUndefinedTestCases = [
-  typesTestCases.string,
-  typesTestCases.boolean,
-  typesTestCases.null,
-  typesTestCases.object,
-  typesTestCases.buffer,
-];
-
 const nonNumberNullAndUndefinedTestCases = [
   typesTestCases.string,
   typesTestCases.boolean,
@@ -1511,7 +1503,7 @@ describe('DocumentRepository', function main() {
                       expect.fail('should throw an error');
                     } catch (e) {
                       expect(e).to.be.instanceOf(InvalidQueryError);
-                      expect(e.message).to.equal('value error: structure Error: value is not a float');
+                      expect(e.message).to.equal('value error: structure error: value is not a float');
                     }
                   });
                 });
@@ -1851,7 +1843,9 @@ describe('DocumentRepository', function main() {
 
                     expect.fail('should throw an error');
                   } catch (e) {
-                    expect(e.message).to.equal('value error: structure Error: value is not a float');
+                    expect(e.message).to.startsWith(
+                      'value error: structure error: value is not an integer',
+                    );
                     expect(e).to.be.instanceOf(InvalidQueryError);
                   }
                 });
@@ -1865,8 +1859,8 @@ describe('DocumentRepository', function main() {
                     expect.fail('should throw an error');
                   } catch (e) {
                     expect(e).to.be.instanceOf(InvalidQueryError);
-                    expect(e.message).to.equal(
-                      'value error: structure Error: value is not a float',
+                    expect(e.message).to.startsWith(
+                      'value error: structure error: value is not an integer',
                     );
                   }
                 });
@@ -1984,7 +1978,7 @@ describe('DocumentRepository', function main() {
                   expect.fail('should throw an error');
                 } catch (e) {
                   expect(e).to.be.instanceOf(InvalidQueryError);
-                  expect(e.message).to.equal('value error: structure Error: value is not a float');
+                  expect(e.message).to.equal('value error: structure error: value is not a float');
                 }
               });
             });
@@ -2607,11 +2601,11 @@ describe('DocumentRepository', function main() {
             expect.fail('should throw an error');
           } catch (e) {
             expect(e).to.be.instanceOf(InvalidQueryError);
-            expect(e.message).to.equal('value error: structure Error: value is not an integer');
+            expect(e.message).to.equal('value error: structure error: value is not an integer');
           }
         });
 
-        nonNumberAndUndefinedTestCases.forEach(({ type, value }) => {
+        nonNumberNullAndUndefinedTestCases.forEach(({ type, value }) => {
           it(`should return invalid result if "limit" is not a number, but ${type}`, async () => {
             try {
               await documentRepository.find(queryDataContract, 'documentNumber', {
@@ -2625,7 +2619,7 @@ describe('DocumentRepository', function main() {
               expect.fail('should throw an error');
             } catch (e) {
               expect(e).to.be.instanceOf(InvalidQueryError);
-              expect(e.message).to.equal('value error: structure Error: value is not an integer');
+              expect(e.message).to.equal('value error: structure error: value is not an integer');
             }
           });
         });
@@ -2799,7 +2793,7 @@ describe('DocumentRepository', function main() {
               expect.fail('should throw an error');
             } catch (e) {
               expect(e).to.be.instanceOf(InvalidQueryError);
-              expect(e.message).to.equal('value error: structure Error: value are not bytes, a string, or an array of values representing bytes');
+              expect(e.message).to.equal('value error: structure error: value are not bytes, a string, or an array of values representing bytes');
             }
           });
         });

diff --git a/packages/rs-dpp/schema/document/documentBase.json b/packages/rs-dpp/schema/document/documentBase.json
@@ -2,38 +2,24 @@
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"type": "object",
 	"properties": {
-		"$protocolVersion": {
-			"type": "integer",
-			"$comment": "Maximum is the latest protocol version"
-		},
 		"$id": {
 			"type": "array",
 			"byteArray": true,
 			"minItems": 32,
 			"maxItems": 32,
 			"contentMediaType": "application/x.dash.dpp.identifier"
 		},
-		"$type": {
-			"type": "string"
-		},
-		"$revision": {
-			"type": "integer",
-			"minimum": 1
-		},
-		"$dataContractId": {
-			"type": "array",
-			"byteArray": true,
-			"minItems": 32,
-			"maxItems": 32,
-			"contentMediaType": "application/x.dash.dpp.identifier"
-		},
 		"$ownerId": {
 			"type": "array",
 			"byteArray": true,
 			"minItems": 32,
 			"maxItems": 32,
 			"contentMediaType": "application/x.dash.dpp.identifier"
 		},
+		"$revision": {
+			"type": "integer",
+			"minimum": 1
+		},
 		"$createdAt": {
 			"type": "integer",
 			"minimum": 0
@@ -44,11 +30,7 @@
 		}
 	},
 	"required": [
-		"$protocolVersion",
 		"$id",
-		"$type",
-		"$revision",
-		"$dataContractId",
 		"$ownerId"
 	],
 	"additionalProperties": false

diff --git a/packages/rs-dpp/schema/document/documentExtended.json b/packages/rs-dpp/schema/document/documentExtended.json
@@ -0,0 +1,55 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "$protocolVersion": {
+      "type": "integer",
+      "$comment": "Maximum is the latest protocol version"
+    },
+    "$id": {
+      "type": "array",
+      "byteArray": true,
+      "minItems": 32,
+      "maxItems": 32,
+      "contentMediaType": "application/x.dash.dpp.identifier"
+    },
+    "$type": {
+      "type": "string"
+    },
+    "$revision": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "$dataContractId": {
+      "type": "array",
+      "byteArray": true,
+      "minItems": 32,
+      "maxItems": 32,
+      "contentMediaType": "application/x.dash.dpp.identifier"
+    },
+    "$ownerId": {
+      "type": "array",
+      "byteArray": true,
+      "minItems": 32,
+      "maxItems": 32,
+      "contentMediaType": "application/x.dash.dpp.identifier"
+    },
+    "$createdAt": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "$updatedAt": {
+      "type": "integer",
+      "minimum": 0
+    }
+  },
+  "required": [
+    "$protocolVersion",
+    "$id",
+    "$type",
+    "$revision",
+    "$dataContractId",
+    "$ownerId"
+  ],
+  "additionalProperties": false
+}
diff --git a/packages/rs-dpp/src/bls.rs b/packages/rs-dpp/src/bls.rs
@@ -1,4 +1,5 @@
 use crate::{ProtocolError, PublicKeyValidationError};
+#[cfg(not(target_arch = "wasm32"))]
 use anyhow::anyhow;
 use bls_signatures::{verify_messages, PrivateKey, PublicKey, Serialize};
 use std::convert::TryInto;

diff --git a/packages/rs-dpp/src/convertible.rs b/packages/rs-dpp/src/convertible.rs
@@ -1,16 +1,22 @@
+use platform_value::Value;
 use serde_json::Value as JsonValue;
 
 use crate::ProtocolError;
 
 pub trait Convertible {
+    /// Returns the [`platform_value::Value`] instance on an object
+    fn to_object(&self) -> Result<Value, ProtocolError>;
+    fn to_cleaned_object(&self) -> Result<Value, ProtocolError>;
+    /// Returns the [`platform_value::Value`] instance on an object
+    fn into_object(self) -> Result<Value, ProtocolError>;
     /// Returns the [`serde_json::Value`] instance that preserves the `Vec<u8>` representation
     /// for Identifiers and binary data
-    fn to_object(&self) -> Result<JsonValue, ProtocolError>;
+    fn to_json_object(&self) -> Result<JsonValue, ProtocolError>;
     /// Returns the [`serde_json::Value`] instance that encodes:
     ///  - Identifiers  - with base58
     ///  - Binary data  - with base64
     fn to_json(&self) -> Result<JsonValue, ProtocolError>;
-    /// Returns the cibor-encoded bytes representation of the object. The data is prefixed by 4 bytes containing
+    /// Returns the cbor-encoded bytes representation of the object. The data is prefixed by 4 bytes containing
     /// the Protocol Version
     fn to_buffer(&self) -> Result<Vec<u8>, ProtocolError>;
 }