Merge pull request #87 from okjodom/type-updates

Type Updates
fedimint · Jul 18, 2023 · 43debed · 43debed
2 parents 2619034 + d3530f1
commit 43debed
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 37 deletions.
diff --git a/apps/gateway-ui/src/App.tsx b/apps/gateway-ui/src/App.tsx
@@ -70,7 +70,7 @@ export const App = React.memo(function Admin(): JSX.Element {
               {gatewayInfo.federations.map((federation: Federation) => {
                 return (
                   <FederationCard
-                    key={federation.registration.gateway_pub_key}
+                    key={federation.federation_id}
                     federation={federation}
                   />
                 );

diff --git a/apps/gateway-ui/src/components/FederationCard.tsx b/apps/gateway-ui/src/components/FederationCard.tsx
@@ -29,11 +29,7 @@ enum OpenTab {
 }
 
 export const FederationCard = (props: FederationCardProps): JSX.Element => {
-  const {
-    federation_id,
-    balance_msat,
-    registration: { gateway_pub_key },
-  } = props.federation;
+  const { federation_id, balance_msat } = props.federation;
 
   const [showDetails, setShowDetails] = useState<boolean>(false);
   const [tab, setOpenTab] = useState<{ open: OpenTab; mru: OpenTab }>({
@@ -74,7 +70,7 @@ export const FederationCard = (props: FederationCardProps): JSX.Element => {
             </Circle>
             <Box pl='2'>
               <Text fontSize={{ base: '13px', md: '15px', lg: '16px' }}>
-                {`${gateway_pub_key?.substring(0, 24)}...`}
+                {`${federation_id.substring(0, 24)}...`}
               </Text>
             </Box>
           </HStack>

diff --git a/apps/gateway-ui/src/types.tsx b/apps/gateway-ui/src/types.tsx
@@ -1,35 +1,16 @@
-export interface Fees {
+interface Fees {
   base_msat: number;
   proportional_millionths: number;
 }
-export interface Registration {
-  gateway_pub_key: string;
-  api: string;
-  fees: Fees;
-  mint_channel_id: number;
-  node_pub_key: string;
-  route_hints: object[]; // FIXME : https://github.com/fedimint/ui/issues/80
-  valid_until: {
-    nanos_since_epoch: number;
-    secs_since_epoch: number;
-  };
-}
 
 export interface Federation {
   federation_id: string;
-  registration: Registration;
   balance_msat: number;
-  lightning_alias: string;
-  version_hash: string;
-  lightning_pub_key: string;
 }
 
 export interface GatewayInfo {
   federations: Federation[];
-  fees: {
-    base_msat: number;
-    proportional_millionths: number;
-  };
+  fees: Fees;
   lightning_alias: string;
   lightning_pub_key: string;
   version_hash: string;

diff --git a/apps/guardian-ui/src/GuardianApi.ts b/apps/guardian-ui/src/GuardianApi.ts
@@ -3,7 +3,6 @@ import { ConfigGenParams, ConsensusState, PeerHashMap } from './setup/types';
 import {
   ConfigResponse,
   ConsensusStatus,
-  Gateway,
   ServerStatus,
   StatusResponse,
   Versions,

diff --git a/apps/guardian-ui/src/components/ConnectedNodes.tsx b/apps/guardian-ui/src/components/ConnectedNodes.tsx
@@ -12,7 +12,7 @@ export const ConnectedNodes: FC<ConnectedNodesProps> = ({ gateways }) => {
     <>
       {gateways.map((gateway: Gateway) => (
         <LightningNode
-          key={gateway.gateway_pub_key}
+          key={gateway.gateway_id}
           nodeName={'Gateway'}
           nodeId={gateway.node_pub_key}
           incomingFees={gateway.fees}

diff --git a/apps/guardian-ui/src/types.tsx b/apps/guardian-ui/src/types.tsx
@@ -75,25 +75,38 @@ export interface ClientConfig {
   modules: Record<number, FedimintModule>;
   meta: MetaConfig;
 }
+
 export interface ConfigResponse {
   client_config: ClientConfig;
 }
 
-// These types are shared with the gateway-ui
+interface Validity {
+  nanos_since_epoch: number;
+  secs_since_epoch: number;
+}
+
 export interface Fees {
   base_msat: number;
   proportional_millionths: number;
 }
 
 export interface Gateway {
-  gateway_pub_key: string;
   api: string;
   fees: Fees;
+  gateway_id: string;
+  gateway_redeem_key: string;
   mint_channel_id: number;
   node_pub_key: string;
-  route_hints: object[]; // FIXME: https://github.com/fedimint/ui/issues/80
-  valid_until: {
-    nanos_since_epoch: number;
-    secs_since_epoch: number;
-  };
+  route_hints: RouteHint[];
+  valid_until: Validity;
+}
+
+interface RouteHint {
+  base_msat: number;
+  proportional_millionths: number;
+  cltv_expiry_delta: number;
+  htlc_maximum_msat: number;
+  htlc_minimum_msat: number;
+  short_channel_id: string;
+  src_node_id: string;
 }