@dashevo/wasm-dpp 1.8.0 → 2.0.0-dev.1

package/src/voting/state_transition/masternode_vote_transition/mod.rs

@@ -220,60 +220,85 @@ impl MasternodeVoteTransitionWasm {
         self.0.is_voting_state_transition()
     }
 
+    #[wasm_bindgen(js_name=getUserFeeIncrease)]
+    pub fn get_user_fee_increase(&self) -> u16 {
+        self.0.user_fee_increase() as u16
+    }
+
+    #[wasm_bindgen(js_name=setUserFeeIncrease)]
+    pub fn set_user_fee_increase(&mut self, user_fee_increase: u16) {
+        self.0.set_user_fee_increase(user_fee_increase);
+    }
+
+    #[wasm_bindgen(js_name=getIdentityContractNonce)]
+    pub fn get_identity_nonce(&self) -> u64 {
+        self.0.nonce()
+    }
+
     #[wasm_bindgen(js_name=getContestedDocumentResourceVotePoll)]
     pub fn contested_document_resource_vote_poll(&self) -> Option<Object> {
         match self.0.vote() {
-            Vote::ResourceVote(vote) => match vote.vote_poll() {
-                VotePoll::ContestedDocumentResourceVotePoll(
-                    contested_document_resource_vote_poll,
-                ) => {
-                    let js_object = Object::new();
-
-                    let contract_id = IdentifierWrapper::from(
-                        contested_document_resource_vote_poll.contract_id.clone(),
-                    );
-
-                    Reflect::set(&js_object, &"contractId".into(), &contract_id.into()).unwrap();
-                    Reflect::set(
-                        &js_object,
-                        &"documentTypeName".into(),
-                        &contested_document_resource_vote_poll
-                            .document_type_name
-                            .clone()
-                            .into(),
-                    )
-                    .unwrap();
-                    Reflect::set(
-                        &js_object,
-                        &"indexName".into(),
-                        &contested_document_resource_vote_poll
-                            .index_name
-                            .clone()
-                            .into(),
-                    )
-                    .unwrap();
-
-                    let config = bincode::config::standard()
-                        .with_big_endian()
-                        .with_no_limit();
-
-                    let serialized_index_values = contested_document_resource_vote_poll
-                        .index_values
-                        .iter()
-                        .map(|value| {
-                            JsValue::from(Buffer::from_bytes_owned(
-                                bincode::encode_to_vec(value, config)
-                                    .expect("expected to encode value in path"),
-                            ))
-                        });
-
-                    let js_array = Array::from_iter(serialized_index_values);
-
-                    Reflect::set(&js_object, &"indexValues".into(), &js_array.into()).unwrap();
-
-                    Some(js_object)
+            Vote::ResourceVote(vote) => {
+                let js_object = Object::new();
+
+                Reflect::set(
+                    &js_object,
+                    &"choice".into(),
+                    &vote.resource_vote_choice().clone().to_string().into(),
+                )
+                .unwrap();
+
+                match vote.vote_poll() {
+                    VotePoll::ContestedDocumentResourceVotePoll(
+                        contested_document_resource_vote_poll,
+                    ) => {
+                        let contract_id = IdentifierWrapper::from(
+                            contested_document_resource_vote_poll.contract_id.clone(),
+                        );
+
+                        Reflect::set(&js_object, &"contractId".into(), &contract_id.into())
+                            .unwrap();
+                        Reflect::set(
+                            &js_object,
+                            &"documentTypeName".into(),
+                            &contested_document_resource_vote_poll
+                                .document_type_name
+                                .clone()
+                                .into(),
+                        )
+                        .unwrap();
+                        Reflect::set(
+                            &js_object,
+                            &"indexName".into(),
+                            &contested_document_resource_vote_poll
+                                .index_name
+                                .clone()
+                                .into(),
+                        )
+                        .unwrap();
+
+                        let config = bincode::config::standard()
+                            .with_big_endian()
+                            .with_no_limit();
+
+                        let serialized_index_values = contested_document_resource_vote_poll
+                            .index_values
+                            .iter()
+                            .map(|value| {
+                                JsValue::from(Buffer::from_bytes_owned(
+                                    bincode::encode_to_vec(value, config)
+                                        .expect("expected to encode value in path"),
+                                ))
+                            });
+
+                        let js_array = Array::from_iter(serialized_index_values);
+
+                        Reflect::set(&js_object, &"indexValues".into(), &js_array.into()).unwrap();
+
+                        Some(js_object)
+                    }
                 }
-            },
+            }
         }
     }
 

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

@@ -85,7 +85,7 @@ describe('ExtendedDocument', () => {
       expect(result.$id.toBuffer()).to.deep.equal(document.getId().toBuffer());
       expect(result.$ownerId.toBuffer()).to.deep.equal(document.getOwnerId().toBuffer());
       expect(result.identifierField.toBuffer()).to.deep.equal(document.get('identifierField').toBuffer());
-      expect(result.$revision).to.deep.equal(document.getRevision());
+      expect(BigInt(result.$revision)).to.deep.equal(document.getRevision());
       expect(result.$type).to.deep.equal(document.getType());
       expect(result.byteArrayField).to.deep.equal(document.get('byteArrayField'));
     });
@@ -93,12 +93,7 @@ describe('ExtendedDocument', () => {
 
   describe('#setMetadata', () => {
     it('should set metadata - Rust', () => {
-      const otherMetadata = new Metadata({
-        blockHeight: 43,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
+      const otherMetadata = new Metadata(BigInt(43), 1, BigInt(100), 2);
       document.setMetadata(otherMetadata);
 
       expect(document.getMetadata().toObject()).to.deep.equal(otherMetadata.toObject());

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

@@ -8,7 +8,7 @@ const {
   ExtendedDocument,
   DataContract,
   ValidationResult,
-  DocumentsBatchTransition,
+  BatchTransition,
   DashPlatformProtocol,
   DataContractNotPresentError,
 } = require('../../..');
@@ -95,7 +95,7 @@ describe('DocumentFacade', () => {
   });
 
   describe('createStateTransition', () => {
-    it('should create DocumentsBatchTransition with passed documents - Rust', () => {
+    it('should create BatchTransition with passed documents - Rust', () => {
       const identityId = documents[0].getOwnerId();
       const contractId = documents[0].getDataContractId();
 
@@ -103,11 +103,11 @@ describe('DocumentFacade', () => {
         create: documents,
       }, {
         [identityId.toString()]: {
-          [contractId.toString()]: 1,
+          [contractId.toString()]: '1',
         },
       });
 
-      expect(result).to.be.instanceOf(DocumentsBatchTransition);
+      expect(result).to.be.instanceOf(BatchTransition);
       // expect(result.getTransitions().map((t) => t.toObject()))
       //   .has.deep.members(getDocumentTransitionsFixture({
       //     create: documentsJs,

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

@@ -32,7 +32,7 @@ describe('IdentityFacade', () => {
     chainAssetLockProof = new ChainAssetLockProof(chainAssetLockProofJS.toObject());
 
     identity = await getIdentityFixture(instantAssetLockProof.createIdentifier());
-    identity.setBalance(0);
+    identity.setBalance(BigInt(0));
   });
 
   describe('#create', () => {
@@ -62,16 +62,11 @@ describe('IdentityFacade', () => {
 
   describe('#createFromBuffer', () => {
     it('should create Identity from a Buffer', () => {
-      let result;
-      try {
-        result = dpp.identity.createFromBuffer(identity.toBuffer());
-      } catch (e) {
-        console.dir(e.getErrors()[0].toString());
-      }
+      const deserialized = dpp.identity.createFromBuffer(identity.toBuffer());
 
-      expect(result).to.be.an.instanceOf(Identity);
+      expect(deserialized).to.be.an.instanceOf(Identity);
 
-      expect(result.toObject()).to.deep.equal(identity.toObject());
+      expect(deserialized.toObject()).to.deep.equal(identity.toObject());
     });
   });
 
@@ -186,7 +181,7 @@ describe('IdentityFacade', () => {
       expect(stateTransition.getIdentityId().toBuffer())
         .to.be.deep.equal(identity.getId().toBuffer());
       expect(stateTransition.getRevision()).to.equal(
-        identity.getRevision() + 1,
+        identity.getRevision() + BigInt(1),
       );
       expect(
         stateTransition.getPublicKeysToAdd().map((pk) => pk.toObject()),

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

@@ -124,7 +124,7 @@ describe.skip('validateIdentityUpdateTransitionStateFactory', () => {
     expect(error.getId()).to.equal(3);
   });
 
-  it('should pass when disabling public key', async function () {
+  it('should pass when disabling public key', async function it() {
     stateTransition.setPublicKeyIdsToDisable([1]);
     stateTransition.setPublicKeysToAdd(undefined);
 
@@ -143,7 +143,7 @@ describe.skip('validateIdentityUpdateTransitionStateFactory', () => {
       .to.be.calledOnce();
   });
 
-  it('should pass when adding public key', async function () {
+  it('should pass when adding public key', async function it() {
     stateTransition.setPublicKeyIdsToDisable(undefined);
 
     const result = await validateIdentityUpdateTransitionState(stateTransition);
@@ -161,7 +161,7 @@ describe.skip('validateIdentityUpdateTransitionStateFactory', () => {
       .to.not.be.called();
   });
 
-  it('should pass when both adding and disabling public keys', async function () {
+  it('should pass when both adding and disabling public keys', async function it() {
     stateTransition.setPublicKeyIdsToDisable([1]);
 
     const result = await validateIdentityUpdateTransitionState(stateTransition);
@@ -227,7 +227,7 @@ describe.skip('validateIdentityUpdateTransitionStateFactory', () => {
     // );
   });
 
-  it('should return valid result on dry run', async function () {
+  it('should return valid result on dry run', async function it() {
     stateTransition.setPublicKeyIdsToDisable([3]);
 
     // Make code that executes after dry run check to fail

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

@@ -307,7 +307,7 @@ describe.skip('validateChainAssetLockProofStructureFactory', () => {
       expect(stateRepositoryMock.fetchLatestPlatformCoreChainLockedHeight).to.not.be.called();
     });
 
-    it('should point to existing transaction', async function () {
+    it('should point to existing transaction', async function it() {
       stateRepositoryMock.fetchTransaction.resolves(null);
 
       const result = await validateChainAssetLockProofStructure(
@@ -353,7 +353,7 @@ describe.skip('validateChainAssetLockProofStructureFactory', () => {
       );
     });
 
-    it('should point to transaction from block lower than core chain locked height', async function () {
+    it('should point to transaction from block lower than core chain locked height', async function it() {
       rawProof.coreChainLockedHeight = 41;
       stateRepositoryMock.fetchLatestPlatformCoreChainLockedHeight.resolves(41);
 
@@ -378,7 +378,7 @@ describe.skip('validateChainAssetLockProofStructureFactory', () => {
     });
   });
 
-  it('should return valid result', async function () {
+  it('should return valid result', async function it() {
     const result = await validateChainAssetLockProofStructure(
       rawProof,
       executionContext,

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

@@ -89,7 +89,7 @@ describe.skip('fetchAssetLockTransactionOutputFactory', () => {
       ([output] = transaction.outputs);
     });
 
-    it('should fetch output from state repository', async function () {
+    it('should fetch output from state repository', async function it() {
       const assetLockTransactionOutput = await fetchAssetLockTransactionOutput(
         assetLockProofFixture,
         executionContext,

package/test/integration/stateTransition/StateTransitionFacade.spec.js

@@ -102,14 +102,14 @@ describe('StateTransitionFacade', () => {
       create: documents,
     }, {
       [documents[0].getOwnerId().toString()]: {
-        [documents[0].getDataContractId().toString()]: 0,
+        [documents[0].getDataContractId().toString()]: '0',
       },
     });
     await documentsBatchTransition.sign(identityPublicKey, privateKey);
 
     identity = await getIdentityFixture();
     identity.setId(await generateRandomIdentifierAsync());
-    identity.setBalance(10000000);
+    identity.setBalance(BigInt(10000000));
     identity.setPublicKeys([identityPublicKey]);
 
     dpp = new DashPlatformProtocol(
@@ -171,7 +171,7 @@ describe('StateTransitionFacade', () => {
     });
 
     it('should return invalid result if not enough balance to pay fee for State Transition', async () => {
-      identity.setBalance(0);
+      identity.setBalance(BigInt(0));
       stateRepositoryMock.fetchIdentityBalance.resolves(0);
       const result = await dpp.stateTransition.validate(
         dataContractCreateTransition,

package/test/unit/Metadata.spec.js

@@ -9,41 +9,26 @@ describe('Metadata', () => {
 
   describe('#constructor', () => {
     it('should set height and core chain-locked height', () => {
-      const result = new Metadata({
-        blockHeight: 42,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
-
-      expect(result.getBlockHeight()).to.equal(42);
+      const result = new Metadata(BigInt(42), 1, BigInt(100), 2);
+
+      expect(result.getBlockHeight()).to.equal(BigInt(42));
       expect(result.getCoreChainLockedHeight()).to.equal(1);
-      expect(result.getTimeMs()).to.equal(100);
+      expect(result.getTimeMs()).to.equal(BigInt(100));
       expect(result.getProtocolVersion()).to.equal(2);
     });
   });
 
   describe('#getBlockHeight', () => {
     it('should get block height', () => {
-      const result = new Metadata({
-        blockHeight: 42,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
-
-      expect(result.getBlockHeight()).to.equal(42);
+      const result = new Metadata(BigInt(42), 1, BigInt(100), 2);
+
+      expect(result.getBlockHeight()).to.equal(BigInt(42));
     });
   });
 
   describe('#getCoreChainLockedHeight', () => {
     it('should get core chain-locked height', () => {
-      const result = new Metadata({
-        blockHeight: 1,
-        coreChainLockedHeight: 42,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
+      const result = new Metadata(BigInt(1), 42, BigInt(100), 2);
 
       expect(result.getCoreChainLockedHeight()).to.equal(42);
     });

package/test/unit/dataContract/DataContract.spec.js

@@ -16,11 +16,10 @@ describe('DataContract', () => {
 
   let DataContract;
   let Identifier;
-  let Metadata;
 
   before(async () => {
     ({
-      DataContract, Identifier, Metadata,
+      DataContract, Identifier,
     } = await loadWasmDpp());
   });
 
@@ -298,22 +297,6 @@ describe('DataContract', () => {
     });
   });
 
-  describe('#setMetadata', () => {
-    it('should set metadata', () => {
-      const otherMetadata = new Metadata({
-        blockHeight: 43,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
-      const otherMetadataToObject = otherMetadata.toObject();
-
-      dataContract.setMetadata(otherMetadata);
-
-      expect(dataContract.getMetadata().toObject()).to.deep.equal(otherMetadataToObject);
-    });
-  });
-
   describe.skip('#setConfig', () => {
     it('should set config', () => {
       const config = {

package/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js

@@ -66,7 +66,7 @@ describe('DataContractCreateTransition', () => {
     it('should return serialized State Transition', () => {
       const result = stateTransition.toBuffer();
       expect(result).to.be.instanceOf(Buffer);
-      expect(result).to.have.lengthOf(2359);
+      expect(result).to.have.lengthOf(2360);
     });
 
     it('should be able to restore contract config from bytes', () => {

package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js

@@ -65,7 +65,7 @@ describe('DataContractUpdateTransition', () => {
     it('should return serialized State Transition', () => {
       const result = stateTransition.toBuffer();
       expect(result).to.be.instanceOf(Buffer);
-      expect(result).to.have.lengthOf(2359);
+      expect(result).to.have.lengthOf(2360);
     });
 
     it('should be able to restore contract config from bytes', () => {

package/test/unit/document/Document.spec.js

@@ -1,5 +1,3 @@
-const crypto = require('crypto');
-
 const generateRandomIdentifierAsync = require('../../../lib/test/utils/generateRandomIdentifierAsync');
 const { default: loadWasmDpp, DocumentCreateTransition } = require('../../..');
 const { getLatestProtocolVersion } = require('../../..');
@@ -29,7 +27,6 @@ describe('Document', () => {
     const ownerId = await generateRandomIdentifierAsync();
     const dataContractFactory = new DataContractFactory(
       1,
-      { generate: () => crypto.randomBytes(32) },
     );
 
     const rawDataContract = {
@@ -83,7 +80,7 @@ describe('Document', () => {
       $type: 'test',
       $dataContractId: dataContract.getId(),
       $ownerId: ownerId,
-      $revision: DocumentCreateTransition.INITIAL_REVISION,
+      $revision: Number(DocumentCreateTransition.INITIAL_REVISION.toString()),
       $createdAt: now,
       $createdAtBlockHeight: 1,
       $createdAtCoreBlockHeight: 1,
@@ -101,7 +98,7 @@ describe('Document', () => {
       $type: 'test',
       $dataContractId: dataContract.getId().toBuffer(),
       $ownerId: ownerId.toBuffer(),
-      $revision: DocumentCreateTransition.INITIAL_REVISION,
+      $revision: Number(DocumentCreateTransition.INITIAL_REVISION.toString()),
       $createdAt: now,
       $createdAtBlockHeight: 1,
       $createdAtCoreBlockHeight: 1,
@@ -261,7 +258,7 @@ describe('Document', () => {
 
       document = new ExtendedDocument(rawDocument, dataContract);
 
-      expect(document.getRevision()).to.equal(rawDocument.$revision);
+      expect(document.getRevision()).to.equal(BigInt(rawDocument.$revision));
     });
 
     it('should create Document with $createdAt and data if present', async () => {
@@ -342,7 +339,7 @@ describe('Document', () => {
 
   describe('#setRevision/#getRevision', () => {
     it('should set $revision and get $revision', () => {
-      const revision = 5;
+      const revision = BigInt(5);
 
       document.setRevision(revision);
 

package/test/unit/document/DocumentFactory.spec.js

@@ -294,7 +294,7 @@ describe('DocumentFactory', () => {
         replace: [newDocument],
       }, {
         [identityId.toString()]: {
-          [dataContract.getId().toString()]: 1,
+          [dataContract.getId().toString()]: '1',
         },
       });
 
@@ -304,7 +304,7 @@ describe('DocumentFactory', () => {
         .filter((t) => t.getAction() === 0);
 
       expect(replaceDocuments[0].getId()).to.deep.equal(newDocument.getId());
-      expect(replaceDocuments[0].getRevision()).to.deep.equal(2);
+      expect(replaceDocuments[0].getRevision()).to.deep.equal(BigInt(2));
       expect(createDocuments).to.have.lengthOf(documents.length);
     });
   });

package/test/unit/identity/Identity.spec.js

@@ -22,21 +22,11 @@ describe('Identity', () => {
 
     rawIdentity = identity.toObject();
 
-    metadataFixture = new Metadata({
-      blockHeight: 42,
-      coreChainLockedHeight: 0,
-      timeMs: 100,
-      protocolVersion: 2,
-    });
+    metadataFixture = new Metadata(BigInt(42), 1, BigInt(100), 2);
 
     identity.setMetadata(metadataFixture);
 
-    metadataFixture = new Metadata({
-      blockHeight: 42,
-      coreChainLockedHeight: 0,
-      timeMs: 100,
-      protocolVersion: 2,
-    });
+    metadataFixture = new Metadata(BigInt(42), 1, BigInt(100), 2);
   });
 
   describe('#constructor', () => {
@@ -173,52 +163,42 @@ describe('Identity', () => {
 
   describe('#getBalance', () => {
     it('should return set identity balance', () => {
-      identity.setBalance(42);
-      expect(identity.getBalance()).to.equal(42);
+      identity.setBalance(BigInt(42));
+      expect(identity.getBalance()).to.equal(BigInt(42));
     });
   });
 
   describe('#setBalance', () => {
     it('should set identity balance', () => {
-      identity.setBalance(42);
-      expect(identity.getBalance()).to.equal(42);
+      identity.setBalance(BigInt(42));
+      expect(identity.getBalance()).to.equal(BigInt(42));
     });
   });
 
   describe('#increaseBalance', () => {
     it('should increase identity balance', () => {
-      const result = identity.increaseBalance(42);
+      const result = identity.increaseBalance(BigInt(42));
 
-      expect(result).to.equal(42);
-      expect(identity.getBalance()).to.equal(42);
+      expect(result).to.equal(BigInt(42));
+      expect(identity.getBalance()).to.equal(BigInt(42));
     });
   });
 
   describe('#reduceBalance', () => {
     it('should reduce identity balance', () => {
-      identity.setBalance(42);
+      identity.setBalance(BigInt(42));
 
-      const result = identity.reduceBalance(2);
+      const result = identity.reduceBalance(BigInt(2));
 
-      expect(result).to.equal(40);
-      expect(identity.getBalance()).to.equal(40);
+      expect(result).to.equal(BigInt(40));
+      expect(identity.getBalance()).to.equal(BigInt(40));
     });
   });
 
   describe('#setMetadata', () => {
     it('should set metadata', () => {
-      const otherMetadata = new Metadata({
-        blockHeight: 43,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
-      const expectedMetadata = new Metadata({
-        blockHeight: 43,
-        coreChainLockedHeight: 1,
-        timeMs: 100,
-        protocolVersion: 2,
-      });
+      const otherMetadata = new Metadata(BigInt(43), 1, BigInt(100), 2);
+      const expectedMetadata = new Metadata(BigInt(43), 1, BigInt(100), 2);
 
       identity.setMetadata(otherMetadata);
 

package/test/unit/identity/IdentityFactory.spec.js

@@ -29,7 +29,7 @@ describe('IdentityFactory', () => {
     factory = new IdentityFactory(3);
 
     identity = await getIdentityFixture(instantAssetLockProof.createIdentifier());
-    identity.setBalance(0);
+    identity.setBalance(BigInt(0));
 
     fakeTime = this.sinon.useFakeTimers(new Date());
   });
@@ -179,7 +179,7 @@ describe('IdentityFactory', () => {
   describe('createChainAssetLockProof', () => {
     it('should create IdentityCreateTransition from Identity model', async () => {
       identity = await getIdentityFixture(chainAssetLockProof.createIdentifier());
-      identity.setBalance(0);
+      identity.setBalance(BigInt(0));
 
       const stateTransition = factory.createIdentityCreateTransition(
         identity,
@@ -226,7 +226,7 @@ describe('IdentityFactory', () => {
 
   describe('createIdentityUpdateTransition', () => {
     it('should create IdentityUpdateTransition', () => {
-      const revision = 1;
+      const revision = BigInt(1);
       const disablePublicKeys = [identity.getPublicKeyById(0)];
       const key = new IdentityPublicKeyWithWitness(1);
       key.setData(Buffer.from('AuryIuMtRrl/VviQuyLD1l4nmxi9ogPzC9LT7tdpo0di', 'base64'));

package/test/unit/identity/stateTransition/IdentityUpdateTransition/IdentityUpdateTransition.spec.js

@@ -45,9 +45,9 @@ describe('IdentityUpdateTransition', () => {
 
   describe('#setRevision', () => {
     it('should set revision', () => {
-      stateTransition.setRevision(42);
+      stateTransition.setRevision(BigInt(42));
 
-      expect(stateTransition.getRevision()).to.equal(42);
+      expect(stateTransition.getRevision()).to.equal(BigInt(42));
     });
   });
 

package/test/unit/identity/stateTransition/identityCreditTransferTransition/identityCreditTransferTransition.spec.js

@@ -24,7 +24,7 @@ describe('IdentityCreditTransferTransition', () => {
       );
 
       expect(stateTransition.getAmount()).to.be.equal(
-        rawStateTransition.amount,
+        BigInt(rawStateTransition.amount),
       );
     });
   });