@dashevo/wasm-dpp 0.24.0-dev.34 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "0.24.0-dev.34",
+  "version": "0.24.0",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,8 +44,8 @@
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "^7.15.4",
     "@dashevo/dashcore-lib": "~0.20.5",
-    "@dashevo/dpns-contract": "0.24.0-dev.34",
-    "@dashevo/dpp": "0.24.0-dev.34",
+    "@dashevo/dpns-contract": "0.24.0",
+    "@dashevo/dpp": "0.24.0",
     "@dashevo/wasm-re2": "~1.0.2",
     "@types/bs58": "^4.0.1",
     "@types/node": "^14.6.0",

package/scripts/build-wasm.sh

@@ -25,10 +25,10 @@ if ! [[ -d $OUTPUT_DIR ]];  then
   mkdir -p "$OUTPUT_DIR"
 fi
 
-if ! [ -x "$(command -v wasm-bindgen)" ]; then
-    echo 'Wasm-bindgen CLI is not installed. Installing';
-    cargo install -f wasm-bindgen-cli
-fi
+#if ! [ -x "$(command -v wasm-bindgen)" ]; then
+#    echo 'Wasm-bindgen CLI is not installed. Installing';
+    cargo install -f wasm-bindgen-cli@0.2.84
+#fi
 
 
 # On a mac, bundled clang won't work - you need to install LLVM manually through brew,

package/src/errors/value_error.rs

@@ -29,4 +29,9 @@ impl PlatformValueErrorWasm {
     pub fn to_string(&self) -> String {
         format!("PlatformValueError: {}", self.message)
     }
+
+    #[wasm_bindgen(js_name=valueOf)]
+    pub fn value_of(&self) -> String {
+        self.to_string()
+    }
 }

package/src/identity/state_transition/mod.rs

@@ -9,4 +9,5 @@ mod identity_create_transition;
 pub(crate) mod identity_public_key_transitions;
 mod identity_topup_transition;
 mod identity_update_transition;
+mod transition_types;
 mod validate_public_key_signatures;

package/src/identity/state_transition/transition_types.rs

@@ -0,0 +1,30 @@
+use dpp::state_transition::StateTransitionType;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(js_name=StateTransitionTypes)]
+#[allow(non_camel_case_types)]
+pub enum StateTransitionTypeWasm {
+    DataContractCreate = 0,
+    DocumentsBatch = 1,
+    IdentityCreate = 2,
+    IdentityTopUp = 3,
+    DataContractUpdate = 4,
+    IdentityUpdate = 5,
+    IdentityCreditWithdrawal = 6,
+}
+
+impl From<StateTransitionType> for StateTransitionTypeWasm {
+    fn from(state_transition_type: StateTransitionType) -> Self {
+        match state_transition_type {
+            StateTransitionType::DataContractCreate => StateTransitionTypeWasm::DataContractCreate,
+            StateTransitionType::DocumentsBatch => StateTransitionTypeWasm::DocumentsBatch,
+            StateTransitionType::IdentityCreate => StateTransitionTypeWasm::IdentityCreate,
+            StateTransitionType::IdentityTopUp => StateTransitionTypeWasm::IdentityTopUp,
+            StateTransitionType::DataContractUpdate => StateTransitionTypeWasm::DataContractUpdate,
+            StateTransitionType::IdentityUpdate => StateTransitionTypeWasm::IdentityUpdate,
+            StateTransitionType::IdentityCreditWithdrawal => {
+                StateTransitionTypeWasm::IdentityCreditWithdrawal
+            }
+        }
+    }
+}

package/src/lib.rs

@@ -31,4 +31,5 @@ mod decode_protocol_entity;
 mod entropy_generator;
 mod generate_temporary_ecdsa_private_key;
 mod lodash;
+mod protocol_version;
 mod validation;

package/src/protocol_version.rs

