feat: add lombard btc bridging

apps/legacy/package.json

@@ -57,6 +57,7 @@
     "@keystonehq/hw-app-eth": "0.4.4",
     "@keystonehq/hw-transport-webusb": "0.5.1",
     "@keystonehq/ur-decoder": "0.9.2",
+    "@layerzerolabs/lz-v2-utilities": "3.0.17",
     "@metamask/eth-sig-util": "4.0.1",
     "@metamask/rpc-errors": "6.3.0",
     "@noble/curves": "1.6.0",

apps/legacy/src/pages/Bridge/BridgeTransactionStatus.tsx

@@ -187,6 +187,26 @@ const BridgeTransactionStatus = () => {
 
   const hasOffBoardingDelay = typeof offboardingDelay === 'number';
 
+  /**
+   * For Unified Bridge, the source transfer is complete when the source
+   * confirmation count is greater than or equal to the source required
+   * confirmation count. This is because it can much longer for the target
+   * transaction to be created so we can't rely on targetStartedAt
+   */
+  const isBridgeSourceTransferComplete = useMemo(() => {
+    if (!bridgeTransaction) {
+      return false;
+    }
+    if (isUnifiedBridgeTransfer(bridgeTransaction)) {
+      return (
+        bridgeTransaction.sourceConfirmationCount >=
+        bridgeTransaction.sourceRequiredConfirmationCount
+      );
+    }
+
+    return Boolean(bridgeTransaction.targetStartedAt);
+  }, [bridgeTransaction]);
+
   if (!activeAccount) {
     history.push('/home');
     return null;
@@ -277,7 +297,7 @@ const BridgeTransactionStatus = () => {
             </Card>
             <BridgeCard // from chain (Middle Card)
               isWaiting={false} // starts immediately
-              isDone={Boolean(bridgeTransaction.targetStartedAt)}
+              isDone={isBridgeSourceTransferComplete}
               isTransferComplete={isComplete}
             >
               <Stack

apps/legacy/src/pages/Bridge/components/BridgeEstimatedTimeWarning.tsx

@@ -0,0 +1,51 @@
+import { getEstimatedBridgingTime } from '@avalabs/bridge-unified';
+import { BridgeType } from '@avalabs/bridge-unified';
+import {
+  AlertCircleIcon,
+  Stack,
+  Typography,
+  useTheme,
+} from '@avalabs/core-k2-components';
+import { NetworkWithCaipId } from '@core/types';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+interface BridgeTimeWarningProps {
+  bridgeType?: BridgeType;
+  targetChain?: NetworkWithCaipId;
+}
+
+export const BridgeEstimatedTimeWarning = ({
+  bridgeType,
+  targetChain,
+}: BridgeTimeWarningProps) => {
+  const { t } = useTranslation();
+  const [estimatedTime, setEstimatedTime] = useState<number>();
+  const theme = useTheme();
+
+  useEffect(() => {
+    if (bridgeType) {
+      setEstimatedTime(getEstimatedBridgingTime(bridgeType));
+    }
+  }, [bridgeType]);
+
+  if (!bridgeType || !estimatedTime || !targetChain) {
+    return null;
+  }
+
+  return (
+    <Stack direction="row" alignItems="center" gap={1}>
+      <Typography variant="caption" color={theme.palette.error.main}>
+        {t(
+          'Bridging to {{targetChain}} can take up to {{estimatedTime}} hours',
+          {
+            targetChain: targetChain?.chainName,
+            estimatedTime,
+          },
+        )}
+      </Typography>
+
+      <AlertCircleIcon size={16} color={theme.palette.error.main} />
+    </Stack>
+  );
+};

apps/legacy/src/pages/Bridge/components/BridgeForm.tsx

@@ -48,6 +48,7 @@ import { NetworkFee } from '@core/types';
 import { findMatchingBridgeAsset, isBitcoinNetwork } from '@core/common';
 import { BridgeTypeFootnote } from './BridgeTypeFootnote';
 import { NetworkSelector } from './NetworkSelector';
+import { BridgeEstimatedTimeWarning } from './BridgeEstimatedTimeWarning';
 
 export type BridgeFormProps = ReturnType<typeof useBridge> & {
   isPending: boolean;
@@ -335,7 +336,7 @@ export const BridgeForm = ({
               pointerEvents: isPending ? 'none' : 'auto',
             }}
           >
-            <Stack ref={cardRef} sx={{ p: 0, overflow: 'unset' }}>
+            <Stack ref={cardRef} sx={{ p: 0, overflow: 'unset', gap: 1 }}>
               <Stack sx={{ width: '100%' }}>
                 {/* From section */}
                 <Card
@@ -537,6 +538,11 @@ export const BridgeForm = ({
                   </Card>
                 </Slide>
               </Stack>
+
+              <BridgeEstimatedTimeWarning
+                bridgeType={bridgeType}
+                targetChain={targetChain}
+              />
             </Stack>
           </Stack>
           {withFeeBox && neededGas && (

packages/common/src/utils/getEnabledBridgeTypes.ts

@@ -1,5 +1,5 @@
 import { BridgeType } from '@avalabs/bridge-unified';
-import { FeatureFlags, FeatureGates } from '@core/types';
+import { type FeatureFlags, FeatureGates } from '@core/types';
 
 export const getEnabledBridgeTypes = (featureFlags: Partial<FeatureFlags>) => {
   const enabled: BridgeType[] = [];
@@ -13,10 +13,17 @@ export const getEnabledBridgeTypes = (featureFlags: Partial<FeatureFlags>) => {
   if (featureFlags[FeatureGates.UNIFIED_BRIDGE_AB_EVM]) {
     enabled.push(BridgeType.AVALANCHE_EVM);
   }
-  if (featureFlags[FeatureGates.UNIFIED_BRIDGE_AB_BTC_TO_AVA]) {
+  if (featureFlags[FeatureGates.UNIFIED_BRIDGE_LOMBARD_BTC_TO_AVA]) {
+    enabled.push(BridgeType.LOMBARD_BTC_TO_BTCB);
+  } else if (featureFlags[FeatureGates.UNIFIED_BRIDGE_AB_BTC_TO_AVA]) {
+    // Make sure to not enable both at the same time
     enabled.push(BridgeType.AVALANCHE_BTC_AVA);
   }
-  if (featureFlags[FeatureGates.UNIFIED_BRIDGE_AB_AVA_TO_BTC]) {
+
+  if (featureFlags[FeatureGates.UNIFIED_BRIDGE_LOMBARD_AVA_TO_BTC]) {
+    enabled.push(BridgeType.LOMBARD_BTCB_TO_BTC);
+  } else if (featureFlags[FeatureGates.UNIFIED_BRIDGE_AB_AVA_TO_BTC]) {
+    // Make sure to not enable both at the same time
     enabled.push(BridgeType.AVALANCHE_AVA_BTC);
   }
 

packages/service-worker/package.json

@@ -68,7 +68,7 @@
     "argon2-browser": "1.18.0",
     "bip32": "2.0.6",
     "bip39": "3.0.4",
-    "bitcoinjs-lib": "5.2.0",
+    "bitcoinjs-lib": "6.1.5",
     "bn.js": "5.2.1",
     "buffer": "6.0.3",
     "date-fns": "2.28.0",

packages/service-worker/rsbuild.worker.common.ts

@@ -49,7 +49,7 @@ export default defineConfig(() => {
         // Joi by default goes to browser-specific version which does not include the list of TLDS (which we need for email validation)
         joi: require.resolve('joi/lib/index.js'),
       },
-      dedupe: ['bn.js', 'bitcoinjs-lib', 'ledger-bitcoin'],
+      dedupe: ['bn.js', 'ledger-bitcoin'],
       fallback: {
         path: false,
         fs: false,

packages/service-worker/src/services/unifiedBridge/UnifiedBridgeService.ts

@@ -129,6 +129,9 @@ export class UnifiedBridgeService implements OnStorageReady {
       async sign() {
         return '0x' as const;
       },
+      async signMessage() {
+        return '0x' as const;
+      },
     };
 
     switch (type) {
@@ -153,6 +156,15 @@ export class UnifiedBridgeService implements OnStorageReady {
           signer: dummySigner,
           bitcoinFunctions: bitcoinProvider,
         };
+
+      case BridgeType.LOMBARD_BTC_TO_BTCB:
+      case BridgeType.LOMBARD_BTCB_TO_BTC:
+        return {
+          type,
+          evmSigner: dummySigner,
+          btcSigner: dummySigner,
+          bitcoinFunctions: bitcoinProvider,
+        };
     }
   }
 

packages/service-worker/src/services/wallet/WalletService.ts

@@ -943,6 +943,10 @@ export class WalletService implements OnUnlock {
       return { signedTx: signingResult.toHex() };
     }
 
+    if ('toHex' in signingResult && typeof signingResult.toHex === 'function') {
+      return { signedTx: signingResult.toHex() as string };
+    }
+
     return signingResult;
   }
 

packages/types/src/feature-flags.ts

@@ -40,6 +40,8 @@ export enum FeatureGates {
   UNIFIED_BRIDGE_AB_EVM = 'unified-bridge-ab-evm',
   UNIFIED_BRIDGE_AB_AVA_TO_BTC = 'unified-bridge-ab-ava-to-btc',
   UNIFIED_BRIDGE_AB_BTC_TO_AVA = 'unified-bridge-ab-btc-to-ava',
+  UNIFIED_BRIDGE_LOMBARD_BTC_TO_AVA = 'unified-bridge-lombard-btc-to-ava',
+  UNIFIED_BRIDGE_LOMBARD_AVA_TO_BTC = 'unified-bridge-lombard-ava-to-btc',
   DEBANK_TRANSACTION_PARSING = 'debank-transaction-parsing',
   DEBANK_TRANSACTION_PRE_EXECUTION = 'debank-transaction-pre-execution',
   PRIMARY_ACCOUNT_REMOVAL = 'primary-account-removal',

packages/ui/src/contexts/UnifiedBridgeProvider.tsx

@@ -10,7 +10,7 @@ import {
   BtcSigner,
   Chain,
   Environment,
-  EvmSigner,
+  EvmSignerWithMessage,
   GasSettings,
   TokenType,
   ErrorCode as UnifiedBridgeErrorCode,
@@ -58,6 +58,7 @@ import { useAccountsContext } from './AccountsProvider';
 import { useConnectionContext } from './ConnectionProvider';
 import { useFeatureFlagContext } from './FeatureFlagsProvider';
 import { useNetworkContext } from './NetworkProvider';
+import { hex, utf8 } from '@scure/base';
 
 export interface UnifiedBridgeContext {
   estimateTransferGas(
@@ -163,8 +164,56 @@ export function UnifiedBridgeProvider({ children }: PropsWithChildren) {
   const [activeBridgeTypes, setActiveBridgeTypes] =
     useState<BridgeServicesMap>();
 
-  const evmSigner: EvmSigner = useMemo(
+  const evmSigner: EvmSignerWithMessage = useMemo(
     () => ({
+      signMessage: async (
+        data: { message: string; address: `0x${string}`; chainId: number },
+        _,
+        { currentSignature, requiredSignatures },
+      ) => {
+        const { message, address, chainId } = data;
+
+        assert(message, UnifiedBridgeError.InvalidTxPayload);
+        assert(address, UnifiedBridgeError.InvalidTxPayload);
+
+        try {
+          const result = await request(
+            {
+              method: RpcMethod.PERSONAL_SIGN,
+              params: [`0x${hex.encode(utf8.decode(message))}`, address],
+            },
+            {
+              scope: `eip155:${chainId}`,
+              context: {
+                customApprovalScreenTitle: t('Confirm Bridge'),
+                alert:
+                  requiredSignatures > currentSignature
+                    ? {
+                        type: 'info',
+                        title: t(
+                          'This operation requires {{total}} approvals.',
+                          {
+                            total: requiredSignatures,
+                          },
+                        ),
+                        notice: t(
+                          'You will be prompted {{remaining}} more time(s).',
+                          {
+                            remaining: requiredSignatures - currentSignature,
+                          },
+                        ),
+                      }
+                    : undefined,
+              },
+            },
+          );
+
+          return result as `0x${string}`;
+        } catch (err) {
+          console.error(err);
+          throw err;
+        }
+      },
       sign: async (
         { from, data, to, value },
         _,
@@ -331,6 +380,22 @@ export function UnifiedBridgeProvider({ children }: PropsWithChildren) {
             signer: btcSigner,
             bitcoinFunctions,
           };
+
+        case BridgeType.LOMBARD_BTC_TO_BTCB:
+          return {
+            type,
+            evmSigner,
+            btcSigner,
+            bitcoinFunctions,
+          };
+
+        case BridgeType.LOMBARD_BTCB_TO_BTC:
+          return {
+            type,
+            evmSigner,
+            btcSigner,
+            bitcoinFunctions,
+          };
       }
     },
     [evmSigner, btcSigner],
@@ -684,6 +749,11 @@ export function UnifiedBridgeProvider({ children }: PropsWithChildren) {
         case UnifiedBridgeErrorCode.TIMEOUT:
           return t('The transaction timed out');
 
+        case UnifiedBridgeErrorCode.NOTARIZATION_FAILED:
+          return t(
+            'Notarization failed for deposit. Your deposit is safe, please contact support to complete the bridge.',
+          );
+
         case UnifiedBridgeErrorCode.TRANSACTION_REVERTED:
           return t('The transaction has been reverted');
       }

packages/ui/src/hooks/usePendingBridgeTransactions.ts

@@ -10,6 +10,7 @@ export const usePendingBridgeTransactions = () => {
   const {
     state: { pendingTransfers: unifiedBridgeTransfers },
   } = useUnifiedBridgeContext();
+
   const bridgeTransactions = useMemo(() => {
     return [
       ...Object.values(legacyBridgeTransfers),