From 84a757217aa872679539e2137cef95640f52f72a Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Wed, 1 May 2024 10:48:19 +0000 Subject: [PATCH] cargo: Update smoldot on latest git branch Signed-off-by: Alexandru Vasile --- Cargo.lock | 88 ++++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 4 +-- 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c387815394..9fc6503ae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -340,12 +340,12 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 5.0.0", + "event-listener 5.3.0", "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", @@ -547,6 +547,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -1522,9 +1528,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.0.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1547,7 +1553,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "event-listener 5.0.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -2370,7 +2376,7 @@ dependencies = [ "pin-project", "rustls-native-certs 0.7.0", "rustls-pki-types", - "soketto", + "soketto 0.7.1", "thiserror", "tokio", "tokio-rustls 0.25.0", @@ -2671,12 +2677,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - [[package]] name = "nodrop" version = "0.1.14" @@ -3580,13 +3580,12 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ruzstd" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" +checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" dependencies = [ "byteorder", "derive_more", - "twox-hash", ] [[package]] @@ -3970,6 +3969,17 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.9.9" @@ -4079,13 +4089,12 @@ dependencies = [ [[package]] name = "smoldot" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65332bfea88002d2b47f33e5f3ccd22a1c94967f8ada0c912be56865a02e5e57" +source = "git+https://github.com/smol-dot/smoldot.git#30760fd3e1cec8331877df8dec4dbb137c77b82b" dependencies = [ "arrayvec 0.7.4", "async-lock 3.3.0", "atomic-take", - "base64 0.21.7", + "base64 0.22.1", "bip39", "blake2-rfc", "bs58", @@ -4094,7 +4103,7 @@ dependencies = [ "derive_more", "ed25519-zebra 4.0.3", "either", - "event-listener 4.0.3", + "event-listener 5.3.0", "fnv", "futures-lite", "futures-util", @@ -4105,7 +4114,6 @@ dependencies = [ "libm", "libsecp256k1", "merlin", - "no-std-net", "nom", "num-bigint", "num-rational", @@ -4124,7 +4132,7 @@ dependencies = [ "siphasher", "slab", "smallvec", - "soketto", + "soketto 0.8.0", "twox-hash", "wasmi", "x25519-dalek", @@ -4134,16 +4142,16 @@ dependencies = [ [[package]] name = "smoldot-light" version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416a29c366a0e6d41bf81dc6c1e4851c60834eabea7e65d056c6becfdfd89977" +source = "git+https://github.com/smol-dot/smoldot.git#30760fd3e1cec8331877df8dec4dbb137c77b82b" dependencies = [ "async-channel", "async-lock 3.3.0", - "base64 0.21.7", + "base64 0.22.1", "blake2-rfc", + "bs58", "derive_more", "either", - "event-listener 4.0.3", + "event-listener 5.3.0", "fnv", "futures-channel", "futures-lite", @@ -4153,7 +4161,6 @@ dependencies = [ "itertools 0.12.1", "log", "lru", - "no-std-net", "parking_lot", "pin-project", "rand", @@ -4192,6 +4199,21 @@ dependencies = [ "sha-1", ] +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "httparse", + "log", + "rand", + "sha1", +] + [[package]] name = "sp-application-crypto" version = "33.0.0" @@ -5581,9 +5603,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasmi" -version = "0.32.0-beta.8" +version = "0.32.0-beta.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c72a5f9570c87a59db8f071bbc1338922c9b19a43128d01e1d0c77f65ff2b1" +checksum = "17bbbb60479dea0008e74b1b2dde8fbd2a724258b971782882b199cba627896e" dependencies = [ "arrayvec 0.7.4", "multi-stash", @@ -5604,9 +5626,9 @@ checksum = "0f686876d8f92a573a9a1e005b78ec1e893158bbdc3ac75a1270384ca86d6c6b" [[package]] name = "wasmi_core" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06223fd279f83ff4739554b9df82d9632bf5922acb7fc505990a0406837b5474" +checksum = "783d04e557f951438da2c96c42432fe56fcb10267c8163b493c145dffdebe4f6" dependencies = [ "downcast-rs", "libm", @@ -5626,9 +5648,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] diff --git a/Cargo.toml b/Cargo.toml index 701243ebd0..857e9c9b1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,8 +113,8 @@ which = "5.0.0" strip-ansi-escapes = "0.2.0" # Light client support: -smoldot = { version = "0.17.0", default-features = false } -smoldot-light = { version = "0.15.0", default-features = false } +smoldot = { git = "https://github.com/smol-dot/smoldot.git", default-features = false } +smoldot-light = { git = "https://github.com/smol-dot/smoldot.git", default-features = false } tokio-stream = "0.1.15"