Merge pull request fedimint#267 from fedimint/wo/update-fedimint

Update fedimint to `23ee7c`, fix listGateways response
Kodylow · Nov 6, 2023 · 9ca4e73 · 9ca4e73
2 parents 57386a1 + 9b2ce7b
commit 9ca4e73
Show file tree

Hide file tree

Showing 4 changed files with 182 additions and 68 deletions.
diff --git a/apps/guardian-ui/src/components/GatewaysCard.tsx b/apps/guardian-ui/src/components/GatewaysCard.tsx
@@ -35,11 +35,11 @@ export const GatewaysCard: React.FC<GatewaysCardProps> = ({ config }) => {
   useEffect(() => {
     if (!lnModuleId) return;
     api
-      .moduleApiCall<Gateway[]>(
+      .moduleApiCall<{ info: Gateway }[]>(
         Number(lnModuleId),
         LightningModuleRpc.listGateways
       )
-      .then(setGateways)
+      .then((gateways) => setGateways(gateways.map((g) => g.info)))
       .catch(console.error);
   }, [config, api, lnModuleId]);
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   fedimintd_1:
     # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
-    image: fedimint/fedimintd:a71267934a5ec2f0df28686fa21362386e762ca0
+    image: fedimint/fedimintd:23ee7cb6e96fce89bb024fbc1fcfccbfb3dc968b
     environment:
       - FM_DATA_DIR=/data
       - FM_BIND_P2P=0.0.0.0:18173
@@ -21,7 +21,7 @@ services:
 
   gatewayd_1:
     # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
-    image: fedimint/gatewayd:a71267934a5ec2f0df28686fa21362386e762ca0
+    image: fedimint/gatewayd:23ee7cb6e96fce89bb024fbc1fcfccbfb3dc968b
     command: gatewayd lnd
     environment:
       # Path to folder containing gateway config and data files
@@ -61,7 +61,7 @@ services:
 
   fedimintd_2:
     # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
-    image: fedimint/fedimintd:a71267934a5ec2f0df28686fa21362386e762ca0
+    image: fedimint/fedimintd:23ee7cb6e96fce89bb024fbc1fcfccbfb3dc968b
     environment:
       - FM_DATA_DIR=/data
       - FM_BIND_P2P=0.0.0.0:18173
@@ -85,7 +85,7 @@ services:
 
   fedimintd_3:
     # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
-    image: fedimint/fedimintd:a71267934a5ec2f0df28686fa21362386e762ca0
+    image: fedimint/fedimintd:23ee7cb6e96fce89bb024fbc1fcfccbfb3dc968b
     environment:
       - FM_DATA_DIR=/data
       - FM_BIND_P2P=0.0.0.0:18174
@@ -103,7 +103,7 @@ services:
 
   fedimintd_4:
     # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
-    image: fedimint/fedimintd:a71267934a5ec2f0df28686fa21362386e762ca0
+    image: fedimint/fedimintd:23ee7cb6e96fce89bb024fbc1fcfccbfb3dc968b
     environment:
       - FM_DATA_DIR=/data
       - FM_BIND_P2P=0.0.0.0:18175