@dashevo/wasm-dpp 2.0.0-rc.13 → 2.0.0-rc.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "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.26.10",
     "@babel/preset-env": "^7.26.9",
     "@dashevo/dashcore-lib": "~0.22.0",
-    "@dashevo/dpns-contract": "2.0.0-rc.13",
+    "@dashevo/dpns-contract": "2.0.0-rc.15",
     "@types/bs58": "^4.0.1",
     "@types/node": "^14.6.0",
     "@yarnpkg/pnpify": "^4.0.0-rc.42",

package/src/data_contract/data_contract.rs

@@ -415,12 +415,11 @@ impl DataContractWasm {
         self.clone()
     }
 
-    pub(crate) fn try_from_serialization_format(
+    pub(crate) fn try_from_serialization_format_with_platform_version(
         value: DataContractInSerializationFormat,
         full_validation: bool,
+        platform_version: &PlatformVersion,
     ) -> Result<Self, JsValue> {
-        let platform_version = PlatformVersion::first();
-
         DataContract::try_from_platform_versioned(
             value,
             full_validation,

package/src/data_contract/state_transition/data_contract_create_transition/mod.rs

@@ -55,9 +55,24 @@ impl DataContractCreateTransitionWasm {
     }
 
     #[wasm_bindgen(js_name=getDataContract)]
-    pub fn get_data_contract(&self) -> DataContractWasm {
-        DataContractWasm::try_from_serialization_format(self.0.data_contract().clone(), false)
-            .expect("should convert from serialziation format")
+    pub fn get_data_contract(
+        &self,
+        protocol_version: Option<u32>,
+    ) -> Result<DataContractWasm, JsValue> {
+        // Use provided protocol version or latest if not specified
+        let platform_version = if let Some(version) = protocol_version {
+            PlatformVersion::get(version)
+                .map_err(ProtocolError::PlatformVersionError)
+                .with_js_error()?
+        } else {
+            PlatformVersion::latest()
+        };
+
+        DataContractWasm::try_from_serialization_format_with_platform_version(
+            self.0.data_contract().clone(),
+            false,
+            platform_version,
+        )
     }
 
     // #[wasm_bindgen(js_name=setDataContractConfig)]

package/src/data_contract/state_transition/data_contract_update_transition/mod.rs

@@ -56,9 +56,24 @@ impl DataContractUpdateTransitionWasm {
     }
 
     #[wasm_bindgen(js_name=getDataContract)]
-    pub fn get_data_contract(&self) -> DataContractWasm {
-        DataContractWasm::try_from_serialization_format(self.0.data_contract().clone(), false)
-            .expect("should create data contract from serialized format")
+    pub fn get_data_contract(
+        &self,
+        protocol_version: Option<u32>,
+    ) -> Result<DataContractWasm, JsValue> {
+        // Use provided protocol version or latest if not specified
+        let platform_version = if let Some(version) = protocol_version {
+            PlatformVersion::get(version)
+                .map_err(ProtocolError::PlatformVersionError)
+                .with_js_error()?
+        } else {
+            PlatformVersion::latest()
+        };
+
+        DataContractWasm::try_from_serialization_format_with_platform_version(
+            self.0.data_contract().clone(),
+            false,
+            platform_version,
+        )
     }
 
     // #[wasm_bindgen(js_name=setDataContractConfig)]

package/src/document/state_transition/batch_transition/token_transition/burn.rs

@@ -1,3 +1,4 @@
+use dpp::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods;
 use dpp::state_transition::batch_transition::TokenBurnTransition;
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -10,3 +11,16 @@ impl From<TokenBurnTransition> for TokenBurnTransitionWasm {
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class = TokenBurnTransition)]
+impl TokenBurnTransitionWasm {
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getBurnAmount)]
+    pub fn amount(&self) -> u64 {
+        self.0.burn_amount()
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/claim.rs

@@ -1,3 +1,5 @@
+use dpp::data_contract::associated_token::token_distribution_key::TokenDistributionType;
+use dpp::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods;
 use dpp::state_transition::batch_transition::TokenClaimTransition;
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -10,3 +12,19 @@ impl From<TokenClaimTransition> for TokenClaimTransitionWasm {
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class = TokenClaimTransition)]
+impl TokenClaimTransitionWasm {
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getDistributionType)]
+    pub fn distribution_type(&self) -> u8 {
+        match self.0.distribution_type() {
+            TokenDistributionType::PreProgrammed => 0,
+            TokenDistributionType::Perpetual => 1,
+        }
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/config.rs

@@ -1,3 +1,4 @@
+use dpp::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods;
 use dpp::state_transition::batch_transition::TokenConfigUpdateTransition;
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -10,3 +11,11 @@ impl From<TokenConfigUpdateTransition> for TokenConfigUpdateTransitionWasm {
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class = TokenConfigUpdateTransition)]
+impl TokenConfigUpdateTransitionWasm {
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/destroy.rs

@@ -19,4 +19,9 @@ impl TokenDestroyFrozenFundsTransitionWasm {
     pub fn frozen_identity_id(&self) -> IdentifierWrapper {
         self.0.frozen_identity_id().into()
     }
+
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
 }

package/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs

@@ -1,3 +1,6 @@
+use dpp::balances::credits::TokenAmount;
+use dpp::fee::Credits;
+use dpp::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods;
 use dpp::state_transition::batch_transition::TokenDirectPurchaseTransition;
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -10,3 +13,16 @@ impl From<TokenDirectPurchaseTransition> for TokenDirectPurchaseTransitionWasm {
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class = TokenDirectPurchaseTransition)]
+impl TokenDirectPurchaseTransitionWasm {
+    #[wasm_bindgen(js_name=getTokenCount)]
+    pub fn count(&self) -> TokenAmount {
+        self.0.token_count()
+    }
+
+    #[wasm_bindgen(js_name=getTotalAgreedPrice)]
+    pub fn total_agreed_price(&self) -> Credits {
+        self.0.total_agreed_price()
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/emergency_action.rs

@@ -1,4 +1,6 @@
+use dpp::state_transition::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods;
 use dpp::state_transition::batch_transition::TokenEmergencyActionTransition;
+use dpp::tokens::emergency_action::TokenEmergencyAction;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen(js_name=TokenEmergencyActionTransition)]
@@ -10,3 +12,19 @@ impl From<TokenEmergencyActionTransition> for TokenEmergencyActionTransitionWasm
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class = TokenEmergencyActionTransition)]
+impl TokenEmergencyActionTransitionWasm {
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getEmergencyAction)]
+    pub fn emergency_action(&self) -> u8 {
+        match self.0.emergency_action() {
+            TokenEmergencyAction::Pause => 0,
+            TokenEmergencyAction::Resume => 1,
+        }
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/freeze.rs

@@ -19,4 +19,9 @@ impl TokenFreezeTransitionWasm {
     pub fn frozen_identity_id(&self) -> IdentifierWrapper {
         self.0.frozen_identity_id().into()
     }
+
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
 }

package/src/document/state_transition/batch_transition/token_transition/mint.rs

@@ -28,4 +28,19 @@ impl TokenMintTransitionWasm {
             .with_js_error()
             .map(Into::into)
     }
+
+    #[wasm_bindgen(js_name=getIssuedToIdentityId)]
+    pub fn issued_to_identity_id(&self) -> Option<IdentifierWrapper> {
+        self.0.issued_to_identity_id().map(|id| id.into())
+    }
+
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getAmount)]
+    pub fn amount(&self) -> u64 {
+        self.0.amount()
+    }
 }

