Merge pull request #473 from m1sterc001guy/version_update

feat: update versions in connection stream

Author: m1sterc001guy

lib/app.dart

@@ -564,7 +564,6 @@ class _MyAppState extends State<MyApp> {
               fed: _selectedFederation!,
               welcomeMessage: meta.welcome,
               imageUrl: meta.picture,
-              guardians: meta.guardians,
               onLeaveFederation: _leaveFederation,
             ),
       ),

lib/discover.dart

@@ -75,7 +75,6 @@ class _Discover extends State<Discover> with SingleTickerProviderStateMixin {
                 inviteCode: inviteCode,
                 welcomeMessage: meta.welcome,
                 imageUrl: meta.picture,
-                guardians: meta.guardians,
                 joinable: true,
                 onLeaveFederation: () {},
               ),

lib/frb_generated.dart

@@ -13058,14 +13058,15 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   PeerStatus dco_decode_peer_status(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
     final arr = raw as List<dynamic>;
-    if (arr.length != 5)
-      throw Exception('unexpected arr length: expect 5 but see ${arr.length}');
+    if (arr.length != 6)
+      throw Exception('unexpected arr length: expect 6 but see ${arr.length}');
     return PeerStatus(
       peerId: dco_decode_u_16(arr[0]),
       name: dco_decode_String(arr[1]),
       online: dco_decode_bool(arr[2]),
       connectivity: dco_decode_peer_connectivity(arr[3]),
       url: dco_decode_String(arr[4]),
+      version: dco_decode_opt_String(arr[5]),
     );
   }
 
@@ -15935,12 +15936,14 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     var var_online = sse_decode_bool(deserializer);
     var var_connectivity = sse_decode_peer_connectivity(deserializer);
     var var_url = sse_decode_String(deserializer);
+    var var_version = sse_decode_opt_String(deserializer);
     return PeerStatus(
       peerId: var_peerId,
       name: var_name,
       online: var_online,
       connectivity: var_connectivity,
       url: var_url,
+      version: var_version,
     );
   }
 
@@ -18836,6 +18839,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     sse_encode_bool(self.online, serializer);
     sse_encode_peer_connectivity(self.connectivity, serializer);
     sse_encode_String(self.url, serializer);
+    sse_encode_opt_String(self.version, serializer);
   }
 
   @protected

lib/multimint.dart

@@ -876,12 +876,18 @@ class PeerStatus {
   final PeerConnectivity connectivity;
   final String url;
 
+  /// Guardian's reported `fedimintd` version. Travels with the peer status so
+  /// the UI reflects guardian upgrades in real time (a guardian upgrade
+  /// restarts fedimintd, which surfaces as a reconnect on the status stream).
+  final String? version;
+
   const PeerStatus({
     required this.peerId,
     required this.name,
     required this.online,
     required this.connectivity,
     required this.url,
+    this.version,
   });
 
   @override
@@ -890,7 +896,8 @@ class PeerStatus {
       name.hashCode ^
       online.hashCode ^
       connectivity.hashCode ^
-      url.hashCode;
+      url.hashCode ^
+      version.hashCode;
 
   @override
   bool operator ==(Object other) =>
@@ -901,7 +908,8 @@ class PeerStatus {
           name == other.name &&
           online == other.online &&
           connectivity == other.connectivity &&
-          url == other.url;
+          url == other.url &&
+          version == other.version;
 }
 
 /// Fee parameters for an on-chain deposit (peg-in). We can't quote an exact

lib/scan.dart

@@ -358,7 +358,6 @@ class _ScanQRPageState extends State<ScanQRPage> {
                         inviteCode: field0,
                         welcomeMessage: meta.welcome,
                         imageUrl: meta.picture,
-                        guardians: meta.guardians,
                         joinable: true,
                         onLeaveFederation: () {},
                       ),
@@ -511,7 +510,6 @@ class _ScanQRPageState extends State<ScanQRPage> {
                         inviteCode: field0,
                         welcomeMessage: meta.welcome,
                         imageUrl: meta.picture,
-                        guardians: meta.guardians,
                         joinable: true,
                         ecash: field1,
                         onLeaveFederation: () {},

lib/screens/federation_info_screen.dart

@@ -17,7 +17,6 @@ class FederationInfoScreen extends StatefulWidget {
   final FederationSelector fed;
   final String? welcomeMessage;
   final String? imageUrl;
-  final List<Guardian>? guardians;
   final VoidCallback onLeaveFederation;
 
   // Joinable mode fields
@@ -30,7 +29,6 @@ class FederationInfoScreen extends StatefulWidget {
     required this.fed,
     this.welcomeMessage,
     this.imageUrl,
-    this.guardians,
     required this.onLeaveFederation,
     this.joinable = false,
     this.inviteCode,
@@ -472,9 +470,7 @@ class _FederationInfoScreenState extends State<FederationInfoScreen> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        context.l10n.versionLabel(
-                          widget.guardians?[index].version ?? '',
-                        ),
+                        context.l10n.versionLabel(peer.version ?? ''),
                         style: theme.textTheme.bodySmall?.copyWith(
                           color: Colors.grey,
                         ),

lib/screens/my_wallet_screen.dart

@@ -164,7 +164,6 @@ class _MyWalletScreenState extends State<MyWalletScreen> {
                   fed: widget.fed,
                   welcomeMessage: _federationMeta?.welcome,
                   imageUrl: _federationMeta?.picture,
-                  guardians: _federationMeta?.guardians ?? [],
                   onLeaveFederation: widget.onLeaveFederation ?? () {},
                 ),
           ),

lib/sidebar.dart

@@ -468,7 +468,6 @@ class FederationListItem extends StatelessWidget {
                               fed: fed,
                               welcomeMessage: data.welcomeMessage,
                               imageUrl: data.federationImageUrl,
-                              guardians: data.guardians,
                               onLeaveFederation: onLeaveFederation,
                             ),
                       ),

rust/ecashapp/src/frb_generated.rs

@@ -15415,12 +15415,14 @@ impl SseDecode for crate::multimint::PeerStatus {
         let mut var_online = <bool>::sse_decode(deserializer);
         let mut var_connectivity = <crate::multimint::PeerConnectivity>::sse_decode(deserializer);
         let mut var_url = <String>::sse_decode(deserializer);
+        let mut var_version = <Option<String>>::sse_decode(deserializer);
         return crate::multimint::PeerStatus {
             peer_id: var_peerId,
             name: var_name,
             online: var_online,
             connectivity: var_connectivity,
             url: var_url,
+            version: var_version,
         };
     }
 }
@@ -18080,6 +18082,7 @@ impl flutter_rust_bridge::IntoDart for crate::multimint::PeerStatus {
             self.online.into_into_dart().into_dart(),
             self.connectivity.into_into_dart().into_dart(),
             self.url.into_into_dart().into_dart(),
+            self.version.into_into_dart().into_dart(),
         ]
         .into_dart()
     }
@@ -19980,6 +19983,7 @@ impl SseEncode for crate::multimint::PeerStatus {
         <bool>::sse_encode(self.online, serializer);
         <crate::multimint::PeerConnectivity>::sse_encode(self.connectivity, serializer);
         <String>::sse_encode(self.url, serializer);
+        <Option<String>>::sse_encode(self.version, serializer);
     }
 }
 

