diff --git a/wasm_bindings/Cargo.lock b/wasm_bindings/Cargo.lock index 3cce567..e977c3d 100644 --- a/wasm_bindings/Cargo.lock +++ b/wasm_bindings/Cargo.lock @@ -68,9 +68,21 @@ dependencies = [ [[package]] name = "anyhow" +<<<<<<< HEAD version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +======= +<<<<<<< HEAD +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +======= +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +>>>>>>> main +>>>>>>> main [[package]] name = "autocfg" @@ -161,7 +173,15 @@ dependencies = [ "heck", "proc-macro2", "quote", +<<<<<<< HEAD "syn 2.0.92", +======= +<<<<<<< HEAD + "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -236,7 +256,15 @@ dependencies = [ "proc-macro2", "quote", "strsim", +<<<<<<< HEAD + "syn 2.0.92", +======= +<<<<<<< HEAD "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -247,7 +275,15 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", +<<<<<<< HEAD + "syn 2.0.92", +======= +<<<<<<< HEAD "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -474,9 +510,21 @@ dependencies = [ [[package]] name = "quote" +<<<<<<< HEAD version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +======= +<<<<<<< HEAD +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +======= +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +>>>>>>> main +>>>>>>> main dependencies = [ "proc-macro2", ] @@ -528,15 +576,31 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" +<<<<<<< HEAD version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +======= +<<<<<<< HEAD +version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +======= +version = "1.0.216" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +>>>>>>> main +>>>>>>> main dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" +<<<<<<< HEAD +version = "1.0.217" +======= +<<<<<<< HEAD version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" @@ -544,13 +608,39 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.92", +======= +version = "1.0.216" +>>>>>>> main +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", +<<<<<<< HEAD + "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] name = "serde_json" +<<<<<<< HEAD +version = "1.0.134" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +======= +<<<<<<< HEAD version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +======= +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +>>>>>>> main +>>>>>>> main dependencies = [ "itoa", "memchr", @@ -586,6 +676,10 @@ dependencies = [ [[package]] name = "serde_with" +<<<<<<< HEAD +version = "3.12.0" +======= +<<<<<<< HEAD version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" @@ -593,6 +687,20 @@ dependencies = [ "serde", "serde_derive", "serde_with_macros 3.12.0", +======= +version = "3.11.0" +>>>>>>> main +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +dependencies = [ + "serde", + "serde_derive", +<<<<<<< HEAD + "serde_with_macros 3.12.0", +======= + "serde_with_macros 3.11.0", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -604,19 +712,47 @@ dependencies = [ "darling", "proc-macro2", "quote", +<<<<<<< HEAD + "syn 2.0.92", +======= +<<<<<<< HEAD "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] name = "serde_with_macros" +<<<<<<< HEAD +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +======= +<<<<<<< HEAD version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +======= +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +>>>>>>> main +>>>>>>> main dependencies = [ "darling", "proc-macro2", "quote", +<<<<<<< HEAD "syn 2.0.92", +======= +<<<<<<< HEAD + "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -732,7 +868,15 @@ version = "0.1.3" dependencies = [ "num-bigint", "serde", +<<<<<<< HEAD + "serde_with 3.12.0", +======= +<<<<<<< HEAD "serde_with 3.12.0", +======= + "serde_with 3.11.0", +>>>>>>> main +>>>>>>> main "starknet-core", "starknet-crypto", "starknet-types-core", @@ -749,7 +893,15 @@ dependencies = [ "blake2", "num-bigint", "serde", +<<<<<<< HEAD + "serde_with 3.12.0", +======= +<<<<<<< HEAD "serde_with 3.12.0", +======= + "serde_with 3.11.0", +>>>>>>> main +>>>>>>> main "sha3", "starknet-core", "starknet-crypto", @@ -765,7 +917,15 @@ version = "0.1.3" dependencies = [ "num-bigint", "serde", +<<<<<<< HEAD "serde_with 3.12.0", +======= +<<<<<<< HEAD + "serde_with 3.12.0", +======= + "serde_with 3.11.0", +>>>>>>> main +>>>>>>> main "sha3", "starknet-core", "starknet-crypto", @@ -809,7 +969,15 @@ name = "swiftness_stark" version = "0.1.3" dependencies = [ "serde", +<<<<<<< HEAD + "serde_with 3.12.0", +======= +<<<<<<< HEAD "serde_with 3.12.0", +======= + "serde_with 3.11.0", +>>>>>>> main +>>>>>>> main "starknet-core", "starknet-crypto", "swiftness_air", @@ -854,9 +1022,21 @@ dependencies = [ [[package]] name = "syn" +<<<<<<< HEAD +version = "2.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126" +======= +<<<<<<< HEAD version = "2.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126" +======= +version = "2.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +>>>>>>> main +>>>>>>> main dependencies = [ "proc-macro2", "quote", @@ -880,7 +1060,15 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", +<<<<<<< HEAD "syn 2.0.92", +======= +<<<<<<< HEAD + "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main ] [[package]] @@ -973,7 +1161,15 @@ dependencies = [ "log", "proc-macro2", "quote", +<<<<<<< HEAD + "syn 2.0.92", +======= +<<<<<<< HEAD "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main "wasm-bindgen-shared", ] @@ -995,7 +1191,15 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", +<<<<<<< HEAD + "syn 2.0.92", +======= +<<<<<<< HEAD "syn 2.0.92", +======= + "syn 2.0.90", +>>>>>>> main +>>>>>>> main "wasm-bindgen-backend", "wasm-bindgen-shared", ]