pshenmic-dpp 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pshenmic-dpp",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "dist/wasm/pshenmic_dpp.js",
   "repository": {
     "type": "git",
@@ -20,5 +20,6 @@
     "babel": "^6.23.0",
     "babel-cli": "^6.26.0",
     "typescript": "^5.8.2"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package/packages/{cbor-conversation → cbor_conversation}/Cargo.toml

@@ -15,7 +15,3 @@ pshenmic_dpp_utils = {path = "../utils"}
 base64 = "0.22.1"
 ciborium = "0.2.2"
 serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }
-
-[profile.release]
-lto = true
-opt-level = 'z'

package/packages/data_contract/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "pshenmic_dpp_data_contract"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+
+[dependencies]
+wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
+pshenmic_dpp_utils = {path = "../utils"}
+pshenmic_dpp_enums = {path = "../enums"}
+dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
+    "data-contract-json-conversion",
+    "platform-value"
+]}
+serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }

package/packages/data_contract/src/lib.rs

@@ -0,0 +1,162 @@
+use dpp::dashcore::hashes::serde::Serialize;
+use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters};
+use dpp::data_contract::conversion::json::DataContractJsonConversionMethodsV0;
+use dpp::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0;
+use dpp::data_contract::document_type::DocumentTypeRef;
+use dpp::data_contract::errors::DataContractError;
+use dpp::data_contract::schema::DataContractSchemaMethodsV0;
+use dpp::data_contract::{DataContract, DataContractV0};
+use dpp::prelude::IdentityNonce;
+use dpp::serialization::{
+    PlatformDeserializableWithPotentialValidationFromVersionedStructure,
+    PlatformSerializableWithPlatformVersion,
+};
+use pshenmic_dpp_enums::platform::PlatformVersionWASM;
+use pshenmic_dpp_utils::{ToSerdeJSONExt, WithJsError, identifier_from_js_value};
+use wasm_bindgen::JsValue;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen(js_name = "DataContractWASM")]
+#[derive(Clone)]
+pub struct DataContractWASM(DataContract);
+
+impl From<DataContract> for DataContractWASM {
+    fn from(v: DataContract) -> Self {
+        DataContractWASM(v)
+    }
+}
+
+impl From<DataContractWASM> for DataContract {
+    fn from(v: DataContractWASM) -> Self {
+        v.0
+    }
+}
+
+#[wasm_bindgen]
+impl DataContractWASM {
+    #[wasm_bindgen(constructor)]
+    pub fn new(
+        js_value: JsValue,
+        full_validation: bool,
+        platform_version: PlatformVersionWASM,
+    ) -> Result<DataContractWASM, JsValue> {
+        let value = js_value.with_serde_to_platform_value()?;
+
+        let v0_contract =
+            DataContractV0::from_value(value, full_validation, &platform_version.into())
+                .with_js_error()?;
+
+        Ok(DataContractWASM(DataContract::V0(v0_contract)))
+    }
+
+    #[wasm_bindgen(js_name = "fromBytes")]
+    pub fn from_bytes(
+        bytes: Vec<u8>,
+        full_validation: bool,
+        platform_version: PlatformVersionWASM,
+    ) -> Result<DataContractWASM, JsValue> {
+        let rs_data_contract = DataContract::versioned_deserialize(
+            &bytes.as_slice(),
+            full_validation,
+            &platform_version.into(),
+        )
+        .with_js_error()?;
+
+        Ok(DataContractWASM(rs_data_contract))
+    }
+
+    #[wasm_bindgen(js_name = "toBytes")]
+    pub fn to_bytes(&self, platform_version: PlatformVersionWASM) -> Result<Vec<u8>, JsValue> {
+        let rs_data_contract: DataContract = self.0.clone();
+
+        rs_data_contract
+            .serialize_to_bytes_with_platform_version(&platform_version.into())
+            .with_js_error()
+    }
+
+    #[wasm_bindgen(js_name = "toValue")]
+    pub fn to_value(&self, platform_version: PlatformVersionWASM) -> Result<JsValue, JsValue> {
+        let serializer = serde_wasm_bindgen::Serializer::json_compatible();
+
+        self.0
+            .clone()
+            .to_value(&platform_version.into())
+            .with_js_error()?
+            .serialize(&serializer)
+            .map_err(JsValue::from)
+    }
+
+    #[wasm_bindgen(js_name = "getSchemas")]
+    pub fn get_schemas(&self) -> Result<JsValue, JsValue> {
+        let serializer = serde_wasm_bindgen::Serializer::json_compatible();
+
+        self.0
+            .document_schemas()
+            .serialize(&serializer)
+            .map_err(JsValue::from)
+    }
+
+    #[wasm_bindgen(js_name = "getDataContractVersion")]
+    pub fn get_data_contract_version(&self) -> u32 {
+        self.0.version()
+    }
+
+    #[wasm_bindgen(js_name = "getId")]
+    pub fn get_id(&self) -> Vec<u8> {
+        self.0.id().to_vec()
+    }
+
+    #[wasm_bindgen(js_name = "getOwnerId")]
+    pub fn get_owner_id(&self) -> Vec<u8> {
+        self.0.owner_id().to_vec()
+    }
+
+    #[wasm_bindgen(js_name = "getConfig")]
+    pub fn get_config(&self) -> Result<JsValue, JsValue> {
+        self.0
+            .config()
+            .serialize(&serde_wasm_bindgen::Serializer::json_compatible())
+            .map_err(JsValue::from)
+    }
+
+    #[wasm_bindgen(js_name = "toJson")]
+    pub fn to_json(&self, platform_version: PlatformVersionWASM) -> Result<JsValue, JsValue> {
+        let json = self.0.to_json(&platform_version.into()).with_js_error()?;
+
+        json.serialize(&serde_wasm_bindgen::Serializer::json_compatible())
+            .map_err(JsValue::from)
+    }
+
+    #[wasm_bindgen(js_name = "generateId")]
+    pub fn generate_id(
+        js_owner_id: JsValue,
+        identity_nonce: IdentityNonce,
+    ) -> Result<Vec<u8>, JsValue> {
+        let owner_id = identifier_from_js_value(&js_owner_id)?;
+
+        Ok(DataContract::generate_data_contract_id_v0(owner_id, identity_nonce).to_vec())
+    }
+
+    #[wasm_bindgen(js_name = "setId")]
+    pub fn set_id(&mut self, js_data_contract_id: JsValue) -> Result<(), JsValue> {
+        let data_contract_id = identifier_from_js_value(&js_data_contract_id)?;
+
+        Ok(self.0.set_id(data_contract_id))
+    }
+
+    #[wasm_bindgen(js_name = "setOwnerId")]
+    pub fn set_owner_id(&mut self, js_owner_id: JsValue) -> Result<(), JsValue> {
+        let owner_id = identifier_from_js_value(&js_owner_id)?;
+
+        Ok(self.0.set_owner_id(owner_id))
+    }
+}
+
+impl DataContractWASM {
+    pub fn get_document_type_ref_by_name(
+        &self,
+        name: String,
+    ) -> Result<DocumentTypeRef, DataContractError> {
+        self.0.document_type_for_name(name.as_str()).clone()
+    }
+}

