@dashevo/wasm-dpp 3.1.0-dev.1 → 3.1.0-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "3.1.0-dev.1",
+  "version": "3.1.0-dev.4",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,11 +44,11 @@
     "@babel/core": "^7.26.10",
     "@babel/preset-env": "^7.26.9",
     "@dashevo/dashcore-lib": "~0.22.0",
-    "@dashevo/dpns-contract": "3.1.0-dev.1",
+    "@dashevo/dpns-contract": "3.1.0-dev.4",
     "@types/bs58": "^4.0.1",
     "@types/node": "^20.10.0",
     "@yarnpkg/pnpify": "^4.0.0-rc.42",
-    "ajv": "^8.6.0",
+    "ajv": "^8.18.0",
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
     "chai": "^4.3.10",
@@ -74,7 +74,7 @@
     "mocha": "^11.1.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "sinon": "^17.0.1",
+    "sinon": "^18.0.1",
     "sinon-chai": "^3.7.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",

package/scripts/build-wasm.sh

@@ -16,8 +16,10 @@ fi
 OUTPUT_DIR="${PWD}/wasm"
 # shellcheck disable=SC2034
 OUTPUT_FILE="${OUTPUT_DIR}/wasm_dpp_bg.wasm"
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
+CARGO_OUT_DIR="${CARGO_TARGET_DIR:-$REPO_ROOT/target}"
 BUILD_COMMAND="cargo build --config net.git-fetch-with-cli=true --target=${TARGET} ${PROFILE_ARG}"
-BINDGEN_COMMAND="wasm-bindgen --out-dir=${OUTPUT_DIR} --target=web --omit-default-module-path ../../target/${TARGET}/${PROFILE}/wasm_dpp.wasm"
+BINDGEN_COMMAND="wasm-bindgen --out-dir=${OUTPUT_DIR} --target=web --omit-default-module-path ${CARGO_OUT_DIR}/${TARGET}/${PROFILE}/wasm_dpp.wasm"
 
 if ! [[ -d ${OUTPUT_DIR} ]]; then
   mkdir -p "${OUTPUT_DIR}"
@@ -49,7 +51,7 @@ fi
 
 if command -v wasm-opt &> /dev/null; then
   echo "Optimizing wasm using Binaryen"
-  
+
   # Check if we're in a release build (via CARGO_BUILD_PROFILE or GitHub event)
   if [ "${CARGO_BUILD_PROFILE}" = "release" ] || [ "${GITHUB_EVENT_NAME:-}" = "release" ] || [ "${GITHUB_EVENT_NAME:-}" = "workflow_dispatch" ]; then
     echo "Running full optimizations for release build (CARGO_BUILD_PROFILE=${CARGO_BUILD_PROFILE}, GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME:-not_set})"

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

@@ -10,6 +10,7 @@ use dpp::errors::consensus::ConsensusError;
 use dpp::serialization::{PlatformDeserializable, PlatformSerializable};
 use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0;
 use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{
     StateTransitionIdentitySigned, StateTransitionOwned, StateTransitionSingleSigned,
 };

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

@@ -6,6 +6,7 @@ use dpp::consensus::ConsensusError;
 use dpp::serialization::{PlatformDeserializable, PlatformSerializable};
 use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0;
 use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionValueConvert};
 use dpp::state_transition::{
     StateTransitionIdentitySigned, StateTransitionOwned, StateTransitionSingleSigned,

package/src/document/extended_document.rs

@@ -19,7 +19,7 @@ use wasm_bindgen::prelude::*;
 
 use crate::buffer::Buffer;
 use crate::data_contract::DataContractWasm;
-#[allow(deprecated)] // BinaryType is unsed in unused code below
+#[allow(deprecated)] // BinaryType is unused in unused code below
 use crate::document::BinaryType;
 use crate::document::{ConversionOptions, DocumentWasm};
 use crate::errors::RustConversionError;

package/src/document/state_transition/batch_transition/mod.rs

@@ -14,6 +14,7 @@ use dpp::platform_value::BinaryData;
 use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0;
 use dpp::state_transition::batch_transition::BatchTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionOwned, StateTransitionSingleSigned};
 use wasm_bindgen::prelude::*;
 