rust/ecashapp/src/multimint.rs

@@ -310,6 +310,10 @@ pub struct PeerStatus {
     pub online: bool,
     pub connectivity: PeerConnectivity,
     pub url: String,
+    /// Guardian's reported `fedimintd` version. Travels with the peer status so
+    /// the UI reflects guardian upgrades in real time (a guardian upgrade
+    /// restarts fedimintd, which surfaces as a reconnect on the status stream).
+    pub version: Option<String>,
 }
 
 #[derive(Debug, Serialize, Clone)]
@@ -1510,19 +1514,17 @@ impl Multimint {
                 futures_util::future::join_all(peers.iter().map(|(peer_id, (name, url))| {
                     let client = client.clone();
                     async move {
-                        let online = client
-                            .api()
-                            .fedimintd_version((*peer_id).into())
-                            .await
-                            .is_ok();
+                        let fetched_version =
+                            client.api().fedimintd_version((*peer_id).into()).await.ok();
                         PeerStatus {
                             peer_id: *peer_id,
                             name: name.clone(),
-                            online,
+                            online: fetched_version.is_some(),
                             // The preview path calls fedimintd_version directly rather than
                             // going through the pooled connection, so the hop is always direct.
                             connectivity: PeerConnectivity::Direct,
                             url: url.clone(),
+                            version: fetched_version,
                         }
                     }
                 }))
@@ -1534,28 +1536,67 @@ impl Multimint {
         // Get the connection status stream from the client
         let status_stream = client.api().connection_status_stream();
 
-        let mapped_stream = status_stream.map(move |status_map| {
-            let peers_status: Vec<PeerStatus> = peers
-                .iter()
-                .map(|(peer_id, (name, url))| {
+        // Fold the guardian version into each peer status so the UI reflects
+        // upgrades in real time without a separate timer. The version only needs
+        // (re)fetching when a peer comes online: a guardian upgrade restarts
+        // fedimintd, which surfaces here as an offline->online transition. We
+        // cache the last-known version per peer and refetch only on that
+        // transition (or if we never managed to fetch it) to avoid hitting every
+        // guardian on each unrelated connectivity change.
+        let mapped_stream = stream::unfold(
+            (
+                Box::pin(status_stream),
+                client,
+                peers,
+                BTreeMap::<u16, Option<String>>::new(),
+                BTreeMap::<u16, bool>::new(),
+            ),
+            |(mut status_stream, client, peers, mut cached_versions, mut prev_online)| async move {
+                let status_map = status_stream.next().await?;
+
+                let mut peers_status = Vec::with_capacity(peers.len());
+                for (peer_id, (name, url)) in peers.iter() {
                     let (online, connectivity) = match status_map.get(&(*peer_id).into()) {
                         Some(FedimintPeerStatus::Connected(c)) => (true, (*c).into()),
                         Some(FedimintPeerStatus::Disconnected) | None => {
                             (false, PeerConnectivity::Unknown)
                         }
                     };
-                    PeerStatus {
+
+                    let version = if online {
+                        let was_online = prev_online.get(peer_id).copied().unwrap_or(false);
+                        let have_version =
+                            cached_versions.get(peer_id).is_some_and(|v| v.is_some());
+                        if was_online && have_version {
+                            cached_versions.get(peer_id).cloned().flatten()
+                        } else {
+                            let fetched =
+                                client.api().fedimintd_version((*peer_id).into()).await.ok();
+                            cached_versions.insert(*peer_id, fetched.clone());
+                            fetched
+                        }
+                    } else {
+                        None
+                    };
+
+                    prev_online.insert(*peer_id, online);
+
+                    peers_status.push(PeerStatus {
                         peer_id: *peer_id,
                         name: name.clone(),
                         online,
                         connectivity,
                         url: url.clone(),
-                    }
-                })
-                .collect();
+                        version,
+                    });
+                }
 
-            peers_status
-        });
+                Some((
+                    peers_status,
+                    (status_stream, client, peers, cached_versions, prev_online),
+                ))
+            },
+        );
 
         Ok(mapped_stream.boxed())
     }