package/packages/data_contract_transitions/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "pshenmic_dpp_data_contract_transitions"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
+dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
+    "state-transition-signing"
+]}
+pshenmic_dpp_data_contract = {path = "../data_contract"}
+pshenmic_dpp_enums = {path = "../enums"}
+pshenmic_dpp_utils = {path = "../utils"}
+pshenmic_dpp_state_transition = {path = "../state_transition"}

package/packages/data_contract_transitions/src/create/mod.rs

@@ -0,0 +1,154 @@
+use dpp::ProtocolError;
+use dpp::data_contract::serialized_version::DataContractInSerializationFormat;
+use dpp::prelude::{DataContract, IdentityNonce};
+use dpp::serialization::{PlatformDeserializable, PlatformSerializable};
+use dpp::state_transition::StateTransition;
+use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0;
+use dpp::state_transition::data_contract_create_transition::{
+    DataContractCreateTransition, DataContractCreateTransitionV0,
+};
+use dpp::validation::operations::ProtocolValidationOperation;
+use dpp::version::{
+    FeatureVersion, ProtocolVersion, TryFromPlatformVersioned, TryIntoPlatformVersioned,
+};
+use pshenmic_dpp_data_contract::DataContractWASM;
+use pshenmic_dpp_enums::platform::PlatformVersionWASM;
+use pshenmic_dpp_state_transition::StateTransitionWASM;
+use pshenmic_dpp_utils::WithJsError;
+use wasm_bindgen::JsValue;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen(js_name = "DataContractCreateTransitionWASM")]
+pub struct DataContractCreateTransitionWASM(DataContractCreateTransition);
+
+#[wasm_bindgen]
+impl DataContractCreateTransitionWASM {
+    #[wasm_bindgen(constructor)]
+    pub fn new(
+        data_contract: &DataContractWASM,
+        identity_nonce: IdentityNonce,
+        platform_version: Option<PlatformVersionWASM>,
+    ) -> Result<DataContractCreateTransitionWASM, JsValue> {
+        let rs_data_contract: DataContract = data_contract.clone().into();
+
+        let rs_data_contract_in_serialized: Result<
+            DataContractInSerializationFormat,
+            ProtocolError,
+        > = rs_data_contract.try_into_platform_versioned(
+            &platform_version
+                .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                .into(),
+        );
+
+        let rs_data_contract_create_transition_v0: DataContractCreateTransitionV0 =
+            DataContractCreateTransitionV0 {
+                data_contract: rs_data_contract_in_serialized.with_js_error()?,
+                identity_nonce,
+                user_fee_increase: 0,
+                signature_public_key_id: 0,
+                signature: Default::default(),
+            };
+
+        let rs_data_contract_transition =
+            DataContractCreateTransition::V0(rs_data_contract_create_transition_v0);
+
+        Ok(DataContractCreateTransitionWASM(
+            rs_data_contract_transition,
+        ))
+    }
+
+    #[wasm_bindgen(js_name = "fromBytes")]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<DataContractCreateTransitionWASM, JsValue> {
+        let rs_data_contract_create_transition: DataContractCreateTransition =
+            DataContractCreateTransition::deserialize_from_bytes(bytes.as_slice())
+                .with_js_error()?;
+
+        Ok(DataContractCreateTransitionWASM(
+            rs_data_contract_create_transition,
+        ))
+    }
+
+    #[wasm_bindgen(js_name = "toBytes")]
+    pub fn to_bytes(&self) -> Result<Vec<u8>, JsValue> {
+        self.0.serialize_to_bytes().with_js_error()
+    }
+
+    #[wasm_bindgen(js_name = "getFeatureVersion")]
+    pub fn get_feature_version(&self) -> FeatureVersion {
+        self.0.feature_version()
+    }
+
+    #[wasm_bindgen(js_name = "verifyProtocolVersion")]
+    pub fn verify_protocol_version(
+        &self,
+        protocol_version: ProtocolVersion,
+    ) -> Result<bool, JsValue> {
+        self.0
+            .verify_protocol_version(protocol_version)
+            .with_js_error()
+    }
+
+    #[wasm_bindgen(js_name = "setDataContract")]
+    pub fn set_data_contract(
+        &mut self,
+        data_contract: DataContractWASM,
+        platform_version_wasm: Option<PlatformVersionWASM>,
+    ) -> Result<(), JsValue> {
+        let data_contract_serialization_format =
+            DataContractInSerializationFormat::try_from_platform_versioned(
+                DataContract::from(data_contract),
+                &platform_version_wasm
+                    .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                    .into(),
+            )
+            .with_js_error()?;
+
+        self.0.set_data_contract(data_contract_serialization_format);
+
+        Ok(())
+    }
+
+    #[wasm_bindgen(js_name = "getDataContract")]
+    pub fn get_data_contract(
+        &self,
+        platform_version_wasm: Option<PlatformVersionWASM>,
+        full_validation: Option<bool>,
+    ) -> Result<DataContractWASM, JsValue> {
+        let rs_data_contract_serialization_format = self.0.data_contract();
+
+        let mut validation_operations: Vec<ProtocolValidationOperation> = Vec::new();
+
+        let rs_data_contract = DataContract::try_from_platform_versioned(
+            rs_data_contract_serialization_format.clone(),
+            full_validation.unwrap_or(false),
+            &mut validation_operations,
+            &platform_version_wasm
+                .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                .into(),
+        )
+        .with_js_error()?;
+
+        Ok(DataContractWASM::from(rs_data_contract))
+    }
+
+    #[wasm_bindgen(js_name = "toStateTransition")]
+    pub fn to_state_transition(&self) -> StateTransitionWASM {
+        let rs_state_transition = StateTransition::from(self.0.clone());
+
+        StateTransitionWASM::from(rs_state_transition)
+    }
+
+    #[wasm_bindgen(js_name = "fromStateTransition")]
+    pub fn from_state_transition(
+        state_transition: &StateTransitionWASM,
+    ) -> Result<DataContractCreateTransitionWASM, JsValue> {
+        let rs_transition = StateTransition::from(state_transition.clone());
+
+        match rs_transition {
+            StateTransition::DataContractCreate(state_transition) => {
+                Ok(DataContractCreateTransitionWASM(state_transition))
+            }
+            _ => Err(JsValue::from("Incorrect transition type")),
+        }
+    }
+}

