Merge branch 'master' into gossipsub-wasm-compatibility

libp2p · May 22, 2023 · f8990b3 · f8990b3
2 parents f11f9e4 + a7be3c0
commit f8990b3
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 47 deletions.
diff --git a/.github/workflows/cache-factory.yml b/.github/workflows/cache-factory.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           shared-key: stable-cache
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           shared-key: stable-cache
           save-if: false
@@ -107,7 +107,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           key: ${{ matrix.target }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -132,7 +132,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -153,7 +153,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           key: ${{ matrix.features }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -170,7 +170,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -196,7 +196,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -213,7 +213,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -229,7 +229,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 #v1.3.0
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
         with:
           shared-key: stable-cache
           save-if: false
@@ -295,7 +295,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
 
       - run: cargo install --version 0.10.0 pb-rs --locked
 
@@ -321,5 +321,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: Swatinem/rust-cache@060bda31e0be4f453bb6ed2d7e5427b31734ad01 # v2.3.0
+      - uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
       - run: cargo metadata --locked --format-version=1 > /dev/null
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 env_logger = "0.10.0"
 futures = "0.3.28"
 libp2p = { path = "../../libp2p", features = ["async-std", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 license = "MIT"
 
 [dependencies]
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 env_logger = "0.10.0"
 futures = "0.3.28"
 futures-timer = "3.0"

diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 either = "1.8"
 env_logger = "0.10"
 futures = "0.3.28"

diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 license = "MIT"
 
 [dependencies]
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 env_logger = "0.10.0"

diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["network-programming", "asynchronous"]
 publish = false
 
 [dependencies]
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"

diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -27,7 +27,7 @@ void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 env_logger = "0.10.0"
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }

diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-io  = { version = "1.13.0", optional = true }
-data-encoding = "2.3.2"
+data-encoding = "2.4.0"
 futures = "0.3.28"
 if-watch = "3.0.1"
 libp2p-core = { workspace = true }

diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 anyhow = "1"
 async-std = { version = "1.9.0", features = ["attributes"] }
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.3.0", features = ["derive"] }
 env_logger = "0.10.0"
 futures = "0.3.28"
 instant = "0.1.11"

diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4"
 rand = "0.8"
 smallvec = "1.6.1"
 void = "1"
-wasm-bindgen-futures = { version = "0.4.35", optional = true }
+wasm-bindgen-futures = { version = "0.4.36", optional = true }
 getrandom = { version = "0.2.9", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 once_cell = "1.17.1"
 multistream-select = { workspace = true }

diff --git a/transports/wasm-ext/Cargo.toml b/transports/wasm-ext/Cargo.toml
@@ -12,11 +12,11 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = "0.3.28"
-js-sys = "0.3.62"
+js-sys = "0.3.63"
 libp2p-core = { workspace = true }
 parity-send-wrapper = "0.1.0"
 wasm-bindgen = "0.2.86"
-wasm-bindgen-futures = "0.4.35"
+wasm-bindgen-futures = "0.4.36"
 
 [features]
 websocket = []