@dashevo/wasm-dpp 0.25.0-dev.8 → 0.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (295) hide show
  1. package/Cargo.toml +33 -7
  2. package/README.md +11 -6
  3. package/dist/errors/patchConsensusErrors.js +94 -115
  4. package/dist/wasm/wasm_dpp.d.ts +2213 -4113
  5. package/dist/wasm/wasm_dpp.js +17748 -2639
  6. package/dist/wasm/wasm_dpp_bg.js +1 -1
  7. package/lib/dpp.ts +1 -1
  8. package/lib/errors/patchConsensusErrors.ts +94 -93
  9. package/lib/test/bootstrap.js +5 -0
  10. package/lib/test/fixtures/getDataContractFixture.js +11 -5
  11. package/lib/test/fixtures/getDocumentsFixture.js +9 -5
  12. package/lib/test/fixtures/getIdentityCreateTransitionFixture.js +14 -20
  13. package/lib/test/fixtures/getIdentityCreditTransferTransitionFixture.js +14 -0
  14. package/lib/test/fixtures/getIdentityFixture.js +21 -32
  15. package/lib/test/fixtures/getIdentityTopUpTransitionFixture.js +7 -10
  16. package/lib/test/fixtures/getIdentityUpdateTransitionFixture.js +13 -28
  17. package/lib/test/fixtures/getPrivateAndPublicKeyForSigningFixture.js +7 -9
  18. package/lib/test/fixtures/js/generateRandomIdentifier.js +1 -0
  19. package/lib/test/fixtures/js/getChainAssetLockProofFixture.js +1 -0
  20. package/lib/test/fixtures/js/getDataContractFixture.js +1 -0
  21. package/lib/test/fixtures/js/getDocumentTransitionsFixture.js +1 -0
  22. package/lib/test/fixtures/js/getDocumentsFixture.js +1 -0
  23. package/lib/test/fixtures/js/getInstantAssetLockProofFixture.js +1 -0
  24. package/lib/test/mocks/createStateRepositoryMock.js +1 -0
  25. package/lib/wasm/wasm_dpp.d.ts +2213 -4113
  26. package/package.json +6 -6
  27. package/scripts/build-wasm.sh +30 -29
  28. package/src/bls_adapter.rs +1 -1
  29. package/src/dash_platform_protocol.rs +173 -196
  30. package/src/data_contract/data_contract.rs +309 -199
  31. package/src/data_contract/data_contract_facade.rs +28 -47
  32. package/src/data_contract/errors/mod.rs +1 -0
  33. package/src/data_contract/mod.rs +2 -2
  34. package/src/data_contract/state_transition/data_contract_create_transition/mod.rs +92 -79
  35. package/src/data_contract/state_transition/data_contract_update_transition/mod.rs +84 -77
  36. package/src/data_contract_factory/data_contract_factory.rs +43 -83
  37. package/src/document/document_facade.rs +81 -76
  38. package/src/document/errors/document_already_exists_error.rs +6 -6
  39. package/src/document/errors/document_no_revision_error.rs +1 -0
  40. package/src/document/errors/document_not_provided_error.rs +6 -6
  41. package/src/document/errors/invalid_document_action_error.rs +11 -7
  42. package/src/document/errors/invalid_initial_revision_error.rs +4 -4
  43. package/src/document/errors/mismatch_owners_ids_error.rs +5 -8
  44. package/src/document/errors/mod.rs +5 -0
  45. package/src/document/errors/revision_absent_error.rs +6 -6
  46. package/src/document/errors/trying_to_delete_immutable_document_error.rs +19 -0
  47. package/src/document/errors/trying_to_replace_immutable_document_error.rs +4 -4
  48. package/src/document/extended_document.rs +76 -76
  49. package/src/document/factory.rs +140 -119
  50. package/src/document/generate_document_id.rs +2 -2
  51. package/src/document/mod.rs +164 -150
  52. package/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs +50 -48
  53. package/src/document/state_transition/document_batch_transition/document_transition/document_delete_transition.rs +14 -14
  54. package/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs +50 -38
  55. package/src/document/state_transition/document_batch_transition/document_transition/mod.rs +165 -153
  56. package/src/document/state_transition/document_batch_transition/mod.rs +232 -222
  57. package/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs +2 -9
  58. package/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs +1 -9
  59. package/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs +2 -10
  60. package/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs +1 -9
  61. package/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs +1 -9
  62. package/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs +1 -9
  63. package/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs +1 -9
  64. package/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs +1 -9
  65. package/src/errors/consensus/basic/data_contract/index_error/duplicate_index_error.rs +1 -9
  66. package/src/errors/consensus/basic/data_contract/index_error/invalid_compound_index_error.rs +1 -9
  67. package/src/errors/consensus/basic/data_contract/index_error/invalid_index_property_type_error.rs +1 -9
  68. package/src/errors/consensus/basic/data_contract/index_error/invalid_indexed_property_constraint_error.rs +1 -9
  69. package/src/errors/consensus/basic/data_contract/index_error/system_property_index_already_present_error.rs +1 -9
  70. package/src/errors/consensus/basic/data_contract/index_error/undefined_index_property_error.rs +1 -9
  71. package/src/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs +1 -9
  72. package/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs +1 -9
  73. package/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs +1 -9
  74. package/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs +1 -9
  75. package/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs +10 -7
  76. package/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs +1 -9
  77. package/src/errors/consensus/basic/document/data_contract_not_present_error.rs +1 -9
  78. package/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs +1 -9
  79. package/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs +1 -9
  80. package/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs +1 -9
  81. package/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs +1 -9
  82. package/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs +1 -9
  83. package/src/errors/consensus/basic/document/invalid_document_type_error.rs +1 -9
  84. package/src/errors/consensus/basic/document/missing_data_contract_id_error.rs +1 -9
  85. package/src/errors/consensus/basic/document/missing_document_transition_action_error.rs +1 -9
  86. package/src/errors/consensus/basic/document/missing_document_transition_type_error.rs +1 -9
  87. package/src/errors/consensus/basic/document/missing_document_type_error.rs +1 -9
  88. package/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs +1 -9
  89. package/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs +1 -9
  90. package/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs +3 -11
  91. package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs +1 -9
  92. package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs +2 -10
  93. package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs +1 -9
  94. package/src/errors/consensus/basic/identity/identity_insufficient_balance_error.rs +1 -9
  95. package/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs +1 -9
  96. package/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs +1 -9
  97. package/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size_error.rs +1 -9
  98. package/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs +1 -1
  99. package/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs +1 -9
  100. package/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs +1 -9
  101. package/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs +1 -9
  102. package/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs +1 -9
  103. package/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs +1 -9
  104. package/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs +1 -9
  105. package/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs +1 -9
  106. package/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs +1 -9
  107. package/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs +1 -9
  108. package/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs +1 -9
  109. package/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs +1 -9
  110. package/src/errors/consensus/basic/identity/missing_master_public_key_error.rs +1 -9
  111. package/src/errors/consensus/basic/identity/missing_public_key_error.rs +1 -9
  112. package/src/errors/consensus/basic/incompatible_protocol_version_error.rs +1 -9
  113. package/src/errors/consensus/basic/invalid_identifier_error.rs +1 -9
  114. package/src/errors/consensus/basic/invalid_signature_public_key_security_level_error.rs +7 -15
  115. package/src/errors/consensus/basic/invalid_state_transition_signature_error.rs +1 -9
  116. package/src/errors/consensus/basic/json_schema_compilation_error.rs +1 -9
  117. package/src/errors/consensus/basic/json_schema_error.rs +1 -9
  118. package/src/errors/consensus/basic/mod.rs +2 -0
  119. package/src/errors/consensus/basic/public_key_is_disabled_error.rs +1 -9
  120. package/src/errors/consensus/basic/public_key_security_level_not_met_error.rs +2 -11
  121. package/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs +1 -9
  122. package/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs +1 -9
  123. package/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs +1 -9
  124. package/src/errors/consensus/basic/unsupported_protocol_version_error.rs +1 -9
  125. package/src/errors/consensus/basic/unsupported_version_error.rs +44 -0
  126. package/src/errors/consensus/basic/wrong_public_key_purpose_error.rs +1 -9
  127. package/src/errors/consensus/consensus_error.rs +44 -21
  128. package/src/errors/consensus/deserialize.rs +2 -1
  129. package/src/errors/consensus/fee/balance_is_not_enough_error.rs +5 -2
  130. package/src/errors/consensus/signature/basic_bls_error.rs +1 -9
  131. package/src/errors/consensus/signature/basic_ecdsa_error.rs +1 -9
  132. package/src/errors/consensus/signature/identity_not_found_error.rs +4 -2
  133. package/src/errors/consensus/signature/signature_should_not_be_present_error.rs +1 -9
  134. package/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs +3 -2
  135. package/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs +42 -0
  136. package/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs +44 -0
  137. package/src/errors/consensus/state/data_contract/data_trigger/data_trigger_condition_error.rs +2 -1
  138. package/src/errors/consensus/state/data_contract/data_trigger/data_trigger_execution_error.rs +2 -1
  139. package/src/errors/consensus/state/data_contract/data_trigger/data_trigger_invalid_result_error.rs +2 -1
  140. package/src/errors/consensus/state/data_contract/mod.rs +7 -1
  141. package/src/errors/consensus/state/document/document_already_present_error.rs +1 -9
  142. package/src/errors/consensus/state/document/document_not_found_error.rs +1 -9
  143. package/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs +1 -9
  144. package/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs +1 -9
  145. package/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs +34 -0
  146. package/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs +1 -9
  147. package/src/errors/consensus/state/document/duplicate_unique_index_error.rs +1 -9
  148. package/src/errors/consensus/state/document/invalid_document_revision_error.rs +9 -12
  149. package/src/errors/consensus/state/document/mod.rs +2 -0
  150. package/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs +1 -9
  151. package/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs +1 -9
  152. package/src/errors/consensus/state/identity/identity_already_exists_error.rs +1 -9
  153. package/src/errors/consensus/state/identity/identity_public_key_disabled_at_window_violation_error.rs +1 -9
  154. package/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs +1 -9
  155. package/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs +1 -9
  156. package/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs +2 -9
  157. package/src/errors/consensus/state/identity/invalid_identity_revision_error.rs +1 -9
  158. package/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs +1 -9
  159. package/src/errors/consensus/value_error.rs +1 -9
  160. package/src/errors/from.rs +12 -8
  161. package/src/errors/mod.rs +7 -7
  162. package/src/errors/value_error.rs +5 -0
  163. package/src/identity/errors/asset_lock_transaction_is_not_found_error.rs +1 -2
  164. package/src/identity/factory_utils.rs +13 -13
  165. package/src/identity/identity.rs +275 -0
  166. package/src/identity/identity_facade.rs +87 -70
  167. package/src/identity/identity_factory.rs +74 -54
  168. package/src/identity/identity_public_key/mod.rs +87 -64
  169. package/src/identity/mod.rs +25 -247
  170. package/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof_structure_validator.rs +0 -1
  171. package/src/identity/state_transition/asset_lock_proof/chain/mod.rs +3 -1
  172. package/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs +2 -2
  173. package/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof_structure_validator.rs +0 -1
  174. package/src/identity/state_transition/asset_lock_proof/instant/mod.rs +3 -1
  175. package/src/identity/state_transition/asset_lock_proof/mod.rs +112 -116
  176. package/src/identity/state_transition/identity_create_transition/identity_create_transition.rs +71 -65
  177. package/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs +0 -1
  178. package/src/identity/state_transition/identity_create_transition/mod.rs +3 -3
  179. package/src/identity/state_transition/identity_create_transition/to_object.rs +10 -12
  180. package/src/identity/state_transition/identity_credit_transfer_transition/apply_identity_credit_transfer_transition.rs +31 -0
  181. package/src/identity/state_transition/identity_credit_transfer_transition/identity_credit_transfer_transition_basic_validator.rs +66 -0
  182. package/src/identity/state_transition/identity_credit_transfer_transition/identity_credit_transfer_transition_state_validator.rs +44 -0
  183. package/src/identity/state_transition/identity_credit_transfer_transition/mod.rs +8 -0
  184. package/src/identity/state_transition/identity_credit_transfer_transition/to_object.rs +49 -0
  185. package/src/identity/state_transition/identity_credit_transfer_transition/transition.rs +344 -0
  186. package/src/identity/state_transition/identity_public_key_transitions.rs +89 -75
  187. package/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs +67 -62
  188. package/src/identity/state_transition/identity_topup_transition/identity_topup_transition_basic_validator.rs +0 -2
  189. package/src/identity/state_transition/identity_topup_transition/mod.rs +3 -3
  190. package/src/identity/state_transition/identity_topup_transition/to_object.rs +8 -12
  191. package/src/identity/state_transition/identity_update_transition/identity_update_public_keys_validator.rs +2 -2
  192. package/src/identity/state_transition/identity_update_transition/identity_update_transition.rs +99 -104
  193. package/src/identity/state_transition/identity_update_transition/mod.rs +4 -4
  194. package/src/identity/state_transition/identity_update_transition/to_object.rs +15 -19
  195. package/src/identity/state_transition/mod.rs +5 -2
  196. package/src/identity/state_transition/transition_types.rs +34 -0
  197. package/src/identity/state_transition/validate_public_key_signatures.rs +2 -2
  198. package/src/lib.rs +10 -11
  199. package/src/metadata.rs +3 -3
  200. package/src/protocol_version.rs +7 -0
  201. package/src/state_transition/conversion.rs +11 -1
  202. package/src/state_transition/errors/invalid_state_transition_error.rs +12 -1
  203. package/src/state_transition/fee/operations/pre_calculated_operation.rs +2 -1
  204. package/src/state_transition/mod.rs +137 -139
  205. package/src/state_transition/state_transition_facade.rs +11 -11
  206. package/src/state_transition/state_transition_factory.rs +142 -153
  207. package/src/state_transition/validation/state_transition_fee_validator.rs +1 -1
  208. package/src/state_transition/validation/validate_state_transition_identity_signature.rs +28 -10
  209. package/src/state_transition/validation/validate_state_transition_key_signature.rs +1 -1
  210. package/src/utils.rs +7 -8
  211. package/src/validation/validation_result.rs +1 -0
  212. package/test/integration/dataContract/DataContractFacade.spec.js +25 -32
  213. package/test/integration/dataContract/stateTransition/DataContractCreateTransition/validation/basic/validateDataContractCreateTransitionBasicFactory.spec.js +6 -6
  214. package/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js +11 -10
  215. package/test/integration/dataContract/validation/validateDataContractFactory.spec.js +3 -3
  216. package/test/integration/document/Document.spec.js +3 -3
  217. package/test/integration/document/DocumentFacade.spec.js +39 -38
  218. package/test/integration/document/stateTransition/DocumentsBatchTransition/DocumentBatchTransition.spec.js +6 -7
  219. package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/basic/validateDocumentsBatchTransitionBasicFactory.spec.js +15 -15
  220. package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/state/executeDataTriggersFactory.spec.js +2 -2
  221. package/test/integration/document/validation/validateDocumentFactory.spec.js +3 -3
  222. package/test/integration/identity/IdentityFacade.spec.js +33 -62
  223. package/test/integration/identity/stateTransition/IdentityCreateTransition/validation/basic/validateIdentityCreateTransitionBasicFactory.spec.js +6 -8
  224. package/test/integration/identity/stateTransition/IdentityTopUpTransition/validation/basic/validateIdentityTopUpTransitionBasicFactory.spec.js +4 -7
  225. package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/basic/validateIdentityUpdateTransitionBasicFactory.spec.js +1 -1
  226. package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js +21 -24
  227. package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validatePublicKeysState.spec.js +2 -2
  228. package/test/integration/identity/stateTransition/assetLockProof/chain/validateChainAssetLockProofStructureFactory.spec.js +4 -4
  229. package/test/integration/identity/stateTransition/assetLockProof/fetchAssetLockTransactionOutputFactory.spec.js +7 -10
  230. package/test/integration/identity/stateTransition/assetLockProof/instant/validateInstantAssetLockProofStructureFactory.spec.js +4 -5
  231. package/test/integration/identity/stateTransition/assetLockProof/validateAssetLockTransactionFactory.spec.js +6 -6
  232. package/test/integration/identity/stateTransition/validatePublicKeySignaturesFactory.spec.js +3 -7
  233. package/test/integration/identity/validation/validateIdentityFactory.spec.js +7 -6
  234. package/test/integration/identity/validation/validatePublicKeysFactory.spec.js +5 -25
  235. package/test/integration/stateTransition/StateTransitionFacade.spec.js +45 -58
  236. package/test/integration/util/generateTemporaryEcdsaPrivateKey.spec.js +1 -1
  237. package/test/unit/DashPlatformProtocol.spec.js +10 -25
  238. package/test/unit/dataContract/DataContract.spec.js +119 -148
  239. package/test/unit/dataContract/DataContractFactory.spec.js +42 -31
  240. package/test/unit/dataContract/createDataContract.spec.js +6 -6
  241. package/test/unit/dataContract/generateDataContractId.spec.js +1 -1
  242. package/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js +34 -26
  243. package/test/unit/dataContract/stateTransition/DataContractCreateTransition/applyDataContractCreateTransitionFactory.spec.js +7 -9
  244. package/test/unit/dataContract/stateTransition/DataContractCreateTransition/validation/state/validateDataContractCreateTransitionStateFactory.spec.js +10 -9
  245. package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js +28 -19
  246. package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js +7 -7
  247. package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.spec.js +5 -5
  248. package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/validation/state/validateDataContractUpdateTransitionStateFactory.spec.js +11 -10
  249. package/test/unit/dataContract/validation/validateDataContractPatterns.spec.js +7 -7
  250. package/test/unit/dataTrigger/dpnsTriggers/createDomainDataTrigger.spec.js +1 -1
  251. package/test/unit/document/Document.spec.js +31 -20
  252. package/test/unit/document/DocumentFactory.spec.js +45 -110
  253. package/test/unit/document/fetchAndValidateDataContractFactory.spec.js +1 -1
  254. package/test/unit/document/stateTransition/DocumetsBatchTransition/DocumentsBatchTransition.spec.js +6 -7
  255. package/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js +11 -12
  256. package/test/unit/document/stateTransition/DocumetsBatchTransition/documentTransition/DocumentCreateTransition.spec.js +1 -1
  257. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/findDuplicatesById.spec.js +1 -1
  258. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/findDuplicatesByIndices.spec.js +1 -1
  259. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/validatePartialCompoundIndices.spec.js +1 -1
  260. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/fetchDocumentsFactory.spec.js +1 -1
  261. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js +9 -9
  262. package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsUniquenessByIndicesFactory.spec.js +1 -1
  263. package/test/unit/identity/Identity.spec.js +46 -81
  264. package/test/unit/identity/IdentityFactory.spec.js +61 -75
  265. package/test/unit/identity/IdentityPublicKey.spec.js +34 -48
  266. package/test/unit/identity/stateTransition/IdentityCreateTransition/IdentityCreateTransition.spec.js +30 -63
  267. package/test/unit/identity/stateTransition/IdentityCreateTransition/applyIdentityCreateTransitionFactory.spec.js +9 -15
  268. package/test/unit/identity/stateTransition/IdentityCreateTransition/validation/state/validateIdentityCreateTransitionStateFactory.spec.js +5 -9
  269. package/test/unit/identity/stateTransition/IdentityTopUpTransition/IdentityTopUpTransition.spec.js +13 -35
  270. package/test/unit/identity/stateTransition/IdentityTopUpTransition/applyIdentityTopUpTransitionFactory.spec.js +9 -13
  271. package/test/unit/identity/stateTransition/IdentityTopUpTransition/validation/state/validateIdentityTopUpTransitionStateFactory.spec.js +5 -9
  272. package/test/unit/identity/stateTransition/IdentityUpdateTransition/IdentityUpdateTransition.spec.js +24 -46
  273. package/test/unit/identity/stateTransition/IdentityUpdateTransition/applyIdentityUpdateTransitionFactory.spec.js +4 -4
  274. package/test/unit/identity/stateTransition/assetLockProof/fetchAssetLockPublicKeyHashFactory.spec.js +1 -1
  275. package/test/unit/identity/stateTransition/identityCreditTransferTransition/identityCreditTransferTransition.spec.js +130 -0
  276. package/test/unit/stateTransition/StateTransitionExecutionContext.spec.js +1 -1
  277. package/test/unit/stateTransition/StateTransitionFactory.spec.js +16 -22
  278. package/test/unit/stateTransition/createStateTransitionFactory.spec.js +43 -21
  279. package/test/unit/stateTransition/validation/validateStateTransitionBasicFactory.spec.js +3 -3
  280. package/test/unit/stateTransition/validation/validateStateTransitionFeeFactory.spec.js +5 -17
  281. package/test/unit/stateTransition/validation/validateStateTransitionIdentitySignatureFactory.spec.js +9 -5
  282. package/test/unit/stateTransition/validation/validateStateTransitionKeySignatureFactory.spec.js +8 -14
  283. package/test/unit/stateTransition/validation/validateStateTransitionStateFactory.spec.js +1 -1
  284. package/test/unit/version/validateProtocolVersionFactory.spec.js +1 -1
  285. package/test-d/index.test-d.ts +2 -2
  286. package/src/data_contract/state_transition/data_contract_create_transition/apply.rs +0 -45
  287. package/src/data_contract/state_transition/data_contract_update_transition/apply.rs +0 -49
  288. package/src/decode_protocol_entity.rs +0 -25
  289. package/src/document/state_transition/document_batch_transition/apply_document_batch_transition.rs +0 -25
  290. package/test/integration/ajv/keywords/byteArray/addByteArrayKeyword.spec.js +0 -148
  291. package/test/integration/util/generateEntropy.spec.js +0 -17
  292. package/test/integration/util/serializer.spec.js +0 -24
  293. package/test/unit/decodeProtocolEntityFactory.spec.js +0 -69
  294. package/test/unit/identity/errors/InvalidIdentityError.spec.js +0 -46
  295. package/test/unit/stateTransition/errors/InvalidStateTransitionError.spec.js +0 -51
