Merge #235: CI: Update continous_integration and audit workflows

aba4b95 CI: Fix clippy issues (Vihiga Tyonum)
cc3c8a2 ci: Update audit workflow and `bytes` dependency (Vihiga Tyonum)
e39e59c ci: add prepush checks that mirrors ci workflow (Vihiga Tyonum)
e849f8e chore: fix clippy warnings (Vihiga Tyonum)
8d20cf2 ci: update cont_integration workflow (Vihiga Tyonum)

Pull request description:

  <!-- You can erase any parts of this template not applicable to your Pull Request. -->

  ### Description

  This PR updates the continuous integration workflow and fixes some Clippy issues.

  Also fixes #239

  <!-- Describe the purpose of this PR, what's being adding and/or fixed -->

  ### Notes to the reviewers

  <!-- In this section you can include notes directed to the reviewers, like explaining why some parts
  of the PR were done in a specific way -->
  - update `actions/checkout` to v6
  - add a separate job for Clippy
  - automate manual caching in the `build-test` job
  - replace `actions-r/toolchain` with `actions-rust-
  lang/setup-rust-toolchain` for toolchain setup
  -fix clippy warnings
  - add prepush command to Justfile
  - Add `tool-version` parameter in audit workflow that forces the `actions-rust-lang/audit` to use a version that supports CVSS 4.0
  - update transitive dependency `bytes` to v1.11.1

  ## Changelog notice

  <!-- Notice the release manager should include in the release tag message changelog -->
  <!-- See https://keepachangelog.com/en/1.0.0/ for examples -->

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

Top commit has no ACKs.

Tree-SHA512: 24ac0771d7e14ea54137fa355b84328bbc0a36c3ab3602f9e07062fca348642e44c2cfca10103a78edf3564618db4111700ac89e0967464dd9a084966373a474

Author: tvpeter

.github/workflows/audit.yml

@@ -13,7 +13,8 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/audit@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          tool-version: 0.22.1

.github/workflows/cont_integration.yml

@@ -2,6 +2,10 @@ on: [push, pull_request]
 
 name: CI
 
+permissions:
+  contents: read
+env:
+  CARGO_TERM_COLOR: always
 jobs:
 
   build-test:
@@ -17,30 +21,41 @@ jobs:
           - --all-features
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Generate cache key
-        run: echo "${{ matrix.rust }} ${{ matrix.features }}" | tee .cache_key
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('.cache_key') }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+        uses: actions/checkout@v6
       - name: Setup Rust Toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
           profile: minimal
           override: true
           components: rustfmt, clippy
+          cache: true
       - name: Build
         run: cargo build ${{ matrix.features }}
-      - name: Clippy
-        run: cargo clippy -- -D warnings
       - name: Test
         run: cargo test ${{ matrix.features }}
