chore: update dependencies (#780)

boltzr/Cargo.toml

@@ -32,58 +32,58 @@ codegen-units = 1
 panic = "abort"
 
 [dependencies]
-axum = "0.7.7"
-bitcoin_hashes = "0.15.0"
-clap = { version = "4.5.23", features = ["derive"] }
-crossbeam-channel = "0.5.13"
+axum = "0.8.1"
+bitcoin_hashes = "0.16.0"
+clap = { version = "4.5.26", features = ["derive"] }
+crossbeam-channel = "0.5.14"
 ctrlc = { version = "3.4.5", features = ["termination"] }
 dirs = "5.0.1"
 num_cpus = "1.16.0"
 prost = "0.13.4"
-rcgen = { version = "0.13.1", features = ["x509-parser"] }
-reqwest = { version = "0.12.9", features = ["json"] }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
-tokio = { version = "1.38.1", features = ["rt-multi-thread", "macros", "process"] }
+rcgen = { version = "0.13.2", features = ["x509-parser"] }
+reqwest = { version = "0.12.12", features = ["json"] }
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.135"
+tokio = { version = "1.43.0", features = ["rt-multi-thread", "macros", "process"] }
 toml = "0.8.19"
 tonic = { version = "0.12.3", features = ["prost", "tls"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 tokio-util = "0.7.13"
 tracing-loki = { version = "0.2.5", optional = true }
 futures = "0.3.31"
-metrics-process = { version = "2.1.0", optional = true }
-metrics-exporter-prometheus = { version = "0.15.3", optional = true, default-features = false }
+metrics-process = { version = "2.4.0", optional = true }
+metrics-exporter-prometheus = { version = "0.16.1", optional = true, default-features = false }
 axum-prometheus = { version = "0.6.1", default-features = false, optional = true, features = ["prometheus"] }
-metrics = { version = "0.23.0", optional = true }
+metrics = { version = "0.24.1", optional = true }
 diesel_migrations = "2.2.0"
 r2d2 = "0.8.10"
 diesel = { version = "2.2.6", default-features = false, features = ["postgres", "r2d2", "chrono"] }
 strum_macros = "0.26.4"
 strum = "0.26.3"
 dashmap = "6.1.0"
-opentelemetry = { version = "0.25.0", optional = true }
-opentelemetry-semantic-conventions = { version = "0.26.0", optional = true, features = ["semconv_experimental"] }
-opentelemetry_sdk = { version = "0.25.0", optional = true, features = ["rt-tokio"] }
-opentelemetry-otlp = { version = "0.25.0", optional = true }
-tracing-opentelemetry = { version = "0.26.0", optional = true }
-diesel-tracing = { version = "0.3.0", optional = true, features = ["postgres", "r2d2", "statement-fields"] }
-alloy = { version = "0.7.3", features = ["reqwest", "sol-types", "serde", "eip712", "signer-local", "signer-mnemonic", "providers", "transports", "contract", "json"] }
-alloy-transport-http = "0.7.3"
-async-tungstenite = { version = "0.28.0", features = ["tokio-native-tls", "tokio-runtime"] }
-async-trait = "0.1.83"
+opentelemetry = { version = "0.27.1", optional = true }
+opentelemetry-semantic-conventions = { version = "0.27.0", optional = true, features = ["semconv_experimental"] }
+opentelemetry_sdk = { version = "0.27.1", optional = true, features = ["rt-tokio"] }
+opentelemetry-otlp = { version = "0.27.0", optional = true }
+tracing-opentelemetry = { version = "0.28.0", optional = true }
+diesel-tracing = { version = "0.3.1", optional = true, features = ["postgres", "r2d2", "statement-fields"] }
+alloy = { version = "0.9.2", features = ["reqwest", "sol-types", "serde", "eip712", "signer-local", "signer-mnemonic", "providers", "transports", "contract", "json"] }
+alloy-transport-http = "0.9.2"
+async-tungstenite = { version = "0.28.2", features = ["tokio-native-tls", "tokio-runtime"] }
+async-trait = "0.1.85"
 futures-util = "0.3.31"
 async-stream = "0.3.6"
-anyhow = "1.0.94"
+anyhow = "1.0.95"
 lightning = { version = "0.0.125", features = ["std"] }
 lightning-invoice = { version = "0.32.0", features = ["std"] }
 bech32 = "0.9.1"
 bitcoin = "0.32.5"
 elements = "0.25.1"
 base64 = "0.22.1"
 rust-s3 = "0.35.1"
-cron = "0.13.0"
-chrono = "0.4.38"
+cron = "0.14.0"
+chrono = "0.4.39"
 fedimint-tonic-lnd = { version = "0.2.0", features = ["lightningrpc"], default-features = false }
 flate2 = "1.0.35"
 
@@ -95,5 +95,5 @@ tonic-build = "0.12.3"
 eventsource-client = "0.13.0"
 mockall = "0.13.1"
 rand = "0.8.5"
-rstest = "0.23.0"
+rstest = "0.24.0"
 serial_test = "3.2.0"

boltzr/src/evm/manager.rs

@@ -1,7 +1,7 @@
 use crate::evm::refund_signer::LocalRefundSigner;
 use crate::evm::RefundSigner;
 use alloy::network::{AnyNetwork, EthereumWallet};
-use alloy::primitives::{Address, FixedBytes, Signature, U256};
+use alloy::primitives::{Address, FixedBytes, PrimitiveSignature, U256};
 use alloy::providers::{Provider, ProviderBuilder};
 use alloy::signers::local::coins_bip39::English;
 use alloy::signers::local::{MnemonicBuilder, PrivateKeySigner};
@@ -94,7 +94,7 @@ impl RefundSigner for Manager {
         amount: U256,
         token_address: Option<Address>,
         timeout: u64,
-    ) -> anyhow::Result<Signature> {
+    ) -> anyhow::Result<PrimitiveSignature> {
         match self.refund_signers.get(&contract_version) {
             Some(signer) => {
                 signer

boltzr/src/evm/mod.rs

@@ -1,4 +1,4 @@
-use alloy::primitives::{Address, FixedBytes, Signature, U256};
+use alloy::primitives::{Address, FixedBytes, PrimitiveSignature, U256};
 use serde::{Deserialize, Serialize};
 
 mod contracts;
@@ -35,5 +35,5 @@ pub trait RefundSigner {
         amount: U256,
         token_address: Option<Address>,
         timeout: u64,
-    ) -> anyhow::Result<Signature>;
+    ) -> anyhow::Result<PrimitiveSignature>;
 }

boltzr/src/evm/refund_signer.rs

@@ -1,4 +1,4 @@
-use alloy::primitives::{Address, FixedBytes, Signature, U256};
+use alloy::primitives::{Address, FixedBytes, PrimitiveSignature, U256};
 use alloy::providers::fillers::{
     BlobGasFiller, ChainIdFiller, FillProvider, GasFiller, JoinFill, NonceFiller, WalletFiller,
 };
@@ -86,7 +86,7 @@ impl LocalRefundSigner {
         amount: U256,
         token_address: Option<Address>,
         timeout: u64,
-    ) -> anyhow::Result<Signature> {
+    ) -> anyhow::Result<PrimitiveSignature> {
         info!(
             "Signing cooperative {} refund",
             if token_address.is_none() {
@@ -115,8 +115,7 @@ impl LocalRefundSigner {
             .eip712_signing_hash(self.ether_swap.eip712_domain())
         };
 
-        let sig = signer.sign_hash(&hash).await?;
-        Ok(Signature::from_bytes_and_parity(&sig.as_bytes(), sig.v())?)
+        Ok(signer.sign_hash(&hash).await?)
     }
 }
 
@@ -205,7 +204,7 @@ pub mod test {
                 amount,
                 claim_keys.address(),
                 U256::from(timelock),
-                refund_sig.v().y_parity_byte_non_eip155().unwrap(),
+                refund_sig.v() as u8 + 27,
                 refund_sig.r().into(),
                 refund_sig.s().into(),
             )
@@ -298,7 +297,7 @@ pub mod test {
                 *token.address(),
                 claim_keys.address(),
                 U256::from(timelock),
-                refund_sig.v().y_parity_byte_non_eip155().unwrap(),
+                refund_sig.v() as u8 + 27,
                 refund_sig.r().into(),
                 refund_sig.s().into(),
             )

boltzr/src/grpc/server.rs

@@ -165,7 +165,7 @@ mod server_test {
     use crate::swap::manager::SwapManager;
     use crate::tracing_setup::ReloadHandler;
     use crate::webhook::caller;
-    use alloy::primitives::{Address, FixedBytes, Signature, U256};
+    use alloy::primitives::{Address, FixedBytes, PrimitiveSignature, U256};
     use async_trait::async_trait;
     use mockall::{mock, predicate::*};
     use std::collections::HashMap;
@@ -207,7 +207,7 @@ mod server_test {
                 amount: U256,
                 token_address: Option<Address>,
                 timeout: u64,
-            ) -> anyhow::Result<Signature>;
+            ) -> anyhow::Result<PrimitiveSignature>;
         }
     }
 

boltzr/src/grpc/service.rs

@@ -722,7 +722,7 @@ mod test {
     use crate::swap::manager::SwapManager;
     use crate::tracing_setup::ReloadHandler;
     use crate::webhook::caller::{Caller, Config};
-    use alloy::primitives::{Address, FixedBytes, Signature, U256};
+    use alloy::primitives::{Address, FixedBytes, PrimitiveSignature, U256};
     use anyhow::anyhow;
     use async_trait::async_trait;
     use mockall::mock;
@@ -763,7 +763,7 @@ mod test {
                 amount: U256,
                 token_address: Option<Address>,
                 timeout: u64,
-            ) -> anyhow::Result<Signature>;
+            ) -> anyhow::Result<PrimitiveSignature>;
         }
     }
 
@@ -922,9 +922,9 @@ mod test {
         let sig_str = "0xd247cfedc0c62ea93f4f3093a3b2941c329773f140ab0cdc04a641376982d34e0aa7152cb2dd9036fad543646a3fdc8b22c8d83e62e13684d61f630afdd08b0f1c";
         signer
             .expect_sign_cooperative_refund()
-            .returning(
-                |_, _, _, _, _| Ok(alloy::primitives::Signature::from_str(sig_str).unwrap()),
-            );
+            .returning(|_, _, _, _, _| {
+                Ok(alloy::primitives::PrimitiveSignature::from_str(sig_str).unwrap())
+            });
         svc.refund_signer = Some(Arc::new(signer));
 
         let res = svc

boltzr/src/notifications/mattermost.rs

@@ -4,7 +4,7 @@ use crate::notifications::{Config, NotificationClient};
 use anyhow::anyhow;
 use async_trait::async_trait;
 use async_tungstenite::tungstenite::Message;
-use futures::{SinkExt, StreamExt};
+use futures::StreamExt;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::json;

boltzr/src/tracing_setup.rs

@@ -10,6 +10,7 @@ use tracing_subscriber::{fmt, reload, EnvFilter, Layer, Registry};
 
 #[cfg(feature = "otel")]
 use opentelemetry::trace::TracerProvider;
+use opentelemetry_otlp::WithExportConfig;
 
 #[derive(Clone)]
 pub struct ReloadHandler {
@@ -176,40 +177,34 @@ fn init_tracer(
         return Ok(None);
     }
 
-    use opentelemetry_otlp::WithExportConfig;
-    use opentelemetry_sdk::runtime;
-
     info!("Enabling OpenTelemetry");
 
     opentelemetry::global::set_text_map_propagator(
         opentelemetry_sdk::propagation::TraceContextPropagator::new(),
     );
 
-    let tracer = opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
-            opentelemetry_sdk::Resource::new(vec![
-                opentelemetry::KeyValue::new(
-                    opentelemetry_semantic_conventions::resource::SERVICE_NAME,
-                    crate::utils::get_name(&crate::utils::get_network(&config.network)),
-                ),
-                opentelemetry::KeyValue::new(
-                    opentelemetry_semantic_conventions::resource::SERVICE_VERSION,
-                    built_info::PKG_VERSION,
-                ),
-                opentelemetry::KeyValue::new(
-                    opentelemetry_semantic_conventions::resource::PROCESS_PID,
-                    std::process::id().to_string(),
-                ),
-            ]),
-        ))
-        .with_batch_config(opentelemetry_sdk::trace::BatchConfig::default())
-        .with_exporter(
-            opentelemetry_otlp::new_exporter()
-                .tonic()
-                .with_endpoint(endpoint.unwrap()),
-        )
-        .install_batch(runtime::Tokio)?;
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .with_endpoint(endpoint.unwrap())
+        .build()?;
+
+    let tracer = opentelemetry_sdk::trace::TracerProvider::builder()
+        .with_resource(opentelemetry_sdk::Resource::new(vec![
+            opentelemetry::KeyValue::new(
+                opentelemetry_semantic_conventions::resource::SERVICE_NAME,
+                crate::utils::get_name(&crate::utils::get_network(&config.network)),
+            ),
+            opentelemetry::KeyValue::new(
+                opentelemetry_semantic_conventions::resource::SERVICE_VERSION,
+                built_info::PKG_VERSION,
+            ),
+            opentelemetry::KeyValue::new(
+                opentelemetry_semantic_conventions::resource::PROCESS_PID,
+                std::process::id().to_string(),
+            ),
+        ]))
+        .with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
+        .build();
 
     Ok(Some(tracer.tracer(built_info::PKG_NAME)))
 }