@@ -0,0 +1,344 @@
1
+ use crate::utils::WithJsError;
2
+ use dpp::platform_value::{ReplacementType, Value};
3
+ use serde_json::Value as JsonValue;
4
+ use std::convert::TryInto;
5
+ use std::default::Default;
6
+
7
+ use dpp::version::PlatformVersion;
8
+ use wasm_bindgen::prelude::*;
9
+
10
+ use crate::bls_adapter::{BlsAdapter, JsBlsAdapter};
11
+ use crate::errors::from_dpp_err;
12
+ use crate::identifier::IdentifierWrapper;
13
+ use crate::identity::IdentityPublicKeyWasm;
14
+ use crate::{buffer::Buffer, utils, with_js_error};
15
+ use dpp::identifier::Identifier;
16
+ use dpp::identity::KeyType;
17
+ use dpp::platform_value::string_encoding::Encoding;
18
+ use dpp::platform_value::{string_encoding, BinaryData};
19
+ use dpp::serialization::{PlatformSerializable, ValueConvertible};
20
+ use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0;
21
+ use dpp::state_transition::identity_credit_transfer_transition::fields::IDENTIFIER_FIELDS;
22
+ use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition;
23
+ use dpp::state_transition::StateTransitionLike;
24
+ use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned};
25
+ #[wasm_bindgen(js_name=IdentityCreditTransferTransition)]
26
+ #[derive(Clone)]
27
+ pub struct IdentityCreditTransferTransitionWasm(IdentityCreditTransferTransition);
28
+
29
+ impl From<IdentityCreditTransferTransition> for IdentityCreditTransferTransitionWasm {
30
+ fn from(v: IdentityCreditTransferTransition) -> Self {
31
+ IdentityCreditTransferTransitionWasm(v)
32
+ }
33
+ }
34
+
35
+ impl From<IdentityCreditTransferTransitionWasm> for IdentityCreditTransferTransition {
36
+ fn from(v: IdentityCreditTransferTransitionWasm) -> Self {
37
+ v.0
38
+ }
39
+ }
40
+
41
+ #[wasm_bindgen(js_class = IdentityCreditTransferTransition)]
42
+ impl IdentityCreditTransferTransitionWasm {
43
+ #[wasm_bindgen(constructor)]
44
+ pub fn new(platform_version: u32) -> Result<IdentityCreditTransferTransitionWasm, JsValue> {
45
+ let platform_version =
46
+ &PlatformVersion::get(platform_version).map_err(|e| JsValue::from(e.to_string()))?;
47
+
48
+ IdentityCreditTransferTransition::default_versioned(&platform_version)
49
+ .map(Into::into)
50
+ .map_err(from_dpp_err)
51
+ }
52
+
53
+ #[wasm_bindgen(js_name=getType)]
54
+ pub fn get_type(&self) -> u8 {
55
+ self.0.state_transition_type() as u8
56
+ }
57
+
58
+ #[wasm_bindgen(getter, js_name=identityId)]
59
+ pub fn identity_id(&self) -> IdentifierWrapper {
60
+ self.get_identity_id()
61
+ }
62
+
63
+ #[wasm_bindgen(getter, js_name=recipientId)]
64
+ pub fn recipient_id(&self) -> IdentifierWrapper {
65
+ self.get_recipient_id()
66
+ }
67
+
68
+ #[wasm_bindgen(getter, js_name=amount)]
69
+ pub fn amount(&self) -> u64 {
70
+ self.0.amount()
71
+ }
72
+
73
+ #[wasm_bindgen(js_name=getIdentityId)]
74
+ pub fn get_identity_id(&self) -> IdentifierWrapper {
75
+ self.0.identity_id().into()
76
+ }
77
+
78
+ #[wasm_bindgen(js_name=getRecipientId)]
79
+ pub fn get_recipient_id(&self) -> IdentifierWrapper {
80
+ self.0.recipient_id().into()
81
+ }
82
+
83
+ #[wasm_bindgen(js_name=setIdentityId)]
84
+ pub fn set_identity_id(&mut self, identity_id: &IdentifierWrapper) {
85
+ self.0.set_identity_id(identity_id.into());
86
+ }
87
+
88
+ #[wasm_bindgen(js_name=setRecipientId)]
89
+ pub fn set_recipient_id(&mut self, recipient_id: &IdentifierWrapper) {
90
+ self.0.set_recipient_id(recipient_id.into());
91
+ }
92
+
93
+ #[wasm_bindgen(js_name=getAmount)]
94
+ pub fn get_amount(&self) -> f64 {
95
+ self.0.amount() as f64
96
+ }
97
+
98
+ #[wasm_bindgen(js_name=setAmount)]
99
+ pub fn set_amount(&mut self, amount: f64) {
100
+ self.0.set_amount(amount as u64);
101
+ }
102
+
103
+ #[wasm_bindgen(js_name=toObject)]
104
+ pub fn to_object(&self, options: JsValue) -> Result<JsValue, JsValue> {
105
+ let opts: super::to_object::ToObjectOptions = if options.is_object() {
106
+ with_js_error!(serde_wasm_bindgen::from_value(options))?
107
+ } else {
108
+ Default::default()
109
+ };
110
+
111
+ let object = super::to_object::to_object_struct(&self.0, opts);
112
+ let js_object = js_sys::Object::new();
113
+
114
+ js_sys::Reflect::set(
115
+ &js_object,
116
+ &"type".to_owned().into(),
117
+ &object.transition_type.into(),
118
+ )?;
119
+
120
+ let version = match self.0 {
121
+ IdentityCreditTransferTransition::V0(_) => "0",
122
+ };
123
+
124
+ js_sys::Reflect::set(&js_object, &"$version".to_owned().into(), &version.into())?;
125
+
126
+ if let Some(signature) = object.signature {
127
+ let signature_value: JsValue = if signature.is_empty() {
128
+ JsValue::undefined()
129
+ } else {
130
+ Buffer::from_bytes(signature.as_slice()).into()
131
+ };
132
+
133
+ js_sys::Reflect::set(&js_object, &"signature".to_owned().into(), &signature_value)?;
134
+
135
+ if let Some(signature_public_key_id) = object.signature_public_key_id {
136
+ js_sys::Reflect::set(
137
+ &js_object,
138
+ &"signaturePublicKeyId".to_owned().into(),
139
+ &JsValue::from(signature_public_key_id),
140
+ )?;
141
+ } else {
142
+ js_sys::Reflect::set(
143
+ &js_object,
144
+ &"signaturePublicKeyId".to_owned().into(),
145
+ &JsValue::undefined(),
146
+ )?;
147
+ }
148
+ }
149
+
150
+ js_sys::Reflect::set(
151
+ &js_object,
152
+ &"identityId".to_owned().into(),
153
+ &Buffer::from_bytes(object.identity_id.to_buffer().as_slice()),
154
+ )?;
155
+
156
+ js_sys::Reflect::set(
157
+ &js_object,
158
+ &"recipientId".to_owned().into(),
159
+ &Buffer::from_bytes(object.recipient_id.to_buffer().as_slice()),
160
+ )?;
161
+
162
+ js_sys::Reflect::set(
163
+ &js_object,
164
+ &"amount".to_owned().into(),
165
+ &JsValue::from_f64(object.amount as f64),
166
+ )?;
167
+
168
+ Ok(js_object.into())
169
+ }
170
+
171
+ #[wasm_bindgen(js_name=toBuffer)]
172
+ pub fn to_buffer(&self) -> Result<Buffer, JsValue> {
173
+ let bytes = PlatformSerializable::serialize_to_bytes(
174
+ &StateTransition::IdentityCreditTransfer(self.0.clone()),
175
+ )
176
+ .with_js_error()?;
177
+ Ok(Buffer::from_bytes(&bytes))
178
+ }
179
+
180
+ #[wasm_bindgen(js_name=toJSON)]
181
+ pub fn to_json(&self) -> Result<JsValue, JsValue> {
182
+ let object = super::to_object::to_object_struct(&self.0, Default::default());
183
+ let js_object = js_sys::Object::new();
184
+
185
+ js_sys::Reflect::set(
186
+ &js_object,
187
+ &"type".to_owned().into(),
188
+ &object.transition_type.into(),
189
+ )?;
190
+
191
+ let version = match self.0 {
192
+ IdentityCreditTransferTransition::V0(_) => "0",
193
+ };
194
+
195
+ js_sys::Reflect::set(&js_object, &"$version".to_owned().into(), &version.into())?;
196
+
197
+ if let Some(signature) = object.signature {
198
+ let signature_value: JsValue = if signature.is_empty() {
199
+ JsValue::undefined()
200
+ } else {
201
+ string_encoding::encode(signature.as_slice(), Encoding::Base64).into()
202
+ };
203
+
204
+ js_sys::Reflect::set(&js_object, &"signature".to_owned().into(), &signature_value)?;
205
+
206
+ if let Some(signature_public_key_id) = object.signature_public_key_id {
207
+ js_sys::Reflect::set(
208
+ &js_object,
209
+ &"signaturePublicKeyId".to_owned().into(),
210
+ &signature_public_key_id.into(),
211
+ )?;
212
+ } else {
213
+ js_sys::Reflect::set(
214
+ &js_object,
215
+ &"signaturePublicKeyId".to_owned().into(),
216
+ &JsValue::undefined(),
217
+ )?;
218
+ }
219
+ }
220
+
221
+ let identity_id = object.identity_id.to_string(Encoding::Base58);
222
+
223
+ js_sys::Reflect::set(
224
+ &js_object,
225
+ &"identityId".to_owned().into(),
226
+ &identity_id.into(),
227
+ )?;
228
+
229
+ let recipient_id = object.recipient_id.to_string(Encoding::Base58);
230
+
231
+ js_sys::Reflect::set(
232
+ &js_object,
233
+ &"recipientId".to_owned().into(),
234
+ &recipient_id.into(),
235
+ )?;
236
+
237
+ js_sys::Reflect::set(
238
+ &js_object,
239
+ &"amount".to_owned().into(),
240
+ &JsValue::from_f64(object.amount as f64),
241
+ )?;
242
+
243
+ Ok(js_object.into())
244
+ }
245
+
246
+ #[wasm_bindgen(js_name=getModifiedDataIds)]
247
+ pub fn modified_data_ids(&self) -> Vec<JsValue> {
248
+ let ids = self.0.modified_data_ids();
249
+
250
+ ids.into_iter()
251
+ .map(|id| <IdentifierWrapper as std::convert::From<Identifier>>::from(id).into())
252
+ .collect()
253
+ }
254
+
255
+ #[wasm_bindgen(js_name=isDataContractStateTransition)]
256
+ pub fn is_data_contract_state_transition(&self) -> bool {
257
+ self.0.is_data_contract_state_transition()
258
+ }
259
+
260
+ #[wasm_bindgen(js_name=isDocumentStateTransition)]
261
+ pub fn is_document_state_transition(&self) -> bool {
262
+ self.0.is_document_state_transition()
263
+ }
264
+
265
+ #[wasm_bindgen(js_name=isIdentityStateTransition)]
266
+ pub fn is_identity_state_transition(&self) -> bool {
267
+ self.0.is_identity_state_transition()
268
+ }
269
+
270
+ #[wasm_bindgen(js_name=signByPrivateKey)]
271
+ pub fn sign_by_private_key(
272
+ &mut self,
273
+ private_key: Vec<u8>,
274
+ key_type: u8,
275
+ bls: Option<JsBlsAdapter>,
276
+ ) -> Result<(), JsValue> {
277
+ let key_type = key_type
278
+ .try_into()
279
+ .map_err(|e: anyhow::Error| e.to_string())?;
280
+
281
+ if bls.is_none() && key_type == KeyType::BLS12_381 {
282
+ return Err(JsError::new(
283
+ format!("BLS adapter is required for BLS key type '{}'", key_type).as_str(),
284
+ )
285
+ .into());
286
+ }
287
+
288
+ let bls_adapter = if let Some(adapter) = bls {
289
+ BlsAdapter(adapter)
290
+ } else {
291
+ BlsAdapter(JsValue::undefined().into())
292
+ };
293
+
294
+ // TODO: not the best approach because it involves cloning the transition
295
+ // Probably it worth to return `sign_by_private_key` per state transition
296
+ let mut wrapper = StateTransition::IdentityCreditTransfer(self.0.clone());
297
+ wrapper
298
+ .sign_by_private_key(private_key.as_slice(), key_type, &bls_adapter)
299
+ .with_js_error()?;
300
+
301
+ self.0.set_signature(wrapper.signature().to_owned());
302
+
303
+ Ok(())
304
+ }
305
+
306
+ #[wasm_bindgen(js_name=getSignature)]
307
+ pub fn get_signature(&self) -> Buffer {
308
+ Buffer::from_bytes(self.0.signature().as_slice())
309
+ }
310
+
311
+ #[wasm_bindgen(js_name=setSignature)]
312
+ pub fn set_signature(&mut self, signature: Option<Vec<u8>>) {
313
+ self.0
314
+ .set_signature(BinaryData::new(signature.unwrap_or(vec![])))
315
+ }
316
+
317
+ #[wasm_bindgen]
318
+ pub fn sign(
319
+ &mut self,
320
+ identity_public_key: &IdentityPublicKeyWasm,
321
+ private_key: Vec<u8>,
322
+ bls: JsBlsAdapter,
323
+ ) -> Result<(), JsValue> {
324
+ let bls_adapter = BlsAdapter(bls);
325
+
326
+ // TODO: come up with a better way to set signature to the binding.
327
+ let mut state_transition = StateTransition::IdentityCreditTransfer(self.0.clone());
328
+ state_transition
329
+ .sign(
330
+ &identity_public_key.to_owned().into(),
331
+ &private_key,
332
+ &bls_adapter,
333
+ )
334
+ .with_js_error()?;
335
+
336
+ let signature = state_transition.signature().to_owned();
337
+ let signature_public_key_id = state_transition.signature_public_key_id().unwrap_or(0);
338
+
339
+ self.0.set_signature(signature);
340
+ self.0.set_signature_public_key_id(signature_public_key_id);
341
+
342
+ Ok(())
343
+ }
344
+ }
@@ -1,17 +1,21 @@
1
1
  //todo: move this file to transition