+  clippy:
+    name: Clippy (${{ matrix.features }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        features:
+          - --no-default-features
+          - --all-features
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      
+      - name: Install Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          components: clippy
+          cache: true
+      - name: Run Clippy
+        run: cargo clippy ${{ matrix.features }} --all-targets -- -D warnings
 
 # TODO: fix or remove this
 #  wasm-build:
@@ -82,13 +97,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setup Rust Toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
           profile: minimal
           override: true
           components: rustfmt, clippy
+          cache: true
       - name: Check fmt
         run: cargo fmt --all -- --check

Cargo.lock

@@ -25,6 +25,15 @@ build: fmt
 test:
     cargo test --all-features --tests 
 
+# checks before pushing
+pre-push:
+    cargo test --features default
+    cargo test --no-default-features
+    cargo test --all-features
+    cargo clippy --no-default-features --all-targets -- -D warnings
+    cargo clippy --all-features --all-targets -- -D warnings
+    cargo fmt --all -- --check
+
 # clean the project target directory
 clean:
     cargo clean

Justfile

@@ -59,15 +59,15 @@ pub enum BDKCliError {
 
     #[cfg(feature = "sqlite")]
     #[error("Rusqlite error: {0}")]
-    RusqliteError(#[from] bdk_wallet::rusqlite::Error),
+    RusqliteError(Box<bdk_wallet::rusqlite::Error>),
 
     #[cfg(feature = "redb")]
     #[error("Redb StoreError: {0}")]
-    RedbStoreError(#[from] bdk_redb::error::StoreError),
+    RedbStoreError(Box<bdk_redb::error::StoreError>),
 
     #[cfg(feature = "redb")]
     #[error("Redb dabtabase error: {0}")]
-    RedbDatabaseError(#[from] bdk_redb::redb::DatabaseError),
+    RedbDatabaseError(Box<bdk_redb::redb::DatabaseError>),
 
     #[error("Serde json error: {0}")]
     SerdeJson(#[from] serde_json::Error),
@@ -147,3 +147,24 @@ impl From<ExtractTxError> for BDKCliError {
         BDKCliError::PsbtExtractTxError(Box::new(value))
     }
 }
+
+#[cfg(feature = "redb")]
+impl From<bdk_redb::error::StoreError> for BDKCliError {
+    fn from(err: bdk_redb::error::StoreError) -> Self {
+        BDKCliError::RedbStoreError(Box::new(err))
+    }
+}
+
+#[cfg(feature = "redb")]
+impl From<bdk_redb::redb::DatabaseError> for BDKCliError {
+    fn from(err: bdk_redb::redb::DatabaseError) -> Self {
+        BDKCliError::RedbDatabaseError(Box::new(err))
+    }
+}
+
+#[cfg(feature = "sqlite")]
+impl From<bdk_wallet::rusqlite::Error> for BDKCliError {
+    fn from(err: bdk_wallet::rusqlite::Error) -> Self {
+        BDKCliError::RusqliteError(Box::new(err))
+    }
+}

src/error.rs

@@ -1156,6 +1156,7 @@ pub fn handle_wallets_subcommand(datadir: &Path, pretty: bool) -> Result<String,
             .wallets
             .iter()
             .map(|(name, wallet_config)| {
+                #[allow(unused_mut)]
                 let mut wallet_json = json!({
                     "name": name,
                     "network": wallet_config.network,

src/handlers.rs

@@ -75,7 +75,7 @@ impl<'a> PayjoinManager<'a> {
         let persister = payjoin::persist::NoopSessionPersister::<ReceiverSessionEvent>::default();
 
         let checked_max_fee_rate = max_fee_rate
-            .map(|rate| FeeRate::from_sat_per_kwu(rate))
+            .map(FeeRate::from_sat_per_kwu)
             .unwrap_or(FeeRate::BROADCAST_MIN);
 
         let receiver = payjoin::receive::v2::ReceiverBuilder::new(
@@ -275,7 +275,7 @@ impl<'a> PayjoinManager<'a> {
                     .await
             }
             ReceiveSession::HasReplyableError(error) => self.handle_error(error, persister).await,
-            ReceiveSession::Closed(_) => return Err(Error::Generic("Session closed".to_string())),
+            ReceiveSession::Closed(_) => Err(Error::Generic("Session closed".to_string())),
         }
     }
 
@@ -305,8 +305,7 @@ impl<'a> PayjoinManager<'a> {
                 }
                 Err(e) => {
                     return Err(Error::Generic(format!(
-                        "Error occurred when polling for Payjoin proposal from the directory: {}",
-                        e.to_string()
+                        "Error occurred when polling for Payjoin proposal from the directory: {e}"
                     )));
                 }
             }
@@ -609,16 +608,12 @@ impl<'a> PayjoinManager<'a> {
                                         return Err(ImplementationError::from("Cannot find the transaction in the mempool or the blockchain"));
                                     };
 
-                                    let is_seen = match tx_details.chain_position {
-                                        bdk_wallet::chain::ChainPosition::Confirmed { .. } => true,
-                                        bdk_wallet::chain::ChainPosition::Unconfirmed { first_seen: Some(_), .. } => true,
-                                        _ => false
-                                    };
+                                    let is_seen = matches!(tx_details.chain_position, bdk_wallet::chain::ChainPosition::Confirmed { .. } | bdk_wallet::chain::ChainPosition::Unconfirmed { first_seen: Some(_), .. });
 
                                     if is_seen {
                                         return Ok(Some(tx_details.tx.as_ref().clone()));
                                     }
-                                    return Err(ImplementationError::from("Cannot find the transaction in the mempool or the blockchain"));
+                                Err(ImplementationError::from("Cannot find the transaction in the mempool or the blockchain"))
                                 },
                                 |outpoint| {
                                     let utxo = self.wallet.get_utxo(outpoint);

src/payjoin/mod.rs

@@ -158,7 +158,7 @@ pub(crate) enum BlockchainClient {
     },
 
     #[cfg(feature = "cbf")]
-    KyotoClient { client: KyotoClientHandle },
+    KyotoClient { client: Box<KyotoClientHandle> },
 }
 
 /// Handle for the Kyoto client after the node has been started.
@@ -195,7 +195,7 @@ pub(crate) fn new_blockchain_client(
         }
         #[cfg(feature = "esplora")]
         ClientType::Esplora => {
-            let client = bdk_esplora::esplora_client::Builder::new(&url).build_async()?;
+            let client = bdk_esplora::esplora_client::Builder::new(url).build_async()?;
             BlockchainClient::Esplora {
                 client: Box::new(client),
                 parallel_requests: wallet_opts.parallel_requests,
@@ -245,10 +245,10 @@ pub(crate) fn new_blockchain_client(
             );
 
             BlockchainClient::KyotoClient {
-                client: KyotoClientHandle {
+                client: Box::new(KyotoClientHandle {
                     requester,
                     update_subscriber: tokio::sync::Mutex::new(update_subscriber),
-                },
+                }),
             }
         }
     };