package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_too_many_inputs_error.rs

@@ -0,0 +1,41 @@
+use dpp::consensus::basic::identity::IdentityAssetLockTransactionTooManyInputsError;
+use dpp::consensus::codes::ErrorWithCode;
+use dpp::consensus::ConsensusError;
+
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(js_name=IdentityAssetLockTransactionTooManyInputsError)]
+pub struct IdentityAssetLockTransactionTooManyInputsErrorWasm {
+    inner: IdentityAssetLockTransactionTooManyInputsError,
+}
+
+impl From<&IdentityAssetLockTransactionTooManyInputsError>
+    for IdentityAssetLockTransactionTooManyInputsErrorWasm
+{
+    fn from(e: &IdentityAssetLockTransactionTooManyInputsError) -> Self {
+        Self { inner: e.clone() }
+    }
+}
+
+#[wasm_bindgen(js_class=IdentityAssetLockTransactionTooManyInputsError)]
+impl IdentityAssetLockTransactionTooManyInputsErrorWasm {
+    #[wasm_bindgen(js_name=getMaxInputs)]
+    pub fn get_max_inputs(&self) -> u16 {
+        self.inner.max_inputs()
+    }
+
+    #[wasm_bindgen(js_name=getActualInputs)]
+    pub fn get_actual_inputs(&self) -> u16 {
+        self.inner.actual_inputs()
+    }
+
+    #[wasm_bindgen(js_name=getCode)]
+    pub fn get_code(&self) -> u32 {
+        ConsensusError::from(self.inner.clone()).code()
+    }
+
+    #[wasm_bindgen(getter)]
+    pub fn message(&self) -> String {
+        self.inner.to_string()
+    }
+}

package/src/errors/consensus/basic/identity/mod.rs

@@ -5,6 +5,7 @@ mod identity_asset_lock_state_transition_replay_error;
 mod identity_asset_lock_transaction_is_not_found_error;
 mod identity_asset_lock_transaction_out_point_already_exists_error;
 mod identity_asset_lock_transaction_output_not_found_error;
+mod identity_asset_lock_transaction_too_many_inputs_error;
 mod identity_credit_transfer_to_self_error;
 mod identity_insufficient_balance_error;
 mod invalid_asset_lock_proof_core_chain_height_error;
@@ -34,6 +35,7 @@ pub use identity_asset_lock_state_transition_replay_error::*;
 pub use identity_asset_lock_transaction_is_not_found_error::*;
 pub use identity_asset_lock_transaction_out_point_already_exists_error::*;
 pub use identity_asset_lock_transaction_output_not_found_error::*;
+pub use identity_asset_lock_transaction_too_many_inputs_error::*;
 pub use identity_credit_transfer_to_self_error::*;
 pub use identity_insufficient_balance_error::*;
 pub use invalid_asset_lock_proof_core_chain_height_error::*;

package/src/errors/consensus/consensus_error.rs

