Update msrv deps #959

benalleng · 2025-08-15T20:30:26Z

I took the liberty to update the versions on many of the dependencies that don't necessarily need to be updated based solely on our new msrv.

Every existing dep should now be on an msrv of 1.85.0. Our ohttp-relay is now using the new v0.0.11 release with these changes as well.

There were a few api changes that were made in the source but most of those changes are minor and can be seen in separate commits

coveralls · 2025-08-15T21:58:19Z

Pull Request Test Coverage Report for Build 17276399990

Details

17 of 17 (100.0%) changed or added relevant lines in 4 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.007%) to 85.724%

Totals
Change from base Build 17275991760:	0.007%
Covered Lines:	7974
Relevant Lines:	9302

💛 - Coveralls

spacebear21 · 2025-08-17T09:33:05Z

We will also want to update the README to remove the pinned deps instructions.

DanGould · 2025-08-18T17:21:48Z

Check out Cargo's version requirement syntax.

X.Y.Z specified in Cargo.toml only holds X.Y true and the lock only locks X.Y.Z. This Is why for most dependencies I think we want to specify X.Y.Z in Cargo.toml and perhaps X.Y. if we absolutely must. This is what inspired my comment above to prefer complete specification if possible. That lets dependencies that combine choose a higher but compatible version.

benalleng · 2025-08-19T18:02:15Z

I have currently pointed ohttp-relay to my own draft branch https://github.com/benalleng/rust-payjoin/blob/386a20591209d1d67f57da2981d01baa80cd287c/payjoin-test-utils/Cargo.toml#L18 but hopefully we can get this PR merged and then continue to move everything forward

spacebear21 · 2025-08-19T18:39:44Z

.github/workflows/python.yml

+      - name: "Install Rust 1.85.0"
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.78.0
+          toolchain: 1.85.0


I realized from working on #876 that this action is obsolete and doesn't have the desired effect of using the specified toolchain (logs indicate it's always using nightly). We should use:

- name: "Install Rust 1.85.0" uses: dtolnay/[email protected]

Actually #986 was the issue. But I still prefer using the actively maintained rust action.

benalleng · 2025-08-26T00:46:23Z

@DanGould would you like this PR to similarly split into seperate commits like in the ohttp relay payjoin/ohttp-relay#66?

DanGould · 2025-08-26T01:52:18Z

It doesn't need to be incredibly granular but it would be nice if the source code changes could be associated with specific commits for just the relevant dependency upgrades

benalleng · 2025-08-26T16:29:05Z

Note that we are now pointing directly to the main branch on ohttp-relay instead of a release candidate

DanGould · 2025-08-26T16:31:06Z

I can cut an ohttp-relay release

This updates the dependencies of payjoin-cli to match the msrv of payjoin bumped to 1.85.0. This commit does not update any dependencies that create any notable new features or api changes that require changes in the source code.

DanGould

I'll approve this because it's not a regression, but one status code handler was changed from a wrong implementation to another wrong implementation that I'd like to see addressed in an immediate follow up. I noticed that the defined anyhow version also varied. Seems OK to me.

ACK 083620d

DanGould · 2025-08-27T17:36:59Z

payjoin-directory/Cargo.toml

 [dependencies]
-anyhow = "1.0.71"
-bitcoin = { version = "0.32.4", features = ["base64", "rand-std"] }
+anyhow = "1.0.89"


payjoin-cli was updated to anyhow 1.0.99. In general I usually update workspace dependencies in tandem (rather than by crate) so that they don't get out of sync and require multiple versions in Cargo.lock.

This is a mistake in that commit! i will change it

DanGould · 2025-08-27T17:42:58Z