2
- use dpp::dashcore::anyhow;
3
- use dpp::document::document_transition::document_base_transition::JsonValue;
4
- use dpp::identity::state_transition::identity_public_key_transitions::IdentityPublicKeyInCreationWithWitness;
5
- use dpp::platform_value::BinaryData;
6
- use dpp::Convertible;
2
+ use dpp::platform_value::{BinaryData, ReplacementType, Value};
3
+ use dpp::serialization::ValueConvertible;
4
+ use dpp::state_transition::public_key_in_creation::accessors::{
5
+ IdentityPublicKeyInCreationV0Getters, IdentityPublicKeyInCreationV0Setters,
6
+ };
7
+ use dpp::state_transition::public_key_in_creation::v0::BINARY_DATA_FIELDS;
8
+ use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation;
9
+ use js_sys::Reflect::delete_property;
7
10
  pub use serde::{Deserialize, Serialize};
8
- use std::convert::{TryFrom, TryInto};
11
+ use serde_json::Value as JsonValue;
12
+ use std::convert::TryInto;
9
13
  use wasm_bindgen::prelude::*;
10
14
 
11
15
  use crate::errors::from_dpp_err;
12
16
  use crate::utils::WithJsError;
13
17
  use crate::{buffer::Buffer, utils, with_js_error};
