chore: rename files etc

Author: micaelae

packages/bridge-controller/src/bridge-controller.sse.test.ts

@@ -36,6 +36,7 @@ import { formatChainIdToDec } from './utils/caip-formatters';
 import * as featureFlagUtils from './utils/feature-flags';
 import * as fetchUtils from './utils/fetch';
 import { FeatureId } from './validators/feature-flags';
+import { validateQuoteResponseV1 } from './validators/quote-response-v1';
 import { QuoteStreamCompleteReason } from './validators/quote-stream-complete';
 import { TokenFeatureType } from './validators/token-feature';
 import type { TxData } from './validators/trade';

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

@@ -56,6 +56,7 @@ import {
   UnifiedSwapBridgeEventName,
 } from './utils/metrics/constants';
 import { FeatureId } from './validators/feature-flags';
+import type { QuoteResponseV1 } from './validators/quote-response-v1';
 
 const EMPTY_INIT_STATE = DEFAULT_BRIDGE_CONTROLLER_STATE;
 

packages/bridge-controller/src/bridge-controller.ts

@@ -31,7 +31,6 @@ import type {
   GenericQuoteRequest,
   NonEvmFees,
   QuoteRequest,
-  QuoteResponseV1,
   BridgeControllerState,
   BridgeControllerMessenger,
   FetchFunction,
@@ -95,6 +94,7 @@ import {
 import { appendFeesToQuotes } from './utils/quote-fees';
 import { getMinimumBalanceForRentExemptionInLamports } from './utils/snaps';
 import type { FeatureId } from './validators/feature-flags';
+import type { QuoteResponseV1 } from './validators/quote-response-v1';
 
 const metadata: StateMetadata<BridgeControllerState> = {
   quoteRequest: {

packages/bridge-controller/src/index.ts

@@ -1,5 +1,3 @@
-import { DiscountType } from './validators/quote-response';
-
 export { BridgeController } from './bridge-controller';
 
 export {
@@ -55,8 +53,6 @@ export type {
   TokenAmountValues,
   Step,
   RefuelData,
-  Quote,
-  QuoteResponseV1 as QuoteResponse,
   FeeData,
   Intent,
   IntentOrderLike,
@@ -111,11 +107,15 @@ export {
   isEvmTxData,
   isStellarTrade,
 } from './validators/trade';
+export type {
+  Quote,
+  QuoteResponseV1 as QuoteResponse,
+} from './validators/quote-response-v1';
 export {
   DiscountType,
   FeeType,
   ActionTypes,
-} from './validators/quote-response';
+} from './validators/quote-response-v1';
 export {
   validateQuoteStreamComplete,
   QuoteStreamCompleteReason,

packages/bridge-controller/src/selectors.test.ts

@@ -28,7 +28,6 @@ import {
   ChainId,
   BridgeAsset,
   NonEvmFees,
-  QuoteResponseV1,
 } from './types';
 import { getNativeAssetForChainId, isNativeAddress } from './utils/bridge';
 import {
@@ -39,7 +38,8 @@ import {
   formatChainIdToHex,
 } from './utils/caip-formatters';
 import { BatchSellTransactionType } from './validators/batch-sell';
-import { validateQuoteResponseV1 } from './validators/quote-response';
+import type { QuoteResponseV1 } from './validators/quote-response-v1';
+import { validateQuoteResponseV1 } from './validators/quote-response-v1';
 
 const MOCK_USDC_ADDRESS = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
 const MOCK_MUSD_ADDRESS = '0x12345A7890123456789012345678901234567890';

packages/bridge-controller/src/selectors.ts

@@ -23,7 +23,6 @@ import type {
   BridgeControllerState,
   ExchangeRate,
   QuoteMetadata,
-  QuoteResponseV1,
   TokenAmountValues,
 } from './types';
 import { RequestStatus, SortOrder } from './types';
@@ -55,6 +54,7 @@ import {
   calcBatchFees,
 } from './utils/quote';
 import { getDefaultSlippagePercentage } from './utils/slippage';
+import type { QuoteResponseV1 } from './validators/quote-response-v1';
 
 /**
  * The controller states that provide exchange rates

packages/bridge-controller/src/types.ts

@@ -33,7 +33,6 @@ import type { BRIDGE_CONTROLLER_NAME } from './constants/bridge';
 import type { SimulatedGasFeeLimitsSchema } from './validators/batch-sell';
 import type { BatchSellTradesResponseSchema } from './validators/batch-sell';
 import type { BridgeAssetSchema } from './validators/bridge-asset';
-import type { FeatureId } from './validators/feature-flags';
 import type {
   ChainConfigurationSchema,
   ChainRankingSchema,
@@ -43,20 +42,13 @@ import type {
   FeeDataSchema,
   IntentSchema,
   ProtocolSchema,
-  QuoteResponseSchema,
-  QuoteSchema,
-  StepSchema,
   GaslessPropertiesSchema,
   TxFeeGasLimitsSchema,
-} from './validators/quote-response';
+  QuoteResponseV1,
+  StepSchema,
+} from './validators/quote-response-v1';
 import type { QuoteStreamCompleteSchema } from './validators/quote-stream-complete';
 import type { TokenFeatureSchema } from './validators/token-feature';
-import type {
-  BitcoinTradeData,
-  StellarTradeData,
-  TronTradeData,
-  TxData,
-} from './validators/trade';
 
 export type FetchFunction = (
   input: RequestInfo | URL | string,
@@ -85,10 +77,16 @@ export type ChainConfiguration = Infer<typeof ChainConfigurationSchema>;
 
 export type ChainRanking = Infer<typeof ChainRankingSchema>;
 
+/**
+ * @deprecated Avoid introducing new usages and use the QuoteResponseV2 feeData.network value instead
+ */
 export type L1GasFees = {
-  l1GasFeesInHexWei?: string; // l1 fees for approval and trade in hex wei, appended by BridgeController.#appendL1GasFees
+  l1GasFeesInHexWei?: Hex; // l1 fees for approval and trade in hex wei, appended by BridgeController.#appendL1GasFees
 };
 
+/**
+ * @deprecated Avoid introducing new usages and use the QuoteResponseV2 feeData.network value instead
+ */
 export type NonEvmFees = {
   nonEvmFeesInNative?: string; // Non-EVM chain fees in native units (SOL for Solana, BTC for Bitcoin)
 };
@@ -126,6 +124,8 @@ export type ExchangeRate = { exchangeRate?: string; usdExchangeRate?: string };
 
 /**
  * Values derived from the quote response
+ *
+ * @deprecated Avoid introducing new usages and use the QuoteResponse V2 type instead
  */
 export type QuoteMetadata = {
   /**
@@ -284,43 +284,9 @@ export type RefuelData = Step;
 
 export type FeeData = Infer<typeof FeeDataSchema>;
 
-export type Quote = Infer<typeof QuoteSchema>;
-
 export type Intent = Infer<typeof IntentSchema>;
 export type IntentOrderLike = Intent['order'];
 
-/**
- * This is the type for the quote response from the bridge-api
- * TxDataType can be overriden to be a string when the quote is non-evm
- * ApprovalType can be overriden when you know the specific approval type (e.g., TxData for EVM-only contexts)
- */
-export type QuoteResponseV1<
-  TxDataType =
-    | TxData
-    | string
-    | BitcoinTradeData
-    | TronTradeData
-    | StellarTradeData,
-  ApprovalType = TxData | TronTradeData,
-> = Infer<typeof QuoteResponseSchema> & {
-  trade: TxDataType;
-  approval?: ApprovalType;
-  /**
-   * Appended to the quote response based on the quote request
-   */
-  featureId?: FeatureId;
-  /**
-   * Appended to the quote response based on the quote request resetApproval flag
-   * If defined, the quote's total network fee will include the reset approval's gas limit.
-   */
-  resetApproval?: TxData;
-  /**
-   * Appended to the quote if there are multiple quote requests in a batch. This
-   * indicates which quoteRequest the quote is for
-   */
-  quoteRequestIndex?: number;
-};
-
 export type BatchSellTradesRequest = {
   quotes: QuoteResponseV1[];
   stxEnabled: boolean;

packages/bridge-controller/src/utils/bridge.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 import { AddressZero } from '@ethersproject/constants';
 import { Contract } from '@ethersproject/contracts';
 import { BtcScope, SolScope, TrxScope, XlmScope } from '@metamask/keyring-api';
@@ -21,9 +22,9 @@ import type {
   BridgeAsset,
   BridgeControllerState,
   GenericQuoteRequest,
-  QuoteResponseV1,
 } from '../types';
 import { ChainId } from '../types';
+import type { QuoteResponseV1 } from '../validators/quote-response-v1';
 import type { TxData } from '../validators/trade';
 import {
   formatChainIdToCaip,

packages/bridge-controller/src/utils/fetch.ts

@@ -3,7 +3,6 @@ import { StructError } from '@metamask/superstruct';
 import type { CaipAssetType, CaipChainId, Hex } from '@metamask/utils';
 
 import type {
-  QuoteResponseV1,
   FetchFunction,
   GenericQuoteRequest,
   QuoteRequest,
@@ -16,7 +15,8 @@ import type {
 import { validateBatchSellTradesResponse } from '../validators/batch-sell';
 import { validateBridgeAsset } from '../validators/bridge-asset';
 import type { FeatureId } from '../validators/feature-flags';
-import { validateQuoteResponseV1 } from '../validators/quote-response';
+import type { QuoteResponseV1 } from '../validators/quote-response-v1';
+import { validateQuoteResponseV1 } from '../validators/quote-response-v1';
 import { validateQuoteStreamComplete } from '../validators/quote-stream-complete';
 import { validateTokenFeature } from '../validators/token-feature';
 import { isEvmTxData } from '../validators/trade';

packages/bridge-controller/src/utils/metrics/properties.test.ts

@@ -1,7 +1,8 @@
 import { SolScope } from '@metamask/keyring-api';
 import type { CaipChainId } from '@metamask/utils';
 
-import type { QuoteMetadata, QuoteResponseV1 } from '../../types';
+import type { QuoteMetadata } from '../../types';
+import type { QuoteResponseV1 } from '../../validators/quote-response-v1';
 import { getNativeAssetForChainId } from '../bridge';
 import { formatChainIdToCaip } from '../caip-formatters';
 import { MetricsSwapType } from './constants';