@dashevo/wasm-dpp 2.0.0-dev.1 → 2.0.0-rc.10

package/src/state_transition/errors/state_transition_is_not_active_error.rs

@@ -0,0 +1,79 @@
+use dpp::version::ProtocolVersion;
+use std::ops::RangeInclusive;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(js_name = StateTransitionIsNotActiveError)]
+pub struct StateTransitionIsNotActiveErrorWasm {
+    state_transition_type: String,
+    active_version_range_start: ProtocolVersion,
+    active_version_range_end: ProtocolVersion,
+    current_protocol_version: ProtocolVersion,
+}
+
+impl StateTransitionIsNotActiveErrorWasm {
+    pub fn new(
+        state_transition_type: String,
+        active_version_range: RangeInclusive<ProtocolVersion>,
+        current_protocol_version: ProtocolVersion,
+    ) -> Self {
+        Self {
+            state_transition_type,
+            active_version_range_start: *active_version_range.start(),
+            active_version_range_end: *active_version_range.end(),
+            current_protocol_version,
+        }
+    }
+}
+
+#[wasm_bindgen(js_class = StateTransitionIsNotActiveError)]
+impl StateTransitionIsNotActiveErrorWasm {
+    #[wasm_bindgen(js_name = getStateTransitionType)]
+    pub fn get_state_transition_type(&self) -> String {
+        self.state_transition_type.clone()
+    }
+
+    #[wasm_bindgen(js_name = getActiveVersionRangeStart)]
+    pub fn get_active_version_range_start(&self) -> u32 {
+        self.active_version_range_start
+    }
+
+    #[wasm_bindgen(js_name = getActiveVersionRangeEnd)]
+    pub fn get_active_version_range_end(&self) -> u32 {
+        self.active_version_range_end
+    }
+
+    #[wasm_bindgen(js_name = getCurrentProtocolVersion)]
+    pub fn get_current_protocol_version(&self) -> u32 {
+        self.current_protocol_version
+    }
+
+    #[wasm_bindgen(js_name = toObject)]
+    pub fn to_object(&self) -> JsValue {
+        let object = js_sys::Object::new();
+        js_sys::Reflect::set(
+            &object,
+            &"stateTransitionType".into(),
+            &self.state_transition_type.clone().into(),
+        )
+        .unwrap();
+        js_sys::Reflect::set(
+            &object,
+            &"activeVersionRangeStart".into(),
+            &JsValue::from(self.active_version_range_start),
+        )
+        .unwrap();
+        js_sys::Reflect::set(
+            &object,
+            &"activeVersionRangeEnd".into(),
+            &JsValue::from(self.active_version_range_end),
+        )
+        .unwrap();
+        js_sys::Reflect::set(
+            &object,
+            &"currentProtocolVersion".into(),
+            &JsValue::from(self.current_protocol_version),
+        )
+        .unwrap();
+        object.into()
+    }
+}

package/src/state_transition/state_transition_factory.rs

@@ -7,6 +7,7 @@ use crate::identity::state_transition::{
     IdentityUpdateTransitionWasm,
 };
 use crate::state_transition::errors::invalid_state_transition_error::InvalidStateTransitionErrorWasm;
+use crate::state_transition::errors::state_transition_is_not_active_error::StateTransitionIsNotActiveErrorWasm;
 use crate::voting::state_transition::masternode_vote_transition::MasternodeVoteTransitionWasm;
 use dpp::state_transition::errors::StateTransitionError;
 use dpp::state_transition::state_transition_factory::StateTransitionFactory;
@@ -70,6 +71,16 @@ impl StateTransitionFactoryWasm {
                     serde_wasm_bindgen::to_value(&raw_state_transition)?,
                 )
                 .into()),
+                StateTransitionError::StateTransitionIsNotActiveError {
+                    state_transition_type,
+                    active_version_range,
+                    current_protocol_version,
+                } => Err(StateTransitionIsNotActiveErrorWasm::new(
+                    state_transition_type,
+                    active_version_range,
+                    current_protocol_version,
+                )
+                .into()),
             },
             Err(other) => Err(from_dpp_err(other)),
         }

package/src/utils.rs

@@ -22,9 +22,9 @@ pub trait ToSerdeJSONExt {
     /// Converts the `JsValue` into `platform::Value`. It's an expensive conversion,
     /// as `JsValue` must be stringified first
     fn with_serde_to_platform_value_map(&self) -> Result<BTreeMap<String, Value>, JsValue>;
-    fn with_serde_into<D: DeserializeOwned>(&self) -> Result<D, JsValue>
+    fn with_serde_into<D>(&self) -> Result<D, JsValue>
     where
-        D: for<'de> serde::de::Deserialize<'de> + 'static;
+        D: DeserializeOwned + for<'de> serde::de::Deserialize<'de> + 'static;
 }
 
 impl ToSerdeJSONExt for JsValue {
@@ -284,8 +284,10 @@ pub fn convert_number_to_u64(js_number: js_sys::Number) -> Result<u64, anyhow::E
 pub(crate) trait Inner {
     type InnerItem;
 
+    #[allow(dead_code)]
     fn into_inner(self) -> Self::InnerItem;
     fn inner(&self) -> &Self::InnerItem;
+    #[allow(dead_code)]
     fn inner_mut(&mut self) -> &mut Self::InnerItem;
 }
 

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

@@ -222,7 +222,7 @@ impl MasternodeVoteTransitionWasm {
 
     #[wasm_bindgen(js_name=getUserFeeIncrease)]
     pub fn get_user_fee_increase(&self) -> u16 {
-        self.0.user_fee_increase() as u16
+        self.0.user_fee_increase()
     }
 
     #[wasm_bindgen(js_name=setUserFeeIncrease)]
@@ -253,7 +253,7 @@ impl MasternodeVoteTransitionWasm {
                         contested_document_resource_vote_poll,
                     ) => {
                         let contract_id = IdentifierWrapper::from(
-                            contested_document_resource_vote_poll.contract_id.clone(),
+                            contested_document_resource_vote_poll.contract_id,
                         );
 
                         Reflect::set(&js_object, &"contractId".into(), &contract_id.into())

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

@@ -18,6 +18,7 @@ pub struct ToObjectOptions {
 pub struct ToObject {
     pub transition_type: u8,
     pub pro_tx_hash: Identifier,
+    #[allow(dead_code)]
     pub vote: Vote,
     pub signature: Option<Vec<u8>>,
     pub signature_public_key_id: Option<KeyID>,