Chore/align GitHub

.changeset/blue-gorillas-rush.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/recovery-shared': patch
+---
+
+updated x-key types for import and vault shared pages

.changeset/dry-paws-thank.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/recovery-utility': minor
+---
+
+Display each keyset with their enabled keys

.changeset/eleven-cheetahs-rest.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/recovery-utility': minor
+---
+
+get specific keyset when x-keys are required

.changeset/giant-cups-explode.md

@@ -0,0 +1,6 @@
+---
+'@fireblocks/recovery-utility': minor
+'@fireblocks/recovery-shared': minor
+---
+
+allow to map keyset when no keyset threshold mapping is defined in drs kit

.changeset/old-drinks-camp.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/recovery-shared': minor
+---
+
+Added type distinction for relay and utility in workspace definition and support for keyset account mapping

.changeset/orange-bobcats-taste.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/extended-key-recovery': patch
+---
+
+Updated tests for multiple keysets

.changeset/tender-turtles-destroy.md

@@ -0,0 +1,6 @@
+---
+'@fireblocks/recovery-utility': minor
+'@fireblocks/recovery-shared': minor
+---
+
+Moved x-key page to utility only

.changeset/violet-ducks-joke.md

@@ -0,0 +1,5 @@
+---
+'@fireblocks/extended-key-recovery': minor
+---
+
+Added recovery for multiple keysets

.changeset/wild-timers-think.md

@@ -0,0 +1,6 @@
+---
+'@fireblocks/wallet-derivation': minor
+'@fireblocks/recovery-shared': minor
+---
+
+Make derivation and base wallet to use correct keyset for account created or used

.gitignore

@@ -10,9 +10,10 @@ dependencies
 node_modules
 .pnp
 .pnp.js
-
+.claude/
 # Generated dependency attributions
 ATTRIBUTION.md
+.gitlab-ci.yml
 
 # Testing
 coverage

README.md

@@ -8,10 +8,6 @@
   Recover Fireblocks assets and keys in a disaster, verify a Recovery Kit, or generate keys to set up a new Recovery Kit.
   <br />
   <br />
-  <p align="center">
-    ⬇️ Latest version 1.8.1 - Download for macOS / Linux via the Fireblocks Console
-  </p>
-  <br />
   <br />
   <a href="#" target="_blank">
     <img  src="docs/img/splash.png" alt="Screenshot" />

apps/recovery-relay/components/WithdrawModal/CreateTransaction/index.tsx

@@ -60,7 +60,7 @@ const getRPCKey = (
   return baseAsset;
 };
 
