fixes

Author: quantum

packages/dapi-grpc/Cargo.toml

@@ -43,18 +43,17 @@ tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", vers
 
 prost = { version = "0.13" }
 futures-core = "0.3.30"
-tonic = { version = "0.13.0", features = [
-  "codegen",
-  "prost",
-  "tls-ring",
-], default-features = false }
 serde = { version = "1.0.219", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
 serde_json = { version = "1.0", optional = true }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
+tonic = { version = "0.13.0", features = [
+  "codegen",
+  "prost",
+], default-features = false }
 getrandom = { version = "0.2", features = ["js"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

packages/rs-dapi-client/Cargo.toml

@@ -31,6 +31,8 @@ gloo-timers = { version = "0.3.0", features = ["futures"] }
 tonic-web-wasm-client = { version = "0.7.0" }
 wasm-bindgen-futures = { version = "0.4.49" }
 getrandom = { version = "0.2", features = ["js"] }
+tower-service = { version = "0.3" }
+http-body-util = { version = "0.1" }
 
 [dependencies]
 backon = { version = "1.3", default-features = false }

packages/rs-dapi-client/src/transport/wasm_channel.rs

@@ -43,21 +43,27 @@ impl WasmClient {
     }
 }
 
-impl tonic::client::GrpcService<tonic::body::BoxBody> for WasmClient {
+
+impl tonic::client::GrpcService<tonic::body::Body> for WasmClient {
     type Future = BoxFuture<'static, Result<http::Response<Self::ResponseBody>, Self::Error>>;
-    type ResponseBody = tonic::body::BoxBody;
+    type ResponseBody = tonic::body::Body;
     type Error = Status;
 
-    fn call(&mut self, request: http::Request<tonic::body::BoxBody>) -> Self::Future {
+    fn call(&mut self, request: http::Request<tonic::body::Body>) -> Self::Future {
         let mut client = self.client.clone();
-        let fut = client.call(request).map(|res| match res {
-            Ok(resp) => {
-                let body = tonic::body::boxed(resp.into_body());
-                Ok(Response::new(body))
+        
+        let fut = async move {
+            match client.call(request).await {
+                Ok(resp) => {
+                    let (parts, body) = resp.into_parts();
+                    let tonic_body = tonic::body::Body::new(body);
+                    Ok(Response::from_parts(parts, tonic_body))
+                }
+                Err(e) => Err(wasm_client_error_to_status(e)),
             }
-            Err(e) => Err(wasm_client_error_to_status(e)),
-        });
+        };
 
+        // For WASM, we need to use into_send to make the future Send
         into_send(fut)
     }
 

packages/wasm-sdk/Cargo.toml

@@ -1,3 +1,6 @@
+[workspace]
+members = ["."]
+
 [package]
 name = "wasm-sdk"
 edition = "2021"
@@ -7,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-dash-sdk = { path = "../rs-sdk", default-features = false }
+dash-sdk = { path = "../rs-sdk", default-features = false, features = ["mocks"] }
 console_error_panic_hook = { version = "0.1.6" }
 thiserror = { version = "2.0.12" }
 web-sys = { version = "0.3.4", features = [
@@ -20,7 +23,7 @@ web-sys = { version = "0.3.4", features = [
 ] }
 wasm-bindgen = { version = "=0.2.100" }
 wasm-bindgen-futures = { version = "0.4.49" }
-drive-proof-verifier = { path = "../rs-drive-proof-verifier" } # TODO: I think it's not needed (LKl)
+drive-proof-verifier = { path = "../rs-drive-proof-verifier", default-features = false } # TODO: I think it's not needed (LKl)
 # tonic = { version = "*", features = ["transport"], default-features = false }
 # client = [
 #   "tonic/channel", FAIL
@@ -30,17 +33,22 @@ drive-proof-verifier = { path = "../rs-drive-proof-verifier" } # TODO: I think i
 #   "tonic/tls-webpki-roots",
 #   "platform",
 # ]
-tracing-wasm = { version = "0.2.1" }
+# tracing-wasm = { version = "0.2.1" }
 wee_alloc = "0.4"
 platform-value = { path = "../rs-platform-value", features = ["json"] }
 serde-wasm-bindgen = { version = "0.6.5" }
+getrandom = { version = "0.2", features = ["js"] }
 
 [profile.release]
-lto = "fat"
 opt-level = "z"
 panic = "abort"
 debug = false
+lto = false
 
 #[package.metadata.wasm-pack.profile.release]
 #wasm-opt = ['-g', '-O'] # -g for profiling
 #  -Oz -Oz -g
+
+[patch.crates-io]
+# Override ring to use the wasm-compatible version
+ring = { git = "https://github.com/briansmith/ring", branch = "main" }

packages/wasm-sdk/build.sh

@@ -7,6 +7,10 @@
 
 set -ex -o pipefail
 
+# Disable LTO for WebAssembly builds
+export CARGO_PROFILE_RELEASE_LTO=false
+export RUSTFLAGS="-C lto=off"
+
 wasm-pack build --target web --release --no-opt
 wasm-opt -tnh --flatten --rereloop -Oz --gufa -Oz --gufa -Oz -o pkg/optimized.wasm pkg/wasm_sdk_bg.wasm
 ls -lah pkg

packages/wasm-sdk/src/context_provider.rs

@@ -4,11 +4,13 @@ use dash_sdk::{
     dpp::{
         prelude::CoreBlockHeight,
         util::vec::{decode_hex, encode_hex},
+        version::PlatformVersion,
+        data_contract::TokenConfiguration,
     },
     error::ContextProviderError,
     platform::{DataContract, Identifier},
 };
-use drive_proof_verifier::ContextProvider;
+use dash_sdk::platform::ContextProvider;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]
@@ -91,10 +93,18 @@ impl ContextProvider for WasmContext {
     fn get_data_contract(
         &self,
         _id: &Identifier,
+        _platform_version: &PlatformVersion,
     ) -> Result<Option<Arc<DataContract>>, ContextProviderError> {
         todo!()
     }
 
+    fn get_token_configuration(
+        &self,
+        _token_id: &Identifier,
+    ) -> Result<Option<TokenConfiguration>, ContextProviderError> {
+        todo!()
+    }
+
     fn get_platform_activation_height(&self) -> Result<CoreBlockHeight, ContextProviderError> {
         todo!()
     }

packages/wasm-sdk/src/lib.rs

@@ -18,7 +18,7 @@ pub async fn start() -> Result<(), JsValue> {
     // * https://crates.io/crates/tracing-web
     console_error_panic_hook::set_once();
 
-    tracing_wasm::set_as_global_default();
+    // tracing_wasm::set_as_global_default();
 
     Ok(())
 }

packages/wasm-sdk/src/sdk.rs

@@ -184,7 +184,7 @@ pub async fn docs_testing(sdk: &WasmSdk) {
         .document_type_for_name("aaa")
         .expect("document type for name");
     let doc_serialized = doc
-        .serialize(document_type, sdk.version())
+        .serialize(document_type, &dc, sdk.version())
         .expect("serialize document");
 
     let msg = js_sys::JsString::from_str(&format!("{:?} {:?} ", dcs, doc_serialized))

packages/wasm-sdk/src/state_transitions/documents.rs

@@ -1,12 +1,13 @@
 use crate::error::to_js_error;
 use dash_sdk::dpp::identity::KeyID;
 use dash_sdk::dpp::serialization::PlatformSerializable;
-use dash_sdk::dpp::state_transition::documents_batch_transition::document_base_transition::v0::DocumentBaseTransitionV0;
-use dash_sdk::dpp::state_transition::documents_batch_transition::document_base_transition::DocumentBaseTransition;
-use dash_sdk::dpp::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransitionV0;
-use dash_sdk::dpp::state_transition::documents_batch_transition::document_transition::DocumentTransition;
-use dash_sdk::dpp::state_transition::documents_batch_transition::{
-    DocumentCreateTransition, DocumentsBatchTransition, DocumentsBatchTransitionV0,
+use dash_sdk::dpp::state_transition::StateTransition;
+use dash_sdk::dpp::state_transition::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0;
+use dash_sdk::dpp::state_transition::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition;
+use dash_sdk::dpp::state_transition::batch_transition::batched_transition::document_create_transition::DocumentCreateTransitionV0;
+use dash_sdk::dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition;
+use dash_sdk::dpp::state_transition::batch_transition::{
+    document_create_transition::DocumentCreateTransition, BatchTransition, BatchTransitionV0,
 };
 use wasm_bindgen::prelude::*;
 use web_sys::js_sys::{Number, Uint8Array};
@@ -60,15 +61,17 @@ fn create_batch_transition(
         )));
     };
 
-    let document_batch_transition = DocumentsBatchTransition::V0(DocumentsBatchTransitionV0 {
+    let document_batch_transition = BatchTransition::V0(BatchTransitionV0 {
         owner_id: Default::default(),
         transitions,
         user_fee_increase: 0,
         signature_public_key_id,
         signature: Default::default(),
     });
 
-    document_batch_transition
+    let state_transition: StateTransition = document_batch_transition.into();
+    
+    state_transition
         .serialize_to_bytes()
         .map_err(to_js_error)
         .map(|bytes| Uint8Array::from(bytes.as_slice()))