From 9ba6d91aa15ecba1afa1ceaca1eaa0cc845c2753 Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 07:50:37 -0400 Subject: [PATCH 1/6] chore: upgrade rust-toolchain to 1.95.0 and switch to TOML format --- rust-toolchain | 1 - rust-toolchain.toml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 7f229af9..00000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.92.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..f25b5b14 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.95.0" From 5ffd1173052bd452660ed9104bb1f50977599297 Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 07:51:36 -0400 Subject: [PATCH 2/6] fix: remove redundant .into_iter() on tx.outputs_data() --- src/subcommands/tx.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subcommands/tx.rs b/src/subcommands/tx.rs index c8b005af..f6745836 100644 --- a/src/subcommands/tx.rs +++ b/src/subcommands/tx.rs @@ -460,7 +460,7 @@ impl CliSubCommand for TxSubCommand<'_> { } let mut output_total = 0; - for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data().into_iter()) { + for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data()) { let capacity: u64 = output.capacity().unpack(); output_total += capacity; let data_len = data.raw_data().len(); From 5fb1e62e21257d2c8b3d36adcc6336d172c5d4b6 Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 07:52:04 -0400 Subject: [PATCH 3/6] fix: remove redundant .into_iter() on key_set.change --- src/subcommands/util.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subcommands/util.rs b/src/subcommands/util.rs index 5276ae18..51329bfb 100644 --- a/src/subcommands/util.rs +++ b/src/subcommands/util.rs @@ -866,7 +866,7 @@ fn search_path( for (path, hash) in key_set .external .into_iter() - .chain(key_set.change.into_iter()) + .chain(key_set.change) { if hash == target { return Ok(path); From afcad7520e70ca1c4c4bb5eda9e3e6ce8347d3cf Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 07:52:18 -0400 Subject: [PATCH 4/6] fix: remove redundant .into_iter() on key_set.change in wallet --- src/subcommands/wallet.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subcommands/wallet.rs b/src/subcommands/wallet.rs index 026db305..518bc7aa 100644 --- a/src/subcommands/wallet.rs +++ b/src/subcommands/wallet.rs @@ -290,7 +290,7 @@ impl<'a> WalletSubCommand<'a> { for (path, hash160) in key_set .external .into_iter() - .chain(key_set.change.into_iter()) + .chain(key_set.change) { if hash160 == change_last { change_path_opt = Some(path.clone()); From d9894001bdaae131a44a5e6bb7119d7eb4064e9b Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 08:09:30 -0400 Subject: [PATCH 5/6] chore: upgrade rust-toolchain to 1.95.0 in CI workflow --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 14ed33fd..4dff25a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - if: matrix.os == 'windows-latest' name: Windows Dependencies shell: pwsh @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v2 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Integration_Test run: make integration @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v2 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Linters run: | cargo fmt --version || rustup component add rustfmt @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: cargo-deny uses: EmbarkStudios/cargo-deny-action@v2 with: From 6f64ac263c01d2538783a5d8f294309b5b902a37 Mon Sep 17 00:00:00 2001 From: Eval Exec Date: Wed, 6 May 2026 08:09:56 -0400 Subject: [PATCH 6/6] style: apply cargo fmt --- src/subcommands/util.rs | 6 +----- src/subcommands/wallet.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/subcommands/util.rs b/src/subcommands/util.rs index 51329bfb..1203ddae 100644 --- a/src/subcommands/util.rs +++ b/src/subcommands/util.rs @@ -863,11 +863,7 @@ fn search_path( let key_set = plugin_mgr .keystore_handler() .derived_key_set_by_index(hash160, 0, 2000, 0, 2000, password)?; - for (path, hash) in key_set - .external - .into_iter() - .chain(key_set.change) - { + for (path, hash) in key_set.external.into_iter().chain(key_set.change) { if hash == target { return Ok(path); } diff --git a/src/subcommands/wallet.rs b/src/subcommands/wallet.rs index 518bc7aa..58381bf4 100644 --- a/src/subcommands/wallet.rs +++ b/src/subcommands/wallet.rs @@ -287,11 +287,7 @@ impl<'a> WalletSubCommand<'a> { None, )?; let mut change_path_opt = None; - for (path, hash160) in key_set - .external - .into_iter() - .chain(key_set.change) - { + for (path, hash160) in key_set.external.into_iter().chain(key_set.change) { if hash160 == change_last { change_path_opt = Some(path.clone()); }