@dashevo/wasm-dpp 0.24.0-dev.12 → 0.24.0-dev.14
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.
- package/.mocharc.yml +1 -1
- package/Cargo.toml +5 -2
- package/README.md +5 -1
- package/dist/index.js +1 -1
- package/dist/index.js.LICENSE.txt +9 -0
- package/dist/wasm/wasm_dpp.d.ts +3397 -1237
- package/karma.conf.js +5 -0
- package/lib/identifier/patchIdentifier.ts +5 -4
- package/lib/index.ts +1 -1
- package/lib/test/bootstrap.js +5 -0
- package/lib/test/fixtures/getDataContractFixture.js +267 -0
- package/lib/test/fixtures/getDocumentsFixture.js +43 -0
- package/lib/test/mocks/createStateRepositoryMock.js +64 -0
- package/lib/test/mocks/getBlsAdapterMock.js +51 -0
- package/package.json +11 -8
- package/src/bls_adapter.rs +17 -1
- package/src/buffer.rs +3 -0
- package/src/dash_platform_protocol.rs +107 -10
- package/src/data_contract/data_contract.rs +59 -10
- package/src/data_contract/data_contract_facade.rs +128 -0
- package/src/data_contract/errors/invalid_data_contract.rs +16 -16
- package/src/data_contract/errors/invalid_document_type.rs +8 -8
- package/src/data_contract/errors/mod.rs +10 -16
- package/src/data_contract/index.rs +56 -1
- package/src/data_contract/mod.rs +4 -0
- package/src/data_contract/state_transition/data_contract_create_transition/apply.rs +1 -1
- package/src/data_contract/state_transition/data_contract_create_transition/mod.rs +41 -10
- package/src/data_contract/state_transition/data_contract_create_transition/validation.rs +35 -4
- package/src/data_contract/state_transition/data_contract_update_transition/apply.rs +1 -1
- package/src/data_contract/state_transition/data_contract_update_transition/mod.rs +20 -7
- package/src/data_contract/state_transition/data_contract_update_transition/validation.rs +47 -11
- package/src/data_contract_factory/data_contract_factory.rs +19 -17
- package/src/data_trigger/data_trigger_execution_context.rs +95 -0
- package/src/data_trigger/data_trigger_execution_result.rs +48 -0
- package/src/data_trigger/execute_data_triggers_factory.rs +60 -0
- package/src/data_trigger/get_data_triggers_factory.rs +65 -0
- package/src/data_trigger/mod.rs +121 -0
- package/src/document/document_facade.rs +125 -0
- package/src/document/errors/invalid_document_error.rs +10 -9
- package/src/document/errors/invalid_initial_revision_error.rs +1 -1
- package/src/document/errors/mismatch_owners_ids_error.rs +14 -4
- package/src/document/errors/mod.rs +17 -13
- package/src/document/errors/no_documents_supplied_error.rs +4 -4
- package/src/document/factory.rs +257 -0
- package/src/document/fetch_and_validate_data_contract.rs +77 -0
- package/src/document/generate_document_id.rs +17 -0
- package/src/document/mod.rs +311 -37
- package/src/document/state_transition/document_batch_transition/apply_document_batch_transition.rs +22 -0
- package/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs +253 -1
- package/src/document/state_transition/document_batch_transition/document_transition/document_delete_transition.rs +60 -1
- package/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs +263 -0
- package/src/document/state_transition/document_batch_transition/document_transition/mod.rs +302 -3
- package/src/document/state_transition/document_batch_transition/mod.rs +378 -0
- package/src/document/state_transition/document_batch_transition/validation/basic/find_duplicates_by_id.rs +40 -0
- package/src/document/state_transition/document_batch_transition/validation/basic/find_duplicates_by_indices.rs +50 -0
- package/src/document/state_transition/document_batch_transition/validation/basic/mod.rs +8 -0
- package/src/document/state_transition/document_batch_transition/validation/basic/validate_documents_batch_transition_basic.rs +34 -0
- package/src/document/state_transition/document_batch_transition/validation/basic/validate_partial_compound_indices.rs +39 -0
- package/src/document/state_transition/document_batch_transition/validation/mod.rs +2 -0
- package/src/document/state_transition/document_batch_transition/validation/state/fetch_documents.rs +43 -0
- package/src/document/state_transition/document_batch_transition/validation/state/mod.rs +3 -0
- package/src/document/state_transition/document_batch_transition/validation/state/validate_documents_batch_transitions_state.rs +27 -0
- package/src/document/state_transition/document_batch_transition/validation/state/validate_documents_uniqueness_by_indices.rs +47 -0
- package/src/document/validator.rs +52 -0
- package/src/errors/compatible_protocol_version_is_not_defined_error.rs +24 -0
- package/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs +1 -1
- package/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs +1 -1
- package/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs +2 -2
- package/src/errors/consensus/basic/document/invalid_document_type_error.rs +15 -1
- package/src/errors/consensus/basic/document/missing_data_contract_id_error.rs +16 -2
- package/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs +1 -1
- package/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs +1 -1
- package/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs +6 -2
- package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs +5 -2
- package/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs +3 -3
- package/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs +2 -2
- package/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs +29 -0
- package/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs +4 -3
- package/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs +1 -1
- package/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs +1 -1
- package/src/errors/consensus/basic/identity/missing_public_key_error.rs +4 -3
- package/src/errors/consensus/basic/identity/mod.rs +2 -0
- package/src/errors/consensus/basic/invalid_identifier_error.rs +1 -1
- package/src/errors/consensus/basic/json_schema_error.rs +8 -2
- package/src/errors/consensus/basic/public_key_is_disabled_error.rs +1 -1
- package/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs +9 -9
- package/src/errors/consensus/state/document/invalid_document_revision_error.rs +4 -4
- package/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs +35 -0
- package/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs +34 -0
- package/src/errors/consensus/state/identity/identity_public_key_disabled_at_window_violation_error.rs +10 -7
- package/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs +2 -3
- package/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs +7 -3
- package/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs +2 -3
- package/src/errors/consensus/state/identity/invalid_identity_revision_error.rs +7 -4
- package/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs +2 -1
- package/src/errors/consensus/state/identity/mod.rs +4 -0
- package/src/errors/consensus_error.rs +218 -268
- package/src/errors/data_contract_not_present_error.rs +23 -0
- package/src/errors/dpp_error.rs +17 -0
- package/src/errors/from.rs +22 -0
- package/src/errors/js_conversion.rs +52 -5
- package/src/errors/mod.rs +6 -0
- package/src/errors/protocol_error.rs +14 -3
- package/src/identifier/errors.rs +30 -0
- package/src/identifier/mod.rs +95 -11
- package/src/identity/errors/asset_lock_output_not_found_error.rs +11 -0
- package/src/identity/errors/asset_lock_transaction_is_not_found_error.rs +20 -0
- package/src/identity/errors/invalid_identity_error.rs +32 -0
- package/src/identity/errors/mod.rs +9 -0
- package/src/identity/errors/unknown_asset_lock_proof_type_error.rs +26 -0
- package/src/identity/factory_utils.rs +87 -0
- package/src/identity/identity_facade.rs +194 -20
- package/src/identity/identity_factory.rs +209 -0
- package/src/identity/identity_public_key/mod.rs +51 -40
- package/src/identity/mod.rs +31 -17
- package/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs +132 -0
- package/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof_structure_validator.rs +72 -0
- package/src/identity/state_transition/asset_lock_proof/chain/mod.rs +4 -0
- package/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs +177 -0
- package/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof_structure_validator.rs +72 -0
- package/src/identity/state_transition/asset_lock_proof/instant/mod.rs +4 -0
- package/src/identity/state_transition/asset_lock_proof/mod.rs +269 -0
- package/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs +26 -0
- package/src/identity/state_transition/identity_create_transition/identity_create_transition.rs +337 -0
- package/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs +153 -0
- package/src/identity/state_transition/identity_create_transition/identity_create_transition_state_validator.rs +37 -0
- package/src/identity/state_transition/identity_create_transition/mod.rs +8 -0
- package/src/identity/state_transition/identity_create_transition/to_object.rs +45 -0
- package/src/identity/state_transition/identity_public_key_transitions.rs +207 -0
- package/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs +31 -0
- package/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs +278 -0
- package/src/identity/state_transition/identity_topup_transition/identity_topup_transition_basic_validator.rs +113 -0
- package/src/identity/state_transition/identity_topup_transition/identity_topup_transition_state_validator.rs +37 -0
- package/src/identity/state_transition/identity_topup_transition/mod.rs +8 -0
- package/src/identity/state_transition/identity_topup_transition/to_object.rs +42 -0
- package/src/identity/state_transition/identity_update_transition/apply_identity_update_transition.rs +24 -0
- package/src/identity/state_transition/identity_update_transition/identity_update_public_keys_validator.rs +55 -0
- package/src/identity/state_transition/identity_update_transition/identity_update_transition.rs +448 -0
- package/src/identity/state_transition/identity_update_transition/identity_update_transition_basic_validator.rs +94 -0
- package/src/identity/state_transition/identity_update_transition/identity_update_transition_state_validator.rs +53 -0
- package/src/identity/state_transition/identity_update_transition/mod.rs +9 -0
- package/src/identity/state_transition/identity_update_transition/to_object.rs +66 -0
- package/src/identity/state_transition/mod.rs +12 -0
- package/src/identity/state_transition/validate_public_key_signatures.rs +61 -0
- package/src/identity/validation/identity_validator.rs +50 -0
- package/src/identity/validation/mod.rs +2 -0
- package/src/identity/validation/public_keys_validator.rs +14 -13
- package/src/identity_public_key/public_keys_validator.rs +44 -0
- package/src/lib.rs +6 -0
- package/src/lodash.rs +7 -0
- package/src/metadata.rs +54 -10
- package/src/state_repository.rs +598 -101
- package/src/state_transition/conversion.rs +104 -0
- package/src/state_transition/errors/invalid_state_transition_error.rs +32 -0
- package/src/state_transition/errors/mod.rs +1 -0
- package/src/state_transition/mod.rs +46 -0
- package/src/state_transition/state_transition_facade.rs +263 -0
- package/src/state_transition/state_transition_factory.rs +216 -0
- package/src/state_transition/validation/mod.rs +1 -0
- package/src/state_transition/validation/validate_state_transition_key_signature.rs +62 -0
- package/src/utils.rs +210 -8
- package/src/validation/json_schema_validator.rs +41 -0
- package/src/validation/mod.rs +2 -0
- package/src/validation/validation_result.rs +29 -5
- package/src/version/mod.rs +2 -0
- package/src/version/protocol_version.rs +103 -0
- package/test/integration/dataContract/DataContractFacade.spec.js +46 -30
- package/test/integration/dataContract/stateTransition/DataContractCreateTransition/validation/basic/validateDataContractCreateTransitionBasicFactory.spec.js +45 -127
- package/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js +91 -139
- package/test/integration/dataContract/validation/validateDataContractFactory.spec.js +577 -503
- package/test/integration/document/Document.spec.js +55 -29
- package/test/integration/document/DocumentFacade.spec.js +51 -64
- package/test/integration/document/stateTransition/DocumentsBatchTransition/DocumentBatchTransition.spec.js +38 -16
- package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/basic/validateDocumentsBatchTransitionBasicFactory.spec.js +341 -396
- package/test/integration/document/stateTransition/DocumentsBatchTransition/validation/state/executeDataTriggersFactory.spec.js +116 -218
- package/test/integration/document/validation/validateDocumentFactory.spec.js +123 -171
- package/test/integration/identity/IdentityFacade.spec.js +52 -27
- package/test/integration/identity/stateTransition/IdentityCreateTransition/validation/basic/validateIdentityCreateTransitionBasicFactory.spec.js +185 -164
- package/test/integration/identity/stateTransition/IdentityTopUpTransition/validation/basic/validateIdentityTopUpTransitionBasicFactory.spec.js +84 -114
- package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/basic/validateIdentityUpdateTransitionBasicFactory.spec.js +120 -137
- package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js +106 -91
- package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validatePublicKeysState.spec.js +50 -16
- package/test/integration/identity/stateTransition/assetLockProof/chain/validateChainAssetLockProofStructureFactory.spec.js +78 -86
- package/test/integration/identity/stateTransition/assetLockProof/fetchAssetLockTransactionOutputFactory.spec.js +74 -30
- package/test/integration/identity/stateTransition/assetLockProof/instant/validateInstantAssetLockProofStructureFactory.spec.js +93 -147
- package/test/integration/identity/stateTransition/assetLockProof/validateAssetLockTransactionFactory.spec.js +65 -77
- package/test/integration/identity/stateTransition/validatePublicKeySignaturesFactory.spec.js +60 -23
- package/test/integration/identity/validation/validateIdentityFactory.spec.js +46 -114
- package/test/integration/identity/validation/validatePublicKeysFactory.spec.js +9 -3
- package/test/integration/stateTransition/AbstractStateTransitionIdentitySigned.spec.js +12 -8
- package/test/integration/stateTransition/StateTransitionFacade.spec.js +95 -233
- package/test/integration/stateTransition/calculateStateTransitionFeeFromOperationsFactory.spec.js +53 -0
- package/test/unit/Identifier.spec.js +36 -36
- package/test/unit/Metadata.spec.js +17 -3
- package/test/unit/dataContract/DataContract.spec.js +9 -4
- package/test/unit/dataContract/createDataContract.spec.js +0 -1
- package/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js +3 -3
- package/test/unit/dataContract/stateTransition/DataContractCreateTransition/applyDataContractCreateTransitionFactory.spec.js +1 -1
- package/test/unit/dataContract/stateTransition/DataContractCreateTransition/validation/state/validateDataContractCreateTransitionStateFactory.spec.js +2 -2
- package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js +3 -3
- package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js +1 -1
- package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.spec.js +25 -31
- package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/validation/state/validateDataContractUpdateTransitionStateFactory.spec.js +3 -3
- package/test/unit/dataTrigger/rewardShareDataTriggers/createMasternodeRewardSharesDataTrigger.spec.js +2 -0
- package/test/unit/decodeProtocolEntityFactory.spec.js +2 -2
- package/test/unit/document/Document.spec.js +147 -155
- package/test/unit/document/DocumentFactory.spec.js +153 -153
- package/test/unit/document/fetchAndValidateDataContractFactory.spec.js +59 -14
- package/test/unit/document/stateTransition/DocumetsBatchTransition/DocumentsBatchTransition.spec.js +131 -62
- package/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js +144 -56
- package/test/unit/document/stateTransition/DocumetsBatchTransition/documentTransition/DocumentCreateTransition.spec.js +38 -8
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/findDuplicatesById.spec.js +11 -7
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/findDuplicatesByIndices.spec.js +29 -18
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/basic/validatePartialCompoundIndices.spec.js +38 -29
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/fetchDocumentsFactory.spec.js +53 -91
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js +357 -493
- package/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsUniquenessByIndicesFactory.spec.js +133 -72
- package/test/unit/identity/Identity.spec.js +26 -9
- package/test/unit/identity/IdentityFactory.spec.js +81 -89
- package/test/unit/identity/stateTransition/IdentityCreateTransition/IdentityCreateTransition.spec.js +73 -30
- package/test/unit/identity/stateTransition/IdentityCreateTransition/applyIdentityCreateTransitionFactory.spec.js +38 -38
- package/test/unit/identity/stateTransition/IdentityCreateTransition/validation/state/validateIdentityCreateTransitionStateFactory.spec.js +34 -25
- package/test/unit/identity/stateTransition/IdentityTopUpTransition/IdentityTopUpTransition.spec.js +36 -16
- package/test/unit/identity/stateTransition/IdentityTopUpTransition/applyIdentityTopUpTransitionFactory.spec.js +85 -50
- package/test/unit/identity/stateTransition/IdentityTopUpTransition/validation/state/validateIdentityTopUpTransitionStateFactory.spec.js +24 -6
- package/test/unit/identity/stateTransition/IdentityUpdateTransition/IdentityUpdateTransition.spec.js +44 -22
- package/test/unit/identity/stateTransition/IdentityUpdateTransition/applyIdentityUpdateTransitionFactory.spec.js +58 -103
- package/test/unit/identity/stateTransition/assetLockProof/ChainAssetLockProof.spec.js +63 -0
- package/test/unit/identity/stateTransition/assetLockProof/InstantAssetLockProof.spec.js +90 -0
- package/test/unit/identity/stateTransition/assetLockProof/createAssetLockProofInstance.spec.js +18 -3
- package/test/unit/identity/stateTransition/assetLockProof/fetchAssetLockPublicKeyHashFactory.spec.js +38 -11
- package/test/unit/stateTransition/StateTransitionFactory.spec.js +49 -101
- package/test/unit/stateTransition/validation/validateStateTransitionFeeFactory.spec.js +23 -25
- package/test/unit/stateTransition/validation/validateStateTransitionKeySignatureFactory.spec.js +73 -46
- package/test/unit/version/validateProtocolVersionFactory.spec.js +45 -27
- package/wasm/package.json +5 -0
- package/wasm/wasm_dpp.d.ts +3397 -1237
- package/wasm/wasm_dpp.js +7158 -1384
- package/wasm/wasm_dpp_bg.js +1 -1
- package/wasm/wasm_dpp_bg.wasm +0 -0
- package/wasm/wasm_dpp_bg.wasm.d.ts +777 -389
- package/webpack.config.js +9 -0
- package/src/document/state_transition/document_batch_transition/document_transition/document_update_transition.rs +0 -22
- package/test/integration/stateTransition/calculateStateTransitionFeeFactory.spec.js +0 -135
- package/test/unit/dataContract/errors/InvalidDataContractError.spec.js +0 -54
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
use dpp::identity::state_transition::asset_lock_proof::{
|
|
2
|
+
AssetLockProofValidator, AssetLockTransactionValidator, ChainAssetLockProofStructureValidator,
|
|
3
|
+
InstantAssetLockProofStructureValidator,
|
|
4
|
+
};
|
|
5
|
+
use dpp::identity::state_transition::identity_create_transition::validation::basic::IdentityCreateTransitionBasicValidator;
|
|
6
|
+
use dpp::identity::state_transition::validate_public_key_signatures::PublicKeysSignaturesValidator;
|
|
7
|
+
use dpp::identity::validation::{
|
|
8
|
+
PublicKeysValidator, RequiredPurposeAndSecurityLevelValidator, PUBLIC_KEY_SCHEMA_FOR_TRANSITION,
|
|
9
|
+
};
|
|
10
|
+
use dpp::state_transition::state_transition_execution_context::StateTransitionExecutionContext;
|
|
11
|
+
|
|
12
|
+
use dpp::version::{ProtocolVersionValidator, COMPATIBILITY_MAP, LATEST_VERSION};
|
|
13
|
+
use dpp::ProtocolError;
|
|
14
|
+
|
|
15
|
+
use std::sync::Arc;
|
|
16
|
+
use wasm_bindgen::prelude::*;
|
|
17
|
+
|
|
18
|
+
use crate::bls_adapter::{BlsAdapter, JsBlsAdapter};
|
|
19
|
+
use crate::errors::from_dpp_err;
|
|
20
|
+
use crate::utils::ToSerdeJSONExt;
|
|
21
|
+
use crate::{
|
|
22
|
+
state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper},
|
|
23
|
+
validation::ValidationResultWasm,
|
|
24
|
+
StateTransitionExecutionContextWasm,
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
#[wasm_bindgen(js_name=IdentityCreateTransitionBasicValidator)]
|
|
28
|
+
pub struct IdentityCreateTransitionBasicValidatorWasm(
|
|
29
|
+
IdentityCreateTransitionBasicValidator<
|
|
30
|
+
PublicKeysValidator<BlsAdapter>,
|
|
31
|
+
RequiredPurposeAndSecurityLevelValidator,
|
|
32
|
+
ExternalStateRepositoryLikeWrapper,
|
|
33
|
+
PublicKeysSignaturesValidator<BlsAdapter>,
|
|
34
|
+
BlsAdapter,
|
|
35
|
+
>,
|
|
36
|
+
);
|
|
37
|
+
|
|
38
|
+
impl
|
|
39
|
+
From<
|
|
40
|
+
IdentityCreateTransitionBasicValidator<
|
|
41
|
+
PublicKeysValidator<BlsAdapter>,
|
|
42
|
+
RequiredPurposeAndSecurityLevelValidator,
|
|
43
|
+
ExternalStateRepositoryLikeWrapper,
|
|
44
|
+
PublicKeysSignaturesValidator<BlsAdapter>,
|
|
45
|
+
BlsAdapter,
|
|
46
|
+
>,
|
|
47
|
+
> for IdentityCreateTransitionBasicValidatorWasm
|
|
48
|
+
{
|
|
49
|
+
fn from(
|
|
50
|
+
validator: IdentityCreateTransitionBasicValidator<
|
|
51
|
+
PublicKeysValidator<BlsAdapter>,
|
|
52
|
+
RequiredPurposeAndSecurityLevelValidator,
|
|
53
|
+
ExternalStateRepositoryLikeWrapper,
|
|
54
|
+
PublicKeysSignaturesValidator<BlsAdapter>,
|
|
55
|
+
BlsAdapter,
|
|
56
|
+
>,
|
|
57
|
+
) -> Self {
|
|
58
|
+
Self(validator)
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
#[wasm_bindgen(js_class=IdentityCreateTransitionBasicValidator)]
|
|
63
|
+
impl IdentityCreateTransitionBasicValidatorWasm {
|
|
64
|
+
#[wasm_bindgen(constructor)]
|
|
65
|
+
pub fn new(
|
|
66
|
+
state_repository: ExternalStateRepositoryLike,
|
|
67
|
+
js_bls: JsBlsAdapter,
|
|
68
|
+
) -> Result<IdentityCreateTransitionBasicValidatorWasm, JsValue> {
|
|
69
|
+
let state_repository_wrapper =
|
|
70
|
+
Arc::new(ExternalStateRepositoryLikeWrapper::new(state_repository));
|
|
71
|
+
|
|
72
|
+
let protocol_version_validator = ProtocolVersionValidator::new(
|
|
73
|
+
LATEST_VERSION,
|
|
74
|
+
LATEST_VERSION,
|
|
75
|
+
COMPATIBILITY_MAP.clone(),
|
|
76
|
+
);
|
|
77
|
+
|
|
78
|
+
let public_keys_validator = PublicKeysValidator::new_with_schema(
|
|
79
|
+
PUBLIC_KEY_SCHEMA_FOR_TRANSITION.clone(),
|
|
80
|
+
BlsAdapter(js_bls.clone()),
|
|
81
|
+
)
|
|
82
|
+
.map_err(|e| from_dpp_err(ProtocolError::Generic(e.to_string())))?;
|
|
83
|
+
|
|
84
|
+
let public_keys_transition_validator = RequiredPurposeAndSecurityLevelValidator::default();
|
|
85
|
+
|
|
86
|
+
let asset_lock_proof_validator: AssetLockProofValidator<
|
|
87
|
+
ExternalStateRepositoryLikeWrapper,
|
|
88
|
+
>;
|
|
89
|
+
{
|
|
90
|
+
let tx_validator = Arc::new(AssetLockTransactionValidator::new(
|
|
91
|
+
state_repository_wrapper.clone(),
|
|
92
|
+
));
|
|
93
|
+
|
|
94
|
+
let instant_asset_lock_proof_validator = InstantAssetLockProofStructureValidator::new(
|
|
95
|
+
state_repository_wrapper.clone(),
|
|
96
|
+
tx_validator.clone(),
|
|
97
|
+
)
|
|
98
|
+
.map_err(|e| from_dpp_err(ProtocolError::Generic(e.to_string())))?;
|
|
99
|
+
|
|
100
|
+
let chain_asset_lock_proof_validator =
|
|
101
|
+
ChainAssetLockProofStructureValidator::new(state_repository_wrapper, tx_validator)
|
|
102
|
+
.map_err(|e| from_dpp_err(ProtocolError::Generic(e.to_string())))?;
|
|
103
|
+
|
|
104
|
+
asset_lock_proof_validator = AssetLockProofValidator::new(
|
|
105
|
+
instant_asset_lock_proof_validator,
|
|
106
|
+
chain_asset_lock_proof_validator,
|
|
107
|
+
);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
let public_keys_signature_validator =
|
|
111
|
+
PublicKeysSignaturesValidator::new(BlsAdapter(js_bls.clone()));
|
|
112
|
+
|
|
113
|
+
let validator = IdentityCreateTransitionBasicValidator::new(
|
|
114
|
+
protocol_version_validator,
|
|
115
|
+
Arc::new(public_keys_validator),
|
|
116
|
+
Arc::new(public_keys_transition_validator),
|
|
117
|
+
Arc::new(asset_lock_proof_validator),
|
|
118
|
+
BlsAdapter(js_bls),
|
|
119
|
+
Arc::new(public_keys_signature_validator),
|
|
120
|
+
)
|
|
121
|
+
.map_err(|e| from_dpp_err(ProtocolError::Generic(e.to_string())))?;
|
|
122
|
+
|
|
123
|
+
Ok(validator.into())
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
#[wasm_bindgen]
|
|
127
|
+
pub async fn validate(
|
|
128
|
+
mut self,
|
|
129
|
+
raw_state_transition: JsValue,
|
|
130
|
+
execution_context: &StateTransitionExecutionContextWasm,
|
|
131
|
+
) -> Result<ValidationResultWasm, JsValue> {
|
|
132
|
+
let execution_context: &StateTransitionExecutionContext = execution_context.into();
|
|
133
|
+
|
|
134
|
+
let current_protocol_version =
|
|
135
|
+
js_sys::Reflect::get(&raw_state_transition, &"protocolVersion".into())
|
|
136
|
+
.map(|v| v.as_f64().unwrap_or(LATEST_VERSION as f64) as u32)
|
|
137
|
+
.unwrap_or(LATEST_VERSION);
|
|
138
|
+
|
|
139
|
+
self.0
|
|
140
|
+
.protocol_version_validator()
|
|
141
|
+
.set_current_protocol_version(current_protocol_version);
|
|
142
|
+
|
|
143
|
+
let state_transition_json = raw_state_transition.with_serde_to_json_value()?;
|
|
144
|
+
|
|
145
|
+
let validation_result = self
|
|
146
|
+
.0
|
|
147
|
+
.validate(&state_transition_json, execution_context)
|
|
148
|
+
.await
|
|
149
|
+
.map_err(|e| from_dpp_err(e.into()))?;
|
|
150
|
+
|
|
151
|
+
Ok(validation_result.map(|_| JsValue::undefined()).into())
|
|
152
|
+
}
|
|
153
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
use crate::errors::from_dpp_err;
|
|
2
|
+
use crate::state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper};
|
|
3
|
+
use crate::validation::ValidationResultWasm;
|
|
4
|
+
use crate::IdentityCreateTransitionWasm;
|
|
5
|
+
use dpp::identity::state_transition::identity_create_transition::validation::state::validate_identity_create_transition_state;
|
|
6
|
+
use wasm_bindgen::prelude::*;
|
|
7
|
+
use wasm_bindgen::JsValue;
|
|
8
|
+
|
|
9
|
+
#[wasm_bindgen(js_name=IdentityCreateTransitionStateValidator)]
|
|
10
|
+
pub struct IdentityCreateTransitionStateValidator {
|
|
11
|
+
state_repository: ExternalStateRepositoryLikeWrapper,
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
#[wasm_bindgen(js_class=IdentityCreateTransitionStateValidator)]
|
|
15
|
+
impl IdentityCreateTransitionStateValidator {
|
|
16
|
+
#[wasm_bindgen(constructor)]
|
|
17
|
+
pub fn new(state_repository: ExternalStateRepositoryLike) -> Self {
|
|
18
|
+
Self {
|
|
19
|
+
state_repository: ExternalStateRepositoryLikeWrapper::new(state_repository),
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
#[wasm_bindgen(js_name = validate)]
|
|
24
|
+
pub async fn validate(
|
|
25
|
+
&self,
|
|
26
|
+
state_transition: &IdentityCreateTransitionWasm,
|
|
27
|
+
) -> Result<ValidationResultWasm, JsValue> {
|
|
28
|
+
let validation_result = validate_identity_create_transition_state(
|
|
29
|
+
&self.state_repository,
|
|
30
|
+
&state_transition.to_owned().into(),
|
|
31
|
+
)
|
|
32
|
+
.await
|
|
33
|
+
.map_err(|e| from_dpp_err(e.into()))?;
|
|
34
|
+
|
|
35
|
+
Ok(validation_result.map(|_| JsValue::undefined()).into())
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
use dpp::identity::state_transition::asset_lock_proof::AssetLockProof;
|
|
2
|
+
use dpp::identity::state_transition::identity_public_key_transitions::IdentityPublicKeyCreateTransition;
|
|
3
|
+
use dpp::{
|
|
4
|
+
identifier::Identifier,
|
|
5
|
+
identity::state_transition::identity_create_transition::IdentityCreateTransition,
|
|
6
|
+
state_transition::StateTransitionLike,
|
|
7
|
+
};
|
|
8
|
+
use serde::Deserialize;
|
|
9
|
+
use std::default::Default;
|
|
10
|
+
|
|
11
|
+
#[derive(Deserialize, Default)]
|
|
12
|
+
#[serde(rename_all = "camelCase")]
|
|
13
|
+
pub struct ToObjectOptions {
|
|
14
|
+
pub skip_signature: Option<bool>,
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
#[derive(Default)]
|
|
18
|
+
pub struct ToObject {
|
|
19
|
+
pub transition_type: u8,
|
|
20
|
+
pub protocol_version: u32,
|
|
21
|
+
pub identity_id: Identifier,
|
|
22
|
+
pub asset_lock_proof: AssetLockProof,
|
|
23
|
+
pub public_keys: Vec<IdentityPublicKeyCreateTransition>,
|
|
24
|
+
pub signature: Option<Vec<u8>>,
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
pub fn to_object_struct(
|
|
28
|
+
transition: &IdentityCreateTransition,
|
|
29
|
+
options: ToObjectOptions,
|
|
30
|
+
) -> ToObject {
|
|
31
|
+
let mut to_object = ToObject {
|
|
32
|
+
transition_type: transition.get_type() as u8,
|
|
33
|
+
protocol_version: transition.get_protocol_version(),
|
|
34
|
+
public_keys: transition.get_public_keys().to_owned(),
|
|
35
|
+
asset_lock_proof: transition.get_asset_lock_proof().to_owned(),
|
|
36
|
+
identity_id: transition.get_identity_id().to_owned(),
|
|
37
|
+
signature: None,
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
if !options.skip_signature.unwrap_or(false) {
|
|
41
|
+
to_object.signature = Some(transition.get_signature().to_owned());
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
to_object
|
|
45
|
+
}
|
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
//todo: move this file to transition
|
|
2
|
+
use dpp::dashcore::anyhow;
|
|
3
|
+
use dpp::identity::state_transition::identity_public_key_transitions::IdentityPublicKeyCreateTransition;
|
|
4
|
+
pub use serde::{Deserialize, Serialize};
|
|
5
|
+
use std::convert::{TryFrom, TryInto};
|
|
6
|
+
use wasm_bindgen::prelude::*;
|
|
7
|
+
|
|
8
|
+
use crate::errors::from_dpp_err;
|
|
9
|
+
use crate::{buffer::Buffer, utils, with_js_error};
|
|
10
|
+
|
|
11
|
+
#[derive(Deserialize, Default)]
|
|
12
|
+
#[serde(rename_all = "camelCase")]
|
|
13
|
+
struct ToObjectOptions {
|
|
14
|
+
pub skip_signature: Option<bool>,
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
#[wasm_bindgen(js_name=IdentityPublicKeyCreateTransition)]
|
|
18
|
+
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
19
|
+
pub struct IdentityPublicKeyCreateTransitionWasm(IdentityPublicKeyCreateTransition);
|
|
20
|
+
|
|
21
|
+
#[wasm_bindgen(js_class = IdentityPublicKeyCreateTransition)]
|
|
22
|
+
impl IdentityPublicKeyCreateTransitionWasm {
|
|
23
|
+
#[wasm_bindgen(constructor)]
|
|
24
|
+
pub fn new(raw_public_key: JsValue) -> Result<IdentityPublicKeyCreateTransitionWasm, JsValue> {
|
|
25
|
+
let data_string = utils::stringify(&raw_public_key)?;
|
|
26
|
+
let pk: IdentityPublicKeyCreateTransitionWasm =
|
|
27
|
+
serde_json::from_str(&data_string).map_err(|e| e.to_string())?;
|
|
28
|
+
|
|
29
|
+
Ok(pk)
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
#[wasm_bindgen(js_name=getId)]
|
|
33
|
+
pub fn get_id(&self) -> u32 {
|
|
34
|
+
self.0.id
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
#[wasm_bindgen(js_name=setId)]
|
|
38
|
+
pub fn set_id(&mut self, id: u32) {
|
|
39
|
+
self.0.id = id;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
#[wasm_bindgen(js_name=getType)]
|
|
43
|
+
pub fn get_type(&self) -> u8 {
|
|
44
|
+
self.0.key_type as u8
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
#[wasm_bindgen(js_name=setType)]
|
|
48
|
+
pub fn set_type(&mut self, key_type: u8) -> Result<(), JsValue> {
|
|
49
|
+
self.0.key_type = key_type
|
|
50
|
+
.try_into()
|
|
51
|
+
.map_err(|e: anyhow::Error| e.to_string())?;
|
|
52
|
+
Ok(())
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
#[wasm_bindgen(js_name=setData)]
|
|
56
|
+
pub fn set_data(&mut self, data: Vec<u8>) -> Result<(), JsValue> {
|
|
57
|
+
self.0.data = data;
|
|
58
|
+
Ok(())
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
#[wasm_bindgen(js_name=getData)]
|
|
62
|
+
pub fn get_data(&self) -> Vec<u8> {
|
|
63
|
+
self.0.data.clone()
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
#[wasm_bindgen(js_name=setPurpose)]
|
|
67
|
+
pub fn set_purpose(&mut self, purpose: u8) -> Result<(), JsValue> {
|
|
68
|
+
self.0.purpose = purpose
|
|
69
|
+
.try_into()
|
|
70
|
+
.map_err(|e: anyhow::Error| e.to_string())?;
|
|
71
|
+
Ok(())
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
#[wasm_bindgen(js_name=getPurpose)]
|
|
75
|
+
pub fn get_purpose(&self) -> u8 {
|
|
76
|
+
self.0.purpose as u8
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
#[wasm_bindgen(js_name=setSecurityLevel)]
|
|
80
|
+
pub fn set_security_level(&mut self, security_level: u8) -> Result<(), JsValue> {
|
|
81
|
+
self.0.security_level = security_level
|
|
82
|
+
.try_into()
|
|
83
|
+
.map_err(|e: anyhow::Error| e.to_string())?;
|
|
84
|
+
Ok(())
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
#[wasm_bindgen(js_name=getSecurityLevel)]
|
|
88
|
+
pub fn get_security_level(&self) -> u8 {
|
|
89
|
+
self.0.security_level as u8
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
#[wasm_bindgen(js_name=setReadOnly)]
|
|
93
|
+
pub fn set_read_only(&mut self, read_only: bool) {
|
|
94
|
+
self.0.read_only = read_only;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
#[wasm_bindgen(js_name=isReadOnly)]
|
|
98
|
+
pub fn is_read_only(&self) -> bool {
|
|
99
|
+
self.0.read_only
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
#[wasm_bindgen(js_name=setSignature)]
|
|
103
|
+
pub fn set_signature(&mut self, signature: Vec<u8>) {
|
|
104
|
+
self.0.signature = signature
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
#[wasm_bindgen(js_name=getSignature)]
|
|
108
|
+
pub fn get_signature(&self) -> Vec<u8> {
|
|
109
|
+
self.0.signature.clone()
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
#[wasm_bindgen(js_name=hash)]
|
|
113
|
+
pub fn hash(&self) -> Result<Vec<u8>, JsValue> {
|
|
114
|
+
self.0.hash().map_err(from_dpp_err)
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
#[wasm_bindgen(js_name=isMaster)]
|
|
118
|
+
pub fn is_master(&self) -> bool {
|
|
119
|
+
self.0.is_master()
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
#[wasm_bindgen(js_name=toJSON)]
|
|
123
|
+
pub fn to_json(&self) -> Result<JsValue, JsValue> {
|
|
124
|
+
let val = self.0.to_json().map_err(|e| from_dpp_err(e.into()))?;
|
|
125
|
+
let json = val.to_string();
|
|
126
|
+
js_sys::JSON::parse(&json)
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
#[wasm_bindgen(js_name=toObject)]
|
|
130
|
+
pub fn to_object(&self, options: JsValue) -> Result<JsValue, JsValue> {
|
|
131
|
+
let opts: ToObjectOptions = if options.is_object() {
|
|
132
|
+
with_js_error!(serde_wasm_bindgen::from_value(options))?
|
|
133
|
+
} else {
|
|
134
|
+
Default::default()
|
|
135
|
+
};
|
|
136
|
+
|
|
137
|
+
let val = self
|
|
138
|
+
.0
|
|
139
|
+
.to_raw_json_object(opts.skip_signature.unwrap_or(false))
|
|
140
|
+
.map_err(|e| from_dpp_err(e.into()))?;
|
|
141
|
+
|
|
142
|
+
let data_buffer = Buffer::from_bytes(self.0.data.as_slice());
|
|
143
|
+
|
|
144
|
+
let json = val.to_string();
|
|
145
|
+
let js_object = js_sys::JSON::parse(&json)?;
|
|
146
|
+
|
|
147
|
+
js_sys::Reflect::set(
|
|
148
|
+
&js_object,
|
|
149
|
+
&JsValue::from_str("type"),
|
|
150
|
+
&JsValue::from(self.get_type()),
|
|
151
|
+
)?;
|
|
152
|
+
|
|
153
|
+
js_sys::Reflect::set(
|
|
154
|
+
&js_object,
|
|
155
|
+
&JsValue::from_str("data"),
|
|
156
|
+
&JsValue::from(data_buffer),
|
|
157
|
+
)?;
|
|
158
|
+
|
|
159
|
+
if !opts.skip_signature.unwrap_or(false) && !self.0.signature.is_empty() {
|
|
160
|
+
js_sys::Reflect::set(
|
|
161
|
+
&js_object,
|
|
162
|
+
&JsValue::from_str("signature"),
|
|
163
|
+
&JsValue::from(Buffer::from_bytes(&self.0.signature)),
|
|
164
|
+
)?;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
Ok(js_object)
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
impl IdentityPublicKeyCreateTransitionWasm {
|
|
172
|
+
pub fn into_inner(self) -> IdentityPublicKeyCreateTransition {
|
|
173
|
+
self.0
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
pub fn inner(&self) -> &IdentityPublicKeyCreateTransition {
|
|
177
|
+
&self.0
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
pub fn inner_mut(&mut self) -> &mut IdentityPublicKeyCreateTransition {
|
|
181
|
+
&mut self.0
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
impl From<IdentityPublicKeyCreateTransition> for IdentityPublicKeyCreateTransitionWasm {
|
|
186
|
+
fn from(v: IdentityPublicKeyCreateTransition) -> Self {
|
|
187
|
+
IdentityPublicKeyCreateTransitionWasm(v)
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
impl TryFrom<JsValue> for IdentityPublicKeyCreateTransitionWasm {
|
|
192
|
+
type Error = JsValue;
|
|
193
|
+
|
|
194
|
+
fn try_from(value: JsValue) -> Result<Self, Self::Error> {
|
|
195
|
+
let str = String::from(js_sys::JSON::stringify(&value)?);
|
|
196
|
+
let val = serde_json::from_str(&str).map_err(|e| from_dpp_err(e.into()))?;
|
|
197
|
+
Ok(Self(
|
|
198
|
+
IdentityPublicKeyCreateTransition::from_raw_object(val).map_err(from_dpp_err)?,
|
|
199
|
+
))
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
impl From<IdentityPublicKeyCreateTransitionWasm> for IdentityPublicKeyCreateTransition {
|
|
204
|
+
fn from(pk: IdentityPublicKeyCreateTransitionWasm) -> Self {
|
|
205
|
+
pk.0
|
|
206
|
+
}
|
|
207
|
+
}
|
package/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
use dpp::identity::state_transition::asset_lock_proof::AssetLockTransactionOutputFetcher;
|
|
2
|
+
use dpp::identity::state_transition::identity_topup_transition::ApplyIdentityTopUpTransition;
|
|
3
|
+
use std::sync::Arc;
|
|
4
|
+
use wasm_bindgen::prelude::*;
|
|
5
|
+
|
|
6
|
+
use crate::{
|
|
7
|
+
state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper},
|
|
8
|
+
IdentityTopUpTransitionWasm,
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
#[wasm_bindgen(js_name=applyIdentityTopUpTransition)]
|
|
12
|
+
pub async fn apply_identity_topup_transition_wasm(
|
|
13
|
+
state_repository: ExternalStateRepositoryLike,
|
|
14
|
+
state_transition: &IdentityTopUpTransitionWasm,
|
|
15
|
+
) -> Result<(), JsValue> {
|
|
16
|
+
let wrapped_state_repository =
|
|
17
|
+
Arc::new(ExternalStateRepositoryLikeWrapper::new(state_repository));
|
|
18
|
+
|
|
19
|
+
let tx_output_fetcher =
|
|
20
|
+
AssetLockTransactionOutputFetcher::new(wrapped_state_repository.clone());
|
|
21
|
+
|
|
22
|
+
let instance =
|
|
23
|
+
ApplyIdentityTopUpTransition::new(wrapped_state_repository, Arc::new(tx_output_fetcher));
|
|
24
|
+
|
|
25
|
+
instance
|
|
26
|
+
.apply(&state_transition.to_owned().into())
|
|
27
|
+
.await
|
|
28
|
+
.map_err(|e| JsValue::from_str(&e.to_string()))?;
|
|
29
|
+
|
|
30
|
+
Ok(())
|
|
31
|
+
}
|