From 617ff4f0f91181cf799b8ab4c99c0abc76c6eee0 Mon Sep 17 00:00:00 2001 From: Enzo Cioppettini <48031343+ecioppettini@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:10:41 -0300 Subject: [PATCH 1/4] wasm-bindgen: upgrade and remove serde-deserialize feature --- chain/rust/Cargo.toml | 2 +- chain/wasm/Cargo.toml | 2 +- cip25/rust/Cargo.toml | 2 +- cip25/wasm/Cargo.toml | 2 +- cip36/wasm/Cargo.toml | 2 +- cml/wasm/Cargo.toml | 2 +- core/rust/Cargo.toml | 4 ++-- core/wasm/Cargo.toml | 4 ++-- crypto/wasm/Cargo.toml | 2 +- multi-era/rust/Cargo.toml | 4 ++-- multi-era/wasm/Cargo.toml | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chain/rust/Cargo.toml b/chain/rust/Cargo.toml index d12cb741..f4aa7876 100644 --- a/chain/rust/Cargo.toml +++ b/chain/rust/Cargo.toml @@ -52,7 +52,7 @@ unicode-segmentation = "1.10.1" # wasm #[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } #rand_os = { version = "0.1", features = ["wasm-bindgen"] } #js-sys = "=0.3.59" diff --git a/chain/wasm/Cargo.toml b/chain/wasm/Cargo.toml index 3183820f..24977dd4 100644 --- a/chain/wasm/Cargo.toml +++ b/chain/wasm/Cargo.toml @@ -22,7 +22,7 @@ cml-crypto = { path = "../../crypto/rust", version = "5.3.1" } cml-crypto-wasm = { path = "../../crypto/wasm", version = "5.3.1" } cbor_event = "2.4.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" diff --git a/cip25/rust/Cargo.toml b/cip25/rust/Cargo.toml index 6277b682..448aa0fa 100644 --- a/cip25/rust/Cargo.toml +++ b/cip25/rust/Cargo.toml @@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" thiserror = "1.0.37" # for enums -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } \ No newline at end of file +wasm-bindgen = { version = "=0.2.87" } diff --git a/cip25/wasm/Cargo.toml b/cip25/wasm/Cargo.toml index db03c318..1b3674e3 100644 --- a/cip25/wasm/Cargo.toml +++ b/cip25/wasm/Cargo.toml @@ -24,4 +24,4 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } \ No newline at end of file +wasm-bindgen = { version = "=0.2.87" } diff --git a/cip36/wasm/Cargo.toml b/cip36/wasm/Cargo.toml index 6de5fcea..8503718c 100644 --- a/cip36/wasm/Cargo.toml +++ b/cip36/wasm/Cargo.toml @@ -23,7 +23,7 @@ cml-core = { path = "../../core/rust", version = "5.3.1" } cml-core-wasm = { path = "../../core/wasm", version = "5.3.1" } cbor_event = "2.2.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" diff --git a/cml/wasm/Cargo.toml b/cml/wasm/Cargo.toml index 15d595ad..857ef5a8 100644 --- a/cml/wasm/Cargo.toml +++ b/cml/wasm/Cargo.toml @@ -23,4 +23,4 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "0.2", features=["serde-serialize"] } \ No newline at end of file +wasm-bindgen = { version = "0.2" } diff --git a/core/rust/Cargo.toml b/core/rust/Cargo.toml index d50ea7ac..fb0798ee 100644 --- a/core/rust/Cargo.toml +++ b/core/rust/Cargo.toml @@ -24,7 +24,7 @@ schemars = "0.8.8" bech32 = "0.7.2" hex = "0.4.0" itertools = "0.10.1" -getrandom = { version = "0.2.3", features = ["js"] } +getrandom = { version = "0.2.3" } rand = "0.8.5" fraction = "0.10.0" base64 = "0.13" @@ -50,7 +50,7 @@ cfg-if = "1" # wasm #[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } #rand_os = { version = "0.1", features = ["wasm-bindgen"] } #js-sys = "=0.3.59" diff --git a/core/wasm/Cargo.toml b/core/wasm/Cargo.toml index 605216ed..17734280 100644 --- a/core/wasm/Cargo.toml +++ b/core/wasm/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"] cml-core = { path = "../rust", version = "5.3.1" } cbor_event = "2.2.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" -serde-wasm-bindgen = "0.4.5" \ No newline at end of file +serde-wasm-bindgen = "0.4.5" diff --git a/crypto/wasm/Cargo.toml b/crypto/wasm/Cargo.toml index 39eb864c..b842904e 100644 --- a/crypto/wasm/Cargo.toml +++ b/crypto/wasm/Cargo.toml @@ -16,6 +16,6 @@ crate-type = ["cdylib", "rlib"] [dependencies] cml-crypto = { path = "../rust", version = "5.3.1" } cbor_event = "2.2.0" -wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" diff --git a/multi-era/rust/Cargo.toml b/multi-era/rust/Cargo.toml index bb5c5e66..3f20e73e 100644 --- a/multi-era/rust/Cargo.toml +++ b/multi-era/rust/Cargo.toml @@ -23,8 +23,8 @@ derivative = "2.2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" schemars = "0.8.8" -wasm-bindgen = { version = "0.2", features=["serde-serialize"] } +wasm-bindgen = { version = "0.2" } # only for declaring hash types bech32 = "0.7.2" -hex = "0.4.0" \ No newline at end of file +hex = "0.4.0" diff --git a/multi-era/wasm/Cargo.toml b/multi-era/wasm/Cargo.toml index e4c5bedc..b7896cc1 100644 --- a/multi-era/wasm/Cargo.toml +++ b/multi-era/wasm/Cargo.toml @@ -26,7 +26,7 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "0.2", features=["serde-serialize"] } +wasm-bindgen = { version = "0.2" } # not actual multi-era dependencies but we re-export these for the wasm builds cml-cip25-wasm = { path = "../../cip25/wasm", version = "5.3.1" } -cml-cip36-wasm = { path = "../../cip36/wasm", version = "5.3.1" } \ No newline at end of file +cml-cip36-wasm = { path = "../../cip36/wasm", version = "5.3.1" } From b4cfe4cccbb0c5d244b99d68516d869824563ab5 Mon Sep 17 00:00:00 2001 From: Enzo Cioppettini <48031343+ecioppettini@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:51:12 -0300 Subject: [PATCH 2/4] consistently pin the version in all crates --- cml/wasm/Cargo.toml | 2 +- core/rust/Cargo.toml | 2 +- multi-era/rust/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cml/wasm/Cargo.toml b/cml/wasm/Cargo.toml index 857ef5a8..fd1f570e 100644 --- a/cml/wasm/Cargo.toml +++ b/cml/wasm/Cargo.toml @@ -23,4 +23,4 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "0.2" } +wasm-bindgen = { version = "=0.2.87" } diff --git a/core/rust/Cargo.toml b/core/rust/Cargo.toml index fb0798ee..273e9796 100644 --- a/core/rust/Cargo.toml +++ b/core/rust/Cargo.toml @@ -24,7 +24,7 @@ schemars = "0.8.8" bech32 = "0.7.2" hex = "0.4.0" itertools = "0.10.1" -getrandom = { version = "0.2.3" } +getrandom = { version = "0.2.3", features = ["js"] } rand = "0.8.5" fraction = "0.10.0" base64 = "0.13" diff --git a/multi-era/rust/Cargo.toml b/multi-era/rust/Cargo.toml index 3f20e73e..dc7e13da 100644 --- a/multi-era/rust/Cargo.toml +++ b/multi-era/rust/Cargo.toml @@ -23,7 +23,7 @@ derivative = "2.2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" schemars = "0.8.8" -wasm-bindgen = { version = "0.2" } +wasm-bindgen = { version = "=0.2.87" } # only for declaring hash types bech32 = "0.7.2" From 8e9af287e8a8f40490ed0b2ed42ee265d5338012 Mon Sep 17 00:00:00 2001 From: Enzo Cioppettini <48031343+ecioppettini@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:52:36 -0300 Subject: [PATCH 3/4] remove the = from the wasm bindgen version --- chain/rust/Cargo.toml | 2 +- chain/wasm/Cargo.toml | 2 +- cip25/rust/Cargo.toml | 2 +- cip25/wasm/Cargo.toml | 2 +- cip36/wasm/Cargo.toml | 2 +- cml/wasm/Cargo.toml | 2 +- core/rust/Cargo.toml | 2 +- core/wasm/Cargo.toml | 2 +- crypto/wasm/Cargo.toml | 2 +- multi-era/rust/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chain/rust/Cargo.toml b/chain/rust/Cargo.toml index f4aa7876..981a7d9a 100644 --- a/chain/rust/Cargo.toml +++ b/chain/rust/Cargo.toml @@ -52,7 +52,7 @@ unicode-segmentation = "1.10.1" # wasm #[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } #rand_os = { version = "0.1", features = ["wasm-bindgen"] } #js-sys = "=0.3.59" diff --git a/chain/wasm/Cargo.toml b/chain/wasm/Cargo.toml index 24977dd4..beff9882 100644 --- a/chain/wasm/Cargo.toml +++ b/chain/wasm/Cargo.toml @@ -22,7 +22,7 @@ cml-crypto = { path = "../../crypto/rust", version = "5.3.1" } cml-crypto-wasm = { path = "../../crypto/wasm", version = "5.3.1" } cbor_event = "2.4.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" diff --git a/cip25/rust/Cargo.toml b/cip25/rust/Cargo.toml index 448aa0fa..99b7e507 100644 --- a/cip25/rust/Cargo.toml +++ b/cip25/rust/Cargo.toml @@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" thiserror = "1.0.37" # for enums -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } diff --git a/cip25/wasm/Cargo.toml b/cip25/wasm/Cargo.toml index 1b3674e3..cc62917b 100644 --- a/cip25/wasm/Cargo.toml +++ b/cip25/wasm/Cargo.toml @@ -24,4 +24,4 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } diff --git a/cip36/wasm/Cargo.toml b/cip36/wasm/Cargo.toml index 8503718c..0a83fc26 100644 --- a/cip36/wasm/Cargo.toml +++ b/cip36/wasm/Cargo.toml @@ -23,7 +23,7 @@ cml-core = { path = "../../core/rust", version = "5.3.1" } cml-core-wasm = { path = "../../core/wasm", version = "5.3.1" } cbor_event = "2.2.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" diff --git a/cml/wasm/Cargo.toml b/cml/wasm/Cargo.toml index fd1f570e..42ae2dc2 100644 --- a/cml/wasm/Cargo.toml +++ b/cml/wasm/Cargo.toml @@ -23,4 +23,4 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } diff --git a/core/rust/Cargo.toml b/core/rust/Cargo.toml index 273e9796..1954ac5e 100644 --- a/core/rust/Cargo.toml +++ b/core/rust/Cargo.toml @@ -50,7 +50,7 @@ cfg-if = "1" # wasm #[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } #rand_os = { version = "0.1", features = ["wasm-bindgen"] } #js-sys = "=0.3.59" diff --git a/core/wasm/Cargo.toml b/core/wasm/Cargo.toml index 17734280..58eac743 100644 --- a/core/wasm/Cargo.toml +++ b/core/wasm/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"] cml-core = { path = "../rust", version = "5.3.1" } cbor_event = "2.2.0" hex = "0.4.0" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" diff --git a/crypto/wasm/Cargo.toml b/crypto/wasm/Cargo.toml index b842904e..9cc87314 100644 --- a/crypto/wasm/Cargo.toml +++ b/crypto/wasm/Cargo.toml @@ -16,6 +16,6 @@ crate-type = ["cdylib", "rlib"] [dependencies] cml-crypto = { path = "../rust", version = "5.3.1" } cbor_event = "2.2.0" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } linked-hash-map = "0.5.3" serde_json = "1.0.57" diff --git a/multi-era/rust/Cargo.toml b/multi-era/rust/Cargo.toml index dc7e13da..3457cc9b 100644 --- a/multi-era/rust/Cargo.toml +++ b/multi-era/rust/Cargo.toml @@ -23,7 +23,7 @@ derivative = "2.2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" schemars = "0.8.8" -wasm-bindgen = { version = "=0.2.87" } +wasm-bindgen = { version = "0.2.87" } # only for declaring hash types bech32 = "0.7.2" From c7d5ec3508997e534d25944c07806fc09866b0ba Mon Sep 17 00:00:00 2001 From: Enzo Cioppettini <48031343+ecioppettini@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:06:31 -0300 Subject: [PATCH 4/4] change version in multi-era/wasm too (for consistency) --- multi-era/wasm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi-era/wasm/Cargo.toml b/multi-era/wasm/Cargo.toml index b7896cc1..7f296d81 100644 --- a/multi-era/wasm/Cargo.toml +++ b/multi-era/wasm/Cargo.toml @@ -26,7 +26,7 @@ hex = "0.4.0" linked-hash-map = "0.5.3" serde_json = "1.0.57" serde-wasm-bindgen = "0.4.5" -wasm-bindgen = { version = "0.2" } +wasm-bindgen = { version = "0.2.87" } # not actual multi-era dependencies but we re-export these for the wasm builds cml-cip25-wasm = { path = "../../cip25/wasm", version = "5.3.1" } cml-cip36-wasm = { path = "../../cip36/wasm", version = "5.3.1" }