package/packages/data_contract_transitions/src/lib.rs

@@ -0,0 +1,2 @@
+mod create;
+mod update;

package/packages/data_contract_transitions/src/update/mod.rs

@@ -0,0 +1,135 @@
+use dpp::data_contract::serialized_version::DataContractInSerializationFormat;
+use dpp::prelude::{DataContract, IdentityNonce};
+use dpp::serialization::{PlatformDeserializable, PlatformSerializable};
+use dpp::state_transition::StateTransition;
+use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition;
+use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0;
+use dpp::validation::operations::ProtocolValidationOperation;
+use dpp::version::{FeatureVersion, ProtocolVersion, TryFromPlatformVersioned};
+use pshenmic_dpp_data_contract::DataContractWASM;
+use pshenmic_dpp_enums::platform::PlatformVersionWASM;
+use pshenmic_dpp_state_transition::StateTransitionWASM;
+use pshenmic_dpp_utils::WithJsError;
+use wasm_bindgen::JsValue;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen(js_name = "DataContractUpdateTransitionWASM")]
+pub struct DataContractUpdateTransitionWASM(DataContractUpdateTransition);
+
+#[wasm_bindgen]
+impl DataContractUpdateTransitionWASM {
+    #[wasm_bindgen(constructor)]
+    pub fn new(
+        data_contract: &DataContractWASM,
+        identity_nonce: IdentityNonce,
+        platform_version: Option<PlatformVersionWASM>,
+    ) -> Result<DataContractUpdateTransitionWASM, JsValue> {
+        let rs_data_contract_update_transition =
+            DataContractUpdateTransition::try_from_platform_versioned(
+                (DataContract::from(data_contract.clone()), identity_nonce),
+                &platform_version
+                    .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                    .into(),
+            )
+            .with_js_error()?;
+
+        Ok(DataContractUpdateTransitionWASM(
+            rs_data_contract_update_transition,
+        ))
+    }
+
+    #[wasm_bindgen(js_name = "fromBytes")]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<DataContractUpdateTransitionWASM, JsValue> {
+        let rs_data_contract_update_transition: DataContractUpdateTransition =
+            DataContractUpdateTransition::deserialize_from_bytes(bytes.as_slice())
+                .with_js_error()?;
+
+        Ok(DataContractUpdateTransitionWASM(
+            rs_data_contract_update_transition,
+        ))
+    }
+
+    #[wasm_bindgen(js_name = "toBytes")]
+    pub fn to_bytes(&self) -> Result<Vec<u8>, JsValue> {
+        self.0.serialize_to_bytes().with_js_error()
+    }
+
+    #[wasm_bindgen(js_name = "getFeatureVersion")]
+    pub fn get_feature_version(&self) -> FeatureVersion {
+        self.0.feature_version()
+    }
+
+    #[wasm_bindgen(js_name = "verifyProtocolVersion")]
+    pub fn verify_protocol_version(
+        &self,
+        protocol_version: ProtocolVersion,
+    ) -> Result<bool, JsValue> {
+        self.0
+            .verify_protocol_version(protocol_version)
+            .with_js_error()
+    }
+
+    #[wasm_bindgen(js_name = "setDataContract")]
+    pub fn set_data_contract(
+        &mut self,
+        data_contract: &DataContractWASM,
+        platform_version_wasm: Option<PlatformVersionWASM>,
+    ) -> Result<(), JsValue> {
+        let data_contract_serialization_format =
+            DataContractInSerializationFormat::try_from_platform_versioned(
+                DataContract::from(data_contract.clone()),
+                &platform_version_wasm
+                    .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                    .into(),
+            )
+            .with_js_error()?;
+
+        self.0.set_data_contract(data_contract_serialization_format);
+
+        Ok(())
+    }
+
+    #[wasm_bindgen(js_name = "getDataContract")]
+    pub fn get_data_contract(
+        &self,
+        full_validation: Option<bool>,
+        platform_version_wasm: Option<PlatformVersionWASM>,
+    ) -> Result<DataContractWASM, JsValue> {
+        let data_contract_serialization_format = self.0.data_contract();
+
+        let mut validation_operations: Vec<ProtocolValidationOperation> = Vec::new();
+
+        let rs_data_contract = DataContract::try_from_platform_versioned(
+            data_contract_serialization_format.clone(),
+            full_validation.unwrap_or(false),
+            &mut validation_operations,
+            &platform_version_wasm
+                .unwrap_or(PlatformVersionWASM::PLATFORM_V1)
+                .into(),
+        )
+        .with_js_error()?;
+
+        Ok(DataContractWASM::from(rs_data_contract))
+    }
+
+    #[wasm_bindgen(js_name = "toStateTransition")]
+    pub fn to_state_transition(&self) -> StateTransitionWASM {
+        let rs_state_transition = StateTransition::from(self.0.clone());
+
+        StateTransitionWASM::from(rs_state_transition)
+    }
+
+    #[wasm_bindgen(js_name = "fromStateTransition")]
+    pub fn from_state_transition(
+        state_transition: &StateTransitionWASM,
+    ) -> Result<DataContractUpdateTransitionWASM, JsValue> {
+        let rs_transition = StateTransition::from(state_transition.clone());
+
+        match rs_transition {
+            StateTransition::DataContractUpdate(state_transition) => {
+                Ok(DataContractUpdateTransitionWASM(state_transition))
+            }
+            _ => Err(JsValue::from("Incorrect transition type")),
+        }
+    }
+}

