@dashevo/wasm-dpp 1.8.0-dev.1 → 1.8.0-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "1.8.0-dev.1",
+  "version": "1.8.0-dev.2",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,7 +44,7 @@
     "@babel/core": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@dashevo/dashcore-lib": "~0.22.0",
-    "@dashevo/dpns-contract": "1.8.0-dev.1",
+    "@dashevo/dpns-contract": "1.8.0-dev.2",
     "@types/bs58": "^4.0.1",
     "@types/node": "^14.6.0",
     "@yarnpkg/pnpify": "^4.0.0-rc.42",

package/scripts/build-wasm.sh

@@ -47,8 +47,9 @@ fi
 # EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0 --no-entry" cargo build --target=wasm32-unknown-emscripten --release
 # EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0 --no-entry" wasm-bindgen --out-dir=wasm --target=web --omit-default-module-path ../../target/wasm32-unknown-emscripten/release/wasm_dpp.wasm
 
-# TODO: Must be somehow preinstalled?
-#if [ "$PROFILE" == "release" ]; then
-#  echo "Optimizing wasm using Binaryen"
-#  wasm-opt -Os "$OUTPUT_FILE" -o "$OUTPUT_FILE"
-#fi
+if command -v wasm-opt &> /dev/null; then
+  echo "Optimizing wasm using Binaryen"
+  wasm-opt -Oz "$OUTPUT_FILE" -o "$OUTPUT_FILE"
+else
+  echo "wasm-opt command not found. Skipping wasm optimization."
+fi

package/src/identity/factory_utils.rs

@@ -9,7 +9,6 @@ use dpp::identity::{IdentityPublicKey, KeyID};
 use dpp::serialization::ValueConvertible;
 use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation;
 use std::collections::BTreeMap;
-use wasm_bindgen::__rt::Ref;
 use wasm_bindgen::{JsCast, JsValue};
 
 pub fn parse_public_keys(
@@ -47,11 +46,10 @@ pub fn parse_create_identity_update_transition_keys(
         let keys: Vec<IdentityPublicKeyInCreation> = add_public_keys_array
             .iter()
             .map(|key| {
-                let public_key: Ref<IdentityPublicKeyWithWitnessWasm> =
-                    generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
-                        &key,
-                        "IdentityPublicKeyWithWitness",
-                    )?;
+                let public_key = generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
+                    &key,
+                    "IdentityPublicKeyWithWitness",
+                )?;
 
                 Ok(public_key.clone().into())
             })