package/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs

@@ -1,5 +1,8 @@
 use dpp::state_transition::batch_transition::TokenSetPriceForDirectPurchaseTransition;
 use wasm_bindgen::prelude::wasm_bindgen;
+use dpp::fee::Credits;
+use dpp::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods;
+use dpp::tokens::token_pricing_schedule::TokenPricingSchedule;
 
 #[wasm_bindgen(js_name=TokenSetPriceForDirectPurchaseTransition)]
 #[derive(Debug, Clone)]
@@ -12,3 +15,22 @@ impl From<TokenSetPriceForDirectPurchaseTransition>
         Self(value)
     }
 }
+
+#[wasm_bindgen(js_class=TokenSetPriceForDirectPurchaseTransition)]
+impl TokenSetPriceForDirectPurchaseTransitionWasm {
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getPrice)]
+    pub fn price(&self) -> Option<Credits> {
+        match self.0.price() {
+            Some(token_pricing_schedule) => match token_pricing_schedule {
+                TokenPricingSchedule::SinglePrice(credits) => Some(*credits),
+                TokenPricingSchedule::SetPrices(_) => None,
+            },
+            None => None,
+        }
+    }
+}

package/src/document/state_transition/batch_transition/token_transition/transfer.rs

@@ -19,4 +19,14 @@ impl TokenTransferTransitionWasm {
     pub fn recipient_id(&self) -> IdentifierWrapper {
         self.0.recipient_id().into()
     }
+
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
+
+    #[wasm_bindgen(js_name=getAmount)]
+    pub fn amount(&self) -> u64 {
+        self.0.amount()
+    }
 }

package/src/document/state_transition/batch_transition/token_transition/unfreeze.rs

@@ -19,4 +19,9 @@ impl TokenUnfreezeTransitionWasm {
     pub fn frozen_identity_id(&self) -> IdentifierWrapper {
         self.0.frozen_identity_id().into()
     }
+
+    #[wasm_bindgen(js_name=getPublicNote)]
+    pub fn public_note(&self) -> Option<String> {
+        self.0.public_note().cloned()
+    }
 }