@@ -12,7 +12,8 @@ use crate::errors::consensus::basic::identity::{
     IdentityAssetLockTransactionIsNotFoundErrorWasm,
     IdentityAssetLockTransactionOutPointAlreadyExistsErrorWasm,
     IdentityAssetLockTransactionOutPointNotEnoughBalanceErrorWasm,
-    IdentityAssetLockTransactionOutputNotFoundErrorWasm, IdentityCreditTransferToSelfErrorWasm,
+    IdentityAssetLockTransactionOutputNotFoundErrorWasm,
+    IdentityAssetLockTransactionTooManyInputsErrorWasm, IdentityCreditTransferToSelfErrorWasm,
     IdentityInsufficientBalanceErrorWasm, InvalidAssetLockProofCoreChainHeightErrorWasm,
     InvalidAssetLockProofTransactionHeightErrorWasm,
     InvalidAssetLockTransactionOutputReturnSizeErrorWasm,
@@ -38,7 +39,8 @@ use dpp::consensus::basic::BasicError::{
     IdentityAssetLockStateTransitionReplayError, IdentityAssetLockTransactionIsNotFoundError,
     IdentityAssetLockTransactionOutPointAlreadyConsumedError,
     IdentityAssetLockTransactionOutPointNotEnoughBalanceError,
-    IdentityAssetLockTransactionOutputNotFoundError, IncompatibleProtocolVersionError,
+    IdentityAssetLockTransactionOutputNotFoundError,
+    IdentityAssetLockTransactionTooManyInputsError, IncompatibleProtocolVersionError,
     IncompatibleRe2PatternError, InvalidAssetLockProofCoreChainHeightError,
     InvalidAssetLockProofTransactionHeightError, InvalidAssetLockTransactionOutputReturnSizeError,
     InvalidCreditWithdrawalTransitionCoreFeeError,
@@ -88,7 +90,12 @@ use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized
 use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError;
 use dpp::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountNotFrozenError, IdentityTokenAccountFrozenError, TokenIsPausedError, IdentityTokenAccountAlreadyFrozenError, UnauthorizedTokenActionError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, TokenMintPastMaxSupplyError, NewTokensDestinationIdentityDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, InvalidGroupPositionError, TokenAlreadyPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, TokenTransferRecipientIdentityNotExistError, PreProgrammedDistributionTimestampInPastError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError, IdentityTryingToPayWithWrongTokenError, TokenDirectPurchaseUserPriceTooLow, TokenAmountUnderMinimumSaleAmount, TokenNotForDirectSale, InvalidTokenPositionStateError};
 use dpp::consensus::state::address_funds::{AddressDoesNotExistError, AddressInvalidNonceError, AddressNotEnoughFundsError, AddressesNotEnoughFundsError};
-use dpp::consensus::basic::state_transition::{StateTransitionNotActiveError, TransitionOverMaxInputsError, TransitionOverMaxOutputsError, InputWitnessCountMismatchError, TransitionNoInputsError, TransitionNoOutputsError, FeeStrategyEmptyError, FeeStrategyDuplicateError, FeeStrategyIndexOutOfBoundsError, FeeStrategyTooManyStepsError, InputBelowMinimumError, OutputBelowMinimumError, InputOutputBalanceMismatchError, OutputsNotGreaterThanInputsError, WithdrawalBalanceMismatchError, InsufficientFundingAmountError, InputsNotLessThanOutputsError, OutputAddressAlsoInputError, InvalidRemainderOutputCountError, WithdrawalBelowMinAmountError};
+use dpp::consensus::state::shielded::insufficient_pool_notes_error::InsufficientPoolNotesError;
+use dpp::consensus::state::shielded::insufficient_shielded_fee_error::InsufficientShieldedFeeError;
+use dpp::consensus::state::shielded::invalid_anchor_error::InvalidAnchorError;
+use dpp::consensus::state::shielded::invalid_shielded_proof_error::InvalidShieldedProofError;
+use dpp::consensus::state::shielded::nullifier_already_spent_error::NullifierAlreadySpentError;
+use dpp::consensus::basic::state_transition::{StateTransitionNotActiveError, TransitionOverMaxInputsError, TransitionOverMaxOutputsError, InputWitnessCountMismatchError, TransitionNoInputsError, TransitionNoOutputsError, FeeStrategyEmptyError, FeeStrategyDuplicateError, FeeStrategyIndexOutOfBoundsError, FeeStrategyTooManyStepsError, InputBelowMinimumError, OutputBelowMinimumError, InputOutputBalanceMismatchError, OutputsNotGreaterThanInputsError, WithdrawalBalanceMismatchError, InsufficientFundingAmountError, InputsNotLessThanOutputsError, OutputAddressAlsoInputError, InvalidRemainderOutputCountError, WithdrawalBelowMinAmountError, ShieldedNoActionsError, ShieldedTooManyActionsError, ShieldedEmptyProofError, ShieldedZeroAnchorError, ShieldedInvalidValueBalanceError, ShieldedEncryptedNoteSizeMismatchError};
 use dpp::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError;
 use dpp::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError;
 use dpp::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError;
@@ -443,6 +450,19 @@ pub fn from_state_error(state_error: &StateError) -> JsValue {
         StateError::AddressInvalidNonceError(e) => {
             generic_consensus_error!(AddressInvalidNonceError, e).into()
         }
+        StateError::InvalidAnchorError(e) => generic_consensus_error!(InvalidAnchorError, e).into(),
+        StateError::NullifierAlreadySpentError(e) => {
+            generic_consensus_error!(NullifierAlreadySpentError, e).into()
+        }
+        StateError::InvalidShieldedProofError(e) => {
+            generic_consensus_error!(InvalidShieldedProofError, e).into()
+        }
+        StateError::InsufficientPoolNotesError(e) => {
+            generic_consensus_error!(InsufficientPoolNotesError, e).into()
+        }
+        StateError::InsufficientShieldedFeeError(e) => {
+            generic_consensus_error!(InsufficientShieldedFeeError, e).into()
+        }
     }
 }
 