package/packages/document/Cargo.toml

@@ -9,11 +9,9 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
 pshenmic_dpp_utils = {path = "../utils"}
+pshenmic_dpp_enums = {path = "../enums"}
+pshenmic_dpp_data_contract = {path = "../data_contract"}
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
-    "document-json-conversion"
+    "document-value-conversion"
 ]}
-serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }
-
-[profile.release]
-lto = true
-opt-level = 'z'
+serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }

package/packages/document/src/lib.rs

@@ -1,6 +1,6 @@
 mod methods;
 
-use dpp::document::{Document, DocumentV0Getters};
+use dpp::document::{Document, DocumentV0, DocumentV0Getters};
 use dpp::identifier::Identifier;
 use dpp::identity::TimestampMillis;
 use dpp::platform_value::Value;
@@ -29,6 +29,49 @@ pub struct DocumentWASM {
     entropy: Option<[u8; 32]>,
 }
 
+impl From<DocumentWASM> for Document {
+    fn from(wasm_doc: DocumentWASM) -> Self {
+        Document::V0(DocumentV0 {
+            id: wasm_doc.id,
+            owner_id: wasm_doc.owner_id,
+            properties: wasm_doc.properties,
+            revision: wasm_doc.revision,
+            created_at: wasm_doc.created_at,
+            updated_at: wasm_doc.updated_at,
+            transferred_at: wasm_doc.transferred_at,
+            created_at_block_height: wasm_doc.created_at_block_height,
+            updated_at_block_height: wasm_doc.updated_at_block_height,
+            transferred_at_block_height: wasm_doc.transferred_at_block_height,
+            created_at_core_block_height: wasm_doc.created_at_core_block_height,
+            updated_at_core_block_height: wasm_doc.updated_at_core_block_height,
+            transferred_at_core_block_height: wasm_doc.transferred_at_core_block_height,
+        })
+    }
+}
+
+impl From<Document> for DocumentWASM {
+    fn from(doc: Document) -> Self {
+        DocumentWASM {
+            id: doc.id(),
+            owner_id: doc.owner_id(),
+            revision: doc.revision(),
+            data_contract_id: Default::default(),
+            document_type_name: "".to_string(),
+            properties: doc.properties().clone(),
+            created_at: doc.created_at(),
+            updated_at: doc.updated_at(),
+            transferred_at: doc.transferred_at(),
+            created_at_block_height: doc.created_at_block_height(),
+            updated_at_block_height: doc.updated_at_block_height(),
+            transferred_at_block_height: doc.transferred_at_block_height(),
+            created_at_core_block_height: doc.created_at_core_block_height(),
+            updated_at_core_block_height: doc.updated_at_core_block_height(),
+            transferred_at_core_block_height: doc.transferred_at_core_block_height(),
+            entropy: None,
+        }
+    }
+}
+
 impl DocumentWASM {
     pub fn from_batch(
         document: Document,

package/packages/document/src/methods/js.rs

@@ -1,14 +1,21 @@
 use crate::DocumentWASM;
+use dpp::ProtocolError;
+use dpp::dashcore::hashes::serde::Serialize;
+use dpp::data_contract::JsonValue;
+use dpp::document::Document;
+use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0;
 use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter;
 use dpp::platform_value::string_encoding::Encoding::Base58;
 use dpp::prelude::Revision;
-use pshenmic_dpp_utils::{ToSerdeJSONExt, identifier_from_js_value};
+use pshenmic_dpp_data_contract::DataContractWASM;
+use pshenmic_dpp_enums::platform::PlatformVersionWASM;
+use pshenmic_dpp_utils::{ToSerdeJSONExt, WithJsError, identifier_from_js_value};
 use wasm_bindgen::JsValue;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]
 impl DocumentWASM {
-    #[wasm_bindgen(js_name=new)]
+    #[wasm_bindgen(constructor)]
     pub fn js_new(
         js_raw_document: JsValue,
         js_document_type_name: &str,
@@ -50,12 +57,15 @@ impl DocumentWASM {
     }
 
     #[wasm_bindgen(js_name=getProperties)]
-    pub fn js_get_properties(&self) -> JsValue {
-        let json = &self.properties.to_json_value().unwrap();
-
-        let obj = json.as_object().unwrap();
-
-        serde_wasm_bindgen::to_value(obj).unwrap()
+    pub fn js_get_properties(&self) -> Result<JsValue, JsValue> {
+        let json_value: JsonValue = self
+            .properties
+            .to_json_value()
+            .map_err(ProtocolError::ValueError)
+            .with_js_error()?;
+
+        let js_value = json_value.serialize(&serde_wasm_bindgen::Serializer::json_compatible())?;
+        Ok(js_value)
     }
 
     #[wasm_bindgen(js_name=getRevision)]
@@ -201,4 +211,50 @@ impl DocumentWASM {
     pub fn set_document_type_name(&mut self, document_type_name: &str) {
         self.document_type_name = document_type_name.to_string();
     }
+
+    #[wasm_bindgen(js_name=toBytes)]
+    pub fn to_bytes(
+        &self,
+        data_contract: &DataContractWASM,
+        type_name: String,
+        platform_version: PlatformVersionWASM,
+    ) -> Result<Vec<u8>, JsValue> {
+        let rs_document: Document = Document::from(self.clone());
+
+        let document_type_ref = data_contract
+            .get_document_type_ref_by_name(type_name)
+            .map_err(|err| JsValue::from_str(err.to_string().as_str()))?;
+
+        DocumentPlatformConversionMethodsV0::serialize(
+            &rs_document,
+            document_type_ref,
+            &platform_version.into(),
+        )
+        .with_js_error()
+    }
+
+    #[wasm_bindgen(js_name=fromBytes)]
+    pub fn from_bytes(
+        bytes: Vec<u8>,
+        data_contract: &DataContractWASM,
+        type_name: String,
+        platform_version: PlatformVersionWASM,
+    ) -> Result<DocumentWASM, JsValue> {
+        let document_type_ref = match data_contract.get_document_type_ref_by_name(type_name) {
+            Ok(type_ref) => Ok(type_ref),
+            Err(err) => Err(JsValue::from_str(err.to_string().as_str())),
+        }?;
+
+        let rs_document = Document::from_bytes(
+            bytes.as_slice(),
+            document_type_ref,
+            &platform_version.into(),
+        )
+        .with_js_error();
+
+        match rs_document {
+            Ok(doc) => Ok(DocumentWASM::from(doc)),
+            Err(err) => Err(err),
+        }
+    }
 }