@@ -0,0 +1,7 @@
+use dpp::version::LATEST_VERSION;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen(js_name = getLatestProtocolVersion)]
+pub fn latest_protocol_version() -> u32 {
+    LATEST_VERSION
+}

package/src/state_transition/errors/invalid_state_transition_error.rs

@@ -1,5 +1,7 @@
 use dpp::consensus::ConsensusError;
-use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
+use serde::Serialize;
+use serde_json::json;
+use wasm_bindgen::{prelude::wasm_bindgen, JsError, JsValue};
 
 use crate::{
     buffer::Buffer, errors::consensus::consensus_error::from_consensus_error_ref,
@@ -45,4 +47,15 @@ impl InvalidStateTransitionErrorWasm {
     pub fn get_raw_state_transition(&self) -> JsValue {
         self.raw_state_transition.clone()
     }
+
+    #[wasm_bindgen(js_name = valueOf)]
+    pub fn value_of(&self) -> Result<JsValue, JsError> {
+        let errors = serde_json::to_value(&self.errors)
+            .map_err(|_| JsError::new("Can't serialize consensus errors to json"))?;
+        let ser = serde_wasm_bindgen::Serializer::json_compatible();
+        let val = errors
+            .serialize(&ser)
+            .map_err(|_| JsError::new("Can't serialize consensus errors to json"));
+        val
+    }
 }

package/src/state_transition/state_transition_facade.rs

@@ -14,11 +14,15 @@ use dpp::state_transition::{
 use dpp::version::ProtocolVersionValidator;
 use serde::Deserialize;
 
+use crate::errors::consensus::basic::state_transition::InvalidStateTransitionTypeErrorWasm;
 use crate::errors::protocol_error::from_protocol_error;
 use crate::errors::value_error::PlatformValueErrorWasm;
+use crate::state_transition::errors::invalid_state_transition_error::InvalidStateTransitionErrorWasm;
 use dpp::data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransition;
 use dpp::document::DocumentsBatchTransition;
 use dpp::ProtocolError;
+use dpp::ProtocolError::InvalidStateTransitionTypeError;
+use num_enum::TryFromPrimitiveError;
 use std::sync::Arc;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsValue;
@@ -67,7 +71,9 @@ impl StateTransitionFacadeWasm {
             .get_integer::<u8>("type")
             .map_err(|e| PlatformValueErrorWasm::from(e))?
             .try_into()
-            .map_err(|_| JsValue::from_str("Invalid state transition type"))?;
+            .map_err(|e: TryFromPrimitiveError<StateTransitionType>| {
+                InvalidStateTransitionTypeErrorWasm::new(e.number as u8)
+            })?;
 
         // TODO: clean values of other transitions as well?
         match state_transition_type {

package/test/integration/dataContract/DataContractFacade.spec.js

@@ -1,5 +1,5 @@
-const getDataContractJSFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
 const crypto = require('crypto');
+const getDataContractJSFixture = require('../../../lib/test/fixtures/js/getDataContractFixture');
 const getBlsAdapterMock = require('../../../lib/test/mocks/getBlsAdapterMock');
 const createStateRepositoryMock = require('../../../lib/test/mocks/createStateRepositoryMock');
 const getPrivateAndPublicKey = require('../../../lib/test/fixtures/getPrivateAndPublicKeyForSigningFixture');

package/test/integration/dataContract/stateTransition/DataContractCreateTransition/validation/basic/validateDataContractCreateTransitionBasicFactory.spec.js

@@ -1,10 +1,10 @@
 const crypto = require('crypto');
-const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
 
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
+const getDataContractFixture = require('../../../../../../../lib/test/fixtures/getDataContractFixture');
 const { expectJsonSchemaError, expectValidationError, expectValueError } = require('../../../../../../../lib/test/expect/expectError');
 
-const { default: loadWasmDpp } = require('../../../../../../../dist');
+const { default: loadWasmDpp } = require('../../../../../../..');
+const { getLatestProtocolVersion } = require('../../../../../../..');
 
 describe('validateDataContractCreateTransitionBasicFactory', () => {
   let stateTransition;
@@ -29,11 +29,11 @@ describe('validateDataContractCreateTransitionBasicFactory', () => {
   });
 
   beforeEach(async () => {
-    dataContract = getDataContractFixture();
+    dataContract = await getDataContractFixture();
     rawDataContract = dataContract.toObject();
 
     stateTransition = new DataContractCreateTransition({
-      protocolVersion: protocolVersion.latestVersion,
+      protocolVersion: getLatestProtocolVersion(),
       dataContract: rawDataContract,
       entropy: dataContract.getEntropy(),
       signature: Buffer.alloc(65),

package/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js

@@ -1,9 +1,9 @@
-const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
+const getDataContractFixture = require('../../../../../../../lib/test/fixtures/getDataContractFixture');
 const { expectJsonSchemaError, expectValidationError, expectValueError } = require('../../../../../../../lib/test/expect/expectError');
 
-const { default: loadWasmDpp } = require('../../../../../../../dist');
+const { default: loadWasmDpp } = require('../../../../../../..');
+const { getLatestProtocolVersion } = require('../../../../../../..');
 
 describe('validateDataContractUpdateTransitionBasicFactory', () => {
   let DataContractUpdateTransition;
@@ -39,13 +39,13 @@ describe('validateDataContractUpdateTransitionBasicFactory', () => {
   });
 
   beforeEach(async function beforeEach() {
-    dataContract = getDataContractFixture();
+    dataContract = await getDataContractFixture();
 
     rawDataContract = dataContract.toObject();
     rawDataContract.version += 1;
 
     stateTransition = new DataContractUpdateTransition({
-      protocolVersion: protocolVersion.latestVersion,
+      protocolVersion: getLatestProtocolVersion(),
       dataContract: rawDataContract,
       signature: Buffer.alloc(65),
       signaturePublicKeyId: 0,
@@ -54,7 +54,7 @@ describe('validateDataContractUpdateTransitionBasicFactory', () => {
     rawStateTransition = stateTransition.toObject();
 
     const validator = new DataContractValidator();
-    const dataContractFactory = new DataContractFactory(protocolVersion.latestVersion, validator);
+    const dataContractFactory = new DataContractFactory(getLatestProtocolVersion(), validator);
     const wasmDataContract = await dataContractFactory.createFromBuffer(dataContract.toBuffer());
     stateRepositoryMock = createStateRepositoryMock(this.sinonSandbox);
     stateRepositoryMock.fetchDataContract.resolves(wasmDataContract);

package/test/integration/dataContract/validation/validateDataContractFactory.spec.js

@@ -1,5 +1,5 @@
 const lodashCloneDeep = require('lodash/cloneDeep');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
+const getDataContractFixture = require('../../../../lib/test/fixtures/getDataContractFixture');
 const { expectJsonSchemaError, expectValidationError } = require('../../../../lib/test/expect/expectError');
 
 const { default: loadWasmDpp } = require('../../../../dist');
@@ -39,7 +39,7 @@ describe('validateDataContractFactory', () => {
   });
 
   beforeEach(async () => {
-    dataContract = getDataContractFixture();
+    dataContract = await getDataContractFixture();
 
     const dataContractValidator = new DataContractValidator();
 

package/test/integration/document/DocumentFacade.spec.js

@@ -1,8 +1,8 @@
 const crypto = require('crypto');
-const generateRandomIdentifier = require('@dashevo/dpp/lib/test/utils/generateRandomIdentifier');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
-const getDocumentsFixture = require('@dashevo/dpp/lib/test/fixtures/getDocumentsFixture');
+const generateRandomIdentifier = require('../../../lib/test/fixtures/js/generateRandomIdentifier');
+const getDataContractFixture = require('../../../lib/test/fixtures/js/getDataContractFixture');
+const getDocumentsFixture = require('../../../lib/test/fixtures/js/getDocumentsFixture');
+const createStateRepositoryMock = require('../../../lib/test/mocks/createStateRepositoryMock');
 const getDocumentTransitionsFixture = require('../../../lib/test/fixtures/getDocumentTransitionsFixture');
 
 const { default: loadWasmDpp } = require('../../../dist');

package/test/integration/document/stateTransition/DocumentsBatchTransition/DocumentBatchTransition.spec.js

@@ -1,10 +1,9 @@
-const IdentityPublicKey = require('@dashevo/dpp/lib/identity/IdentityPublicKey');
+const createStateRepositoryMock = require('../../../../../lib/test/mocks/createStateRepositoryMock');
+const getDataContractFixture = require('../../../../../lib/test/fixtures/js/getDataContractFixture');
+const getDocumentsFixture = require('../../../../../lib/test/fixtures/js/getDocumentsFixture');
 
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
-const getDocumentsFixture = require('@dashevo/dpp/lib/test/fixtures/getDocumentsFixture');
-
-const { default: loadWasmDpp } = require('../../../../../dist');
+const { default: loadWasmDpp } = require('../../../../..');
+const { IdentityPublicKey } = require('../../../../..');
 
 let ExtendedDocument;
 let DataContract;

package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/basic/validateDocumentsBatchTransitionBasicFactory.spec.js

@@ -1,12 +1,12 @@
-const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
-const generateRandomIdentifier = require('@dashevo/dpp/lib/test/utils/generateRandomIdentifier');
-const getDocumentTransitionsFixture = require('@dashevo/dpp/lib/test/fixtures/getDocumentTransitionsFixture');
-const getDocumentsFixture = require('@dashevo/dpp/lib/test/fixtures/getDocumentsFixture');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-
-const { default: loadWasmDpp } = require('../../../../../../../dist');
+const getDocumentTransitionsFixture = require('../../../../../../../lib/test/fixtures/getDocumentTransitionsFixture');
+const getDocumentsFixture = require('../../../../../../../lib/test/fixtures/js/getDocumentsFixture');
+const getDataContractFixture = require('../../../../../../../lib/test/fixtures/js/getDataContractFixture');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
+
+const { default: loadWasmDpp } = require('../../../../../../..');
+const { getLatestProtocolVersion } = require('../../../../../../..');
 const { expectJsonSchemaError, expectValidationError, expectValueError } = require('../../../../../../../lib/test/expect/expectError');
+const generateRandomIdentifierAsync = require('../../../../../../../lib/test/utils/generateRandomIdentifierAsync');
 
 let DataContract;
 let DocumentsBatchTransition;
@@ -71,7 +71,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
     executionContext = new StateTransitionExecutionContext();
 
     stateTransition = new DocumentsBatchTransition({
-      protocolVersion: protocolVersion.latestVersion,
+      protocolVersion: getLatestProtocolVersion(),
       ownerId,
       contractId: dataContract.getId(),
       transitions: documentTransitions.map((t) => t.toObject()),
@@ -425,7 +425,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
           const [documentTransition] = documentTransitions.map((t) => t.toObject());
 
           stateTransition = new DocumentsBatchTransition({
-            protocolVersion: protocolVersion.latestVersion,
+            protocolVersion: getLatestProtocolVersion(),
             ownerId,
             contractId: dataContract.getId(),
             transitions: [documentTransition, documentTransition],
@@ -627,7 +627,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
             const [firstTransition] = rawStateTransition.transitions;
 
             const expectedId = firstTransition.$id;
-            firstTransition.$id = generateRandomIdentifier().toBuffer();
+            firstTransition.$id = (await generateRandomIdentifierAsync()).toBuffer();
 
             const result = await validateDocumentsBatchTransitionBasic(
               protocolVersionValidator,
@@ -745,7 +745,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
           });
 
           stateTransition = new DocumentsBatchTransition({
-            protocolVersion: protocolVersion.latestVersion,
+            protocolVersion: getLatestProtocolVersion(),
             ownerId,
             contractId: dataContract.getId(),
             transitions: documentTransitions.map((t) => t.toObject()),
@@ -848,7 +848,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
           });
 
           stateTransition = new DocumentsBatchTransition({
-            protocolVersion: protocolVersion.latestVersion,
+            protocolVersion: getLatestProtocolVersion(),
             ownerId,
             contractId: dataContract.getId(),
             transitions: documentTransitions.map((t) => t.toObject()),
@@ -895,7 +895,7 @@ describe('validateDocumentsBatchTransitionBasicFactory', () => {
         const duplicates = [duplicatedTransition, indexedTransition];
 
         stateTransition = new DocumentsBatchTransition({
-          protocolVersion: protocolVersion.latestVersion,
+          protocolVersion: getLatestProtocolVersion(),
           ownerId,
           contractId: dataContract.getId(),
           transitions: duplicates,

package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/state/executeDataTriggersFactory.spec.js

@@ -1,4 +1,3 @@
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
 const dpnsSystemIds = require('@dashevo/dpns-contract/lib/systemIds');
 const getDpnsContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDpnsContractFixture');
 const dpnsDocumentFixture = require('@dashevo/dpp/lib/test/fixtures/getDpnsDocumentFixture');
@@ -7,6 +6,7 @@ const getDocumentTransitionsFixture = require('@dashevo/dpp/lib/test/fixtures/ge
 const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
 
 const IdentifierJs = require('@dashevo/dpp/lib/identifier/Identifier');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
 
 const { default: loadWasmDpp } = require('../../../../../../../dist');
 

package/test/integration/document/validation/validateDocumentFactory.spec.js

@@ -1,5 +1,5 @@
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
-const getDocumentsFixture = require('@dashevo/dpp/lib/test/fixtures/getDocumentsFixture');
+const getDataContractFixture = require('../../../../lib/test/fixtures/js/getDataContractFixture');
+const getDocumentsFixture = require('../../../../lib/test/fixtures/js/getDocumentsFixture');
 
 const { expectJsonSchemaError, expectValidationError } = require('../../../../lib/test/expect/expectError');
 const { default: loadWasmDpp } = require('../../../../dist');

package/test/integration/identity/IdentityFacade.spec.js

@@ -1,13 +1,13 @@
 const crypto = require('crypto');
-const getIdentityFixture = require('@dashevo/dpp/lib/test/fixtures/getIdentityFixture');
+const getIdentityFixture = require('../../../lib/test/fixtures/getIdentityFixture');
 
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getInstantAssetLockProofFixture = require('@dashevo/dpp/lib/test/fixtures/getInstantAssetLockProofFixture');
-const getChainAssetLockProofFixture = require('@dashevo/dpp/lib/test/fixtures/getChainAssetLockProofFixture');
-const IdentityPublicKey = require('@dashevo/dpp/lib/identity/IdentityPublicKey');
+const createStateRepositoryMock = require('../../../lib/test/mocks/createStateRepositoryMock');
+const getInstantAssetLockProofFixture = require('../../../lib/test/fixtures/getInstantAssetLockProofFixture');
+const getChainAssetLockProofFixture = require('../../../lib/test/fixtures/getChainAssetLockProofFixture');
 const getBlsAdapterMock = require('../../../lib/test/mocks/getBlsAdapterMock');
 
-const { default: loadWasmDpp } = require('../../../dist');
+const { default: loadWasmDpp } = require('../../..');
+const { IdentityPublicKey } = require('../../..');
 
 describe('IdentityFacade', () => {
   let dpp;
@@ -52,11 +52,11 @@ describe('IdentityFacade', () => {
     );
 
     const chainAssetLockProofJS = getChainAssetLockProofFixture();
-    const instantAssetLockProofJS = getInstantAssetLockProofFixture();
+    const instantAssetLockProofJS = await getInstantAssetLockProofFixture();
     instantAssetLockProof = new InstantAssetLockProof(instantAssetLockProofJS.toObject());
     chainAssetLockProof = new ChainAssetLockProof(chainAssetLockProofJS.toObject());
 
-    const identityObject = getIdentityFixture().toObject();
+    const identityObject = (await getIdentityFixture()).toObject();
     identityObject.id = instantAssetLockProof.createIdentifier();
     identity = new Identity(identityObject);
     identity.setAssetLockProof(instantAssetLockProof);

package/test/integration/identity/stateTransition/IdentityCreateTransition/validation/basic/validateIdentityCreateTransitionBasicFactory.spec.js

@@ -1,7 +1,7 @@
 const { PrivateKey } = require('@dashevo/dashcore-lib');
 
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getIdentityCreateTransitionFixture = require('@dashevo/dpp/lib/test/fixtures/getIdentityCreateTransitionFixture');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
+const getIdentityCreateTransitionFixture = require('../../../../../../../lib/test/fixtures/getIdentityCreateTransitionFixture');
 
 const { expectValidationError, expectJsonSchemaError } = require('../../../../../../../lib/test/expect/expectError');
 const { default: loadWasmDpp } = require('../../../../../../../dist');
@@ -18,7 +18,6 @@ describe('validateIdentityCreateTransitionBasicFactory', () => {
   let validateIdentityCreateTransitionBasic;
 
   let StateTransitionExecutionContext;
-  let IdentityCreateTransition;
   let IdentityPublicKey;
   let UnsupportedProtocolVersionError;
   let InvalidInstantAssetLockProofSignatureError;
@@ -30,7 +29,6 @@ describe('validateIdentityCreateTransitionBasicFactory', () => {
 
   before(async () => {
     ({
-      IdentityCreateTransition,
       StateTransitionExecutionContext,
       UnsupportedProtocolVersionError,
       InvalidInstantAssetLockProofSignatureError,
@@ -57,6 +55,7 @@ describe('validateIdentityCreateTransitionBasicFactory', () => {
   });
 
   beforeEach(async function () {
+    this.timeout(20000);
     stateRepositoryMock = createStateRepositoryMock(this.sinonSandbox);
     stateRepositoryMock.verifyInstantLock.resolves(true);
     stateRepositoryMock.isAssetLockTransactionOutPointAlreadyUsed.resolves(false);
@@ -68,8 +67,7 @@ describe('validateIdentityCreateTransitionBasicFactory', () => {
     const validator = new IdentityCreateTransitionBasicValidator(stateRepositoryMock, blsAdapter);
     validateIdentityCreateTransitionBasic = (st, context) => validator.validate(st, context);
 
-    const stateTransitionJS = getIdentityCreateTransitionFixture();
-    stateTransition = new IdentityCreateTransition(stateTransitionJS.toObject());
+    stateTransition = await getIdentityCreateTransitionFixture();
 
     const privateKey = new PrivateKey('9b67f852093bc61cea0eeca38599dbfba0de28574d2ed9b99d10d33dc1bde7b2');
     const publicKey = privateKey.toPublicKey();

package/test/integration/identity/stateTransition/IdentityTopUpTransition/validation/basic/validateIdentityTopUpTransitionBasicFactory.spec.js

@@ -1,5 +1,5 @@
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getIdentityTopUpTransitionFixture = require('../../../../../../../lib/test/fixtures/getIdentityTopUpTransitionFixtureJs');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
+const getIdentityTopUpTransitionFixture = require('../../../../../../../lib/test/fixtures/getIdentityTopUpTransitionFixture');
 
 const {
   expectJsonSchemaError,
@@ -17,7 +17,6 @@ describe('validateIdentityTopUpTransitionBasicFactory', () => {
   let validateIdentityTopUpTransitionBasic;
 
   let StateTransitionExecutionContext;
-  let IdentityTopUpTransition;
   let IdentityPublicKey;
   let UnsupportedProtocolVersionError;
   let InvalidInstantAssetLockProofSignatureError;
@@ -26,7 +25,6 @@ describe('validateIdentityTopUpTransitionBasicFactory', () => {
   before(async () => {
     ({
       IdentityTopUpTransitionBasicValidator,
-      IdentityTopUpTransition,
       StateTransitionExecutionContext,
       IdentityPublicKey,
       UnsupportedProtocolVersionError,
@@ -47,8 +45,7 @@ describe('validateIdentityTopUpTransitionBasicFactory', () => {
       context,
     );
 
-    const stateTransitionJS = getIdentityTopUpTransitionFixture();
-    stateTransition = new IdentityTopUpTransition(stateTransitionJS.toObject());
+    stateTransition = await getIdentityTopUpTransitionFixture();
 
     const privateKey = '9b67f852093bc61cea0eeca38599dbfba0de28574d2ed9b99d10d33dc1bde7b2';
 

package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js

@@ -1,11 +1,9 @@
-const identitySchema = require('@dashevo/dpp/schema/identity/identity.json');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getIdentityFixture = require('@dashevo/dpp/lib/test/fixtures/getIdentityFixture');
-const ValidationResult = require('@dashevo/dpp/lib/validation/ValidationResult');
-const SomeConsensusError = require('@dashevo/dpp/lib/test/mocks/SomeConsensusError');
+const identitySchema = require('../../../../../../../../rs-dpp/src/schema/identity/identity.json');
+const createStateRepositoryMock = require('../../../../../../../lib/test/mocks/createStateRepositoryMock');
+const getIdentityFixture = require('../../../../../../../lib/test/fixtures/getIdentityFixture');
 const getIdentityUpdateTransitionFixture = require('../../../../../../../lib/test/fixtures/getIdentityUpdateTransitionFixture');
 
-const { default: loadWasmDpp } = require('../../../../../../../dist');
+const { default: loadWasmDpp } = require('../../../../../../..');
 const { expectValidationError } = require('../../../../../../../lib/test/expect/expectError');
 const generateRandomIdentifierAsync = require('../../../../../../../lib/test/utils/generateRandomIdentifierAsync');
 const getBlsAdapterMock = require('../../../../../../../lib/test/mocks/getBlsAdapterMock');
@@ -16,7 +14,6 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
   let stateTransition;
   let identity;
   let rawIdentity;
-  let validatePublicKeysMock;
   let blockTime;
   let executionContext;
 
@@ -49,7 +46,7 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
   });
 
   beforeEach(async function beforeEach() {
-    rawIdentity = getIdentityFixture().toObject();
+    rawIdentity = (await getIdentityFixture()).toObject();
     // Patch identity id to be acceptable by wasm-dpp
     rawIdentity.id = await generateRandomIdentifierAsync();
     identity = new Identity(rawIdentity);
@@ -251,21 +248,21 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
   // TODO: remove?
   // Skipped, because two tests above are seem to be enough
   it.skip('should validate resulting identity public keys', async () => {
-    const publicKeysError = new SomeConsensusError('test');
-
-    validatePublicKeysMock.returns(new ValidationResult([publicKeysError]));
-
-    const result = await validateIdentityUpdateTransitionState(stateTransition);
-
-    expectValidationError(result, SomeConsensusError);
-
-    expect(validatePublicKeysMock).to.be.calledOnce();
-
-    const publicKeys = [...identity.getPublicKeys(), ...stateTransition.getPublicKeysToAdd()];
-
-    expect(validatePublicKeysMock).to.be.calledWithExactly(
-      publicKeys.map((pk) => pk.toObject()),
-    );
+    // const publicKeysError = new SomeConsensusError('test');
+    //
+    // validatePublicKeysMock.returns(new ValidationResult([publicKeysError]));
+    //
+    // const result = await validateIdentityUpdateTransitionState(stateTransition);
+    //
+    // expectValidationError(result, SomeConsensusError);
+    //
+    // expect(validatePublicKeysMock).to.be.calledOnce();
+    //
+    // const publicKeys = [...identity.getPublicKeys(), ...stateTransition.getPublicKeysToAdd()];
+    //
+    // expect(validatePublicKeysMock).to.be.calledWithExactly(
+    //   publicKeys.map((pk) => pk.toObject()),
+    // );
   });
 
   it('should return valid result on dry run', async function () {

package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validatePublicKeysState.spec.js

@@ -1,4 +1,4 @@
-const identitySchema = require('@dashevo/dpp/schema/identity/identity.json');
+const identitySchema = require('../../../../../../../../rs-dpp/src/schema/identity/identity.json');
 const { expectValidationError } = require('../../../../../../../lib/test/expect/expectError');
 
 const { default: loadWasmDpp } = require('../../../../../../../dist');

package/test/integration/identity/stateTransition/assetLockProof/chain/validateChainAssetLockProofStructureFactory.spec.js

@@ -1,9 +1,9 @@
 const { Transaction, Script, PrivateKey } = require('@dashevo/dashcore-lib');
 
-const getChainAssetLockFixture = require('@dashevo/dpp/lib/test/fixtures/getChainAssetLockProofFixture');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-
 const { expect } = require('chai');
+const getChainAssetLockFixture = require('../../../../../../lib/test/fixtures/getChainAssetLockProofFixture');
+const createStateRepositoryMock = require('../../../../../../lib/test/mocks/createStateRepositoryMock');
+
 const { expectJsonSchemaError, expectValidationError } = require('../../../../../../lib/test/expect/expectError');
 
 const { default: loadWasmDpp } = require('../../../../../../dist');

package/test/integration/identity/stateTransition/assetLockProof/fetchAssetLockTransactionOutputFactory.spec.js

@@ -1,8 +1,8 @@
 const { Transaction } = require('@dashevo/dashcore-lib');
 
-const getChainAssetLockFixture = require('@dashevo/dpp/lib/test/fixtures/getChainAssetLockProofFixture');
-const getInstantAssetLockProofFixture = require('@dashevo/dpp/lib/test/fixtures/getInstantAssetLockProofFixture');
-const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
+const getChainAssetLockFixture = require('../../../../../lib/test/fixtures/getChainAssetLockProofFixture');
+const getInstantAssetLockProofFixture = require('../../../../../lib/test/fixtures/getInstantAssetLockProofFixture');
+const createStateRepositoryMock = require('../../../../../lib/test/mocks/createStateRepositoryMock');
 const { default: loadWasmDpp } = require('../../../../../dist');
 
 describe('fetchAssetLockTransactionOutputFactory', () => {
@@ -11,7 +11,6 @@ describe('fetchAssetLockTransactionOutputFactory', () => {
   let executionContext;
 
   let StateTransitionExecutionContext;
-  let InstantAssetLockProof;
   let ChainAssetLockProof;
   let AssetLockTransactionIsNotFoundError;
   let UnknownAssetLockProofTypeError;
@@ -22,7 +21,6 @@ describe('fetchAssetLockTransactionOutputFactory', () => {
     ({
       StateTransitionExecutionContext,
       fetchAssetLockTransactionOutput: fetchAssetLockTransactionOutputDPP,
-      InstantAssetLockProof,
       ChainAssetLockProof,
       AssetLockTransactionIsNotFoundError,
       UnknownAssetLockProofTypeError,
@@ -44,9 +42,8 @@ describe('fetchAssetLockTransactionOutputFactory', () => {
   describe('InstantAssetLockProof', () => {
     let assetLockProofFixture;
 
-    beforeEach(() => {
-      const assetLockProofFixtureJS = getInstantAssetLockProofFixture();
-      assetLockProofFixture = new InstantAssetLockProof(assetLockProofFixtureJS.toObject());
+    beforeEach(async () => {
+      assetLockProofFixture = await getInstantAssetLockProofFixture();
     });
 
     it('should return asset lock output', async () => {