14
-
18
+ use dpp::version::PlatformVersion;
15
19
  #[derive(Deserialize, Default)]
16
20
  #[serde(rename_all = "camelCase")]
17
21
  struct ToObjectOptions {
@@ -20,98 +24,104 @@ struct ToObjectOptions {
20
24
 
21
25
  #[wasm_bindgen(js_name=IdentityPublicKeyWithWitness)]
22
26
  #[derive(Serialize, Deserialize, Debug, Clone)]
23
- pub struct IdentityPublicKeyWithWitnessWasm(IdentityPublicKeyInCreationWithWitness);
27
+ pub struct IdentityPublicKeyWithWitnessWasm(IdentityPublicKeyInCreation);
24
28
 
25
29
  #[wasm_bindgen(js_class = IdentityPublicKeyWithWitness)]
26
30
  impl IdentityPublicKeyWithWitnessWasm {
27
31
  #[wasm_bindgen(constructor)]
28
- pub fn new(raw_public_key: JsValue) -> Result<IdentityPublicKeyWithWitnessWasm, JsValue> {
29
- let data_string = utils::stringify(&raw_public_key)?;
30
- let value: JsonValue = serde_json::from_str(&data_string).map_err(|e| e.to_string())?;
31
-
32
- let pk = IdentityPublicKeyInCreationWithWitness::from_json_object(value).with_js_error()?;
32
+ pub fn new(platform_version: u32) -> Result<IdentityPublicKeyWithWitnessWasm, JsValue> {
33
+ let platform_version =
34
+ &PlatformVersion::get(platform_version).map_err(|e| JsValue::from(e.to_string()))?;
33
35
 
34
- Ok(IdentityPublicKeyWithWitnessWasm(pk))
36
+ IdentityPublicKeyInCreation::default_versioned(&platform_version)
37
+ .map(Into::into)
38
+ .map_err(from_dpp_err)
35
39
  }
36
40
 
37
41
  #[wasm_bindgen(js_name=getId)]
38
42
  pub fn get_id(&self) -> u32 {
39
- self.0.id
43
+ self.0.id()
40
44
  }
41
45
 
42
46
  #[wasm_bindgen(js_name=setId)]
43
47
  pub fn set_id(&mut self, id: u32) {
44
- self.0.id = id;
48
+ self.0.set_id(id);
45
49
  }
46
50
 
47
51
  #[wasm_bindgen(js_name=getType)]
48
52
  pub fn get_type(&self) -> u8 {
49
- self.0.key_type as u8
53
+ self.0.key_type() as u8
50
54
  }
51
55
 
52
56
  #[wasm_bindgen(js_name=setType)]
53
57
  pub fn set_type(&mut self, key_type: u8) -> Result<(), JsValue> {
54
- self.0.key_type = key_type
55
- .try_into()
56
- .map_err(|e: anyhow::Error| e.to_string())?;
58
+ self.0.set_type(
59
+ key_type
60
+ .try_into()
61
+ .map_err(|e: anyhow::Error| e.to_string())?,
62
+ );
57
63
  Ok(())
58
64
  }
59
65
 
60
66
  #[wasm_bindgen(js_name=setData)]
61
67
  pub fn set_data(&mut self, data: Vec<u8>) -> Result<(), JsValue> {
62
- self.0.data = BinaryData::new(data);
68
+ self.0.set_data(BinaryData::new(data));
63
69
  Ok(())
64
70
  }
65
71
 
66
72
  #[wasm_bindgen(js_name=getData)]
67
73
  pub fn get_data(&self) -> Buffer {
68
- Buffer::from_bytes_owned(self.0.data.to_vec())
74
+ Buffer::from_bytes_owned(self.0.data().to_vec())
69
75
  }
70
76
 
71
77
  #[wasm_bindgen(js_name=setPurpose)]
72
78
  pub fn set_purpose(&mut self, purpose: u8) -> Result<(), JsValue> {
73
- self.0.purpose = purpose
74
- .try_into()
75
- .map_err(|e: anyhow::Error| e.to_string())?;
79
+ self.0.set_purpose(
80
+ purpose
81
+ .try_into()
82
+ .map_err(|e: anyhow::Error| e.to_string())?,
83
+ );
76
84
  Ok(())
77
85
  }
78
86
 
79
87
  #[wasm_bindgen(js_name=getPurpose)]
80
88
  pub fn get_purpose(&self) -> u8 {
81
- self.0.purpose as u8
89
+ self.0.purpose() as u8
82
90
  }
83
91
 
84
92
  #[wasm_bindgen(js_name=setSecurityLevel)]
85
93
  pub fn set_security_level(&mut self, security_level: u8) -> Result<(), JsValue> {
86
- self.0.security_level = security_level
87
- .try_into()
88
- .map_err(|e: anyhow::Error| e.to_string())?;
94
+ self.0.set_security_level(
95
+ security_level
96
+ .try_into()
97
+ .map_err(|e: anyhow::Error| e.to_string())?,
98
+ );
89
99
  Ok(())
90
100
  }
91
101
 
92
102
  #[wasm_bindgen(js_name=getSecurityLevel)]
93
103
  pub fn get_security_level(&self) -> u8 {
94
- self.0.security_level as u8
104
+ self.0.security_level() as u8
95
105
  }
96
106
 
97
107
  #[wasm_bindgen(js_name=setReadOnly)]
98
108
  pub fn set_read_only(&mut self, read_only: bool) {
99
- self.0.read_only = read_only;
109
+ self.0.set_read_only(read_only);
100
110
  }
101
111
 
102
112
  #[wasm_bindgen(js_name=isReadOnly)]
103
113
  pub fn is_read_only(&self) -> bool {
104
- self.0.read_only
114
+ self.0.read_only()
105
115
  }
106
116
 
107
117
  #[wasm_bindgen(js_name=setSignature)]
108
118
  pub fn set_signature(&mut self, signature: Vec<u8>) {
109
- self.0.signature = BinaryData::new(signature)
119
+ self.0.set_signature(BinaryData::new(signature))
110
120
  }
111
121
 
112
122
  #[wasm_bindgen(js_name=getSignature)]
113
123
  pub fn get_signature(&self) -> Vec<u8> {
114
- self.0.signature.to_vec()
124
+ self.0.signature().to_vec()
115
125
  }
116
126
 
117
127
  #[wasm_bindgen(js_name=hash)]
@@ -119,35 +129,33 @@ impl IdentityPublicKeyWithWitnessWasm {
119
129
  self.0.hash_as_vec().with_js_error()
120
130
  }
121
131
 
122
- #[wasm_bindgen(js_name=isMaster)]
123
- pub fn is_master(&self) -> bool {
124
- self.0.is_master()
125
- }
126
-
127
132
  #[wasm_bindgen(js_name=toJSON)]
128
133
  pub fn to_json(&self) -> Result<JsValue, JsValue> {
129
- let val = self.0.to_json().map_err(from_dpp_err)?;
130
- let json = val.to_string();
134
+ let mut value = self.0.to_object().map_err(from_dpp_err)?;
135
+
136
+ value
137
+ .replace_at_paths(
138
+ dpp::identity::identity_public_key::BINARY_DATA_FIELDS,
139
+ ReplacementType::TextBase64,
140
+ )
141
+ .map_err(|e| e.to_string())?;
142
+
143
+ let json = value
144
+ .try_into_validating_json()
145
+ .map_err(|e| e.to_string())?
146
+ .to_string();
147
+
131
148
  js_sys::JSON::parse(&json)
132
149
  }
133
150
 
134
151
  #[wasm_bindgen(js_name=toObject)]
135
- pub fn to_object(&self, options: JsValue) -> Result<JsValue, JsValue> {
136
- let opts: ToObjectOptions = if options.is_object() {
137
- with_js_error!(serde_wasm_bindgen::from_value(options))?
138
- } else {
139
- Default::default()
140
- };
141
-
142
- let val = self
143
- .0
144
- .to_raw_json_object(opts.skip_signature.unwrap_or(false))
145
- .map_err(|e| from_dpp_err(e.into()))?;
152
+ pub fn to_object(&self, skip_signature: bool) -> Result<JsValue, JsValue> {
153
+ let value = self.0.to_object().map_err(from_dpp_err)?;
146
154
 
147
- let data_buffer = Buffer::from_bytes(self.0.data.as_slice());
155
+ let data_buffer = Buffer::from_bytes(self.0.data().as_slice());
148
156
 
149
- let json = val.to_string();
150
- let js_object = js_sys::JSON::parse(&json)?;
157
+ let serializer = serde_wasm_bindgen::Serializer::json_compatible();
158
+ let js_object = with_js_error!(value.serialize(&serializer))?;
151
159
 
152
160
  js_sys::Reflect::set(
153
161
  &js_object,
@@ -161,12 +169,17 @@ impl IdentityPublicKeyWithWitnessWasm {
161
169
  &JsValue::from(data_buffer),
162
170
  )?;
163
171
 
164
- if !opts.skip_signature.unwrap_or(false) && !self.0.signature.is_empty() {
172
+ if !skip_signature {
173
+ let signature_buffer = Buffer::from_bytes(self.0.signature().as_slice());
165
174
  js_sys::Reflect::set(
166
175
  &js_object,
167
176
  &JsValue::from_str("signature"),
168
- &JsValue::from(Buffer::from_bytes_owned(self.0.signature.to_vec())),
177
+ &JsValue::from(signature_buffer),
169
178
  )?;
179
+ } else {
180
+ let js_object = js_sys::Object::from(js_object);
181
+ delete_property(&js_object, &JsValue::from_str("signature"))?;
182
+ return Ok(js_object.into());
170
183
  }
171
184
 
172
185
  Ok(js_object)
@@ -174,38 +187,39 @@ impl IdentityPublicKeyWithWitnessWasm {
174
187
  }
175
188
 
176
189
  impl IdentityPublicKeyWithWitnessWasm {
177
- pub fn into_inner(self) -> IdentityPublicKeyInCreationWithWitness {
190
+ pub fn into_inner(self) -> IdentityPublicKeyInCreation {
178
191
  self.0
179
192
  }
180
193
 
181
- pub fn inner(&self) -> &IdentityPublicKeyInCreationWithWitness {
194
+ pub fn inner(&self) -> &IdentityPublicKeyInCreation {
182
195
  &self.0
183
196
  }
184
197
 
185
- pub fn inner_mut(&mut self) -> &mut IdentityPublicKeyInCreationWithWitness {
198
+ pub fn inner_mut(&mut self) -> &mut IdentityPublicKeyInCreation {
186
199
  &mut self.0
187
200
  }
188
201
  }
189
202
 
190
- impl From<IdentityPublicKeyInCreationWithWitness> for IdentityPublicKeyWithWitnessWasm {
191
- fn from(v: IdentityPublicKeyInCreationWithWitness) -> Self {
203
+ impl From<IdentityPublicKeyInCreation> for IdentityPublicKeyWithWitnessWasm {
204
+ fn from(v: IdentityPublicKeyInCreation) -> Self {
192
205
  IdentityPublicKeyWithWitnessWasm(v)
193
206
  }
194
207
  }
195
208
 
196
- impl TryFrom<JsValue> for IdentityPublicKeyWithWitnessWasm {
197
- type Error = JsValue;
198
-
199
- fn try_from(value: JsValue) -> Result<Self, Self::Error> {
200
- let str = String::from(js_sys::JSON::stringify(&value)?);
201
- let val = serde_json::from_str(&str).map_err(|e| from_dpp_err(e.into()))?;
202
- Ok(Self(
203
- IdentityPublicKeyInCreationWithWitness::from_raw_json_object(val).with_js_error()?,
204
- ))
205
- }
206
- }
207
-
208
- impl From<IdentityPublicKeyWithWitnessWasm> for IdentityPublicKeyInCreationWithWitness {
209
+ // TODO(versioning): restore
210
+ // impl TryFrom<JsValue> for IdentityPublicKeyWithWitnessWasm {
211
+ // type Error = JsValue;
212
+ //
213
+ // fn try_from(value: JsValue) -> Result<Self, Self::Error> {
214
+ // let str = String::from(js_sys::JSON::stringify(&value)?);
215
+ // let val = serde_json::from_str(&str).map_err(|e| from_dpp_err(e.into()))?;
216
+ // Ok(Self(
217
+ // IdentityPublicKeyInCreation::from_raw_json_object(val).with_js_error()?,
218
+ // ))
219
+ // }
220
+ // }
221
+
222
+ impl From<IdentityPublicKeyWithWitnessWasm> for IdentityPublicKeyInCreation {
209
223
  fn from(pk: IdentityPublicKeyWithWitnessWasm) -> Self {
210
224
  pk.0
211
225
  }