payjoin-directory/src/db.rs


    async fn push(&self, mailbox_id: &ShortId, channel_type: &str, data: Vec<u8>) -> Result<()> {
-        let mut conn = self.client.get_async_connection().await?;
+        let mut conn = self.client.get_multiplexed_async_connection().await?;


Where'd you find this equivalence? https://docs.rs/redis/latest/redis/#connection-pooling?

Would be nice to have this kind of change documented in the commit log.

DanGould · 2025-08-27T17:52:39Z

payjoin/src/core/ohttp.rs

+        .status(
+            m.control()
+                .status()
+                .map(|code| {
+                    http::StatusCode::from_u16(code.code()).map_err(|_| bhttp::Error::InvalidStatus)
+                })
+                .unwrap_or(Ok(http::StatusCode::INTERNAL_SERVER_ERROR))?,
+        )


I fear the original code is kind of jank, AND the updated code is jank.

The original is jank because it defaults to INTERNAL_SERVER_ERROR instead of throwing an error in this function when things go wrong. The updated code is jank because it keeps this but also maps to an error variant (InvalidStatus) that is never propagated. I think something like the following is more appropriate, where any problems become an InvalidStatus that actually gets returned as a Result.

Suggested change

.status(

m.control()

.status()

.map(|code| {

http::StatusCode::from_u16(code.code()).map_err(|_| bhttp::Error::InvalidStatus)

})

.unwrap_or(Ok(http::StatusCode::INTERNAL_SERVER_ERROR))?,

)

.status({

let code = m.control().status().ok_or(bhttp::Error::InvalidStatus)?;

http::StatusCode::from_u16(code.code()).map_err(|_| bhttp::Error::InvalidStatus)?

})

This commit updates the payjoin directory deps that do not imact any source code changes or significant feature changes.

The bhttp dependency now no longer needs to be pinned to o.5.1 as we are bumping our msrv to 1.85.0.

this update bumps the redis dependency to 1.85.0 and changes some db source with the updated api changes. The `get_async_connection()` method for redis Client was deprecated in v0.25.2 and removed in v0.30.0 the method `get_multiplexed_async_connetion()` is the suggested replacement.

This bumps the dependencies in payjoin ffi to match the overall payjoin msrv of 1.85.0

This commit updates the dependencies in payjoin-test-utils to match the msrv of 1.85.0 that does not change any features or any significant api changes.

this commit updates the dependencies in payjoin to match the new 1.85.0 msrv that don't make any significant api changes or feature changes.

With the new msrv of 1.85.0 we no longer need to lock the version of bhttp and can now use standard semver for this dependency. We do need some minor modifications in the source as the api has changed.

This commit updates the tls related dependencies to mathc the new payjoin msrv to 1.85.0> All these crates have these changes together as the crates are all interdependent on each other. As well there are some significant api changes that come with these new dep bumps. payjoin-cli and payjoin-directory both use tokio-rustls which has an internal rustls module accesible so I removed their direct rustls deps in hopes that it could prevent some divergent changes in the future.

benalleng · 2025-08-27T19:16:18Z

Ok, the anyhow error was a mistake I made when splitting these commits up but is now fixed, as well I added a description for the deprecation of get_async_connection for redis::Client in 5c44c02

DanGould

Legend

ACK 7eaa50e

benalleng force-pushed the msrv-pinned-deps branch 2 times, most recently from d6e2242 to 0ac5e73 Compare August 15, 2025 21:54

benalleng force-pushed the msrv-pinned-deps branch 2 times, most recently from 09c02d2 to 60d96d8 Compare August 18, 2025 17:18

benalleng force-pushed the msrv-pinned-deps branch 3 times, most recently from 0cb6dc8 to 386a205 Compare August 19, 2025 17:43

benalleng force-pushed the msrv-pinned-deps branch from 386a205 to 468401f Compare August 19, 2025 18:16

spacebear21 reviewed Aug 19, 2025

View reviewed changes

benalleng force-pushed the msrv-pinned-deps branch 3 times, most recently from 75a9b28 to 6e49fdb Compare August 21, 2025 20:55

benalleng added the blocked label Aug 21, 2025

benalleng force-pushed the msrv-pinned-deps branch from 6e49fdb to a7420a6 Compare August 26, 2025 00:37

benalleng force-pushed the msrv-pinned-deps branch 2 times, most recently from 36339d2 to 07d9799 Compare August 26, 2025 16:10

benalleng changed the title ~~[WIP] update msrv deps~~ Update msrv deps Aug 26, 2025

benalleng marked this pull request as ready for review August 26, 2025 16:11

benalleng removed the blocked label Aug 26, 2025

benalleng requested review from DanGould and spacebear21 August 26, 2025 16:23

DanGould mentioned this pull request Aug 26, 2025

Bump ohttp-relay to v0.0.11 payjoin/ohttp-relay#68

Merged

benalleng force-pushed the msrv-pinned-deps branch 3 times, most recently from 657190b to f5dfe48 Compare August 26, 2025 18:05

benalleng added 2 commits August 27, 2025 09:41

clear readme of pinned dep instructions

83beac3

Update payjoin cli misc dependencies

c952dac

This updates the dependencies of payjoin-cli to match the msrv of payjoin bumped to 1.85.0. This commit does not update any dependencies that create any notable new features or api changes that require changes in the source code.

benalleng force-pushed the msrv-pinned-deps branch from f5dfe48 to 083620d Compare August 27, 2025 13:52

DanGould approved these changes Aug 27, 2025

View reviewed changes

benalleng added 2 commits August 27, 2025 14:50

Update payjoin-directory misc dependencies to match msrv

d96385f

This commit updates the payjoin directory deps that do not imact any source code changes or significant feature changes.

Update bhttp dependency in payjoin-directory to match new msrv

5c729a6

The bhttp dependency now no longer needs to be pinned to o.5.1 as we are bumping our msrv to 1.85.0.

benalleng force-pushed the msrv-pinned-deps branch 2 times, most recently from 794dff7 to 9ef3280 Compare August 27, 2025 18:54

benalleng added 6 commits August 27, 2025 15:11

Bump dependencies in payjoin-ffi to match msrv

91cf38b

This bumps the dependencies in payjoin ffi to match the overall payjoin msrv of 1.85.0

Update misc dependencies in payjoin-test-utils to match msrv

98d22cd

This commit updates the dependencies in payjoin-test-utils to match the msrv of 1.85.0 that does not change any features or any significant api changes.

Update misc dependencies in main payjoin crate to match new msrv

4543e5e

this commit updates the dependencies in payjoin to match the new 1.85.0 msrv that don't make any significant api changes or feature changes.

Update bhttp dependency in payjoin crate to match msrv

f51cad1

With the new msrv of 1.85.0 we no longer need to lock the version of bhttp and can now use standard semver for this dependency. We do need some minor modifications in the source as the api has changed.

benalleng force-pushed the msrv-pinned-deps branch from 9ef3280 to 7eaa50e Compare August 27, 2025 19:14

benalleng requested a review from DanGould August 27, 2025 19:16

DanGould approved these changes Aug 28, 2025

View reviewed changes

DanGould merged commit f8fd372 into payjoin:master Aug 28, 2025
14 checks passed

Update msrv deps #959

Update msrv deps #959

Uh oh!

Conversation

benalleng commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coveralls commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 17276399990

Details

💛 - Coveralls

Uh oh!

spacebear21 commented Aug 17, 2025

Uh oh!

DanGould commented Aug 18, 2025

Uh oh!

benalleng commented Aug 19, 2025

Uh oh!

spacebear21 Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

spacebear21 Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

benalleng commented Aug 26, 2025

Uh oh!

DanGould commented Aug 26, 2025

Uh oh!

benalleng commented Aug 26, 2025

Uh oh!

DanGould commented Aug 26, 2025

Uh oh!

DanGould left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DanGould Aug 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

benalleng Aug 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DanGould Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

DanGould Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

benalleng commented Aug 27, 2025

Uh oh!

DanGould left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

benalleng commented Aug 15, 2025 •

edited

Loading

coveralls commented Aug 15, 2025 •

edited

Loading

DanGould left a comment •

edited

Loading

DanGould Aug 27, 2025 •

edited

Loading

benalleng Aug 27, 2025 •

edited

Loading