@@ -596,6 +616,9 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
         InvalidIdentityAssetLockTransactionError(e) => {
             InvalidIdentityAssetLockTransactionErrorWasm::from(e).into()
         }
+        IdentityAssetLockTransactionTooManyInputsError(e) => {
+            IdentityAssetLockTransactionTooManyInputsErrorWasm::from(e).into()
+        }
         InvalidInstantAssetLockProofError(e) => {
             InvalidInstantAssetLockProofErrorWasm::from(e).into()
         }
@@ -923,6 +946,24 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
         BasicError::WithdrawalBelowMinAmountError(e) => {
             generic_consensus_error!(WithdrawalBelowMinAmountError, e).into()
         }
+        BasicError::ShieldedNoActionsError(e) => {
+            generic_consensus_error!(ShieldedNoActionsError, e).into()
+        }
+        BasicError::ShieldedTooManyActionsError(e) => {
+            generic_consensus_error!(ShieldedTooManyActionsError, e).into()
+        }
+        BasicError::ShieldedEmptyProofError(e) => {
+            generic_consensus_error!(ShieldedEmptyProofError, e).into()
+        }
+        BasicError::ShieldedZeroAnchorError(e) => {
+            generic_consensus_error!(ShieldedZeroAnchorError, e).into()
+        }
+        BasicError::ShieldedInvalidValueBalanceError(e) => {
+            generic_consensus_error!(ShieldedInvalidValueBalanceError, e).into()
+        }
+        BasicError::ShieldedEncryptedNoteSizeMismatchError(e) => {
+            generic_consensus_error!(ShieldedEncryptedNoteSizeMismatchError, e).into()
+        }
     }
 }
 

package/src/errors/from.rs

@@ -39,7 +39,7 @@ pub fn from_dpp_init_error(e: DashPlatformProtocolInitError) -> JsValue {
     match e {
         DashPlatformProtocolInitError::SchemaDeserializationError(e) => e.to_string().into(),
         DashPlatformProtocolInitError::InvalidSchemaError(e) => e.to_string().into(),
-        // TODO(versioning): add rest erros
+        // TODO(versioning): add rest errors
         _ => JsValue::from_str(&format!("Error conversion not implemented: {e:#}",)),
     }
 }

package/src/errors/generic_consensus_error.rs

@@ -7,7 +7,7 @@ macro_rules! generic_consensus_error {
                 serialization::PlatformSerializableWithPlatformVersion,
                 version::PlatformVersion,
             },
-            paste::paste,
+            pastey::paste,
             wasm_bindgen::prelude::wasm_bindgen,
             $crate::buffer::Buffer,
         };

package/src/identity/state_transition/identity_create_transition/transition.rs

