From f999b19684ad7e72399eccaaac73b2bbeb0be63c Mon Sep 17 00:00:00 2001 From: DanGould Date: Tue, 28 Nov 2023 13:43:17 -0500 Subject: [PATCH] Test payjoin-cli 1.63.0 msrv --- .github/workflows/rust.yml | 17 +++-- README.md | 18 ++--- payjoin-cli/Cargo.lock | 133 ++++++++----------------------------- 3 files changed, 46 insertions(+), 122 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 462d0f9b..256576ad 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -28,13 +28,6 @@ jobs: if: matrix.rust == '1.63.0' run: | cargo update - cargo update -p log --precise 0.4.18 - cargo update -p tempfile --precise 3.6.0 - cargo update -p flate2 --precise 1.0.26 - cargo update -p minreq --precise 2.8.0 - cargo update -p rustls --precise 0.20.8 - cargo update -p webpki --precise 0.22.2 - cargo update -p byteorder --precise 1.4.3 cargo update -p regex --precise 1.9.6 - name: test run: cargo test --verbose --all-features --lib @@ -47,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [stable, nightly] + rust: [1.63.0, stable, nightly] steps: - uses: actions/checkout@v2 @@ -56,9 +49,15 @@ jobs: with: toolchain: ${{ matrix.rust }} override: true + - name: Fixes for MSRV + if: matrix.rust == '1.63.0' + run: | + cargo update + cargo update -p regex --precise 1.9.6 + cargo update -p time@0.3.30 --precise 0.3.20 - name: build payjoin cli example run: | - cargo test --verbose --features=local-https + cargo test --verbose --features=danger-local-https fmt: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 143adaf7..4c00bc87 100644 --- a/README.md +++ b/README.md @@ -72,22 +72,22 @@ Seeking review of the code that verifies there is no overpayment. Contributions ## Minimum Supported Rust Version (MSRV) -The `payjoin` library should always compile with any combination of features on Rust **1.63.0**. +The `payjoin` library and `payjoin-cli` should always compile with any combination of features on Rust **1.63.0**. To build and test with the MSRV you will need to pin the below dependency versions: +### `payjoin` + ```shell -cargo update -p log --precise 0.4.18 -cargo update -p tempfile --precise 3.6.0 -cargo update -p flate2 --precise 1.0.26 -cargo update -p minreq --precise 2.8.0 -cargo update -p rustls --precise 0.20.8 -cargo update -p webpki --precise 0.22.2 -cargo update -p byteorder --precise 1.4.3 cargo update -p regex --precise 1.9.6 ``` -The `payjoin-cli` should compile with Rust **stable** MSRV +### `payjoin-cli` + +```shell +cargo update -p regex --precise 1.9.6 +cargo update -p time@0.3.30 --precise 0.3.20 +``` ## License diff --git a/payjoin-cli/Cargo.lock b/payjoin-cli/Cargo.lock index 229e8f76..3b55af44 100644 --- a/payjoin-cli/Cargo.lock +++ b/payjoin-cli/Cargo.lock @@ -218,9 +218,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -445,12 +445,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -466,9 +463,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -699,7 +696,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.9", + "rustls", "rustls-native-certs", "tokio", "tokio-rustls", @@ -735,26 +732,6 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.3", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "itoa" version = "1.0.9" @@ -821,12 +798,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.11" @@ -845,9 +816,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -872,15 +843,15 @@ dependencies = [ [[package]] name = "minreq" -version = "2.8.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6c6973f78ef55d0e5fc04fdb8f9ad67c87c9e86bca0ff77b6a3102b0eb36b7" +checksum = "cb3371dfc7b772c540da1380123674a8e20583aca99907087d990ca58cf44203" dependencies = [ "log", "once_cell", - "rustls 0.20.9", - "webpki", - "webpki-roots 0.22.6", + "rustls", + "rustls-webpki", + "webpki-roots", ] [[package]] @@ -1007,7 +978,7 @@ dependencies = [ "log", "payjoin", "rcgen", - "rustls 0.21.9", + "rustls", "serde", "tokio", "ureq", @@ -1253,9 +1224,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" dependencies = [ "cc", "getrandom", @@ -1292,20 +1263,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.25" @@ -1315,22 +1272,10 @@ dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", + "linux-raw-sys", "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.9" @@ -1338,7 +1283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.6", "rustls-webpki", "sct", ] @@ -1370,7 +1315,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.6", "untrusted 0.9.0", ] @@ -1401,7 +1346,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.6", "untrusted 0.9.0", ] @@ -1588,15 +1533,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.27", + "redox_syscall 0.4.1", + "rustix", "windows-sys 0.48.0", ] @@ -1713,7 +1657,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.9", + "rustls", "tokio", ] @@ -1826,11 +1770,11 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.21.9", + "rustls", "rustls-native-certs", "rustls-webpki", "url", - "webpki-roots 0.25.3", + "webpki-roots", ] [[package]] @@ -1935,25 +1879,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.3" @@ -1969,7 +1894,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.25", + "rustix", ] [[package]]