-export const getAssetURL = (
+export const getAssetURLAndApiKey = (
   assetId: string,
   RPCs: Record<
     string,
@@ -69,16 +69,18 @@ export const getAssetURL = (
       allowedEmptyValue: boolean;
       name: string;
       url?: string | null | undefined;
+      requiresApiKey?: boolean;
+      apiKey?: string | null;
     }
   >,
-): string | null | undefined => {
+): { url: string; requiresApiKey?: boolean; apiKey?: string | null } | null | undefined => {
   const rpcKey = getRPCKey(assetId, RPCs);
   if (rpcKey === undefined) {
     return undefined;
   }
 
   const assetRPCData = RPCs[rpcKey];
-  const { url } = assetRPCData;
+  const { url, requiresApiKey, apiKey } = assetRPCData;
   logger.info(`RPC URL for ${rpcKey} is ${assetRPCData.enabled ? 'enabled' : 'disabled'} and is ${url}`);
 
   if (assetRPCData.allowedEmptyValue && (url === null || url === undefined)) {
@@ -88,7 +90,7 @@ export const getAssetURL = (
     // If not enabled we shouldn't be getting a request to the relay for it regardless.
     return undefined;
   }
-  return url;
+  return { url: url as string, requiresApiKey, apiKey };
 };
 
 const getWallet = (accounts: Map<number, VaultAccount<Derivation>>, accountId?: number, assetId?: string) => {
@@ -152,8 +154,9 @@ export const CreateTransaction = ({ asset, inboundRelayParams, setSignTxResponse
   const values = watch();
 
   const fromAddress = values.fromAddress ?? defaultValues.fromAddress;
-
-  const derivation = wallet?.derivations?.get(getDerivationMapKey(asset?.id, fromAddress));
+  const derivation = fromAddress
+    ? wallet?.derivations?.get(getDerivationMapKey(asset?.id, fromAddress)) ?? wallet?.derivations?.get(fromAddress)
+    : undefined;
 
   // TODO: Show both original balance and adjusted balance in create tx UI
 
@@ -164,7 +167,12 @@ export const CreateTransaction = ({ asset, inboundRelayParams, setSignTxResponse
     enabled: !!derivation,
     queryFn: async () => {
       logger.debug(`Querying prepare transaction ${toAddress}`);
-      const rpcUrl = getAssetURL(derivation?.assetId ?? '', RPCs);
+      const data = getAssetURLAndApiKey(derivation?.assetId ?? '', RPCs);
+      if (!data) {
+        throw new Error(`No RPC data for: ${derivation?.assetId}`);
+      }
+      const { url: rpcUrl, requiresApiKey, apiKey } = data;
+
       if (rpcUrl === undefined) {
         logger.error(`Unknown URL for ${derivation?.assetId ?? '<empty>'}`);
         throw new Error(`No RPC Url for: ${derivation?.assetId}`);
@@ -185,6 +193,13 @@ export const CreateTransaction = ({ asset, inboundRelayParams, setSignTxResponse
         (derivation as ERC20).setToAddress(toAddress);
       }
       if (rpcUrl !== null) derivation!.setRPCUrl(rpcUrl); // this must remain the last method called on derivation for ERC20 support
+      if (requiresApiKey) {
+        if (!apiKey || apiKey === '') {
+          throw new Error(`RPC for ${derivation?.assetId} requires an API key. Please set one in the Settings page.`);
+        } else {
+          derivation!.setAPIKey(apiKey);
+        }
+      }
 
       return await derivation!.prepare?.(toAddress, values.memo);
     },
@@ -328,6 +343,12 @@ export const CreateTransaction = ({ asset, inboundRelayParams, setSignTxResponse
             {prepareQuery.error || typeof prepareQuery.data?.balance === 'undefined'
               ? 'Could not get balance'
               : `${prepareQuery.data.balance} ${asset.id}`}
+            {prepareQuery.error && (
+              <>
+                <br />
+                {prepareQuery.error.message}
+              </>
+            )}
           </Typography>
         )}
       </Grid>
@@ -337,7 +358,11 @@ export const CreateTransaction = ({ asset, inboundRelayParams, setSignTxResponse
             id={addressExplorerId}
             variant='outlined'
             component={NextLinkComposed}
-            to={asset.getExplorerUrl?.('address')(fromAddress ?? '')}
+            to={
+              asset.nativeAsset === 'XRP'
+                ? asset.getExplorerUrl?.('accounts')(fromAddress ?? '')
+                : asset.getExplorerUrl?.('address')(fromAddress ?? '')
+            }
             target='_blank'
             rel='noopener noreferrer'
           >

apps/recovery-relay/components/WithdrawModal/index.tsx

@@ -17,7 +17,7 @@ import { sanatize } from '@fireblocks/recovery-shared/lib/sanatize';
 import { getAssetConfig, isTransferableToken } from '@fireblocks/asset-config/util';
 import { SignOrBroadcastTransaction } from '@fireblocks/recovery-shared/components';
 import { useWorkspace } from '../../context/Workspace';
-import { CreateTransaction, getAssetURL } from './CreateTransaction';
+import { CreateTransaction, getAssetURLAndApiKey } from './CreateTransaction';
 import { LateInitConnectedWallet } from '../../lib/wallets/LateInitConnectedWallet';
 import { useSettings } from '../../context/Settings';
 import { ERC20 } from '../../lib/wallets/ERC20';
@@ -83,11 +83,18 @@ export const WithdrawModal = () => {
     const { assetId } = params.signedTx;
     const wallet = accounts.get(params.accountId)?.wallets.get(assetId);
 
-    const derivation = wallet?.derivations?.get(getDerivationMapKey(assetId, params.signedTx.from));
+    const fromAddress = params.signedTx.from;
+    const derivation = fromAddress
+      ? wallet?.derivations?.get(getDerivationMapKey(assetId, fromAddress)) ?? wallet?.derivations?.get(fromAddress)
+      : undefined;
     if (isTransferableToken(assetId) && derivation instanceof ERC20) {
       (derivation as ERC20).setNativeAsset(getAssetConfig(assetId)!.nativeAsset);
     }
-    const rpcUrl = getAssetURL(derivation?.assetId ?? '', RPCs);
+    const data = getAssetURLAndApiKey(derivation?.assetId ?? '', RPCs);
+    if (!data) {
+      throw new Error(`No RPC data for: ${derivation?.assetId}`);
+    }
+    const { url: rpcUrl, requiresApiKey, apiKey } = data;
     if (rpcUrl === undefined) {
       throw new Error(`No RPC URL for asset ${derivation?.assetId}`);
     } else if (rpcUrl === null) {
@@ -98,12 +105,20 @@ export const WithdrawModal = () => {
       derivation?.setRPCUrl(rpcUrl);
     }
 
+    if (requiresApiKey) {
+      if (!apiKey || apiKey === '') {
+        throw new Error(`RPC for ${derivation?.assetId} requires an API key`);
+      } else {
+        derivation!.setAPIKey(apiKey);
+      }
+    }
+
     const signedTxHex = params.signedTx.hex;
 
     const cleanDerivation = derivation ? sanatize(derivation) : undefined;
     logger.info('Derivation and signed transaction hash:', { cleanDerivation, signedTxHex });
     try {
-      const newTxHash = await derivation?.broadcastTx(signedTxHex);
+      const newTxHash = await derivation?.broadcastTx(signedTxHex, logger, derivation?.assetId);
 
       setTxHash(newTxHash);
       logger.info({ newTxHash });
@@ -118,6 +133,13 @@ export const WithdrawModal = () => {
 
   logger.info('Outbound URL', { outboundRelayUrl });
 
+  if (outboundRelayUrl) {
+    console.log('='.repeat(80));
+    console.log('COPY THIS RELAY URL:');
+    console.log(outboundRelayUrl);
+    console.log('='.repeat(80));
+  }
+
   return (
     <BaseModal
       open={!!action?.startsWith('tx') && !!asset}

apps/recovery-relay/context/Settings.tsx

@@ -37,8 +37,14 @@ export const SettingsProvider = ({ children }: Props) => {
   }, []);
 
   const saveSettings = async (data: RelaySettingsInput) => {
-    logger.info('Storing new settings', data);
-    window.localStorage.setItem('settings', JSON.stringify(data));
+    try {
+      logger.info('Storing new settings', data);
+      window.localStorage.setItem('settings', JSON.stringify(data));
+      setSettings(data);
+    } catch (error) {
+      logger.error('Failed to save settings', error);
+      throw error;
+    }
   };
 
   // eslint-disable-next-line react/jsx-no-constructed-context-values

apps/recovery-relay/lib/defaultRPCs.ts

@@ -2,27 +2,40 @@ export const defaultRPCs: Record<
   string,
   {
     url: string | undefined | null;
+    broadcastUrl?: string;
     name: string;
     enabled: boolean;
     allowedEmptyValue: boolean;
+    requiresApiKey?: boolean;
+    apiKey?: string | null;
   }
 > = {
   ALGO: { url: null, allowedEmptyValue: true, enabled: true, name: 'Algorand' },
   ALGO_TEST: { url: null, allowedEmptyValue: true, enabled: true, name: 'Algorand Testnet' },
-  AVAX: { url: 'https://api.avax-test.network/ext/bc/C/rpc', name: 'Avalance C-Chain', enabled: true, allowedEmptyValue: false },
+  AVAX: { url: 'https://api.avax.network/ext/bc/C/rpc', name: 'Avalance C-Chain', enabled: true, allowedEmptyValue: false },
   AVAXTEST: {
-    url: 'https://api.avax.network/ext/bc/C/rpc',
+    url: 'https://api.avax-test.network/ext/bc/C/rpc',
     name: 'Avalance C-Chain Testnet',
     enabled: true,
     allowedEmptyValue: false,
   },
   FLR: { url: 'https://flare-api.flare.network/ext/C/rpc', name: 'Flare', enabled: true, allowedEmptyValue: false },
-  BTC: { url: 'https://api.blockchair.com/bitcoin', name: 'Bitcoin', enabled: true, allowedEmptyValue: false },
+  BTC: {
+    url: 'https://api.blockchair.com/bitcoin',
+    name: 'Bitcoin',
+    enabled: true,
+    allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
+  },
   BTC_TEST: {
     url: 'https://api.blockchair.com/bitcoin/testnet',
+    broadcastUrl: 'https://blockstream.info/testnet/api/tx',
     name: 'Bitcoin Testnet',
     enabled: true,
     allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
   },
   BCH: { url: 'https://rest.bch.actorforth.org/v2', name: 'Bitcoin Cash', enabled: true, allowedEmptyValue: false },
   BCH_TEST: { url: undefined, name: 'Bitcoin Cash Testnet', enabled: false, allowedEmptyValue: false },
@@ -33,16 +46,44 @@ export const defaultRPCs: Record<
     enabled: true,
     allowedEmptyValue: false,
   },
-  DOGE: { url: 'https://api.blockchair.com/dogecoin', name: 'Dogecoin', enabled: true, allowedEmptyValue: false },
+  DOGE: {
+    url: 'https://api.blockchair.com/dogecoin',
+    name: 'Dogecoin',
+    enabled: true,
+    allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
+  },
   DOGE_TEST: { url: undefined, name: 'Dogecoin Testnet', enabled: false, allowedEmptyValue: false },
   DOT: { url: 'wss://rpc.polkadot.io', name: 'Polkadot', enabled: true, allowedEmptyValue: false },
   WND: { url: 'wss://westend-rpc.polkadot.io', name: 'Westend (Polkadot Testnet)', enabled: true, allowedEmptyValue: false },
   KSM: { url: 'wss://kusama-rpc.polkadot.io', name: 'Kusama', enabled: true, allowedEmptyValue: false },
-  LTC: { url: 'https://api.blockchair.com/litecoin', name: 'Litecoin', enabled: true, allowedEmptyValue: false },
+  LTC: {
+    url: 'https://api.blockchair.com/litecoin',
+    name: 'Litecoin',
+    enabled: true,
+    allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
+  },
   LTC_TEST: { url: undefined, name: 'Litecoin Testnet', enabled: false, allowedEmptyValue: false },
-  ZEC: { url: 'https://api.blockchair.com/zcash', name: 'Litecoin', enabled: true, allowedEmptyValue: false },
+  ZEC: {
+    url: 'https://api.blockchair.com/zcash',
+    name: 'Litecoin',
+    enabled: true,
+    allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
+  },
   ZEC_TEST: { url: undefined, name: 'ZCash Testnet', enabled: false, allowedEmptyValue: false },
-  DASH: { url: 'https://api.blockchair.com/Dash', name: 'Dash', enabled: true, allowedEmptyValue: false },
+  DASH: {
+    url: 'https://api.blockchair.com/Dash',
+    name: 'Dash',
+    enabled: true,
+    allowedEmptyValue: false,
+    requiresApiKey: true,
+    apiKey: null,
+  },
   FTM_FANTOM: { url: 'https://rpcapi.fantom.network', name: 'Fantom Testnet', enabled: true, allowedEmptyValue: false },
   ETC: { url: 'https://geth-de.etc-network.info', name: 'Ethereum Classic', enabled: true, allowedEmptyValue: false },
   ETC_TEST: {
@@ -64,7 +105,7 @@ export const defaultRPCs: Record<
     allowedEmptyValue: false,
   },
   ETH_TEST5: {
-    url: 'https://ethereum-sepolia-rpc.publicnode.com',
+    url: 'https://sepolia.drpc.org',
     name: 'Ethereum Sepolia Testnet',
     enabled: true,
     allowedEmptyValue: false,