From 0621124a87f93923c20500ff5453c95e38fb7e32 Mon Sep 17 00:00:00 2001
From: Toralf Wittner <tw@dtex.org>
Date: Wed, 9 Sep 2020 11:38:05 +0200
Subject: [PATCH] yamux-0.5.0 upgrade (#1733)

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
---
 CHANGELOG.md              |  3 +++
 muxers/yamux/CHANGELOG.md | 16 ++++++++++++++++
 muxers/yamux/Cargo.toml   |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a4270f..8cbcedb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@
 
 # Version 0.25.0 [unreleased]
 
+- Update `libp2p-yamux` to `0.22.0`. *This version starts a multi-release
+  upgrade process.* See the `libp2p-yamux` CHANGELOG for details.
+
 - Bump `libp2p-noise` to `0.24`. See the `libp2p-noise`
 changelog for details about the `LegacyConfig`.
 
diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md
index a3f8ed3d..bc574010 100644
--- a/muxers/yamux/CHANGELOG.md
+++ b/muxers/yamux/CHANGELOG.md
@@ -1,7 +1,23 @@
 # 0.22.0 [unreleased]
 
+- Update to `yamux-0.5.0`. *This is the start of a multi-release transition* to a
+  different behaviour w.r.t. the initial window update frame. Tracked in [[1]],
+  this will change the initial window update to mean "in addition to the default
+  receive window" rather than "the total receive window". This version recognises
+  a temporary flag, that will cause the new meaning. The next version `0.23.0`
+  will also set the flag. Version `0.24.0` will still set the flag but will always
+  implement the new meaning, and (finally) version `0.25.0` will no longer set the
+  flag and always use the additive semantics. If current code uses the default
+  Yamux configuration, all upgrades need to be performed in order because each
+  version is only compatible with its immediate predecessor. Alternatively, if the
+  default configuration is deployed with `lazy_open` set to `true`, one can
+  directly upgrade from version `0.21.0` to `0.25.0` without any intermediate
+  upgrades.
+
 - Bump `libp2p-core` dependency.
 
+[1]: https://github.com/paritytech/yamux/issues/92
+
 # 0.21.0 [2020-08-18]
 
 - Bump `libp2p-core` dependency.
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index b24c5bba..63979ff6 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -12,6 +12,6 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 futures = "0.3.1"
 libp2p-core = { version = "0.22.0", path = "../../core" }
-parking_lot = "0.10"
+parking_lot = "0.11"
 thiserror = "1.0"
-yamux = "0.4.5"
+yamux = "0.5.0"