pshenmic-dpp 1.0.2 → 1.0.4

package/packages/document_batch/Cargo.toml

@@ -12,13 +12,6 @@ pshenmic_dpp_document = {path = "../document"}
 pshenmic_dpp_enums = {path = "../enums"}
 pshenmic_dpp_utils = {path = "../utils"}
 pshenmic_dpp_state_transition = {path = "../state_transition"}
-pshenmic_dpp_mock_bls = {path = "../mock_bls"}
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
     "document-json-conversion",
-    "state-transition-signing"
-]}
-
-
-[profile.release]
-lto = true
-opt-level = 'z'
+]}

package/packages/document_batch/src/lib.rs

@@ -83,7 +83,7 @@ impl From<(DocumentTransition, DocumentsBatchTransition)> for DocumentBatchWASM
 
 #[wasm_bindgen]
 impl DocumentBatchWASM {
-    #[wasm_bindgen(js_name=new)]
+    #[wasm_bindgen(constructor)]
     pub fn new(
         batch_type: BatchType,
         document: DocumentWASM,
@@ -163,8 +163,8 @@ impl DocumentBatchWASM {
         StateTransitionWASM::from(st)
     }
 
-    #[wasm_bindgen(js_name=toBuffer)]
-    pub fn to_buffer(&self) -> Result<JsValue, JsValue> {
+    #[wasm_bindgen(js_name=toBytes)]
+    pub fn to_bytes(&self) -> Result<JsValue, JsValue> {
         let bytes = self.batch.serialize_to_bytes().with_js_error();
 
         match bytes {
@@ -195,7 +195,8 @@ impl DocumentBatchWASM {
         }
     }
 
-    pub fn from_buffer(bytes: Vec<u8>) -> Result<DocumentBatchWASM, JsValue> {
+    #[wasm_bindgen(js_name=fromBytes)]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<DocumentBatchWASM, JsValue> {
         let batch_transition =
             DocumentsBatchTransition::deserialize_from_bytes(bytes.as_slice()).with_js_error();
 

package/packages/enums/Cargo.toml

@@ -10,8 +10,4 @@ crate-type = ["cdylib", "lib"]
 wasm-bindgen = "0.2.100"
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
     "identity-value-conversion",
-]}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+]}

package/packages/enums/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod batch;
 pub mod keys;
+pub mod platform;

package/packages/enums/src/platform/mod.rs

@@ -0,0 +1,38 @@
+use dpp::version::PlatformVersion;
+use dpp::version::v1::PLATFORM_V1;
+use dpp::version::v2::PLATFORM_V2;
+use dpp::version::v3::PLATFORM_V3;
+use dpp::version::v4::PLATFORM_V4;
+use dpp::version::v5::PLATFORM_V5;
+use dpp::version::v6::PLATFORM_V6;
+use dpp::version::v7::PLATFORM_V7;
+use dpp::version::v8::PLATFORM_V8;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen(js_name = "PlatformVersionWASM")]
+#[allow(non_camel_case_types)]
+pub enum PlatformVersionWASM {
+    PLATFORM_V1,
+    PLATFORM_V2,
+    PLATFORM_V3,
+    PLATFORM_V4,
+    PLATFORM_V5,
+    PLATFORM_V6,
+    PLATFORM_V7,
+    PLATFORM_V8,
+}
+
+impl From<PlatformVersionWASM> for PlatformVersion {
+    fn from(value: PlatformVersionWASM) -> Self {
+        match value {
+            PlatformVersionWASM::PLATFORM_V1 => PLATFORM_V1,
+            PlatformVersionWASM::PLATFORM_V2 => PLATFORM_V2,
+            PlatformVersionWASM::PLATFORM_V3 => PLATFORM_V3,
+            PlatformVersionWASM::PLATFORM_V4 => PLATFORM_V4,
+            PlatformVersionWASM::PLATFORM_V5 => PLATFORM_V5,
+            PlatformVersionWASM::PLATFORM_V6 => PLATFORM_V6,
+            PlatformVersionWASM::PLATFORM_V7 => PLATFORM_V7,
+            PlatformVersionWASM::PLATFORM_V8 => PLATFORM_V8,
+        }
+    }
+}

