feat: make expressip macaroon caveat optional

TICKET: BTC-1846

Author: davidkaplanbitgo

modules/express/src/lightning/codecs.ts

@@ -33,17 +33,19 @@ export const GetWalletStateResponse = t.type(
 
 export type GetWalletStateResponse = t.TypeOf<typeof GetWalletStateResponse>;
 
-export const InitLightningWalletRequest = t.strict(
-  {
-    walletId: t.string,
-    passphrase: t.string,
-    signerIP: IPAddress,
-    signerTlsCert: t.string,
-    signerTlsKey: t.string,
-    expressIP: IPAddress,
-  },
-  'InitLightningWalletRequest'
-);
+export const InitLightningWalletRequest = t.intersection([
+  t.strict(
+    {
+      walletId: t.string,
+      passphrase: t.string,
+      signerIP: IPAddress,
+      signerTlsCert: t.string,
+      signerTlsKey: t.string,
+    },
+    'InitLightningWalletRequest'
+  ),
+  t.partial({ expressIP: IPAddress }),
+]);
 
 export type InitLightningWalletRequest = t.TypeOf<typeof InitLightningWalletRequest>;
 

modules/express/src/lightning/lightningSignerRoutes.ts

@@ -94,7 +94,7 @@ export async function handleInitLightningWallet(req: express.Request): Promise<u
 
   const encryptedSignerAdminMacaroon = bitgo.encrypt({
     password: passphrase,
-    input: addIPCaveatToMacaroon(adminMacaroon, expressIP),
+    input: expressIP ? addIPCaveatToMacaroon(adminMacaroon, expressIP) : adminMacaroon,
   });
   const encryptedSignerTlsKey = bitgo.encrypt({ password: passphrase, input: signerTlsKey });
   const watchOnly = createWatchOnly(signerRootKey, network);