package/src/errors/consensus/consensus_error.rs

@@ -61,12 +61,12 @@ use dpp::consensus::state::data_trigger::DataTriggerError::{
   DataTriggerConditionError, DataTriggerExecutionError, DataTriggerInvalidResultError,
 };
 use wasm_bindgen::{JsError, JsValue};
-use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, DecimalsOverLimitError, DuplicateKeywordsError, GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupRequiredPowerIsInvalidError, GroupTotalPowerLessThanRequiredError, InvalidDescriptionLengthError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidKeywordCharacterError, InvalidKeywordLengthError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, InvalidTokenLanguageCodeError, InvalidTokenNameCharacterError, InvalidTokenNameLengthError, MainGroupIsNotDefinedError, NewTokensDestinationIdentityOptionRequiredError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, RedundantDocumentPaidForByTokenWithContractId, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, TooManyKeywordsError, UnknownDocumentActionTokenEffectError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
+use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, DecimalsOverLimitError, DuplicateKeywordsError, GroupExceedsMaxMembersError, GroupHasTooFewMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupRequiredPowerIsInvalidError, GroupTotalPowerLessThanRequiredError, InvalidDescriptionLengthError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidKeywordCharacterError, InvalidKeywordLengthError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, InvalidTokenLanguageCodeError, InvalidTokenNameCharacterError, InvalidTokenNameLengthError, MainGroupIsNotDefinedError, NewTokensDestinationIdentityOptionRequiredError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, RedundantDocumentPaidForByTokenWithContractId, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, TooManyKeywordsError, UnknownDocumentActionTokenEffectError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
 use dpp::consensus::basic::document::{ContestedDocumentsTemporarilyNotAllowedError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError};
 use dpp::consensus::basic::group::GroupActionNotAllowedOnTransitionError;
 use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError};
 use dpp::consensus::basic::overflow_error::OverflowError;
-use dpp::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, ContractHasNoTokensError, DestinationIdentityForTokenMintingNotSetError, InvalidActionIdError, InvalidTokenAmountError, InvalidTokenConfigUpdateNoChangeError, InvalidTokenIdError, InvalidTokenNoteTooBigError, InvalidTokenPositionError, MissingDefaultLocalizationError, TokenNoteOnlyAllowedWhenProposerError, TokenTransferToOurselfError};
+use dpp::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, ContractHasNoTokensError, DestinationIdentityForTokenMintingNotSetError, InvalidActionIdError, InvalidTokenAmountError, InvalidTokenConfigUpdateNoChangeError, InvalidTokenIdError, InvalidTokenNoteTooBigError, InvalidTokenPositionError, MissingDefaultLocalizationError, TokenNoteOnlyAllowedWhenProposerError, TokenTransferToOurselfError, InvalidTokenDistributionTimeIntervalNotMinuteAlignedError, InvalidTokenDistributionTimeIntervalTooShortError, InvalidTokenDistributionBlockIntervalTooShortError};
 use dpp::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError;
 use dpp::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError;
 use dpp::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError;
@@ -831,9 +831,22 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
         BasicError::TokenNoteOnlyAllowedWhenProposerError(e) => {
             generic_consensus_error!(TokenNoteOnlyAllowedWhenProposerError, e).into()
         }
+        BasicError::InvalidTokenDistributionBlockIntervalTooShortError(e) => {
+            generic_consensus_error!(InvalidTokenDistributionBlockIntervalTooShortError, e).into()
+        }
+        BasicError::InvalidTokenDistributionTimeIntervalTooShortError(e) => {
+            generic_consensus_error!(InvalidTokenDistributionTimeIntervalTooShortError, e).into()
+        }
+        BasicError::InvalidTokenDistributionTimeIntervalNotMinuteAlignedError(e) => {
+            generic_consensus_error!(InvalidTokenDistributionTimeIntervalNotMinuteAlignedError, e)
+                .into()
+        }
         BasicError::RedundantDocumentPaidForByTokenWithContractId(e) => {
             generic_consensus_error!(RedundantDocumentPaidForByTokenWithContractId, e).into()
         }
+        BasicError::GroupHasTooFewMembersError(e) => {
+            generic_consensus_error!(GroupHasTooFewMembersError, e).into()
+        }
     }
 }
 

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

@@ -46,6 +46,12 @@ describe('DataContractCreateTransition', () => {
 
       expect(result.toObject()).to.deep.equal(dataContract.toObject());
     });
+
+    it('should return Data Contract with specific protocol version', () => {
+      const result = stateTransition.getDataContract(1);
+
+      expect(result.toObject()).to.deep.equal(dataContract.toObject());
+    });
   });
 
   describe.skip('#toJSON', () => {