@@ -29,6 +29,7 @@ use dpp::platform_value::string_encoding;
 use dpp::platform_value::string_encoding::Encoding;
 use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionOwned, StateTransitionSingleSigned};
 use dpp::{
     identity::state_transition::asset_lock_proof::AssetLockProof,

package/src/identity/state_transition/identity_credit_transfer_transition/transition.rs

@@ -19,6 +19,7 @@ use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0;
 
 use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned};
 use dpp::state_transition::{StateTransitionLike, StateTransitionSingleSigned};
 #[wasm_bindgen(js_name=IdentityCreditTransferTransition)]

package/src/identity/state_transition/identity_credit_withdrawal_transition/transition.rs

@@ -19,6 +19,7 @@ use dpp::platform_value::{string_encoding, BinaryData};
 use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0;
 use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned};
 use dpp::state_transition::{StateTransitionLike, StateTransitionSingleSigned};
 use dpp::withdrawal::Pooling;

package/src/identity/state_transition/identity_topup_transition/transition.rs

@@ -28,6 +28,7 @@ use dpp::platform_value::string_encoding::Encoding;
 use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0;
 use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::{StateTransition, StateTransitionOwned, StateTransitionSingleSigned};
 use dpp::{
     identifier::Identifier, identity::state_transition::asset_lock_proof::AssetLockProof,

package/src/identity/state_transition/identity_update_transition/transition.rs

@@ -18,6 +18,7 @@ use dpp::serialization::PlatformSerializable;
 use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0;
 use dpp::state_transition::identity_update_transition::IdentityUpdateTransition;
 use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation;
+use dpp::state_transition::StateTransitionHasUserFeeIncrease;
 use dpp::state_transition::StateTransitionIdentitySigned;
 use dpp::state_transition::{StateTransition, StateTransitionOwned, StateTransitionSingleSigned};
 use dpp::version::PlatformVersion;

package/src/identity/state_transition/transition_types.rs

@@ -55,6 +55,7 @@ impl From<StateTransitionType> for StateTransitionTypeWasm {
             StateTransitionType::AddressCreditWithdrawal => {
                 StateTransitionTypeWasm::AddressCreditWithdrawal
             }
+            _ => todo!("shielded state transition types not yet implemented in wasm"),
         }
     }
 }

package/src/state_transition/state_transition_factory.rs

