From e52b69c7875accd62ea24f16e676c063d204e152 Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Tue, 11 Feb 2025 23:33:08 +0000 Subject: [PATCH 1/6] rm typeshare and add wasm bindgen --- Cargo.lock | 163 +++++++++++----------- Cargo.toml | 1 - crates/cli/Cargo.toml | 4 +- crates/cli/src/meta/types/authoring/v2.rs | 11 +- 4 files changed, 89 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 408a4c88..c19f1b65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -576,21 +576,6 @@ dependencies = [ "url", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anstream" version = "0.6.13" @@ -1337,12 +1322,7 @@ version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", - "windows-targets 0.52.5", ] [[package]] @@ -3123,29 +3103,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -4369,9 +4326,9 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "typeshare", "url", "validator", + "wasm-bindgen-utils", ] [[package]] @@ -4908,7 +4865,7 @@ checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals", + "serde_derive_internals 0.26.0", "syn 1.0.109", ] @@ -5025,6 +4982,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_bytes" version = "0.11.14" @@ -5066,6 +5034,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "serde_json" version = "1.0.116" @@ -5836,6 +5815,30 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tsify-next" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8bf7232b89b86f63b5f0ef22c64960f9cf4fb52c6698f1e7f60de93bc3292f" +dependencies = [ + "serde", + "serde-wasm-bindgen", + "tsify-next-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-next-macros" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2d85ebe93eedca20d3fe6d65814c856467a649674aa7763ebd42e3bb815fec" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals 0.29.1", + "syn 2.0.60", +] + [[package]] name = "tungstenite" version = "0.20.1" @@ -5862,26 +5865,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "typeshare" -version = "1.0.1" -source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c" -dependencies = [ - "chrono", - "serde", - "serde_json", - "typeshare-annotation", -] - -[[package]] -name = "typeshare-annotation" -version = "1.0.2" -source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "ucd-trie" version = "0.1.6" @@ -6101,23 +6084,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.60", @@ -6138,9 +6122,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6148,9 +6132,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -6161,9 +6145,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-bindgen-utils" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aecd97a6b3b5a0a1119c10896a92c0211136dab9ee0a86094aa2997d1064a8eb" +dependencies = [ + "js-sys", + "paste", + "serde", + "serde-wasm-bindgen", + "tsify-next", + "wasm-bindgen", + "wasm-bindgen-futures", +] [[package]] name = "web-sys" @@ -6212,15 +6214,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.5", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index 930af775..f4fd9c62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ url = "2.5.0" serde_json = "1.0.108" async-trait = "0.1.77" rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "0106e645ebd49334addc698c5aad9a85370eb54d" } -typeshare = { git = "https://github.com/tomjw64/typeshare", rev = "556b44aafd5304eedf17206800f69834e3820b7c" } [workspace.dependencies.rain-metadata-bindings] path = "crates/bindings" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index d5ff8eee..57b3b24a 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -36,7 +36,6 @@ thiserror = { workspace = true } alloy-ethers-typecast = { workspace = true } url = { workspace = true } rain-erc = { workspace = true } -typeshare = { workspace = true } # json-schema schemars = { version = "0.8.12", optional = true } @@ -47,6 +46,9 @@ tracing-subscriber = { version = "0.3.17", optional = true } clap = { version = "4.4.8", features = ["cargo", "derive"], optional = true } tokio = { version = "1.34.0", features = ["sync", "macros", "io-util", "rt", "time"], optional = true } +[target.'cfg(target_family = "wasm")'.dependencies] +wasm-bindgen-utils = "0.0" + [dev-dependencies] httpmock = "0.7.0" diff --git a/crates/cli/src/meta/types/authoring/v2.rs b/crates/cli/src/meta/types/authoring/v2.rs index 283c56e3..6ee8fb7b 100644 --- a/crates/cli/src/meta/types/authoring/v2.rs +++ b/crates/cli/src/meta/types/authoring/v2.rs @@ -12,20 +12,25 @@ use crate::meta::{KnownMagic, RainMetaDocumentV1Item}; use rain_metadata_bindings::IDescribedByMetaV1; use thiserror::Error; use super::super::super::implements_i_described_by_meta_v1; -use typeshare::typeshare; +#[cfg(target_family = "wasm")] +use wasm_bindgen_utils::{prelude::*, impl_wasm_traits}; -#[typeshare] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] +#[cfg_attr(target_family = "wasm", derive(Tsify))] pub struct AuthoringMetaV2Word { pub word: String, pub description: String, } +#[cfg(target_family = "wasm")] +impl_wasm_traits!(AuthoringMetaV2Word); -#[typeshare] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] +#[cfg_attr(target_family = "wasm", derive(Tsify))] pub struct AuthoringMetaV2 { pub words: Vec, } +#[cfg(target_family = "wasm")] +impl_wasm_traits!(AuthoringMetaV2); sol!( struct AuthoringMetaV2Sol { From 50d5f9504dd5c2f9bc638b2a76ce6ea500548022 Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Wed, 12 Feb 2025 02:07:13 +0000 Subject: [PATCH 2/6] Update Cargo.lock --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c19f1b65..9ef17f09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6154,9 +6154,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-utils" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecd97a6b3b5a0a1119c10896a92c0211136dab9ee0a86094aa2997d1064a8eb" +checksum = "8e8c58755f5caede0eb15a234026993f4543b2d86a5dbf51050311bc7ed4162d" dependencies = [ "js-sys", "paste", From a6c290e3d6b409ed8bbf0bba066ec662e4c0c87a Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Wed, 12 Feb 2025 22:58:27 +0000 Subject: [PATCH 3/6] Update Cargo.lock --- Cargo.lock | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ef17f09..6c3623b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4982,6 +4982,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde-wasm-bindgen" version = "0.6.5" @@ -5036,9 +5047,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.29.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", @@ -5816,26 +5827,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "tsify-next" -version = "0.5.5" +name = "tsify" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8bf7232b89b86f63b5f0ef22c64960f9cf4fb52c6698f1e7f60de93bc3292f" +checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ "serde", - "serde-wasm-bindgen", - "tsify-next-macros", + "serde-wasm-bindgen 0.5.0", + "tsify-macros", "wasm-bindgen", ] [[package]] -name = "tsify-next-macros" -version = "0.5.5" +name = "tsify-macros" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2d85ebe93eedca20d3fe6d65814c856467a649674aa7763ebd42e3bb815fec" +checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals 0.29.1", + "serde_derive_internals 0.28.0", "syn 2.0.60", ] @@ -6154,15 +6165,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-utils" -version = "0.0.3" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8c58755f5caede0eb15a234026993f4543b2d86a5dbf51050311bc7ed4162d" +checksum = "237e6e4559e81c2fc316b9b598db1dd706fd035556b227949d055e19f60cc947" dependencies = [ "js-sys", "paste", "serde", - "serde-wasm-bindgen", - "tsify-next", + "serde-wasm-bindgen 0.6.5", + "tsify", "wasm-bindgen", "wasm-bindgen-futures", ] From daad8b4f988aa465e2ff2fa1a2e6a16e3eaff883 Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Thu, 13 Feb 2025 21:41:50 +0000 Subject: [PATCH 4/6] Update flake.lock --- flake.lock | 67 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 9bbe3616..d8e55c58 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -75,16 +75,15 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722676286, - "narHash": "sha256-wEDJdvwRZF2ErQ33nQ0Lqn/48XrPbaadv56/bM2MSZU=", + "lastModified": 1737537011, + "narHash": "sha256-yuwV18EzMxc374K76SC7bV+Llbt2Yc+yRpbVKr2kPM0=", "owner": "shazow", "repo": "foundry.nix", - "rev": "d84c83b1c1722c8742b3d2d84c9386814d75384e", + "rev": "d536ce6c6911de5ded748e237f8e0849783fcc3f", "type": "github" }, "original": { "owner": "shazow", - "ref": "monthly", "repo": "foundry.nix", "type": "github" } @@ -105,11 +104,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723043047, - "narHash": "sha256-s6LBVajxwWulSiFYRmxfGFHTlyiy1+lHGbW0nCOTPRk=", + "lastModified": 1737568451, + "narHash": "sha256-WwrgAkD4oseuPe9zEDto1D1o3nQ+R7vlwWBrUQDu9ds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e8f8f13e64d2795384ed17679bf193987a1f731", + "rev": "7081410b9ace94e412bd02e0d9d2f328fde46b1b", "type": "github" }, "original": { @@ -120,11 +119,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "lastModified": 1736320768, + "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", "type": "github" }, "original": { @@ -136,11 +135,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -159,11 +158,11 @@ "solc": "solc" }, "locked": { - "lastModified": 1728997542, - "narHash": "sha256-D/CtiI2B1GoAkhGc0Bxq0XPZItWSgBhTPlW//kW4Kqw=", + "lastModified": 1737918303, + "narHash": "sha256-GmCajHkqmDWlVOQa8gc5H2aG5NfV7LDbkviILIXkvk8=", "owner": "rainprotocol", "repo": "rainix", - "rev": "b2722bcc1856af6c925128962ff24fda1bbc2c82", + "rev": "92f143a7b67d77a1d829b5943d4921677214eb5d", "type": "github" }, "original": { @@ -183,11 +182,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1722997267, - "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", + "lastModified": 1737512878, + "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", + "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", "type": "github" }, "original": { @@ -203,11 +202,11 @@ "solc-macos-amd64-list-json": "solc-macos-amd64-list-json" }, "locked": { - "lastModified": 1717442267, - "narHash": "sha256-6TnQvA6Q/xC3r1M+wGC5gnDc/5XfOPjC8X6LlGDWDNc=", + "lastModified": 1731758759, + "narHash": "sha256-NX4+V6Q8bwopah0oza/Dpf6UsYNGbokW2kE9qT3wdHY=", "owner": "hellwolf", "repo": "solc.nix", - "rev": "2ac2862f224aa0d67cbc6b3246392489f8a50596", + "rev": "0714c24cd521b9eb3ee435818c5d743ac6179176", "type": "github" }, "original": { @@ -219,13 +218,13 @@ "solc-macos-amd64-list-json": { "flake": false, "locked": { - "narHash": "sha256-Prwz95BgMHcWd72VwVbcH17LsV9f24K2QMcUiWUQZzI=", + "narHash": "sha256-KBEEpcDeKtVvCeguRP0D499yg9O5Jef9Nxn3yfrmw9g=", "type": "file", - "url": "https://github.com/ethereum/solc-bin/raw/f743ca7/macosx-amd64/list.json" + "url": "https://github.com/ethereum/solc-bin/raw/67f45d8/macosx-amd64/list.json" }, "original": { "type": "file", - "url": "https://github.com/ethereum/solc-bin/raw/f743ca7/macosx-amd64/list.json" + "url": "https://github.com/ethereum/solc-bin/raw/67f45d8/macosx-amd64/list.json" } }, "systems": { From 9b640cbd1a286184755f97a47fe41448f91422c2 Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Tue, 18 Feb 2025 02:07:35 +0000 Subject: [PATCH 5/6] Update Cargo.lock --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c3623b5..d39876a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6165,9 +6165,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-utils" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237e6e4559e81c2fc316b9b598db1dd706fd035556b227949d055e19f60cc947" +checksum = "04293ba23e84c21b0d42179abedf35e6eb082bd6f06bce7a42a8dd8e0b2b589f" dependencies = [ "js-sys", "paste", From f6ef76904912cafa936e6d2a36e16e3449d37f07 Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Tue, 18 Feb 2025 03:54:55 +0000 Subject: [PATCH 6/6] update --- Cargo.lock | 26 +++++++++------------ flake.lock | 67 +++++++++++++++++++++++++++--------------------------- 2 files changed, 45 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d39876a3..f9db113a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6095,24 +6095,23 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", - "once_cell", - "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", + "once_cell", "proc-macro2", "quote", "syn 2.0.60", @@ -6133,9 +6132,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6143,9 +6142,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -6156,12 +6155,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-bindgen-utils" diff --git a/flake.lock b/flake.lock index d8e55c58..9bbe3616 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -75,15 +75,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737537011, - "narHash": "sha256-yuwV18EzMxc374K76SC7bV+Llbt2Yc+yRpbVKr2kPM0=", + "lastModified": 1722676286, + "narHash": "sha256-wEDJdvwRZF2ErQ33nQ0Lqn/48XrPbaadv56/bM2MSZU=", "owner": "shazow", "repo": "foundry.nix", - "rev": "d536ce6c6911de5ded748e237f8e0849783fcc3f", + "rev": "d84c83b1c1722c8742b3d2d84c9386814d75384e", "type": "github" }, "original": { "owner": "shazow", + "ref": "monthly", "repo": "foundry.nix", "type": "github" } @@ -104,11 +105,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737568451, - "narHash": "sha256-WwrgAkD4oseuPe9zEDto1D1o3nQ+R7vlwWBrUQDu9ds=", + "lastModified": 1723043047, + "narHash": "sha256-s6LBVajxwWulSiFYRmxfGFHTlyiy1+lHGbW0nCOTPRk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7081410b9ace94e412bd02e0d9d2f328fde46b1b", + "rev": "4e8f8f13e64d2795384ed17679bf193987a1f731", "type": "github" }, "original": { @@ -119,11 +120,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736320768, - "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "type": "github" }, "original": { @@ -135,11 +136,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731531548, - "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24f0d4acd634792badd6470134c387a3b039dace", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -158,11 +159,11 @@ "solc": "solc" }, "locked": { - "lastModified": 1737918303, - "narHash": "sha256-GmCajHkqmDWlVOQa8gc5H2aG5NfV7LDbkviILIXkvk8=", + "lastModified": 1728997542, + "narHash": "sha256-D/CtiI2B1GoAkhGc0Bxq0XPZItWSgBhTPlW//kW4Kqw=", "owner": "rainprotocol", "repo": "rainix", - "rev": "92f143a7b67d77a1d829b5943d4921677214eb5d", + "rev": "b2722bcc1856af6c925128962ff24fda1bbc2c82", "type": "github" }, "original": { @@ -182,11 +183,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1737512878, - "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { @@ -202,11 +203,11 @@ "solc-macos-amd64-list-json": "solc-macos-amd64-list-json" }, "locked": { - "lastModified": 1731758759, - "narHash": "sha256-NX4+V6Q8bwopah0oza/Dpf6UsYNGbokW2kE9qT3wdHY=", + "lastModified": 1717442267, + "narHash": "sha256-6TnQvA6Q/xC3r1M+wGC5gnDc/5XfOPjC8X6LlGDWDNc=", "owner": "hellwolf", "repo": "solc.nix", - "rev": "0714c24cd521b9eb3ee435818c5d743ac6179176", + "rev": "2ac2862f224aa0d67cbc6b3246392489f8a50596", "type": "github" }, "original": { @@ -218,13 +219,13 @@ "solc-macos-amd64-list-json": { "flake": false, "locked": { - "narHash": "sha256-KBEEpcDeKtVvCeguRP0D499yg9O5Jef9Nxn3yfrmw9g=", + "narHash": "sha256-Prwz95BgMHcWd72VwVbcH17LsV9f24K2QMcUiWUQZzI=", "type": "file", - "url": "https://github.com/ethereum/solc-bin/raw/67f45d8/macosx-amd64/list.json" + "url": "https://github.com/ethereum/solc-bin/raw/f743ca7/macosx-amd64/list.json" }, "original": { "type": "file", - "url": "https://github.com/ethereum/solc-bin/raw/67f45d8/macosx-amd64/list.json" + "url": "https://github.com/ethereum/solc-bin/raw/f743ca7/macosx-amd64/list.json" } }, "systems": {