Merge pull request #5 from fedibtc/20250711-spv2

tacio · web-flow · commit 51aee297b1dd · 2025-07-12T19:11:49.000-03:00
Upgrade to fm7 and adding spv2 module
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,11 @@
 [workspace]
-members = [
-    "fmo_api_types",
-    "fmo_frontend",
-    "fmo_server",
-]
+members = ["fmo_api_types", "fmo_frontend", "fmo_server"]
 
 resolver = "2"
 
 [workspace.dependencies]
-fedimint-api-client = { version = "0.4", git = "https://github.com/elsirion/fedimint", branch = "v0.4.4-patch-xyz" }
-fedimint-core = { version = "0.4", git = "https://github.com/elsirion/fedimint", branch = "v0.4.4-patch-xyz" }
-fedimint-ln-common = { version = "0.4", git = "https://github.com/elsirion/fedimint", branch = "v0.4.4-patch-xyz" }
-fedimint-mint-common = { version = "0.4", git = "https://github.com/elsirion/fedimint", branch = "v0.4.4-patch-xyz" }
-fedimint-wallet-common = { version = "0.4", git = "https://github.com/elsirion/fedimint", branch = "v0.4.4-patch-xyz" }
+fedimint-core = { git = "https://github.com/fedibtc/fedimint", tag = "v0.7.0-fedi2" }
+fedimint-api-client = { git = "https://github.com/fedibtc/fedimint", tag = "v0.7.0-fedi2" }
+fedimint-ln-common = { git = "https://github.com/fedibtc/fedimint", tag = "v0.7.0-fedi2" }
+fedimint-mint-common = { git = "https://github.com/fedibtc/fedimint", tag = "v0.7.0-fedi2" }
+fedimint-wallet-common = { git = "https://github.com/fedibtc/fedimint", tag = "v0.7.0-fedi2" }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -68,7 +68,7 @@
                 pname = "fmo_server";
                 version = "0.1.0";
                 src = rustSrc;
-                cargoExtraArgs = "--package=fmo_server --features=stability_pool_v1";
+                cargoExtraArgs = "--package=fmo_server --features=stability_pool";
                 RUSTFLAGS = "--cfg tokio_unstable";
               });
             in
diff --git a/fmo_api_types/Cargo.toml b/fmo_api_types/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitcoin = { version = "0.30.2", features = ["serde"] }
+bitcoin = { version = "0.32.5", features = ["serde"] }
 fedimint-core = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/fmo_frontend/src/components/federation/guardians.rs b/fmo_frontend/src/components/federation/guardians.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use fedimint_core::config::FederationId;
-use fedimint_core::util::backon::FibonacciBuilder;
+use fedimint_core::util::backoff_util::background_backoff;
 use fedimint_core::util::retry;
 use fedimint_core::{NumPeers, PeerId};
 use fmo_api_types::GuardianHealth;