@@ -79,6 +79,13 @@ impl StateTransitionFactoryWasm {
                 StateTransition::AddressCreditWithdrawal(st) => {
                     serde_wasm_bindgen::to_value(&st).map_err(|e| JsValue::from(e.to_string()))
                 }
+                StateTransition::Shield(_)
+                | StateTransition::ShieldedTransfer(_)
+                | StateTransition::Unshield(_)
+                | StateTransition::ShieldFromAssetLock(_)
+                | StateTransition::ShieldedWithdrawal(_) => {
+                    todo!("shielded transitions not yet implemented in state_transition_factory")
+                }
             },
             Err(dpp::ProtocolError::StateTransitionError(e)) => match e {
                 StateTransitionError::InvalidStateTransitionError {

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

@@ -223,15 +223,17 @@ impl MasternodeVoteTransitionWasm {
         self.0.is_voting_state_transition()
     }
 
+    /// Masternode vote transitions do not support user fee increase; always returns 0.
+    /// This method is kept for API compatibility.
     #[wasm_bindgen(js_name=getUserFeeIncrease)]
     pub fn get_user_fee_increase(&self) -> u16 {
-        self.0.user_fee_increase()
+        0
     }
 
+    /// Masternode vote transitions do not support user fee increase.
+    /// This method is kept for API compatibility and intentionally does nothing.
     #[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);
-    }
+    pub fn set_user_fee_increase(&mut self, _user_fee_increase: u16) {}
 
     #[wasm_bindgen(js_name=getIdentityContractNonce)]
     pub fn get_identity_nonce(&self) -> u64 {

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

@@ -1610,9 +1610,9 @@ describe.skip('validateDataContractFactory', () => {
           ],
         };
 
-        const indeciesDefinition = rawDataContract.documents.indexedDocument.indices;
+        const indicesDefinition = rawDataContract.documents.indexedDocument.indices;
 
-        indeciesDefinition.push(indexDefinition);
+        indicesDefinition.push(indexDefinition);
 
         const result = await validateDataContract(rawDataContract);
 

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

@@ -27,7 +27,7 @@ describe('DocumentFacade', () => {
     const dataContractObject = dataContractFixture.toObject();
 
     dataContract = new DataContract({
-      $format_version: '0',
+      $formatVersion: '0',
       id: dataContractObject.id,
       version: 1,
       ownerId: dataContractObject.ownerId,

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

@@ -54,7 +54,7 @@ describe('DataContract', () => {
     schemaDefs = { something: { type: 'string' } };
 
     dataContract = new DataContract({
-      $format_version: '0',
+      $formatVersion: '0',
       id: contractId,
       version: 1,
       ownerId,
@@ -65,7 +65,7 @@ describe('DataContract', () => {
   describe('constructor', () => {
     it('should create new DataContract', async () => {
       dataContract = new DataContract({
-        $format_version: '0',
+        $formatVersion: '0',
         id: contractId,
         version: 1,
         ownerId,
@@ -218,9 +218,9 @@ describe('DataContract', () => {
       const result = dataContract.toJSON();
 
       expect(result).to.deep.equal({
-        $format_version: '0',
+        $formatVersion: '0',
         config: {
-          $format_version: '0',
+          $formatVersion: '0',
           canBeDeleted: false,
           documentsCanBeDeletedContractDefault: true,
           documentsKeepHistoryContractDefault: false,
@@ -248,9 +248,9 @@ describe('DataContract', () => {
       const result = dataContract.toJSON();
 
       expect(result).to.deep.equal({
-        $format_version: '0',
+        $formatVersion: '0',
         config: {
-          $format_version: '0',
+          $formatVersion: '0',
           canBeDeleted: false,
           documentsCanBeDeletedContractDefault: true,
           documentsKeepHistoryContractDefault: false,

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

@@ -65,7 +65,7 @@ describe('Identity', () => {
 
     it('should set public keys', () => {
       const rawKey = {
-        $version: '0',
+        $formatVersion: '0',
         id: 2,
         type: KeyType.ECDSA_SECP256K1,
         data: Buffer.alloc(36).fill('a'),
@@ -140,11 +140,11 @@ describe('Identity', () => {
       const jsonIdentity = identity.toJSON();
 
       expect(jsonIdentity).to.deep.equal({
-        $version: '0',
+        $formatVersion: '0',
         id: Identifier.from(rawIdentity.id).toString(),
         publicKeys: [
           {
-            $version: '0',
+            $formatVersion: '0',
             id: 0,
             type: KeyType.ECDSA_SECP256K1,
             data: rawIdentity.publicKeys[0].data.toString('base64'),

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

@@ -189,7 +189,7 @@ describe('IdentityPublicKey', () => {
       const jsonPublicKey = publicKey.toJSON();
 
       expect(jsonPublicKey).to.deep.equal({
-        $version: '0',
+        $formatVersion: '0',
         id: 0,
         type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
         data: 'AkVuTKyF3YgKLAQlLEtaUL2HTditwGILfWUVqjzYnIgH',
@@ -210,7 +210,7 @@ describe('IdentityPublicKey', () => {
       const jsonPublicKey = publicKey.toObject();
 
       expect(jsonPublicKey).to.deep.equal({
-        $version: '0',
+        $formatVersion: '0',
         id: 0,
         type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
         data: Buffer.from('AkVuTKyF3YgKLAQlLEtaUL2HTditwGILfWUVqjzYnIgH', 'base64'),

package/tsconfig.json

@@ -15,4 +15,4 @@
     ]
   },
   "include": ["lib/**/*.ts"],
-}
+}