From 7c9d54064d0f1e9cbde12eca626b708c499afa07 Mon Sep 17 00:00:00 2001
From: DanGould <d@ngould.dev>
Date: Thu, 27 Jun 2024 13:58:29 -0400
Subject: [PATCH] Bump payjoin version to 0.18.0

---
 Cargo.lock             |  4 ++--
 payjoin-cli/Cargo.toml |  2 +-
 payjoin/CHANGELOG.md   | 17 +++++++++++++++++
 payjoin/Cargo.toml     |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index edc4a828..7ea5296e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1177,7 +1177,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -1681,7 +1681,7 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
 [[package]]
 name = "payjoin"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "bhttp",
  "bip21",
diff --git a/payjoin-cli/Cargo.toml b/payjoin-cli/Cargo.toml
index 3d500d84..65e4daa0 100644
--- a/payjoin-cli/Cargo.toml
+++ b/payjoin-cli/Cargo.toml
@@ -33,7 +33,7 @@ env_logger = "0.9.0"
 hyper = { version = "0.14", features = ["full"] }
 hyper-rustls = { version = "0.25", optional = true }
 log = "0.4.7"
-payjoin = { version = "0.17.0", features = ["send", "receive", "base64"] }
+payjoin = { version = "0.18.0", features = ["send", "receive", "base64"] }
 rcgen = { version = "0.11.1", optional = true }
 reqwest = { version = "0.12", default-features = false }
 rustls = { version = "0.22.2", optional = true }
diff --git a/payjoin/CHANGELOG.md b/payjoin/CHANGELOG.md
index 334b03da..330d0769 100644
--- a/payjoin/CHANGELOG.md
+++ b/payjoin/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Payjoin Changelog
 
+## 0.18.0
+
+- Handle OHTTP encapsulated response status ([#284](https://github.com/payjoin/rust-payjoin/pull/284))
+- Upgrade `receive::v2` Typestate machine to resume multiple payjoins simultaneously ([#283](https://github.com/payjoin/rust-payjoin/pull/283))
+    - `Enroller` became `SessionInitializer`
+    - `Enrolled` became `ActiveSession`
+        - `fallback_target()` became `pj_url()`
+        - `pj_url_builder()` was introduced
+    - `ContextV2` became `SessionContext`
+        - Include a bitcoin address in `SessionContext`
+- `send::ResponseError` variants fields got explicit names ([#304](https://github.com/payjoin/rust-payjoin/pull/304))
+- Refactor output substitution with new fallable `try_substitute_outputs` ([#277](https://github.com/payjoin/rust-payjoin/pull/277))
+
+### Contributors:
+
+@DanGould, @grizznaut, @jbesraa, @thebrandonlucas
+
 ## 0.17.0
 
 - Prepare Payjoin PSBT with no output keypaths ([#270](https://github.com/payjoin/rust-payjoin/pull/270))
diff --git a/payjoin/Cargo.toml b/payjoin/Cargo.toml
index ac473000..95430b17 100644
--- a/payjoin/Cargo.toml
+++ b/payjoin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "payjoin"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Dan Gould <d@ngould.dev>"]
 description = "Payjoin Library for the BIP78 Pay to Endpoint protocol."
 repository = "https://github.com/payjoin/rust-payjoin"