@dashevo/wasm-dpp 1.4.0-dev.3 → 1.4.0-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "1.4.0-dev.3",
+  "version": "1.4.0-dev.5",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,7 +44,7 @@
     "@babel/core": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@dashevo/dashcore-lib": "~0.21.3",
-    "@dashevo/dpns-contract": "1.4.0-dev.3",
+    "@dashevo/dpns-contract": "1.4.0-dev.5",
     "@types/bs58": "^4.0.1",
     "@types/node": "^14.6.0",
     "@yarnpkg/pnpify": "^4.0.0-rc.42",

package/src/errors/consensus/consensus_error.rs

@@ -63,7 +63,7 @@ use dpp::consensus::state::data_trigger::DataTriggerError::{
 use wasm_bindgen::{JsError, JsValue};
 use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, InvalidDocumentTypeRequiredSecurityLevelError, UnknownDocumentCreationRestrictionModeError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
 use dpp::consensus::basic::document::{ContestedDocumentsTemporarilyNotAllowedError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError};
-use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError};
+use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError};
 use dpp::consensus::basic::overflow_error::OverflowError;
 use dpp::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError;
 use dpp::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError;
@@ -560,6 +560,13 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
         BasicError::ContestedDocumentsTemporarilyNotAllowedError(e) => {
             generic_consensus_error!(ContestedDocumentsTemporarilyNotAllowedError, e).into()
         }
+        BasicError::WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError(e) => {
+            generic_consensus_error!(
+                WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError,
+                e
+            )
+            .into()
+        }
     }
 }
 

package/src/identity/identity_facade.rs

@@ -206,7 +206,7 @@ impl IdentityFacadeWasm {
         amount: u64,
         core_fee_per_byte: u32,
         pooling: u8,
-        output_script: Vec<u8>,
+        output_script: Option<Vec<u8>>,
         identity_nonce: u64,
     ) -> Result<IdentityCreditWithdrawalTransitionWasm, JsValue> {
         let pooling = match pooling {
@@ -222,7 +222,7 @@ impl IdentityFacadeWasm {
                 amount,
                 core_fee_per_byte,
                 pooling,
-                CoreScript::from_bytes(output_script),
+                output_script.map(CoreScript::from_bytes),
                 identity_nonce as IdentityNonce,
             )
             .map(Into::into)

package/src/identity/identity_factory.rs

@@ -210,7 +210,7 @@ impl IdentityFactoryWasm {
         amount: u64,
         core_fee_per_byte: u32,
         pooling: u8,
-        output_script: Vec<u8>,
+        output_script: Option<Vec<u8>>,
         identity_nonce: u64,
     ) -> Result<IdentityCreditWithdrawalTransitionWasm, JsValue> {
         let pooling = match pooling {
@@ -226,7 +226,7 @@ impl IdentityFactoryWasm {
                 amount,
                 core_fee_per_byte,
                 pooling,
-                CoreScript::from_bytes(output_script),
+                output_script.map(CoreScript::from_bytes),
                 identity_nonce as IdentityNonce,
             )
             .map(Into::into)

package/src/identity/identity_public_key/purpose.rs

@@ -15,6 +15,8 @@ pub enum PurposeWasm {
     SYSTEM = 4,
     /// this key cannot be used for signing documents
     VOTING = 5,
+    /// this key is only for masternode owners
+    OWNER = 6,
 }
 
 impl From<Purpose> for PurposeWasm {
@@ -26,6 +28,7 @@ impl From<Purpose> for PurposeWasm {
             Purpose::TRANSFER => PurposeWasm::TRANSFER,
             Purpose::SYSTEM => PurposeWasm::SYSTEM,
             Purpose::VOTING => PurposeWasm::VOTING,
+            Purpose::OWNER => PurposeWasm::OWNER,
         }
     }
 }

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

@@ -24,7 +24,7 @@ describe('IdentityFacade', () => {
   beforeEach(async () => {
     dpp = new DashPlatformProtocol(
       { generate: () => crypto.randomBytes(32) },
-      1,
+      3,
     );
 
     const chainAssetLockProofJS = getChainAssetLockProofFixture();

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

@@ -26,7 +26,7 @@ describe('IdentityFactory', () => {
 
     // const identityValidator = new IdentityValidator(blsAdapter);
 
-    factory = new IdentityFactory(1);
+    factory = new IdentityFactory(3);
 
     identity = await getIdentityFixture(instantAssetLockProof.createIdentifier());
     identity.setBalance(0);

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

@@ -75,7 +75,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       rawStateTransition = stateTransition.toObject();
 
       expect(rawStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toBuffer(),
         amount: stateTransition.getAmount(),
@@ -92,7 +92,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       rawStateTransition = stateTransition.toObject({ skipSignature: true });
 
       expect(rawStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toBuffer(),
         amount: stateTransition.getAmount(),
@@ -109,7 +109,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       const jsonStateTransition = stateTransition.toJSON();
 
       expect(jsonStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toString(),
         amount: stateTransition.getAmount().toString(),