@@ -74,7 +72,7 @@ pub fn parse_create_identity_update_transition_keys(
         let keys: Vec<KeyID> = disable_public_keys_array
             .iter()
             .map(|key| {
-                let public_key_wasm: Ref<IdentityPublicKeyWasm> =
+                let public_key_wasm =
                     generic_of_js_val::<IdentityPublicKeyWasm>(&key, "IdentityPublicKey")?;
                 Ok(public_key_wasm.get_id())
             })

package/src/identity/state_transition/asset_lock_proof/mod.rs

@@ -5,7 +5,6 @@ pub use chain::*;
 pub use instant::*;
 use std::convert::TryInto;
 use wasm_bindgen::JsCast;
-use wasm_bindgen::__rt::Ref;
 
 use dpp::identity::errors::UnknownAssetLockProofTypeError;
 use wasm_bindgen::prelude::*;
@@ -144,13 +143,13 @@ pub fn create_asset_lock_proof_from_wasm_instance(
 
     match lock_type {
         AssetLockProofType::Instant => {
-            let instant: Ref<InstantAssetLockProofWasm> =
+            let instant =
                 generic_of_js_val::<InstantAssetLockProofWasm>(js_value, "InstantAssetLockProof")?;
 
             Ok(AssetLockProof::Instant(instant.clone().into()))
         }
         AssetLockProofType::Chain => {
-            let chain: Ref<ChainAssetLockProofWasm> =
+            let chain =
                 generic_of_js_val::<ChainAssetLockProofWasm>(js_value, "ChainAssetLockProof")?;
 
             Ok(AssetLockProof::Chain(chain.clone().into()))

package/src/identity/state_transition/identity_create_transition/identity_create_transition.rs

@@ -1,6 +1,5 @@
 use std::default::Default;
 
-use wasm_bindgen::__rt::Ref;
 use wasm_bindgen::prelude::*;
 
 use crate::bls_adapter::BlsAdapter;
@@ -101,11 +100,10 @@ impl IdentityCreateTransitionWasm {
         let public_keys = public_keys
             .iter()
             .map(|value| {
-                let public_key: Ref<IdentityPublicKeyWithWitnessWasm> =
-                    generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
-                        value,
-                        "IdentityPublicKeyWithWitness",
-                    )?;
+                let public_key = generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
+                    value,
+                    "IdentityPublicKeyWithWitness",
+                )?;
                 Ok(public_key.clone().into())
             })
             .collect::<Result<Vec<IdentityPublicKeyInCreation>, JsValue>>()?;
@@ -120,11 +118,10 @@ impl IdentityCreateTransitionWasm {
         let mut public_keys = public_keys
             .iter()
             .map(|value| {
-                let public_key: Ref<IdentityPublicKeyWithWitnessWasm> =
-                    generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
-                        value,
-                        "IdentityPublicKeyWithWitness",
-                    )?;
+                let public_key = generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
+                    value,
+                    "IdentityPublicKeyWithWitness",
+                )?;
                 Ok(public_key.clone().into())
             })
             .collect::<Result<Vec<IdentityPublicKeyInCreation>, JsValue>>()?;

package/src/identity/state_transition/identity_update_transition/identity_update_transition.rs

@@ -1,24 +1,12 @@
-use std::convert::TryInto;
-use std::default::Default;
-
-use serde::{Deserialize, Serialize};
-
-use wasm_bindgen::__rt::Ref;
-use wasm_bindgen::prelude::*;
-
+use crate::bls_adapter::{BlsAdapter, JsBlsAdapter};
+use crate::errors::from_dpp_err;
 use crate::identifier::IdentifierWrapper;
-
+use crate::utils::{generic_of_js_val, WithJsError};
 use crate::{
     buffer::Buffer,
     identity::state_transition::identity_public_key_transitions::IdentityPublicKeyWithWitnessWasm,
     identity::IdentityPublicKeyWasm, with_js_error,
 };
-
-use crate::bls_adapter::{BlsAdapter, JsBlsAdapter};
-
-use crate::utils::{generic_of_js_val, WithJsError};
-
-use crate::errors::from_dpp_err;
 use dpp::errors::consensus::signature::SignatureError;
 use dpp::errors::consensus::ConsensusError;
 use dpp::errors::ProtocolError;
@@ -34,6 +22,10 @@ use dpp::state_transition::StateTransition;
 use dpp::state_transition::StateTransitionIdentitySigned;
 use dpp::version::PlatformVersion;
 use dpp::{identifier::Identifier, state_transition::StateTransitionLike};
+use serde::{Deserialize, Serialize};
+use std::convert::TryInto;
+use std::default::Default;
+use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(js_name=IdentityUpdateTransition)]
 #[derive(Clone)]
@@ -93,11 +85,10 @@ impl IdentityUpdateTransitionWasm {
             keys_to_add = keys
                 .iter()
                 .map(|value| {
-                    let public_key: Ref<IdentityPublicKeyWithWitnessWasm> =
-                        generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
-                            value,
-                            "IdentityPublicKeyWithWitness",
-                        )?;
+                    let public_key = generic_of_js_val::<IdentityPublicKeyWithWitnessWasm>(
+                        value,
+                        "IdentityPublicKeyWithWitness",
+                    )?;
                     Ok(public_key.clone().into())
                 })
                 .collect::<Result<Vec<IdentityPublicKeyInCreation>, JsValue>>()?;