From 5df5c6db1471d8096b09b2882e6f5a5e3e4770f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Feb 2026 11:23:58 +0000 Subject: [PATCH 1/2] chore(deps): bump rsa from 0.9.7 to 0.9.10 Bumps [rsa](https://github.com/RustCrypto/RSA) from 0.9.7 to 0.9.10. - [Changelog](https://github.com/RustCrypto/RSA/blob/v0.9.10/CHANGELOG.md) - [Commits](https://github.com/RustCrypto/RSA/compare/v0.9.7...v0.9.10) --- updated-dependencies: - dependency-name: rsa dependency-version: 0.9.10 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e3ae12e..0c1fa4ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2171,11 +2171,10 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" dependencies = [ - "byteorder", "lazy_static", "libm", "num-integer", @@ -3076,9 +3075,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.7" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ "const-oid", "digest", From e71463017c8c7a300f8dc6dc7e23869f36d6e486 Mon Sep 17 00:00:00 2001 From: Prabhat Verma Date: Fri, 6 Feb 2026 17:47:17 +0530 Subject: [PATCH 2/2] fix: update nix flake and fix check-code failures Update nixpkgs and rust-overlay flake inputs to get cargo-audit 0.22.0 with CVSS 4.0 support. Remove deprecated darwin.apple_sdk.frameworks reference for compatibility with latest nixpkgs. Fix clippy lint in batch repo (unnecessary_unwrap). Update vulnerable dependencies (bytes, rust_decimal, time) to patched versions. Co-Authored-By: Claude Opus 4.6 --- Cargo.lock | 40 ++++++++++++++++++++-------------------- flake.lock | 12 ++++++------ flake.nix | 3 --- src/batch/repo.rs | 4 ++-- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c1fa4ec..3cbcc4bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -590,9 +590,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cached" @@ -928,12 +928,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -2187,9 +2187,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" [[package]] name = "num-integer" @@ -3046,9 +3046,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.45" +version = "0.7.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1" dependencies = [ "bitvec", "bytecheck", @@ -3064,9 +3064,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.45" +version = "0.7.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5" dependencies = [ "proc-macro2", "quote", @@ -3095,9 +3095,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0" dependencies = [ "arrayvec", "borsh", @@ -4057,30 +4057,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", diff --git a/flake.lock b/flake.lock index 955154df..12b6ea3e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1754966322, - "narHash": "sha256-7f/LH60DnjjQVKbXAsHIniGaU7ixVM7eWU3hyjT24YI=", + "lastModified": 1770347142, + "narHash": "sha256-uz+ZSqXpXEPtdRPYwvgsum/CfNq7AUQ/0gZHqTigiPM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c13cec2e3828d964b9980d0ffd680bd8d4dce90", + "rev": "2859683cd9ef7858d324c5399b0d8d6652bf4044", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0cb8d62..01a93fce 100644 --- a/flake.nix +++ b/flake.nix @@ -31,9 +31,6 @@ [ rustToolchain protobuf - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; devEnvVars = rec { PGDATABASE = "pg"; diff --git a/src/batch/repo.rs b/src/batch/repo.rs index 86ad4f6f..74027144 100644 --- a/src/batch/repo.rs +++ b/src/batch/repo.rs @@ -240,7 +240,7 @@ impl Batches { let created_ledger_tx_id = LedgerTxId::from(row.batch_created_ledger_tx_id.unwrap()); let batch_id = BatchId::from(row.id); let payout_queue_id = PayoutQueueId::from(row.payout_queue_id); - if row.ledger_id.is_some() { + if let Some(ledger_id) = row.ledger_id { return Ok(Some(( tx, BatchInfo { @@ -248,7 +248,7 @@ impl Batches { payout_queue_id, created_ledger_tx_id, }, - LedgerTxId::from(row.ledger_id.unwrap()), + LedgerTxId::from(ledger_id), ))); } let ledger_transaction_id = LedgerTxId::new();