@dashevo/wasm-dpp 0.25.0-dev.21 → 0.25.0-dev.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "0.25.0-dev.21",
+  "version": "0.25.0-dev.23",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,8 +44,8 @@
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "^7.15.4",
     "@dashevo/dashcore-lib": "~0.20.9",
-    "@dashevo/dpns-contract": "0.25.0-dev.21",
-    "@dashevo/dpp": "0.25.0-dev.21",
+    "@dashevo/dpns-contract": "0.25.0-dev.23",
+    "@dashevo/dpp": "0.25.0-dev.23",
     "@dashevo/wasm-re2": "~2.0.4",
     "@types/bs58": "^4.0.1",
     "@types/node": "^14.6.0",

package/src/bls_adapter.rs

@@ -1,4 +1,4 @@
-use dpp::dashcore::anyhow::anyhow;
+use anyhow::anyhow;
 use dpp::{BlsModule, PublicKeyValidationError};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;

package/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs

@@ -25,13 +25,13 @@ impl IdentityAssetLockProofLockedTransactionMismatchErrorWasm {
     #[wasm_bindgen(js_name=getInstantLockTransactionId)]
     pub fn instant_lock_transaction_id(&self) -> Buffer {
         let tx_id = self.inner.instant_lock_transaction_id();
-        Buffer::from_bytes(&tx_id)
+        Buffer::from_bytes(&tx_id.to_byte_array())
     }
 
     #[wasm_bindgen(js_name=getAssetLockTransactionId)]
     pub fn asset_lock_transaction_id(&self) -> Buffer {
         let tx_id = self.inner.asset_lock_transaction_id();
-        let mut hash_bytes = tx_id.as_hash().into_inner();
+        let mut hash_bytes = tx_id.to_byte_array();
         hash_bytes.reverse();
 
         Buffer::from_bytes(&hash_bytes)

package/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs

@@ -30,7 +30,7 @@ impl IdentityAssetLockTransactionOutPointAlreadyExistsErrorWasm {
     #[wasm_bindgen(js_name=getTransactionId)]
     pub fn transaction_id(&self) -> Buffer {
         let tx_id = self.inner.transaction_id();
-        let mut tx_id_bytes = tx_id.as_hash().into_inner();
+        let mut tx_id_bytes = tx_id.to_byte_array();
         tx_id_bytes.reverse();
         Buffer::from_bytes(&tx_id_bytes)
     }

package/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs

@@ -23,7 +23,7 @@ impl InvalidIdentityAssetLockProofChainLockValidationErrorWasm {
     #[wasm_bindgen(js_name=getTransactionId)]
     pub fn transaction_id(&self) -> Buffer {
         let tx_id = self.inner.transaction_id();
-        let mut tx_id_bytes = tx_id.as_hash().into_inner();
+        let mut tx_id_bytes = tx_id.to_byte_array();
         tx_id_bytes.reverse();
         Buffer::from_bytes(&tx_id_bytes)
     }

package/src/identity/errors/asset_lock_transaction_is_not_found_error.rs

@@ -1,4 +1,3 @@
-use dpp::dashcore::hashes::hex::ToHex;
 use dpp::identity::errors::AssetLockTransactionIsNotFoundError;
 use wasm_bindgen::prelude::*;
 
@@ -15,6 +14,6 @@ impl From<&AssetLockTransactionIsNotFoundError> for AssetLockTransactionIsNotFou
 impl AssetLockTransactionIsNotFoundErrorWasm {
     #[wasm_bindgen(js_name=getTransactionId)]
     pub fn transaction_id(&self) -> JsValue {
-        self.0.transaction_id().to_hex().into()
+        hex::encode(self.0.transaction_id()).into()
     }
 }

package/src/identity/identity_public_key/mod.rs

@@ -1,4 +1,3 @@
-use dpp::dashcore::anyhow;
 use js_sys::Reflect::delete_property;
 pub use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;

package/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs

@@ -1,5 +1,5 @@
 use dpp::dashcore::{
-    blockdata::{script::Script, transaction::txout::TxOut},
+    blockdata::{script::ScriptBuf, transaction::txout::TxOut},
     consensus::encode::serialize,
 };
 
@@ -26,7 +26,7 @@ struct TxOutJS {
     #[serde(rename = "satoshis")]
     value: u64,
     #[serde(rename = "script")]
-    script_pubkey: Script,
+    script_pubkey: ScriptBuf,
 }
 
 #[derive(Serialize)]

package/src/identity/state_transition/identity_public_key_transitions.rs

@@ -1,5 +1,4 @@
 //todo: move this file to transition
-use dpp::dashcore::anyhow;
 use dpp::platform_value::{BinaryData, ReplacementType, Value};
 use dpp::serialization::ValueConvertible;
 use dpp::state_transition::public_key_in_creation::accessors::{

package/src/utils.rs

@@ -1,12 +1,8 @@
 use std::collections::BTreeMap;
 use std::convert::TryInto;
 
-use anyhow::{anyhow, bail};
-use dpp::{
-    consensus::ConsensusError,
-    dashcore::{anyhow, anyhow::Context},
-    ProtocolError,
-};
+use anyhow::{anyhow, bail, Context};
+use dpp::{consensus::ConsensusError, ProtocolError};
 
 use dpp::platform_value::Value;
 use dpp::serialization::PlatformDeserializable;