@@ -125,7 +125,7 @@ pub struct Guardian {
 async fn fetch_guardian_health(id: FederationId) -> BTreeMap<PeerId, GuardianHealth> {
     retry(
         "fetching guardian health",
-        FibonacciBuilder::default().with_max_times(usize::MAX),
+        background_backoff(),
         || async move {
             reqwest::get(format!("{}/federations/{}/health", BASE_URL, id))
                 .await?
diff --git a/fmo_frontend/src/components/federations/totals.rs b/fmo_frontend/src/components/federations/totals.rs
@@ -1,4 +1,4 @@
-use fedimint_core::util::backon::FibonacciBuilder;
+use fedimint_core::util::backoff_util::background_backoff;
 use fedimint_core::util::retry;
 use fmo_api_types::FedimintTotals;
 use leptos::{component, create_resource, view, IntoView, SignalGet};
@@ -11,7 +11,7 @@ pub fn Totals() -> impl IntoView {
         |_| async {
             retry(
                 "fetching federation totals",
-                FibonacciBuilder::default().with_max_times(usize::MAX),
+                background_backoff(),
                 fetch_federation_totals,
             )
             .await
diff --git a/fmo_frontend/src/components/nostr/mod.rs b/fmo_frontend/src/components/nostr/mod.rs
@@ -6,7 +6,7 @@ use std::collections::BTreeMap;
 use check_federation::CheckFederation;
 use fedimint_core::config::FederationId;
 use fedimint_core::invite_code::InviteCode;
-use fedimint_core::util::backon::FibonacciBuilder;
+use fedimint_core::util::backoff_util::background_backoff;
 use fedimint_core::util::retry;
 use leptos::{component, create_resource, view, IntoView, SignalGet};
 use leptos_meta::Title;
@@ -76,7 +76,7 @@ async fn fetch_nostr_federations() -> BTreeMap<FederationId, InviteCode> {
 
     retry(
         "Fetching Nostr federations",
-        FibonacciBuilder::default().with_max_times(usize::MAX),
+        background_backoff(),
         fetch_nostr_federations_impl,
     )
     .await
diff --git a/fmo_frontend/src/components/nostr/nostr_federation_row.rs b/fmo_frontend/src/components/nostr/nostr_federation_row.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use anyhow::Context;
 use fedimint_core::config::FederationId;
 use fedimint_core::invite_code::InviteCode;
-use fedimint_core::util::backon::FibonacciBuilder;
+use fedimint_core::util::backoff_util::background_backoff;
 use fedimint_core::util::retry;
 use leptos::{component, create_resource, view, IntoView, SignalGet};
 
@@ -57,7 +57,7 @@ async fn fetch_federation_name(invite_code: InviteCode) -> String {
 
     retry(
         "Fetching federation name",
-        FibonacciBuilder::default().with_max_times(usize::MAX),
+        background_backoff(),
         fetch_federation_name_impl,
     )
     .await
diff --git a/fmo_server/Cargo.toml b/fmo_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fmo_server"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -17,10 +17,10 @@ anyhow = "1.0.81"
 async-stream = "0.3.5"
 axum = { version = "0.7.5", features = ["json"] }
 axum-auth = "0.7.0"
-bitcoin = "0.30.2"
+bitcoin = "0.32.5"
 csv = "1.3.0"
 dotenv = "0.15.0"
-esplora-client = { version = "0.7.0", default-features = false, features = [
+esplora-client = { version = "0.10.0", default-features = false, features = [
     "async-https-rustls",
 ] }
 fmo_api_types = { path = "../fmo_api_types" }
@@ -46,7 +46,12 @@ tower-http = { version = "0.5.2", features = ["cors"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 regex = "1.10.4"
 
-stability-pool-common = { git = "https://github.com/tacio/fedi", branch = "fmo-compatible", optional = true }
+# The `stability_pool` feature requires two different versions of the `stability-pool-common` crate.
+# stability-pool-common-old is associated with the kind = stability_pool
+# stability-pool-common is associated with the kind = multi_sig_stability_pool
+stability-pool-common-old = { git = "https://github.com/fedixyz/fedi", tag = "v25.7.1", optional = true, package = "stability-pool-common-old" }
+stability-pool-common = { git = "https://github.com/fedixyz/fedi", tag = "v25.7.1", optional = true }
 
 [features]
-stability_pool_v1 = ["dep:stability-pool-common"]
+# This feature is optional and intended for specific deployments that require stability pool functionality.
+stability_pool = ["dep:stability-pool-common-old", "dep:stability-pool-common"]
diff --git a/fmo_server/src/config/mod.rs b/fmo_server/src/config/mod.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 use axum::extract::{Path, State};
 use axum::routing::get;
 use axum::{Json, Router};
-use fedimint_api_client::download_from_invite_code;
 use fedimint_core::config::{FederationId, JsonClientConfig};
 use fedimint_core::invite_code::InviteCode;
 use reqwest::Method;
@@ -33,7 +32,7 @@ pub fn get_config_routes() -> Router<AppState> {
         .route("/:invite/id", get(fetch_federation_id))
         .route("/:invite/module_kinds", get(fetch_federation_module_kinds));
 
-    let cors_enabled = dotenv::var("ALLOW_CONFIG_CORS").map_or(false, |v| v == "true");
+    let cors_enabled = dotenv::var("ALLOW_CONFIG_CORS").is_ok_and(|v| v == "true");
 
     if cors_enabled {
         router.layer(
@@ -87,6 +86,8 @@ impl FederationConfigCache {
 }
 
 async fn fetch_config_inner(invite: &InviteCode) -> anyhow::Result<JsonClientConfig> {
-    let raw_config = download_from_invite_code(invite).await?;
+    let raw_config = fedimint_api_client::api::net::Connector::default()
+        .download_from_invite_code(invite)
+        .await?;
     config_to_json(raw_config)
 }
diff --git a/fmo_server/src/federation/db.rs b/fmo_server/src/federation/db.rs
@@ -20,7 +20,7 @@ impl FromRow for crate::federation::db::FederationV0 {
     fn try_from_row(row: &Row) -> Result<Self, Error> {
         let federation_id_bytes: Vec<u8> = row.try_get("federation_id")?;
         let federation_id =
-            FederationId::consensus_decode_vec(federation_id_bytes, &Default::default())
+            FederationId::consensus_decode_whole(&federation_id_bytes, &Default::default())
                 .expect("Invalid data in DB");
 
         let config_bytes: Vec<u8> = row.try_get("config")?;
@@ -51,11 +51,11 @@ impl FromRow for Federation {
     fn try_from_row(row: &Row) -> Result<Self, Error> {
         let federation_id_bytes: Vec<u8> = row.try_get("federation_id")?;
         let federation_id =
-            FederationId::consensus_decode_vec(federation_id_bytes, &Default::default())
+            FederationId::consensus_decode_whole(&federation_id_bytes, &Default::default())
                 .expect("Invalid data in DB");
 
         let config_bytes: Vec<u8> = row.try_get("config")?;
-        let config = ClientConfig::consensus_decode_vec(config_bytes, &Default::default())
+        let config = ClientConfig::consensus_decode_whole(&config_bytes, &Default::default())
             .expect("Invalid data in DB");
 
         Ok(Federation {
@@ -83,16 +83,16 @@ impl FromRow for crate::federation::db::Transaction {
         let decoder = ModuleDecoderRegistry::default().with_fallback();
 
         let txid_bytes: Vec<u8> = row.try_get("txid")?;
-        let txid =
-            TransactionId::consensus_decode_vec(txid_bytes, &decoder).expect("Invalid data in DB");
+        let txid = TransactionId::consensus_decode_whole(&txid_bytes, &decoder)
+            .expect("Invalid data in DB");
 
         let session_index = row.try_get::<_, i32>("session_index")?;
 
         let item_index = row.try_get::<_, i32>("item_index")?;
 
         let data_bytes: Vec<u8> = row.try_get("data")?;
         let data =
-            fedimint_core::transaction::Transaction::consensus_decode_vec(data_bytes, &decoder)
+            fedimint_core::transaction::Transaction::consensus_decode_whole(&data_bytes, &decoder)
                 .expect("Invalid data in DB");
 
         Ok(crate::federation::db::Transaction {
@@ -119,8 +119,8 @@ impl FromRow for crate::federation::db::SessionOutcome {
         let decoder = ModuleDecoderRegistry::default().with_fallback();
 
         let session_data_bytes: Vec<u8> = row.try_get("session")?;
-        let data = fedimint_core::session_outcome::SessionOutcome::consensus_decode_vec(
-            session_data_bytes,
+        let data = fedimint_core::session_outcome::SessionOutcome::consensus_decode_whole(
+            &session_data_bytes,
             &decoder,
         )
         .expect("Invalid data in DB");
@@ -144,8 +144,8 @@ impl SessionOutcome {
         decoders: &ModuleDecoderRegistry,
     ) -> Result<Self, Error> {
         let session_data_bytes: Vec<u8> = row.try_get("session")?;
-        let data = fedimint_core::session_outcome::SessionOutcome::consensus_decode_vec(
-            session_data_bytes,
+        let data = fedimint_core::session_outcome::SessionOutcome::consensus_decode_whole(
+            &session_data_bytes,
             decoders,
         )
         .expect("Invalid data in DB");
diff --git a/fmo_server/src/federation/guardians.rs b/fmo_server/src/federation/guardians.rs
@@ -24,7 +24,6 @@ impl FederationObserver {
         federation_id: FederationId,
         config: ClientConfig,
     ) -> anyhow::Result<()> {
-        const REQUEST_TIMEOUT: Duration = Duration::from_secs(20);
         const REQUEST_INTERVAL: Duration = Duration::from_secs(60);
 
         let mut interval = tokio::time::interval(REQUEST_INTERVAL);
@@ -35,7 +34,9 @@ impl FederationObserver {
                 .iter()
                 .map(|(&peer_id, peer_url)| (peer_id, peer_url.url.clone())),
             &None,
-        );
+        )
+        .await?;
+
         let wallet_module = config
             .modules
             .iter()
@@ -55,7 +56,6 @@ impl FederationObserver {
                         // the background
                         let status = api
                             .request_single_peer(
-                                Some(REQUEST_TIMEOUT),
                                 STATUS_ENDPOINT.to_owned(),
                                 ApiRequestErased::default(),
                                 peer_id,
@@ -70,7 +70,6 @@ impl FederationObserver {
                         let block_height = api
                             .with_module(wallet_module)
                             .request_single_peer(
-                                Some(REQUEST_TIMEOUT),
                                 BLOCK_COUNT_LOCAL_ENDPOINT.to_owned(),
                                 ApiRequestErased::default(),
                                 peer_id,
diff --git a/fmo_server/src/federation/observer.rs b/fmo_server/src/federation/observer.rs
diff --git a/fmo_server/src/meta.rs b/fmo_server/src/meta.rs
diff --git a/fmo_server/src/util.rs b/fmo_server/src/util.rs
