@metamask-previews/bridge-controller 79.3.0-preview-5cf810ca6 → 79.3.0-preview-b55ba783e

package/dist/utils/quote-metadata/to-quote-metadata-v1.cjs

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toQuoteMetadataV1 = void 0;
 const lodash_1 = require("lodash");
+const quote_response_js_1 = require("../../validators/quote-response.cjs");
+const number_formatters_js_1 = require("../number-formatters.cjs");
+const include_if_truthy_js_1 = require("./include-if-truthy.cjs");
+const types_js_1 = require("./types.cjs");
 /**
  * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.
  * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.
  *
  * @param quoteResponse - The quote to extract the metadata from
+ * @param migrationPhase - The migration phase to use
  * @returns A partial {@link QuoteMetadata} object
  */
-const toQuoteMetadataV1 = (quoteResponse) => {
+const toQuoteMetadataV1 = (quoteResponse, migrationPhase = types_js_1.QuoteMetadataMigrationPhase.V1Data) => {
     /* istanbul ignore if */
     if (!quoteResponse) {
         return {};
@@ -22,22 +27,66 @@ const toQuoteMetadataV1 = (quoteResponse) => {
         swapRate,
         gasFee,
         totalNetworkFee,
-        ...(adjustedReturn && Object.values(adjustedReturn).some(Boolean)
-            ? { adjustedReturn }
-            : {}),
-        ...(cost && Object.values(cost).some(Boolean) ? { cost } : {}),
-        ...(priceImpact && Object.values(priceImpact).some(Boolean)
-            ? { priceImpact }
-            : {}),
-        ...(relayerFee && Object.values(relayerFee).some(Boolean)
-            ? { relayerFee }
-            : {}),
-        ...(includedTxFees && Object.values(includedTxFees).some(Boolean)
-            ? { includedTxFees }
-            : {}),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(adjustedReturn, { adjustedReturn }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(cost, { cost }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(priceImpact, { priceImpact }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(relayerFee, { relayerFee }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(includedTxFees, { includedTxFees }),
     };
-    // Phase 1 only uses legacyMetadata
-    return (0, lodash_1.merge)({}, legacyMetadata);
+    if (migrationPhase === types_js_1.QuoteMetadataMigrationPhase.V1Data ||
+        !(0, quote_response_js_1.isQuoteResponseV2)(quoteResponse)) {
+        return legacyMetadata;
+    }
+    const { quote: { src, dest, priceData, feeData: { network, relayer, txFee }, }, } = quoteResponse;
+    const totalNetworkFeeV2 = (0, number_formatters_js_1.sumAmounts)(network, relayer);
+    const toTokenAmountValues = (data) => {
+        return {
+            amount: data?.normalizedAmount,
+            usd: data?.usd,
+            valueInCurrency: data?.valueInCurrency,
+        };
+    };
+    // Build V1 from V2 quote
+    const v2Metadata = {
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(src, {
+            sentAmount: toTokenAmountValues(src),
+        }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(dest, {
+            toTokenAmount: toTokenAmountValues(dest),
+            minToTokenAmount: {
+                amount: dest.minAmountNormalized,
+                valueInCurrency: dest.minAmountValueInCurrency,
+                usd: dest.minAmountUsd,
+            },
+        }),
+        ...(priceData?.swapRate && { swapRate: priceData.swapRate }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(priceData?.adjustedReturn, {
+            adjustedReturn: toTokenAmountValues(priceData?.adjustedReturn),
+        }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(network?.[0], {
+            gasFee: {
+                total: toTokenAmountValues(network?.[0]),
+            },
+        }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(totalNetworkFeeV2, {
+            totalNetworkFee: toTokenAmountValues(totalNetworkFeeV2),
+        }),
+        ...(priceData?.priceImpact && {
+            priceImpact: toTokenAmountValues(priceData?.priceImpact),
+            // Use priceImpact as cost
+            cost: toTokenAmountValues(priceData?.priceImpact),
+        }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(relayer?.[0], {
+            relayerFee: toTokenAmountValues(relayer?.[0]),
+        }),
+        ...(0, include_if_truthy_js_1.includeIfTruthy)(txFee?.[0], {
+            includedTxFees: toTokenAmountValues(txFee?.[0]),
+        }),
+    };
+    if (migrationPhase === types_js_1.QuoteMetadataMigrationPhase.V2WithV1Fallback) {
+        return (0, lodash_1.merge)({}, legacyMetadata, v2Metadata);
+    }
+    return v2Metadata;
 };
 exports.toQuoteMetadataV1 = toQuoteMetadataV1;
 //# sourceMappingURL=to-quote-metadata-v1.cjs.map

package/dist/utils/quote-metadata/to-quote-metadata-v1.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v1.cjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAO/B;;;;;;GAMG;AACI,MAAM,iBAAiB,GAAG,CAC/B,aAEQ,EACO,EAAE;IACjB,wBAAwB;IACxB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EACJ,aAAa,EACb,gBAAgB,EAChB,UAAU,EACV,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,cAAc,EACd,UAAU,EACV,eAAe,EACf,MAAM,EACN,WAAW,GACZ,GAAG,aAAa,CAAC;IAElB,MAAM,cAAc,GAAG;QACrB,UAAU;QACV,aAAa;QACb,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,eAAe;QACf,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/D,CAAC,CAAC,EAAE,cAAc,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACzD,CAAC,CAAC,EAAE,WAAW,EAAE;YACjB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACvD,CAAC,CAAC,EAAE,UAAU,EAAE;YAChB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/D,CAAC,CAAC,EAAE,cAAc,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IAEF,mCAAmC;IACnC,OAAO,IAAA,cAAK,EAAC,EAAE,EAAE,cAAc,CAAC,CAAC;AACnC,CAAC,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B","sourcesContent":["import { merge } from 'lodash';\n\nimport type { DeepPartial } from '../../types.js';\nimport type { QuoteResponseV1 } from '../../validators/quote-response-v1.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport type { QuoteMetadata } from './types.js';\n\n/**\n * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.\n * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.\n *\n * @param quoteResponse - The quote to extract the metadata from\n * @returns A partial {@link QuoteMetadata} object\n */\nexport const toQuoteMetadataV1 = (\n  quoteResponse:\n    | (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata)\n    | null,\n): QuoteMetadata => {\n  /* istanbul ignore if */\n  if (!quoteResponse) {\n    return {};\n  }\n\n  const {\n    toTokenAmount,\n    minToTokenAmount,\n    sentAmount,\n    swapRate,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    totalNetworkFee,\n    gasFee,\n    priceImpact,\n  } = quoteResponse;\n\n  const legacyMetadata = {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    gasFee,\n    totalNetworkFee,\n    ...(adjustedReturn && Object.values(adjustedReturn).some(Boolean)\n      ? { adjustedReturn }\n      : {}),\n    ...(cost && Object.values(cost).some(Boolean) ? { cost } : {}),\n    ...(priceImpact && Object.values(priceImpact).some(Boolean)\n      ? { priceImpact }\n      : {}),\n    ...(relayerFee && Object.values(relayerFee).some(Boolean)\n      ? { relayerFee }\n      : {}),\n    ...(includedTxFees && Object.values(includedTxFees).some(Boolean)\n      ? { includedTxFees }\n      : {}),\n  };\n\n  // Phase 1 only uses legacyMetadata\n  return merge({}, legacyMetadata);\n};\n"]}
+{"version":3,"file":"to-quote-metadata-v1.cjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"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","sourcesContent":["import { merge } from 'lodash';\n\nimport type { DeepPartial } from '../../types.js';\nimport type { AmountsAndAsset } from '../../validators/amount-and-asset.js';\nimport type { QuoteResponseV1 } from '../../validators/quote-response-v1.js';\nimport { isQuoteResponseV2 } from '../../validators/quote-response.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport { sumAmounts } from '../number-formatters.js';\nimport { includeIfTruthy } from './include-if-truthy.js';\nimport type { QuoteMetadata, TokenAmountValues } from './types.js';\nimport { QuoteMetadataMigrationPhase } from './types.js';\n\n/**\n * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.\n * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.\n *\n * @param quoteResponse - The quote to extract the metadata from\n * @param migrationPhase - The migration phase to use\n * @returns A partial {@link QuoteMetadata} object\n */\nexport const toQuoteMetadataV1 = (\n  quoteResponse:\n    | (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata)\n    | null,\n  migrationPhase: QuoteMetadataMigrationPhase = QuoteMetadataMigrationPhase.V1Data,\n): QuoteMetadata => {\n  /* istanbul ignore if */\n  if (!quoteResponse) {\n    return {};\n  }\n\n  const {\n    toTokenAmount,\n    minToTokenAmount,\n    sentAmount,\n    swapRate,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    totalNetworkFee,\n    gasFee,\n    priceImpact,\n  } = quoteResponse;\n\n  const legacyMetadata = {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    gasFee,\n    totalNetworkFee,\n    ...includeIfTruthy(adjustedReturn, { adjustedReturn }),\n    ...includeIfTruthy(cost, { cost }),\n    ...includeIfTruthy(priceImpact, { priceImpact }),\n    ...includeIfTruthy(relayerFee, { relayerFee }),\n    ...includeIfTruthy(includedTxFees, { includedTxFees }),\n  };\n\n  if (\n    migrationPhase === QuoteMetadataMigrationPhase.V1Data ||\n    !isQuoteResponseV2(quoteResponse)\n  ) {\n    return legacyMetadata;\n  }\n\n  const {\n    quote: {\n      src,\n      dest,\n      priceData,\n      feeData: { network, relayer, txFee },\n    },\n  } = quoteResponse;\n\n  const totalNetworkFeeV2 = sumAmounts(network, relayer);\n\n  const toTokenAmountValues = (\n    data?: Pick<\n      AmountsAndAsset,\n      'normalizedAmount' | 'usd' | 'valueInCurrency'\n    >,\n  ): Partial<TokenAmountValues> => {\n    return {\n      amount: data?.normalizedAmount,\n      usd: data?.usd,\n      valueInCurrency: data?.valueInCurrency,\n    };\n  };\n\n  // Build V1 from V2 quote\n  const v2Metadata: QuoteMetadata = {\n    ...includeIfTruthy(src, {\n      sentAmount: toTokenAmountValues(src),\n    }),\n    ...includeIfTruthy(dest, {\n      toTokenAmount: toTokenAmountValues(dest),\n      minToTokenAmount: {\n        amount: dest.minAmountNormalized,\n        valueInCurrency: dest.minAmountValueInCurrency,\n        usd: dest.minAmountUsd,\n      },\n    }),\n    ...(priceData?.swapRate && { swapRate: priceData.swapRate }),\n    ...includeIfTruthy(priceData?.adjustedReturn, {\n      adjustedReturn: toTokenAmountValues(priceData?.adjustedReturn),\n    }),\n    ...includeIfTruthy(network?.[0], {\n      gasFee: {\n        total: toTokenAmountValues(network?.[0]),\n      },\n    }),\n    ...includeIfTruthy(totalNetworkFeeV2, {\n      totalNetworkFee: toTokenAmountValues(totalNetworkFeeV2),\n    }),\n    ...(priceData?.priceImpact && {\n      priceImpact: toTokenAmountValues(priceData?.priceImpact),\n      // Use priceImpact as cost\n      cost: toTokenAmountValues(priceData?.priceImpact),\n    }),\n    ...includeIfTruthy(relayer?.[0], {\n      relayerFee: toTokenAmountValues(relayer?.[0]),\n    }),\n    ...includeIfTruthy(txFee?.[0], {\n      includedTxFees: toTokenAmountValues(txFee?.[0]),\n    }),\n  };\n\n  if (migrationPhase === QuoteMetadataMigrationPhase.V2WithV1Fallback) {\n    return merge({}, legacyMetadata, v2Metadata);\n  }\n\n  return v2Metadata;\n};\n"]}

package/dist/utils/quote-metadata/to-quote-metadata-v1.d.cts

@@ -2,12 +2,14 @@ import type { DeepPartial } from "../../types.cjs";
 import type { QuoteResponseV1 } from "../../validators/quote-response-v1.cjs";
 import type { QuoteResponse } from "../../validators/quote-response.cjs";
 import type { QuoteMetadata } from "./types.cjs";
+import { QuoteMetadataMigrationPhase } from "./types.cjs";
 /**
  * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.
  * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.
  *
  * @param quoteResponse - The quote to extract the metadata from
+ * @param migrationPhase - The migration phase to use
  * @returns A partial {@link QuoteMetadata} object
  */
-export declare const toQuoteMetadataV1: (quoteResponse: (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata) | null) => QuoteMetadata;
+export declare const toQuoteMetadataV1: (quoteResponse: (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata) | null, migrationPhase?: QuoteMetadataMigrationPhase) => QuoteMetadata;
 //# sourceMappingURL=to-quote-metadata-v1.d.cts.map

package/dist/utils/quote-metadata/to-quote-metadata-v1.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v1.d.cts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,+CAA8C;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAmB;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBAExB,CAAC,YAAY,aAAa,GAAG,eAAe,CAAC,GAAG,aAAa,CAAC,GAC9D,IAAI,KACP,aA4CF,CAAC"}
+{"version":3,"file":"to-quote-metadata-v1.d.cts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,+CAA8C;AAE7E,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAGxE,OAAO,KAAK,EAAE,aAAa,EAAqB,oBAAmB;AACnE,OAAO,EAAE,2BAA2B,EAAE,oBAAmB;AAEzD;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,kBAExB,CAAC,YAAY,aAAa,GAAG,eAAe,CAAC,GAAG,aAAa,CAAC,GAC9D,IAAI,mBACQ,2BAA2B,KAC1C,aA4GF,CAAC"}

package/dist/utils/quote-metadata/to-quote-metadata-v1.d.mts

@@ -2,12 +2,14 @@ import type { DeepPartial } from "../../types.mjs";
 import type { QuoteResponseV1 } from "../../validators/quote-response-v1.mjs";
 import type { QuoteResponse } from "../../validators/quote-response.mjs";
 import type { QuoteMetadata } from "./types.mjs";
+import { QuoteMetadataMigrationPhase } from "./types.mjs";
 /**
  * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.
  * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.
  *
  * @param quoteResponse - The quote to extract the metadata from
+ * @param migrationPhase - The migration phase to use
  * @returns A partial {@link QuoteMetadata} object
  */
-export declare const toQuoteMetadataV1: (quoteResponse: (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata) | null) => QuoteMetadata;
+export declare const toQuoteMetadataV1: (quoteResponse: (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata) | null, migrationPhase?: QuoteMetadataMigrationPhase) => QuoteMetadata;
 //# sourceMappingURL=to-quote-metadata-v1.d.mts.map

package/dist/utils/quote-metadata/to-quote-metadata-v1.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v1.d.mts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,+CAA8C;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAmB;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBAExB,CAAC,YAAY,aAAa,GAAG,eAAe,CAAC,GAAG,aAAa,CAAC,GAC9D,IAAI,KACP,aA4CF,CAAC"}
+{"version":3,"file":"to-quote-metadata-v1.d.mts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,+CAA8C;AAE7E,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAGxE,OAAO,KAAK,EAAE,aAAa,EAAqB,oBAAmB;AACnE,OAAO,EAAE,2BAA2B,EAAE,oBAAmB;AAEzD;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,kBAExB,CAAC,YAAY,aAAa,GAAG,eAAe,CAAC,GAAG,aAAa,CAAC,GAC9D,IAAI,mBACQ,2BAA2B,KAC1C,aA4GF,CAAC"}

package/dist/utils/quote-metadata/to-quote-metadata-v1.mjs

@@ -1,13 +1,18 @@
 import $lodash from "lodash";
 const { merge } = $lodash;
+import { isQuoteResponseV2 } from "../../validators/quote-response.mjs";
+import { sumAmounts } from "../number-formatters.mjs";
+import { includeIfTruthy } from "./include-if-truthy.mjs";
+import { QuoteMetadataMigrationPhase } from "./types.mjs";
 /**
  * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.
  * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.
  *
  * @param quoteResponse - The quote to extract the metadata from
+ * @param migrationPhase - The migration phase to use
  * @returns A partial {@link QuoteMetadata} object
  */
-export const toQuoteMetadataV1 = (quoteResponse) => {
+export const toQuoteMetadataV1 = (quoteResponse, migrationPhase = QuoteMetadataMigrationPhase.V1Data) => {
     /* istanbul ignore if */
     if (!quoteResponse) {
         return {};
@@ -20,21 +25,65 @@ export const toQuoteMetadataV1 = (quoteResponse) => {
         swapRate,
         gasFee,
         totalNetworkFee,
-        ...(adjustedReturn && Object.values(adjustedReturn).some(Boolean)
-            ? { adjustedReturn }
-            : {}),
-        ...(cost && Object.values(cost).some(Boolean) ? { cost } : {}),
-        ...(priceImpact && Object.values(priceImpact).some(Boolean)
-            ? { priceImpact }
-            : {}),
-        ...(relayerFee && Object.values(relayerFee).some(Boolean)
-            ? { relayerFee }
-            : {}),
-        ...(includedTxFees && Object.values(includedTxFees).some(Boolean)
-            ? { includedTxFees }
-            : {}),
+        ...includeIfTruthy(adjustedReturn, { adjustedReturn }),
+        ...includeIfTruthy(cost, { cost }),
+        ...includeIfTruthy(priceImpact, { priceImpact }),
+        ...includeIfTruthy(relayerFee, { relayerFee }),
+        ...includeIfTruthy(includedTxFees, { includedTxFees }),
     };
-    // Phase 1 only uses legacyMetadata
-    return merge({}, legacyMetadata);
+    if (migrationPhase === QuoteMetadataMigrationPhase.V1Data ||
+        !isQuoteResponseV2(quoteResponse)) {
+        return legacyMetadata;
+    }
+    const { quote: { src, dest, priceData, feeData: { network, relayer, txFee }, }, } = quoteResponse;
+    const totalNetworkFeeV2 = sumAmounts(network, relayer);
+    const toTokenAmountValues = (data) => {
+        return {
+            amount: data?.normalizedAmount,
+            usd: data?.usd,
+            valueInCurrency: data?.valueInCurrency,
+        };
+    };
+    // Build V1 from V2 quote
+    const v2Metadata = {
+        ...includeIfTruthy(src, {
+            sentAmount: toTokenAmountValues(src),
+        }),
+        ...includeIfTruthy(dest, {
+            toTokenAmount: toTokenAmountValues(dest),
+            minToTokenAmount: {
+                amount: dest.minAmountNormalized,
+                valueInCurrency: dest.minAmountValueInCurrency,
+                usd: dest.minAmountUsd,
+            },
+        }),
+        ...(priceData?.swapRate && { swapRate: priceData.swapRate }),
+        ...includeIfTruthy(priceData?.adjustedReturn, {
+            adjustedReturn: toTokenAmountValues(priceData?.adjustedReturn),
+        }),
+        ...includeIfTruthy(network?.[0], {
+            gasFee: {
+                total: toTokenAmountValues(network?.[0]),
+            },
+        }),
+        ...includeIfTruthy(totalNetworkFeeV2, {
+            totalNetworkFee: toTokenAmountValues(totalNetworkFeeV2),
+        }),
+        ...(priceData?.priceImpact && {
+            priceImpact: toTokenAmountValues(priceData?.priceImpact),
+            // Use priceImpact as cost
+            cost: toTokenAmountValues(priceData?.priceImpact),
+        }),
+        ...includeIfTruthy(relayer?.[0], {
+            relayerFee: toTokenAmountValues(relayer?.[0]),
+        }),
+        ...includeIfTruthy(txFee?.[0], {
+            includedTxFees: toTokenAmountValues(txFee?.[0]),
+        }),
+    };
+    if (migrationPhase === QuoteMetadataMigrationPhase.V2WithV1Fallback) {
+        return merge({}, legacyMetadata, v2Metadata);
+    }
+    return v2Metadata;
 };
 //# sourceMappingURL=to-quote-metadata-v1.mjs.map

package/dist/utils/quote-metadata/to-quote-metadata-v1.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v1.mjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":";;AAOA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,aAEQ,EACO,EAAE;IACjB,wBAAwB;IACxB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EACJ,aAAa,EACb,gBAAgB,EAChB,UAAU,EACV,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,cAAc,EACd,UAAU,EACV,eAAe,EACf,MAAM,EACN,WAAW,GACZ,GAAG,aAAa,CAAC;IAElB,MAAM,cAAc,GAAG;QACrB,UAAU;QACV,aAAa;QACb,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,eAAe;QACf,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/D,CAAC,CAAC,EAAE,cAAc,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACzD,CAAC,CAAC,EAAE,WAAW,EAAE;YACjB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACvD,CAAC,CAAC,EAAE,UAAU,EAAE;YAChB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/D,CAAC,CAAC,EAAE,cAAc,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IAEF,mCAAmC;IACnC,OAAO,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;AACnC,CAAC,CAAC","sourcesContent":["import { merge } from 'lodash';\n\nimport type { DeepPartial } from '../../types.js';\nimport type { QuoteResponseV1 } from '../../validators/quote-response-v1.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport type { QuoteMetadata } from './types.js';\n\n/**\n * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.\n * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.\n *\n * @param quoteResponse - The quote to extract the metadata from\n * @returns A partial {@link QuoteMetadata} object\n */\nexport const toQuoteMetadataV1 = (\n  quoteResponse:\n    | (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata)\n    | null,\n): QuoteMetadata => {\n  /* istanbul ignore if */\n  if (!quoteResponse) {\n    return {};\n  }\n\n  const {\n    toTokenAmount,\n    minToTokenAmount,\n    sentAmount,\n    swapRate,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    totalNetworkFee,\n    gasFee,\n    priceImpact,\n  } = quoteResponse;\n\n  const legacyMetadata = {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    gasFee,\n    totalNetworkFee,\n    ...(adjustedReturn && Object.values(adjustedReturn).some(Boolean)\n      ? { adjustedReturn }\n      : {}),\n    ...(cost && Object.values(cost).some(Boolean) ? { cost } : {}),\n    ...(priceImpact && Object.values(priceImpact).some(Boolean)\n      ? { priceImpact }\n      : {}),\n    ...(relayerFee && Object.values(relayerFee).some(Boolean)\n      ? { relayerFee }\n      : {}),\n    ...(includedTxFees && Object.values(includedTxFees).some(Boolean)\n      ? { includedTxFees }\n      : {}),\n  };\n\n  // Phase 1 only uses legacyMetadata\n  return merge({}, legacyMetadata);\n};\n"]}
+{"version":3,"file":"to-quote-metadata-v1.mjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v1.ts"],"names":[],"mappings":"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","sourcesContent":["import { merge } from 'lodash';\n\nimport type { DeepPartial } from '../../types.js';\nimport type { AmountsAndAsset } from '../../validators/amount-and-asset.js';\nimport type { QuoteResponseV1 } from '../../validators/quote-response-v1.js';\nimport { isQuoteResponseV2 } from '../../validators/quote-response.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport { sumAmounts } from '../number-formatters.js';\nimport { includeIfTruthy } from './include-if-truthy.js';\nimport type { QuoteMetadata, TokenAmountValues } from './types.js';\nimport { QuoteMetadataMigrationPhase } from './types.js';\n\n/**\n * Extracts legacy {@link QuoteMetadata} values from a {@link QuoteResponse} or {@link QuoteResponseV1}.\n * If a QuoteResponse is provided, this assumes that its `valueInCurrency` properties are set.\n *\n * @param quoteResponse - The quote to extract the metadata from\n * @param migrationPhase - The migration phase to use\n * @returns A partial {@link QuoteMetadata} object\n */\nexport const toQuoteMetadataV1 = (\n  quoteResponse:\n    | (DeepPartial<QuoteResponse | QuoteResponseV1> & QuoteMetadata)\n    | null,\n  migrationPhase: QuoteMetadataMigrationPhase = QuoteMetadataMigrationPhase.V1Data,\n): QuoteMetadata => {\n  /* istanbul ignore if */\n  if (!quoteResponse) {\n    return {};\n  }\n\n  const {\n    toTokenAmount,\n    minToTokenAmount,\n    sentAmount,\n    swapRate,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    totalNetworkFee,\n    gasFee,\n    priceImpact,\n  } = quoteResponse;\n\n  const legacyMetadata = {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    gasFee,\n    totalNetworkFee,\n    ...includeIfTruthy(adjustedReturn, { adjustedReturn }),\n    ...includeIfTruthy(cost, { cost }),\n    ...includeIfTruthy(priceImpact, { priceImpact }),\n    ...includeIfTruthy(relayerFee, { relayerFee }),\n    ...includeIfTruthy(includedTxFees, { includedTxFees }),\n  };\n\n  if (\n    migrationPhase === QuoteMetadataMigrationPhase.V1Data ||\n    !isQuoteResponseV2(quoteResponse)\n  ) {\n    return legacyMetadata;\n  }\n\n  const {\n    quote: {\n      src,\n      dest,\n      priceData,\n      feeData: { network, relayer, txFee },\n    },\n  } = quoteResponse;\n\n  const totalNetworkFeeV2 = sumAmounts(network, relayer);\n\n  const toTokenAmountValues = (\n    data?: Pick<\n      AmountsAndAsset,\n      'normalizedAmount' | 'usd' | 'valueInCurrency'\n    >,\n  ): Partial<TokenAmountValues> => {\n    return {\n      amount: data?.normalizedAmount,\n      usd: data?.usd,\n      valueInCurrency: data?.valueInCurrency,\n    };\n  };\n\n  // Build V1 from V2 quote\n  const v2Metadata: QuoteMetadata = {\n    ...includeIfTruthy(src, {\n      sentAmount: toTokenAmountValues(src),\n    }),\n    ...includeIfTruthy(dest, {\n      toTokenAmount: toTokenAmountValues(dest),\n      minToTokenAmount: {\n        amount: dest.minAmountNormalized,\n        valueInCurrency: dest.minAmountValueInCurrency,\n        usd: dest.minAmountUsd,\n      },\n    }),\n    ...(priceData?.swapRate && { swapRate: priceData.swapRate }),\n    ...includeIfTruthy(priceData?.adjustedReturn, {\n      adjustedReturn: toTokenAmountValues(priceData?.adjustedReturn),\n    }),\n    ...includeIfTruthy(network?.[0], {\n      gasFee: {\n        total: toTokenAmountValues(network?.[0]),\n      },\n    }),\n    ...includeIfTruthy(totalNetworkFeeV2, {\n      totalNetworkFee: toTokenAmountValues(totalNetworkFeeV2),\n    }),\n    ...(priceData?.priceImpact && {\n      priceImpact: toTokenAmountValues(priceData?.priceImpact),\n      // Use priceImpact as cost\n      cost: toTokenAmountValues(priceData?.priceImpact),\n    }),\n    ...includeIfTruthy(relayer?.[0], {\n      relayerFee: toTokenAmountValues(relayer?.[0]),\n    }),\n    ...includeIfTruthy(txFee?.[0], {\n      includedTxFees: toTokenAmountValues(txFee?.[0]),\n    }),\n  };\n\n  if (migrationPhase === QuoteMetadataMigrationPhase.V2WithV1Fallback) {\n    return merge({}, legacyMetadata, v2Metadata);\n  }\n\n  return v2Metadata;\n};\n"]}

package/dist/utils/quote-metadata/to-quote-metadata-v2.cjs

@@ -5,6 +5,7 @@ const utils_1 = require("@metamask/utils");
 const quote_response_v1_to_v2_js_1 = require("../../coercers/quote-response-v1-to-v2.cjs");
 const bridge_js_1 = require("../bridge.cjs");
 const number_formatters_js_1 = require("../number-formatters.cjs");
+const include_if_truthy_js_1 = require("./include-if-truthy.cjs");
 /**
  * Converts a {@link QuoteMetadata} to a partial {@link QuoteResponse} containing only metadata
  *
@@ -28,71 +29,51 @@ const toQuoteMetadataV2 = (quoteMetadata, quoteResponseV2) => {
         valueInCurrency: priceImpact?.valueInCurrency ?? cost?.valueInCurrency,
     };
     const networkFeeToUse = gasFee?.total ?? totalNetworkFee;
+    const toAmountAndAsset = (asset, metadata, extraFields) => {
+        return {
+            amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(metadata?.amount, asset?.decimals),
+            normalizedAmount: metadata?.amount,
+            valueInCurrency: metadata?.valueInCurrency,
+            usd: metadata?.usd,
+            ...extraFields,
+        };
+    };
     return {
         ...rest,
         quote: {
-            src: {
-                amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(sentAmount?.amount, srcAsset?.decimals),
-                normalizedAmount: sentAmount?.amount,
-                valueInCurrency: sentAmount?.valueInCurrency,
-                usd: sentAmount?.usd,
-            },
+            src: toAmountAndAsset(srcAsset, sentAmount),
             dest: {
-                amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(toTokenAmount?.amount, destAsset?.decimals),
-                normalizedAmount: toTokenAmount?.amount,
-                valueInCurrency: toTokenAmount?.valueInCurrency,
-                usd: toTokenAmount?.usd,
+                ...toAmountAndAsset(destAsset, toTokenAmount),
                 minAmount: (0, number_formatters_js_1.calcAtomicTokenAmount)(minToTokenAmount?.amount, destAsset?.decimals),
                 minAmountNormalized: minToTokenAmount?.amount,
                 minAmountUsd: minToTokenAmount?.usd,
                 minAmountValueInCurrency: minToTokenAmount?.valueInCurrency,
             },
             feeData: {
-                network: [
-                    {
-                        amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(networkFeeToUse?.amount, nativeAsset?.decimals),
-                        normalizedAmount: networkFeeToUse?.amount,
-                        valueInCurrency: networkFeeToUse?.valueInCurrency,
-                        usd: networkFeeToUse?.usd,
-                        asset: nativeAsset,
-                    },
-                ],
-                ...(relayerFee &&
-                    Object.values(relayerFee).some(Boolean) && {
-                    relayer: [
-                        {
-                            amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(relayerFee?.amount, nativeAsset?.decimals),
-                            normalizedAmount: relayerFee.amount,
-                            valueInCurrency: relayerFee.valueInCurrency,
-                            usd: relayerFee.usd,
+                ...(0, include_if_truthy_js_1.includeIfTruthy)(networkFeeToUse, {
+                    network: [
+                        toAmountAndAsset(nativeAsset, networkFeeToUse, {
                             asset: nativeAsset,
-                        },
+                        }),
+                    ],
+                }),
+                ...(0, include_if_truthy_js_1.includeIfTruthy)(relayerFee, {
+                    relayer: [
+                        toAmountAndAsset(nativeAsset, relayerFee, { asset: nativeAsset }),
                     ],
                 }),
-                ...(includedTxFees &&
-                    Object.values(includedTxFees).some(Boolean) && {
+                ...(0, include_if_truthy_js_1.includeIfTruthy)(includedTxFees, {
                     txFee: [
-                        {
-                            amount: (0, number_formatters_js_1.calcAtomicTokenAmount)(includedTxFees?.amount, txFeeAsset?.decimals),
-                            normalizedAmount: includedTxFees?.amount,
-                            valueInCurrency: includedTxFees?.valueInCurrency,
-                            usd: includedTxFees?.usd,
-                            asset: txFeeAsset,
-                        },
+                        toAmountAndAsset(txFeeAsset, includedTxFees, { asset: txFeeAsset }),
                     ],
                 }),
             },
             priceData: {
-                ...(priceImpactToUse &&
-                    Object.values(priceImpactToUse).some(Boolean) && {
+                ...(0, include_if_truthy_js_1.includeIfTruthy)(priceImpactToUse, {
                     priceImpact: priceImpactToUse,
                 }),
-                ...(adjustedReturn &&
-                    Object.values(adjustedReturn).some(Boolean) && {
-                    adjustedReturn: {
-                        valueInCurrency: adjustedReturn?.valueInCurrency,
-                        usd: adjustedReturn?.usd,
-                    },
+                ...(0, include_if_truthy_js_1.includeIfTruthy)(adjustedReturn, {
+                    adjustedReturn,
                 }),
                 swapRate,
             },

package/dist/utils/quote-metadata/to-quote-metadata-v2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v2.cjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import { parseCaipAssetType } from '@metamask/utils';\n\nimport { toBridgeAssetV2 } from '../../coercers/quote-response-v1-to-v2.js';\nimport type { DeepPartial } from '../../types.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport { getNativeAssetForChainId } from '../bridge.js';\nimport { calcAtomicTokenAmount } from '../number-formatters.js';\nimport type { QuoteMetadata } from './types.js';\n\n/**\n * Converts a {@link QuoteMetadata} to a partial {@link QuoteResponse} containing only metadata\n *\n * @param quoteMetadata - The {@link QuoteMetadata} to convert\n * @param quoteResponseV2 - The {@link QuoteResponse} to use for token data\n * @returns The {@link DeepPartial<QuoteResponse>}\n */\nexport const toQuoteMetadataV2 = (\n  quoteMetadata: QuoteMetadata,\n  quoteResponseV2?: DeepPartial<QuoteResponse>,\n): DeepPartial<QuoteResponse> => {\n  const {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    totalNetworkFee,\n    gasFee,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    priceImpact,\n    ...rest\n  } = quoteMetadata;\n\n  const srcAsset = quoteResponseV2?.quote?.src?.asset;\n  const destAsset = quoteResponseV2?.quote?.dest?.asset;\n\n  const chainId = srcAsset?.assetId\n    ? parseCaipAssetType(srcAsset.assetId)?.chainId\n    : undefined;\n  const nativeAsset = chainId\n    ? toBridgeAssetV2(getNativeAssetForChainId(chainId))\n    : undefined;\n  const txFeeAsset = quoteResponseV2?.quote?.feeData?.txFee?.[0]?.asset;\n\n  const priceImpactToUse = {\n    usd: priceImpact?.usd ?? cost?.usd,\n    valueInCurrency: priceImpact?.valueInCurrency ?? cost?.valueInCurrency,\n  };\n  const networkFeeToUse = gasFee?.total ?? totalNetworkFee;\n\n  return {\n    ...rest,\n    quote: {\n      src: {\n        amount: calcAtomicTokenAmount(sentAmount?.amount, srcAsset?.decimals),\n        normalizedAmount: sentAmount?.amount,\n        valueInCurrency: sentAmount?.valueInCurrency,\n        usd: sentAmount?.usd,\n      },\n      dest: {\n        amount: calcAtomicTokenAmount(\n          toTokenAmount?.amount,\n          destAsset?.decimals,\n        ),\n        normalizedAmount: toTokenAmount?.amount,\n        valueInCurrency: toTokenAmount?.valueInCurrency,\n        usd: toTokenAmount?.usd,\n        minAmount: calcAtomicTokenAmount(\n          minToTokenAmount?.amount,\n          destAsset?.decimals,\n        ),\n        minAmountNormalized: minToTokenAmount?.amount,\n        minAmountUsd: minToTokenAmount?.usd,\n        minAmountValueInCurrency: minToTokenAmount?.valueInCurrency,\n      },\n      feeData: {\n        network: [\n          {\n            amount: calcAtomicTokenAmount(\n              networkFeeToUse?.amount,\n              nativeAsset?.decimals,\n            ),\n            normalizedAmount: networkFeeToUse?.amount,\n            valueInCurrency: networkFeeToUse?.valueInCurrency,\n            usd: networkFeeToUse?.usd,\n            asset: nativeAsset,\n          },\n        ],\n        ...(relayerFee &&\n          Object.values(relayerFee).some(Boolean) && {\n            relayer: [\n              {\n                amount: calcAtomicTokenAmount(\n                  relayerFee?.amount,\n                  nativeAsset?.decimals,\n                ),\n                normalizedAmount: relayerFee.amount,\n                valueInCurrency: relayerFee.valueInCurrency,\n                usd: relayerFee.usd,\n                asset: nativeAsset,\n              },\n            ],\n          }),\n        ...(includedTxFees &&\n          Object.values(includedTxFees).some(Boolean) && {\n            txFee: [\n              {\n                amount: calcAtomicTokenAmount(\n                  includedTxFees?.amount,\n                  txFeeAsset?.decimals,\n                ),\n                normalizedAmount: includedTxFees?.amount,\n                valueInCurrency: includedTxFees?.valueInCurrency,\n                usd: includedTxFees?.usd,\n                asset: txFeeAsset,\n              },\n            ],\n          }),\n      },\n      priceData: {\n        ...(priceImpactToUse &&\n          Object.values(priceImpactToUse).some(Boolean) && {\n            priceImpact: priceImpactToUse,\n          }),\n        ...(adjustedReturn &&\n          Object.values(adjustedReturn).some(Boolean) && {\n            adjustedReturn: {\n              valueInCurrency: adjustedReturn?.valueInCurrency,\n              usd: adjustedReturn?.usd,\n            },\n          }),\n        swapRate,\n      },\n    },\n  };\n};\n"]}
+{"version":3,"file":"to-quote-metadata-v2.cjs","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import { parseCaipAssetType } from '@metamask/utils';\n\nimport { toBridgeAssetV2 } from '../../coercers/quote-response-v1-to-v2.js';\nimport type { DeepPartial } from '../../types.js';\nimport type { AmountsAndAsset } from '../../validators/amount-and-asset.js';\nimport type { BridgeAssetV2 } from '../../validators/bridge-asset.js';\nimport type { QuoteResponse } from '../../validators/quote-response.js';\nimport { getNativeAssetForChainId } from '../bridge.js';\nimport { calcAtomicTokenAmount } from '../number-formatters.js';\nimport { includeIfTruthy } from './include-if-truthy.js';\nimport type { QuoteMetadata, TokenAmountValues } from './types.js';\n\n/**\n * Converts a {@link QuoteMetadata} to a partial {@link QuoteResponse} containing only metadata\n *\n * @param quoteMetadata - The {@link QuoteMetadata} to convert\n * @param quoteResponseV2 - The {@link QuoteResponse} to use for token data\n * @returns The {@link DeepPartial<QuoteResponse>}\n */\nexport const toQuoteMetadataV2 = (\n  quoteMetadata: QuoteMetadata,\n  quoteResponseV2?: DeepPartial<QuoteResponse>,\n): DeepPartial<QuoteResponse> => {\n  const {\n    sentAmount,\n    toTokenAmount,\n    minToTokenAmount,\n    swapRate,\n    totalNetworkFee,\n    gasFee,\n    adjustedReturn,\n    cost,\n    includedTxFees,\n    relayerFee,\n    priceImpact,\n    ...rest\n  } = quoteMetadata;\n\n  const srcAsset = quoteResponseV2?.quote?.src?.asset;\n  const destAsset = quoteResponseV2?.quote?.dest?.asset;\n\n  const chainId = srcAsset?.assetId\n    ? parseCaipAssetType(srcAsset.assetId)?.chainId\n    : undefined;\n  const nativeAsset = chainId\n    ? toBridgeAssetV2(getNativeAssetForChainId(chainId))\n    : undefined;\n  const txFeeAsset = quoteResponseV2?.quote?.feeData?.txFee?.[0]?.asset;\n\n  const priceImpactToUse = {\n    usd: priceImpact?.usd ?? cost?.usd,\n    valueInCurrency: priceImpact?.valueInCurrency ?? cost?.valueInCurrency,\n  };\n  const networkFeeToUse = gasFee?.total ?? totalNetworkFee;\n\n  const toAmountAndAsset = (\n    asset?: DeepPartial<BridgeAssetV2>,\n    metadata?: Partial<TokenAmountValues>,\n    extraFields?: DeepPartial<AmountsAndAsset>,\n  ): DeepPartial<AmountsAndAsset> => {\n    return {\n      amount: calcAtomicTokenAmount(metadata?.amount, asset?.decimals),\n      normalizedAmount: metadata?.amount,\n      valueInCurrency: metadata?.valueInCurrency,\n      usd: metadata?.usd,\n      ...extraFields,\n    };\n  };\n\n  return {\n    ...rest,\n    quote: {\n      src: toAmountAndAsset(srcAsset, sentAmount),\n      dest: {\n        ...toAmountAndAsset(destAsset, toTokenAmount),\n        minAmount: calcAtomicTokenAmount(\n          minToTokenAmount?.amount,\n          destAsset?.decimals,\n        ),\n        minAmountNormalized: minToTokenAmount?.amount,\n        minAmountUsd: minToTokenAmount?.usd,\n        minAmountValueInCurrency: minToTokenAmount?.valueInCurrency,\n      },\n      feeData: {\n        ...includeIfTruthy(networkFeeToUse, {\n          network: [\n            toAmountAndAsset(nativeAsset, networkFeeToUse, {\n              asset: nativeAsset,\n            }),\n          ],\n        }),\n        ...includeIfTruthy(relayerFee, {\n          relayer: [\n            toAmountAndAsset(nativeAsset, relayerFee, { asset: nativeAsset }),\n          ],\n        }),\n        ...includeIfTruthy(includedTxFees, {\n          txFee: [\n            toAmountAndAsset(txFeeAsset, includedTxFees, { asset: txFeeAsset }),\n          ],\n        }),\n      },\n      priceData: {\n        ...includeIfTruthy(priceImpactToUse, {\n          priceImpact: priceImpactToUse,\n        }),\n        ...includeIfTruthy(adjustedReturn, {\n          adjustedReturn,\n        }),\n        swapRate,\n      },\n    },\n  };\n};\n"]}

package/dist/utils/quote-metadata/to-quote-metadata-v2.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v2.d.cts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAGxE,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAmB;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,aAAa,oBACV,YAAY,aAAa,CAAC,KAC3C,YAAY,aAAa,CAsH3B,CAAC"}
+{"version":3,"file":"to-quote-metadata-v2.d.cts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAIxE,OAAO,KAAK,EAAE,aAAa,EAAqB,oBAAmB;AAEnE;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,aAAa,oBACV,YAAY,aAAa,CAAC,KAC3C,YAAY,aAAa,CA2F3B,CAAC"}

package/dist/utils/quote-metadata/to-quote-metadata-v2.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"to-quote-metadata-v2.d.mts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAGxE,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAmB;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,aAAa,oBACV,YAAY,aAAa,CAAC,KAC3C,YAAY,aAAa,CAsH3B,CAAC"}
+{"version":3,"file":"to-quote-metadata-v2.d.mts","sourceRoot":"","sources":["../../../src/utils/quote-metadata/to-quote-metadata-v2.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAuB;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,4CAA2C;AAIxE,OAAO,KAAK,EAAE,aAAa,EAAqB,oBAAmB;AAEnE;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,aAAa,oBACV,YAAY,aAAa,CAAC,KAC3C,YAAY,aAAa,CA2F3B,CAAC"}

package/dist/utils/quote-metadata/to-quote-metadata-v2.mjs

@@ -2,6 +2,7 @@ import { parseCaipAssetType } from "@metamask/utils";
 import { toBridgeAssetV2 } from "../../coercers/quote-response-v1-to-v2.mjs";
 import { getNativeAssetForChainId } from "../bridge.mjs";
 import { calcAtomicTokenAmount } from "../number-formatters.mjs";
+import { includeIfTruthy } from "./include-if-truthy.mjs";
 /**
  * Converts a {@link QuoteMetadata} to a partial {@link QuoteResponse} containing only metadata
  *
@@ -25,71 +26,51 @@ export const toQuoteMetadataV2 = (quoteMetadata, quoteResponseV2) => {
         valueInCurrency: priceImpact?.valueInCurrency ?? cost?.valueInCurrency,
     };
     const networkFeeToUse = gasFee?.total ?? totalNetworkFee;
+    const toAmountAndAsset = (asset, metadata, extraFields) => {
+        return {
+            amount: calcAtomicTokenAmount(metadata?.amount, asset?.decimals),
+            normalizedAmount: metadata?.amount,
+            valueInCurrency: metadata?.valueInCurrency,
+            usd: metadata?.usd,
+            ...extraFields,
+        };
+    };
     return {
         ...rest,
         quote: {
-            src: {
-                amount: calcAtomicTokenAmount(sentAmount?.amount, srcAsset?.decimals),
-                normalizedAmount: sentAmount?.amount,
-                valueInCurrency: sentAmount?.valueInCurrency,
-                usd: sentAmount?.usd,
-            },
+            src: toAmountAndAsset(srcAsset, sentAmount),
             dest: {
-                amount: calcAtomicTokenAmount(toTokenAmount?.amount, destAsset?.decimals),
-                normalizedAmount: toTokenAmount?.amount,
-                valueInCurrency: toTokenAmount?.valueInCurrency,
-                usd: toTokenAmount?.usd,
+                ...toAmountAndAsset(destAsset, toTokenAmount),
                 minAmount: calcAtomicTokenAmount(minToTokenAmount?.amount, destAsset?.decimals),
                 minAmountNormalized: minToTokenAmount?.amount,
                 minAmountUsd: minToTokenAmount?.usd,
                 minAmountValueInCurrency: minToTokenAmount?.valueInCurrency,
             },
             feeData: {
-                network: [
-                    {
-                        amount: calcAtomicTokenAmount(networkFeeToUse?.amount, nativeAsset?.decimals),
-                        normalizedAmount: networkFeeToUse?.amount,
-                        valueInCurrency: networkFeeToUse?.valueInCurrency,
-                        usd: networkFeeToUse?.usd,
-                        asset: nativeAsset,
-                    },
-                ],
-                ...(relayerFee &&
-                    Object.values(relayerFee).some(Boolean) && {
-                    relayer: [
-                        {
-                            amount: calcAtomicTokenAmount(relayerFee?.amount, nativeAsset?.decimals),
-                            normalizedAmount: relayerFee.amount,
-                            valueInCurrency: relayerFee.valueInCurrency,
-                            usd: relayerFee.usd,
+                ...includeIfTruthy(networkFeeToUse, {
+                    network: [
+                        toAmountAndAsset(nativeAsset, networkFeeToUse, {
                             asset: nativeAsset,
-                        },
+                        }),
+                    ],
+                }),
+                ...includeIfTruthy(relayerFee, {
+                    relayer: [
+                        toAmountAndAsset(nativeAsset, relayerFee, { asset: nativeAsset }),
                     ],
                 }),
-                ...(includedTxFees &&
-                    Object.values(includedTxFees).some(Boolean) && {
+                ...includeIfTruthy(includedTxFees, {
                     txFee: [
-                        {
-                            amount: calcAtomicTokenAmount(includedTxFees?.amount, txFeeAsset?.decimals),
-                            normalizedAmount: includedTxFees?.amount,
-                            valueInCurrency: includedTxFees?.valueInCurrency,
-                            usd: includedTxFees?.usd,
-                            asset: txFeeAsset,
-                        },
+                        toAmountAndAsset(txFeeAsset, includedTxFees, { asset: txFeeAsset }),
                     ],
                 }),
             },
             priceData: {
-                ...(priceImpactToUse &&
-                    Object.values(priceImpactToUse).some(Boolean) && {
+                ...includeIfTruthy(priceImpactToUse, {
                     priceImpact: priceImpactToUse,
                 }),
-                ...(adjustedReturn &&
-                    Object.values(adjustedReturn).some(Boolean) && {
-                    adjustedReturn: {
-                        valueInCurrency: adjustedReturn?.valueInCurrency,
-                        usd: adjustedReturn?.usd,
-                    },
+                ...includeIfTruthy(adjustedReturn, {
+                    adjustedReturn,
                 }),
                 swapRate,
             },