Merge branch 'master' into evgenii/infromative_change_error

Author: lisicky

rust/Cargo.lock

@@ -32,7 +32,6 @@ num-integer = "0.1.45"
 # feature or this one
 clear_on_drop = { version = "0.2", features = ["no_cc"] }
 itertools = "0.10.1"
-getrandom = { version = "0.2.3", features = ["js"] }
 rand = "0.8.4"
 schemars = "0.8.8"
 serde = { version = "1.0", features = ["derive"] }
@@ -41,12 +40,15 @@ serde = { version = "1.0", features = ["derive"] }
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))'.dependencies]
 rand_os = "0.1"
 noop_proc_macro = "0.3.0"
+getrandom = "0.2.3"
 
 # wasm
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
-wasm-bindgen = { version = "=0.2.78", features = ["serde-serialize"] }
+serde-wasm-bindgen = "0.4.3"
+wasm-bindgen = "=0.2.78"
 rand_os = { version = "0.1", features = ["wasm-bindgen"] }
-js-sys = "=0.3.51"
+js-sys = "0.3.51"
+getrandom = { version = "0.2.3", features = ["js"] }
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.

rust/Cargo.toml

@@ -7,7 +7,6 @@ use cardano_serialization_lib::crypto::*;
 use cardano_serialization_lib::metadata::*;
 use cardano_serialization_lib::plutus::*;
 use cardano_serialization_lib::utils::*;
-use crate::tx_builder::tx_inputs_builder::{PlutusWitness, PlutusWitnesses};
 
 //#[macro_export]
 macro_rules! gen_json_schema {
@@ -156,8 +155,5 @@ fn main() {
     gen_json_schema!(BigInt);
     gen_json_schema!(Int);
     gen_json_schema!(Value);
-
-    // tx_builder.rs
-    gen_json_schema!(PlutusWitness);
-    gen_json_schema!(PlutusWitnesses);
+    gen_json_schema!(TransactionUnspentOutput);
 }