package/packages/identity/Cargo.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
-dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false}
+dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
+    "identity-serialization"
+]}
 serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }
 pshenmic_dpp_public_key = { path = "../public_key" }
-
-[profile.release]
-lto = true
-opt-level = 'z'
+pshenmic_dpp_utils = { path = "../utils" }

package/packages/identity/src/lib.rs

@@ -2,8 +2,10 @@ use dpp::identifier::Identifier;
 use dpp::identity::accessors::{IdentityGettersV0, IdentitySettersV0};
 use dpp::identity::{Identity, KeyID};
 use dpp::platform_value::string_encoding::Encoding::Base58;
+use dpp::serialization::{PlatformDeserializable, PlatformSerializable};
 use dpp::version::PlatformVersion;
 use pshenmic_dpp_public_key::IdentityPublicKeyWASM;
+use pshenmic_dpp_utils::WithJsError;
 use wasm_bindgen::JsValue;
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -13,13 +15,17 @@ pub struct IdentityWASM(Identity);
 #[wasm_bindgen]
 impl IdentityWASM {
     #[wasm_bindgen(constructor)]
-    pub fn new(js_identifier: String) -> IdentityWASM {
+    pub fn new(js_identifier: String) -> Result<IdentityWASM, JsValue> {
         let identifier = Identifier::from_string(&*js_identifier, Base58);
 
         let identity =
-            Identity::create_basic_identity(identifier.unwrap(), PlatformVersion::first()).unwrap();
+            Identity::create_basic_identity(identifier.unwrap(), PlatformVersion::first())
+                .with_js_error();
 
-        IdentityWASM(identity)
+        match identity {
+            Ok(identity) => Ok(IdentityWASM(identity)),
+            Err(err) => Err(err),
+        }
     }
 
     #[wasm_bindgen(js_name = "setId")]
@@ -72,6 +78,20 @@ impl IdentityWASM {
     #[wasm_bindgen(js_name = "getPublicKeys")]
     pub fn get_public_keys(&self) -> JsValue {
         let keys = self.0.public_keys();
+
         serde_wasm_bindgen::to_value(keys).unwrap()
     }
+
+    #[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 = "fromBytes")]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<IdentityWASM, JsValue> {
+        match Identity::deserialize_from_bytes(bytes.as_slice()).with_js_error() {
+            Ok(identity) => Ok(IdentityWASM(identity)),
+            Err(err) => Err(err),
+        }
+    }
 }

package/packages/identity_transitions/Cargo.toml

@@ -14,8 +14,4 @@ dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-
 pshenmic_dpp_utils = {path = "../utils"}
 pshenmic_dpp_public_key = {path = "../public_key"}
 pshenmic_dpp_state_transition = {path = "../state_transition"}
-pshenmic_dpp_enums = {path = "../enums"}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+pshenmic_dpp_enums = {path = "../enums"}

package/packages/identity_transitions/src/create_transition/mod.rs

@@ -64,8 +64,8 @@ impl IdentityCreateTransitionWASM {
         StateTransitionWASM::from(StateTransition::IdentityCreate(self.clone().0))
     }
 
-    #[wasm_bindgen(js_name = "toBuffer")]
-    pub fn to_buffer(&self) -> Result<JsValue, JsValue> {
+    #[wasm_bindgen(js_name = "toBytes")]
+    pub fn to_bytes(&self) -> Result<JsValue, JsValue> {
         let bytes = self.0.serialize_to_bytes().with_js_error();
 
         match bytes {
@@ -76,9 +76,9 @@ impl IdentityCreateTransitionWASM {
 
     #[wasm_bindgen(js_name = "fromStateTransition")]
     pub fn from_state_transition(
-        st: StateTransitionWASM,
+        st: &StateTransitionWASM,
     ) -> Result<IdentityCreateTransitionWASM, JsValue> {
-        let rs_st: StateTransition = st.into();
+        let rs_st: StateTransition = st.clone().into();
 
         match rs_st {
             StateTransition::IdentityCreate(st) => Ok(IdentityCreateTransitionWASM(st)),
@@ -86,8 +86,8 @@ impl IdentityCreateTransitionWASM {
         }
     }
 
-    #[wasm_bindgen(js_name = "fromBuffer")]
-    pub fn from_buffer(bytes: Vec<u8>) -> Result<IdentityCreateTransitionWASM, JsValue> {
+    #[wasm_bindgen(js_name = "fromBytes")]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<IdentityCreateTransitionWASM, JsValue> {
         let rs_transition =
             IdentityCreateTransition::deserialize_from_bytes(bytes.as_slice()).with_js_error();
 

package/packages/mock_bls/Cargo.toml

@@ -9,8 +9,4 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
     "bls-signatures",
-]}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+]}

package/packages/private_key/Cargo.toml

@@ -10,8 +10,4 @@ crate-type = ["cdylib", "lib"]
 wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
     "identity-value-conversion",
-]}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+]}

