Revert "SWAPS-2839 update bridge controllers for bitcoin (#6454)"

This reverts commit 1aae93d.

Author: Gudahtt

packages/bridge-controller/CHANGELOG.md

@@ -29,11 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add support for Bitcoin bridge transactions ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Handle Bitcoin PSBT (Partially Signed Bitcoin Transaction) format in trade data
-  - Add `BitcoinTradeDataSchema` and `BitcoinQuoteResponseSchema` validators
-  - Support Bitcoin chain ID (`ChainId.BTC = 20000000000001`) and CAIP format (`bip122:000000000019d6689c085ae165831e93`)
-- Export `isNonEvmChainId` utility function to check for non-EVM chains (Solana, Bitcoin) ([#6454](https://github.com/MetaMask/core/pull/6454))
 - Add `selectDefaultSlippagePercentage` that returns the default slippage for a chain and token combination ([#6616](https://github.com/MetaMask/core/pull/6616))
   - Return `0.5` if requesting a bridge quote
   - Return `undefined` (auto) if requesting a Solana swap
@@ -43,26 +38,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **BREAKING:** Rename fee handling for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Replace `SolanaFees` type with `NonEvmFees` type
-  - Replace `solanaFeesInLamports` field with `nonEvmFeesInNative` field
-  - Update `#appendSolanaFees` to `#appendNonEvmFees` to support all non-EVM chains
-  - The `nonEvmFeesInNative` field stores fees in the smallest units for each chain (lamports for Solana, satoshis for Bitcoin)
-- Update Snap methods to use new unified interface for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Replace `getFeeForTransaction` with `computeFee` method that returns fees in native token units
-  - Update fee calculation to handle different unit conversions per chain
-  - Support fee computation for Bitcoin and Solana chains
-- Update quote validation to support Bitcoin-specific trade data format ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Add separate validation for Bitcoin quotes that include `unsignedPsbtBase64` field
-- Update selectors and utilities to use `isNonEvmChainId` instead of `isSolanaChainId` for generic non-EVM handling ([#6454](https://github.com/MetaMask/core/pull/6454))
 - Bump `@metamask/controller-utils` from `^11.12.0` to `^11.14.0` ([#6620](https://github.com/MetaMask/core/pull/6620), [#6629](https://github.com/MetaMask/core/pull/6629))
 - Bump `@metamask/base-controller` from `^8.3.0` to `^8.4.0` ([#6632](https://github.com/MetaMask/core/pull/6632))
 
-### Removed
-
-- **BREAKING:** Remove deprecated `SolanaFees` type - use `NonEvmFees` type instead ([#6454](https://github.com/MetaMask/core/pull/6454))
-- **BREAKING:** Remove `solanaFeesInLamports` field from quotes - use `nonEvmFeesInNative` field instead ([#6454](https://github.com/MetaMask/core/pull/6454))
-
 ## [43.0.0]
 
 ### Added

packages/bridge-controller/src/__snapshots__/bridge-controller.test.ts.snap

@@ -3,7 +3,6 @@
 import { Contract } from '@ethersproject/contracts';
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import {
-  BtcScope,
   EthAccountType,
   EthScope,
   SolAccountType,
@@ -590,26 +589,6 @@ describe('BridgeController', function () {
                   resolve('5000');
                 }, 200);
               }
-              if (
-                (params as { handler: string })?.handler ===
-                  'onClientRequest' &&
-                (params as { request?: { method: string } })?.request
-                  ?.method === 'computeFee'
-              ) {
-                return setTimeout(() => {
-                  resolve([
-                    {
-                      type: 'base',
-                      asset: {
-                        unit: 'SOL',
-                        type: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:11111111111111111111111111111111',
-                        amount: '0.000000014', // 14 lamports in SOL
-                        fungible: true,
-                      },
-                    },
-                  ]);
-                }, 100);
-              }
               return setTimeout(() => {
                 resolve({ value: '14' });
               }, 100);
@@ -690,15 +669,9 @@ describe('BridgeController', function () {
         minimumBalanceForRentExemptionInLamports: '5000',
         quotes: mockBridgeQuotesSolErc20.map((quote) => ({
           ...quote,
-          nonEvmFeesInNative: '0.000000014',
+          solanaFeesInLamports: '14',
         })),
         quotesLoadingStatus: RequestStatus.FETCHED,
-        quoteRequest: quoteParams,
-        quoteFetchError: null,
-        assetExchangeRates: {},
-        quotesRefreshCount: 1,
-        quotesInitialLoadTime: expect.any(Number),
-        quotesLastFetched: expect.any(Number),
       }),
     );
     expect(consoleErrorSpy).not.toHaveBeenCalled();
@@ -752,15 +725,9 @@ describe('BridgeController', function () {
         minimumBalanceForRentExemptionInLamports: '5000',
         quotes: mockBridgeQuotesSolErc20.map((quote) => ({
           ...quote,
-          nonEvmFeesInNative: '0.000000014',
+          solanaFeesInLamports: '14',
         })),
         quotesLoadingStatus: RequestStatus.FETCHED,
-        quoteRequest: quoteParams,
-        quoteFetchError: null,
-        assetExchangeRates: {},
-        quotesRefreshCount: expect.any(Number),
-        quotesInitialLoadTime: expect.any(Number),
-        quotesLastFetched: expect.any(Number),
       }),
     );
     expect(consoleErrorSpy).not.toHaveBeenCalled();
@@ -788,15 +755,9 @@ describe('BridgeController', function () {
         minimumBalanceForRentExemptionInLamports: '0',
         quotes: mockBridgeQuotesSolErc20.map((quote) => ({
           ...quote,
-          nonEvmFeesInNative: '0.000000014',
+          solanaFeesInLamports: '14',
         })),
         quotesLoadingStatus: RequestStatus.FETCHED,
-        quoteRequest: { ...quoteParams, srcTokenAmount: '11111' },
-        quoteFetchError: null,
-        assetExchangeRates: {},
-        quotesRefreshCount: expect.any(Number),
-        quotesInitialLoadTime: expect.any(Number),
-        quotesLastFetched: expect.any(Number),
       }),
     );
 
@@ -1601,7 +1562,7 @@ describe('BridgeController', function () {
       mockBridgeQuotesSolErc20 as unknown as QuoteResponse[],
       [],
       2,
-      '0.000005000', // SOL amount (5000 lamports)
+      '5000',
       '300',
     ],
     [
@@ -1718,26 +1679,6 @@ describe('BridgeController', function () {
                   resolve(expectedMinBalance);
                 }, 200);
               }
-              if (
-                (params as { handler: string })?.handler ===
-                  'onClientRequest' &&
-                (params as { request?: { method: string } })?.request
-                  ?.method === 'computeFee'
-              ) {
-                return setTimeout(() => {
-                  resolve([
-                    {
-                      type: 'base',
-                      asset: {
-                        unit: 'SOL',
-                        type: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:11111111111111111111111111111111',
-                        amount: expectedFees || '0',
-                        fungible: true,
-                      },
-                    },
-                  ]);
-                }, 100);
-              }
               return setTimeout(() => {
                 resolve({ value: expectedFees });
               }, 100);
@@ -1811,9 +1752,9 @@ describe('BridgeController', function () {
         }),
       );
 
-      // Verify non-EVM fees
+      // Verify Solana fees
       quotes.forEach((quote) => {
-        expect(quote.nonEvmFeesInNative).toBe(
+        expect(quote.solanaFeesInLamports).toBe(
           isSolanaChainId(quote.quote.srcChainId) ? expectedFees : undefined,
         );
       });
@@ -1840,121 +1781,6 @@ describe('BridgeController', function () {
     },
   );
 
-  it('should handle BTC chain fees correctly', async () => {
-    jest.useFakeTimers();
-    // Use the actual Solana mock which already has string trade type
-    const btcQuoteResponse = mockBridgeQuotesSolErc20.map((quote) => ({
-      ...quote,
-      quote: {
-        ...quote.quote,
-        srcChainId: ChainId.BTC,
-      },
-    })) as unknown as QuoteResponse[];
-
-    messengerMock.call.mockImplementation(
-      (
-        ...args: Parameters<BridgeControllerMessenger['call']>
-      ): ReturnType<BridgeControllerMessenger['call']> => {
-        const [actionType, params] = args;
-
-        if (actionType === 'AccountsController:getSelectedMultichainAccount') {
-          return {
-            type: 'btc:p2wpkh',
-            id: 'btc-account-1',
-            scopes: [BtcScope.Mainnet],
-            methods: [],
-            address: 'bc1q...',
-            metadata: {
-              name: 'BTC Account 1',
-              importTime: 1717334400,
-              keyring: {
-                type: 'Snap Keyring',
-              },
-              snap: {
-                id: 'btc-snap-id',
-                name: 'BTC Snap',
-              },
-            },
-          } as never;
-        }
-
-        if (actionType === 'SnapController:handleRequest') {
-          return new Promise((resolve) => {
-            if (
-              (params as { handler: string })?.handler === 'onClientRequest' &&
-              (params as { request?: { method: string } })?.request?.method ===
-                'computeFee'
-            ) {
-              return setTimeout(() => {
-                resolve([
-                  {
-                    type: 'base',
-                    asset: {
-                      unit: 'BTC',
-                      type: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
-                      amount: '0.00005', // BTC fee
-                      fungible: true,
-                    },
-                  },
-                ]);
-              }, 100);
-            }
-            return setTimeout(() => {
-              resolve('5000');
-            }, 200);
-          });
-        }
-
-        return {
-          provider: jest.fn() as never,
-          selectedNetworkClientId: 'selectedNetworkClientId',
-        } as never;
-      },
-    );
-
-    jest.spyOn(fetchUtils, 'fetchBridgeQuotes').mockResolvedValue({
-      quotes: btcQuoteResponse,
-      validationFailures: [],
-    });
-
-    const quoteParams = {
-      srcChainId: ChainId.BTC.toString(),
-      destChainId: '1',
-      srcTokenAddress: 'NATIVE',
-      destTokenAddress: '0x0000000000000000000000000000000000000000',
-      srcTokenAmount: '100000', // satoshis
-      walletAddress: 'bc1q...',
-      destWalletAddress: '0x5342',
-      slippage: 0.5,
-    };
-
-    await bridgeController.updateBridgeQuoteRequestParams(
-      quoteParams,
-      metricsContext,
-    );
-
-    // Wait for polling to start
-    jest.advanceTimersByTime(201);
-    await flushPromises();
-
-    // Wait for fetch to trigger
-    jest.advanceTimersByTime(295);
-    await flushPromises();
-
-    // Wait for fetch to complete
-    jest.advanceTimersByTime(2601);
-    await flushPromises();
-
-    // Final wait for fee calculation
-    jest.advanceTimersByTime(100);
-    await flushPromises();
-
-    const { quotes } = bridgeController.state;
-    expect(quotes).toHaveLength(2); // mockBridgeQuotesSolErc20 has 2 quotes
-    expect(quotes[0].nonEvmFeesInNative).toBe('0.00005'); // BTC fee as-is
-    expect(quotes[1].nonEvmFeesInNative).toBe('0.00005'); // BTC fee as-is
-  });
-
   describe('trackUnifiedSwapBridgeEvent client-side calls', () => {
     beforeEach(() => {
       jest.clearAllMocks();