package/packages/private_key/src/lib.rs

@@ -7,7 +7,7 @@ pub struct PrivateKeyWASM(PrivateKey);
 
 #[wasm_bindgen]
 impl PrivateKeyWASM {
-    #[wasm_bindgen(js_name = "new")]
+    #[wasm_bindgen(constructor)]
     pub fn new(wif: &str) -> Result<Self, JsValue> {
         let pk = PrivateKey::from_wif(wif).map_err(|err| JsValue::from_str(&*err.to_string()));
 

package/packages/public_key/Cargo.toml

@@ -12,8 +12,4 @@ dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-
     "identity-value-conversion",
 ]}
 pshenmic_dpp_enums = {path = "../enums"}
-pshenmic_dpp_utils = {path = "../utils"}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+pshenmic_dpp_utils = {path = "../utils"}

package/packages/public_key/src/lib.rs

@@ -128,16 +128,14 @@ impl IdentityPublicKeyWASM {
         self.0.set_disabled_at(disabled_at)
     }
 
-    #[wasm_bindgen(js_name = toBuffer)]
-    pub fn to_buffer(&self) -> Result<Vec<u8>, JsValue> {
+    #[wasm_bindgen(js_name = toBytes)]
+    pub fn to_byes(&self) -> Result<Vec<u8>, JsValue> {
         self.0.serialize_to_bytes().with_js_error()
     }
 
-    #[wasm_bindgen(js_name = fromBuffer)]
-    pub fn from_buffer(buffer: Vec<u8>) -> Result<IdentityPublicKeyWASM, JsValue> {
-        let rs_pk = IdentityPublicKey::deserialize_from_bytes(buffer.as_slice()).with_js_error();
-
-        match rs_pk {
+    #[wasm_bindgen(js_name = fromBytes)]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<IdentityPublicKeyWASM, JsValue> {
+        match IdentityPublicKey::deserialize_from_bytes(bytes.as_slice()).with_js_error() {
             Ok(pk) => Ok(IdentityPublicKeyWASM(pk)),
             Err(e) => Err(e),
         }

package/packages/state_transition/Cargo.toml

@@ -15,8 +15,4 @@ pshenmic_dpp_mock_bls = {path = "../mock_bls"}
 pshenmic_dpp_enums = {path = "../enums"}
 dpp = { git = "https://github.com/dashpay/platform", branch = "master", default-features = false, features = [
     "state-transition-signing"
-]}
-
-[profile.release]
-lto = true
-opt-level = 'z'
+]}

package/packages/state_transition/src/lib.rs

@@ -9,6 +9,7 @@ use pshenmic_dpp_utils::WithJsError;
 use wasm_bindgen::JsValue;
 use wasm_bindgen::prelude::wasm_bindgen;
 
+#[derive(Clone)]
 #[wasm_bindgen(js_name = "StateTransitionWASM")]
 pub struct StateTransitionWASM(StateTransition);
 
@@ -29,11 +30,11 @@ impl StateTransitionWASM {
     #[wasm_bindgen(js_name=sign)]
     pub fn sign(
         &mut self,
-        private_key: PrivateKeyWASM,
-        public_key: IdentityPublicKeyWASM,
+        private_key: &PrivateKeyWASM,
+        public_key: &IdentityPublicKeyWASM,
     ) -> Result<JsValue, JsValue> {
         let sig = self.0.sign(
-            &public_key.into(),
+            &public_key.clone().into(),
             private_key.get_key_bytes().as_slice(),
             &MockBLS {},
         );
@@ -57,7 +58,7 @@ impl StateTransitionWASM {
     #[wasm_bindgen(js_name=signByPrivateKey)]
     pub fn sign_by_private_key(
         &mut self,
-        private_key: PrivateKeyWASM,
+        private_key: &PrivateKeyWASM,
         key_type: KeyTypeWASM,
     ) -> JsValue {
         let _sig = self
@@ -77,15 +78,16 @@ impl StateTransitionWASM {
         }
     }
 
-    #[wasm_bindgen(js_name=toBuffer)]
-    pub fn to_buffer(&self) -> Result<JsValue, JsValue> {
-        let bytes = self.0.serialize_to_bytes().expect("Serialization failed");
+    #[wasm_bindgen(js_name=toBytes)]
+    pub fn to_bytes(&self) -> Result<JsValue, JsValue> {
+        let bytes = self.0.serialize_to_bytes().with_js_error()?;
 
         Ok(JsValue::from(bytes.clone()))
     }
 
-    pub fn from_buffer(buffer: Vec<u8>) -> Result<StateTransitionWASM, JsValue> {
-        let st = StateTransition::deserialize_from_bytes(buffer.as_slice());
+    #[wasm_bindgen(js_name=fromBytes)]
+    pub fn from_bytes(bytes: Vec<u8>) -> Result<StateTransitionWASM, JsValue> {
+        let st = StateTransition::deserialize_from_bytes(bytes.as_slice());
 
         match st {
             Err(err) => Err(JsValue::from_str(err.to_string().as_str())),

package/packages/utils/Cargo.toml

@@ -17,8 +17,4 @@ js-sys = "0.3.53"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" }
 serde = { version = "1.0.197", features = ["derive"] }
-itertools = { version = "0.13" }
-
-[profile.release]
-lto = true
-opt-level = 'z'
+itertools = { version = "0.13" }

package/scripts/build-js.sh

@@ -15,12 +15,13 @@ WASM_BINARY_PATH="$WASM_DIR/pshenmic_dpp_bg.wasm"
 # Create directory in dist to save transpiled wasm code and TS typings
 mkdir -p $DIST_WASM_DIR
 
-## Converting wasm into base64 and saving it to dist folder
 
 rm -rf $DIST_WASM_BINARY_BASE_64
 rm -rf $DIST_WASM_BINARY_RAW
 rm -rf $DIST_WASM_JS
 
+## Converting wasm into base64 and saving it to dist folder
+
 if [[ "${RAW}" == "true" ]]; then
   cp $WASM_BINARY_PATH $DIST_WASM_BINARY_RAW
 else
@@ -35,4 +36,4 @@ echo "Transpiling wasm ES Modules to CommonJS"
 cp $WASM_JS_CODE_PATH $DIST_WASM_JS
 
 echo "Cleaning wasm build"
-rm -rf $WASM_DIR
+#rm -rf $WASM_DIR

package/src/lib.rs

@@ -1,5 +1,11 @@
-pub use pshenmic_dpp_document_batch::DocumentBatchWASM;
+#![no_std]
+#![no_main]
+
+pub use pshenmic_dpp_data_contract;
+pub use pshenmic_dpp_data_contract_transitions;
+pub use pshenmic_dpp_document_batch;
 pub use pshenmic_dpp_document_search;
+pub use pshenmic_dpp_enums;
 pub use pshenmic_dpp_identity;
 pub use pshenmic_dpp_identity_transitions;
 pub use pshenmic_dpp_state_transition;