@metamask/bridge-controller 9.0.0 → 11.0.0

package/dist/utils/quote.mjs

@@ -1,9 +1,19 @@
 export const isValidQuoteRequest = (partialRequest, requireAmount = true) => {
-    const stringFields = ['srcTokenAddress', 'destTokenAddress'];
+    const stringFields = [
+        'srcTokenAddress',
+        'destTokenAddress',
+        'srcChainId',
+        'destChainId',
+        'walletAddress',
+    ];
     if (requireAmount) {
         stringFields.push('srcTokenAmount');
     }
-    const numberFields = ['srcChainId', 'destChainId', 'slippage'];
+    const numberFields = [];
+    // if slippage is defined, require it to be a number
+    if (partialRequest.slippage !== undefined) {
+        numberFields.push('slippage');
+    }
     return (stringFields.every((field) => field in partialRequest &&
         typeof partialRequest[field] ===
             'string' &&

package/dist/utils/quote.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"quote.mjs","sourceRoot":"","sources":["../../src/utils/quote.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,cAAqC,EACrC,aAAa,GAAG,IAAI,EACY,EAAE;IAClC,MAAM,YAAY,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC7D,IAAI,aAAa,EAAE;QACjB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KACrC;IACD,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAE/D,OAAO,CACL,YAAY,CAAC,KAAK,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,IAAI,cAAc;QACvB,OAAO,cAAc,CAAC,KAAoC,CAAC;YACzD,QAAQ;QACV,cAAc,CAAC,KAAoC,CAAC,KAAK,SAAS;QAClE,cAAc,CAAC,KAAoC,CAAC,KAAK,EAAE;QAC3D,cAAc,CAAC,KAAoC,CAAC,KAAK,IAAI,CAChE;QACD,YAAY,CAAC,KAAK,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,IAAI,cAAc;YACvB,OAAO,cAAc,CAAC,KAAoC,CAAC;gBACzD,QAAQ;YACV,cAAc,CAAC,KAAoC,CAAC,KAAK,SAAS;YAClE,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAoC,CAAC,CAAC,CAAC;YACpE,cAAc,CAAC,KAAoC,CAAC,KAAK,IAAI,CAChE;QACD,CAAC,aAAa;YACZ,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,CACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { QuoteRequest } from '../types';\n\nexport const isValidQuoteRequest = (\n  partialRequest: Partial<QuoteRequest>,\n  requireAmount = true,\n): partialRequest is QuoteRequest => {\n  const stringFields = ['srcTokenAddress', 'destTokenAddress'];\n  if (requireAmount) {\n    stringFields.push('srcTokenAmount');\n  }\n  const numberFields = ['srcChainId', 'destChainId', 'slippage'];\n\n  return (\n    stringFields.every(\n      (field) =>\n        field in partialRequest &&\n        typeof partialRequest[field as keyof typeof partialRequest] ===\n          'string' &&\n        partialRequest[field as keyof typeof partialRequest] !== undefined &&\n        partialRequest[field as keyof typeof partialRequest] !== '' &&\n        partialRequest[field as keyof typeof partialRequest] !== null,\n    ) &&\n    numberFields.every(\n      (field) =>\n        field in partialRequest &&\n        typeof partialRequest[field as keyof typeof partialRequest] ===\n          'number' &&\n        partialRequest[field as keyof typeof partialRequest] !== undefined &&\n        !isNaN(Number(partialRequest[field as keyof typeof partialRequest])) &&\n        partialRequest[field as keyof typeof partialRequest] !== null,\n    ) &&\n    (requireAmount\n      ? Boolean((partialRequest.srcTokenAmount ?? '').match(/^[1-9]\\d*$/u))\n      : true)\n  );\n};\n"]}
+{"version":3,"file":"quote.mjs","sourceRoot":"","sources":["../../src/utils/quote.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,cAA4C,EAC5C,aAAa,GAAG,IAAI,EACmB,EAAE;IACzC,MAAM,YAAY,GAAG;QACnB,iBAAiB;QACjB,kBAAkB;QAClB,YAAY;QACZ,aAAa;QACb,eAAe;KAChB,CAAC;IACF,IAAI,aAAa,EAAE;QACjB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KACrC;IACD,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,oDAAoD;IACpD,IAAI,cAAc,CAAC,QAAQ,KAAK,SAAS,EAAE;QACzC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAC/B;IAED,OAAO,CACL,YAAY,CAAC,KAAK,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,IAAI,cAAc;QACvB,OAAO,cAAc,CAAC,KAAoC,CAAC;YACzD,QAAQ;QACV,cAAc,CAAC,KAAoC,CAAC,KAAK,SAAS;QAClE,cAAc,CAAC,KAAoC,CAAC,KAAK,EAAE;QAC3D,cAAc,CAAC,KAAoC,CAAC,KAAK,IAAI,CAChE;QACD,YAAY,CAAC,KAAK,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,IAAI,cAAc;YACvB,OAAO,cAAc,CAAC,KAAoC,CAAC;gBACzD,QAAQ;YACV,cAAc,CAAC,KAAoC,CAAC,KAAK,SAAS;YAClE,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAoC,CAAC,CAAC,CAAC;YACpE,cAAc,CAAC,KAAoC,CAAC,KAAK,IAAI,CAChE;QACD,CAAC,aAAa;YACZ,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,CACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { GenericQuoteRequest } from '../types';\n\nexport const isValidQuoteRequest = (\n  partialRequest: Partial<GenericQuoteRequest>,\n  requireAmount = true,\n): partialRequest is GenericQuoteRequest => {\n  const stringFields = [\n    'srcTokenAddress',\n    'destTokenAddress',\n    'srcChainId',\n    'destChainId',\n    'walletAddress',\n  ];\n  if (requireAmount) {\n    stringFields.push('srcTokenAmount');\n  }\n  const numberFields = [];\n  // if slippage is defined, require it to be a number\n  if (partialRequest.slippage !== undefined) {\n    numberFields.push('slippage');\n  }\n\n  return (\n    stringFields.every(\n      (field) =>\n        field in partialRequest &&\n        typeof partialRequest[field as keyof typeof partialRequest] ===\n          'string' &&\n        partialRequest[field as keyof typeof partialRequest] !== undefined &&\n        partialRequest[field as keyof typeof partialRequest] !== '' &&\n        partialRequest[field as keyof typeof partialRequest] !== null,\n    ) &&\n    numberFields.every(\n      (field) =>\n        field in partialRequest &&\n        typeof partialRequest[field as keyof typeof partialRequest] ===\n          'number' &&\n        partialRequest[field as keyof typeof partialRequest] !== undefined &&\n        !isNaN(Number(partialRequest[field as keyof typeof partialRequest])) &&\n        partialRequest[field as keyof typeof partialRequest] !== null,\n    ) &&\n    (requireAmount\n      ? Boolean((partialRequest.srcTokenAmount ?? '').match(/^[1-9]\\d*$/u))\n      : true)\n  );\n};\n"]}

package/dist/utils/validators.cjs

@@ -10,15 +10,23 @@ const HexStringSchema = (0, superstruct_1.define)('HexString', (v) => (0, utils_
 const truthyString = (s) => Boolean(s?.length);
 exports.truthyString = truthyString;
 const TruthyDigitStringSchema = (0, superstruct_1.define)('TruthyDigitString', (v) => (0, exports.truthyString)(v) && Boolean(v.match(/^\d+$/u)));
-const SwapsTokenObjectSchema = (0, superstruct_1.type)({
+const ChainIdSchema = (0, superstruct_1.number)();
+const BridgeAssetSchema = (0, superstruct_1.type)({
+    chainId: ChainIdSchema,
+    address: (0, superstruct_1.string)(),
+    assetId: (0, superstruct_1.string)(),
+    symbol: (0, superstruct_1.string)(),
+    name: (0, superstruct_1.string)(),
     decimals: (0, superstruct_1.number)(),
-    address: (0, superstruct_1.intersection)([(0, superstruct_1.string)(), HexAddressSchema]),
-    symbol: (0, superstruct_1.size)((0, superstruct_1.string)(), 1, 12),
+    icon: (0, superstruct_1.optional)((0, superstruct_1.string)()),
+    iconUrl: (0, superstruct_1.optional)((0, superstruct_1.string)()),
 });
 const validateFeatureFlagsResponse = (data) => {
     const ChainConfigurationSchema = (0, superstruct_1.type)({
         isActiveSrc: (0, superstruct_1.boolean)(),
         isActiveDest: (0, superstruct_1.boolean)(),
+        refreshRate: (0, superstruct_1.optional)((0, superstruct_1.number)()),
+        topAssets: (0, superstruct_1.optional)((0, superstruct_1.array)((0, superstruct_1.string)())),
     });
     const ConfigSchema = (0, superstruct_1.type)({
         refreshRate: (0, superstruct_1.number)(),
@@ -35,19 +43,10 @@ const validateFeatureFlagsResponse = (data) => {
 };
 exports.validateFeatureFlagsResponse = validateFeatureFlagsResponse;
 const validateSwapsTokenObject = (data) => {
-    return (0, superstruct_1.is)(data, SwapsTokenObjectSchema);
+    return (0, superstruct_1.is)(data, BridgeAssetSchema);
 };
 exports.validateSwapsTokenObject = validateSwapsTokenObject;
 const validateQuoteResponse = (data) => {
-    const ChainIdSchema = (0, superstruct_1.number)();
-    const BridgeAssetSchema = (0, superstruct_1.type)({
-        chainId: ChainIdSchema,
-        address: (0, superstruct_1.string)(),
-        symbol: (0, superstruct_1.string)(),
-        name: (0, superstruct_1.string)(),
-        decimals: (0, superstruct_1.number)(),
-        icon: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-    });
     const FeeDataSchema = (0, superstruct_1.type)({
         amount: TruthyDigitStringSchema,
         asset: BridgeAssetSchema,
@@ -71,10 +70,10 @@ const validateQuoteResponse = (data) => {
     const QuoteSchema = (0, superstruct_1.type)({
         requestId: (0, superstruct_1.string)(),
         srcChainId: ChainIdSchema,
-        srcAsset: SwapsTokenObjectSchema,
+        srcAsset: BridgeAssetSchema,
         srcTokenAmount: (0, superstruct_1.string)(),
         destChainId: ChainIdSchema,
-        destAsset: SwapsTokenObjectSchema,
+        destAsset: BridgeAssetSchema,
         destTokenAmount: (0, superstruct_1.string)(),
         feeData: (0, superstruct_1.record)((0, superstruct_1.enums)(Object.values(types_1.FeeType)), FeeDataSchema),
         bridgeId: (0, superstruct_1.string)(),
@@ -93,7 +92,7 @@ const validateQuoteResponse = (data) => {
     const QuoteResponseSchema = (0, superstruct_1.type)({
         quote: QuoteSchema,
         approval: (0, superstruct_1.optional)(TxDataSchema),
-        trade: TxDataSchema,
+        trade: (0, superstruct_1.union)([TxDataSchema, (0, superstruct_1.string)()]),
         estimatedProcessingTimeInSeconds: (0, superstruct_1.number)(),
     });
     return (0, superstruct_1.is)(data, QuoteResponseSchema);

package/dist/utils/validators.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"validators.cjs","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  string,\n  boolean,\n  number,\n  type,\n  is,\n  record,\n  array,\n  nullable,\n  optional,\n  enums,\n  define,\n  intersection,\n  size,\n} from '@metamask/superstruct';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport type { SwapsTokenObject } from '../constants/tokens';\nimport type { FeatureFlagResponse, QuoteResponse } from '../types';\nimport { ActionTypes, BridgeFlag, FeeType } from '../types';\n\nconst HexAddressSchema = define('HexAddress', (v: unknown) =>\n  isValidHexAddress(v as string, { allowNonPrefixed: false }),\n);\n\nconst HexStringSchema = define('HexString', (v: unknown) =>\n  isStrictHexString(v as string),\n);\n\nexport const truthyString = (s: string) => Boolean(s?.length);\nconst TruthyDigitStringSchema = define(\n  'TruthyDigitString',\n  (v: unknown) =>\n    truthyString(v as string) && Boolean((v as string).match(/^\\d+$/u)),\n);\n\nconst SwapsTokenObjectSchema = type({\n  decimals: number(),\n  address: intersection([string(), HexAddressSchema]),\n  symbol: size(string(), 1, 12),\n});\n\nexport const validateFeatureFlagsResponse = (\n  data: unknown,\n): data is FeatureFlagResponse => {\n  const ChainConfigurationSchema = type({\n    isActiveSrc: boolean(),\n    isActiveDest: boolean(),\n  });\n\n  const ConfigSchema = type({\n    refreshRate: number(),\n    maxRefreshCount: number(),\n    support: boolean(),\n    chains: record(string(), ChainConfigurationSchema),\n  });\n\n  // Create schema for FeatureFlagResponse\n  const FeatureFlagResponseSchema = type({\n    [BridgeFlag.EXTENSION_CONFIG]: ConfigSchema,\n    [BridgeFlag.MOBILE_CONFIG]: ConfigSchema,\n  });\n\n  return is(data, FeatureFlagResponseSchema);\n};\n\nexport const validateSwapsTokenObject = (\n  data: unknown,\n): data is SwapsTokenObject => {\n  return is(data, SwapsTokenObjectSchema);\n};\n\nexport const validateQuoteResponse = (data: unknown): data is QuoteResponse => {\n  const ChainIdSchema = number();\n\n  const BridgeAssetSchema = type({\n    chainId: ChainIdSchema,\n    address: string(),\n    symbol: string(),\n    name: string(),\n    decimals: number(),\n    icon: optional(string()),\n  });\n\n  const FeeDataSchema = type({\n    amount: TruthyDigitStringSchema,\n    asset: BridgeAssetSchema,\n  });\n\n  const ProtocolSchema = type({\n    name: string(),\n    displayName: optional(string()),\n    icon: optional(string()),\n  });\n\n  const StepSchema = type({\n    action: enums(Object.values(ActionTypes)),\n    srcChainId: ChainIdSchema,\n    destChainId: optional(ChainIdSchema),\n    srcAsset: BridgeAssetSchema,\n    destAsset: BridgeAssetSchema,\n    srcAmount: string(),\n    destAmount: string(),\n    protocol: ProtocolSchema,\n  });\n\n  const RefuelDataSchema = StepSchema;\n\n  const QuoteSchema = type({\n    requestId: string(),\n    srcChainId: ChainIdSchema,\n    srcAsset: SwapsTokenObjectSchema,\n    srcTokenAmount: string(),\n    destChainId: ChainIdSchema,\n    destAsset: SwapsTokenObjectSchema,\n    destTokenAmount: string(),\n    feeData: record(enums(Object.values(FeeType)), FeeDataSchema),\n    bridgeId: string(),\n    bridges: array(string()),\n    steps: array(StepSchema),\n    refuel: optional(RefuelDataSchema),\n  });\n\n  const TxDataSchema = type({\n    chainId: number(),\n    to: HexAddressSchema,\n    from: HexAddressSchema,\n    value: HexStringSchema,\n    data: HexStringSchema,\n    gasLimit: nullable(number()),\n  });\n\n  const QuoteResponseSchema = type({\n    quote: QuoteSchema,\n    approval: optional(TxDataSchema),\n    trade: TxDataSchema,\n    estimatedProcessingTimeInSeconds: number(),\n  });\n\n  return is(data, QuoteResponseSchema);\n};\n"]}
+{"version":3,"file":"validators.cjs","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":";;;AAAA,iEAA+D;AAC/D,uDAa+B;AAC/B,2CAAoD;AAGpD,wCAA4D;AAE5D,MAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAC,YAAY,EAAE,CAAC,CAAU,EAAE,EAAE,CAC3D,IAAA,oCAAiB,EAAC,CAAW,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAC5D,CAAC;AAEF,MAAM,eAAe,GAAG,IAAA,oBAAM,EAAC,WAAW,EAAE,CAAC,CAAU,EAAE,EAAE,CACzD,IAAA,yBAAiB,EAAC,CAAW,CAAC,CAC/B,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAAjD,QAAA,YAAY,gBAAqC;AAC9D,MAAM,uBAAuB,GAAG,IAAA,oBAAM,EACpC,mBAAmB,EACnB,CAAC,CAAU,EAAE,EAAE,CACb,IAAA,oBAAY,EAAC,CAAW,CAAC,IAAI,OAAO,CAAE,CAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CACtE,CAAC;AAEF,MAAM,aAAa,GAAG,IAAA,oBAAM,GAAE,CAAC;AAE/B,MAAM,iBAAiB,GAAG,IAAA,kBAAI,EAAC;IAC7B,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,IAAA,oBAAM,GAAE;IACjB,OAAO,EAAE,IAAA,oBAAM,GAAE;IACjB,MAAM,EAAE,IAAA,oBAAM,GAAE;IAChB,IAAI,EAAE,IAAA,oBAAM,GAAE;IACd,QAAQ,EAAE,IAAA,oBAAM,GAAE;IAClB,IAAI,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;IACxB,OAAO,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;CAC5B,CAAC,CAAC;AAEI,MAAM,4BAA4B,GAAG,CAC1C,IAAa,EACgB,EAAE;IAC/B,MAAM,wBAAwB,GAAG,IAAA,kBAAI,EAAC;QACpC,WAAW,EAAE,IAAA,qBAAO,GAAE;QACtB,YAAY,EAAE,IAAA,qBAAO,GAAE;QACvB,WAAW,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;QAC/B,SAAS,EAAE,IAAA,sBAAQ,EAAC,IAAA,mBAAK,EAAC,IAAA,oBAAM,GAAE,CAAC,CAAC;KACrC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,kBAAI,EAAC;QACxB,WAAW,EAAE,IAAA,oBAAM,GAAE;QACrB,eAAe,EAAE,IAAA,oBAAM,GAAE;QACzB,OAAO,EAAE,IAAA,qBAAO,GAAE;QAClB,MAAM,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,wBAAwB,CAAC;KACnD,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,yBAAyB,GAAG,IAAA,kBAAI,EAAC;QACrC,CAAC,kBAAU,CAAC,gBAAgB,CAAC,EAAE,YAAY;QAC3C,CAAC,kBAAU,CAAC,aAAa,CAAC,EAAE,YAAY;KACzC,CAAC,CAAC;IAEH,OAAO,IAAA,gBAAE,EAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;AAC7C,CAAC,CAAC;AAxBW,QAAA,4BAA4B,gCAwBvC;AAEK,MAAM,wBAAwB,GAAG,CACtC,IAAa,EACQ,EAAE;IACvB,OAAO,IAAA,gBAAE,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,wBAAwB,4BAInC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAa,EAAyB,EAAE;IAC5E,MAAM,aAAa,GAAG,IAAA,kBAAI,EAAC;QACzB,MAAM,EAAE,uBAAuB;QAC/B,KAAK,EAAE,iBAAiB;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAA,kBAAI,EAAC;QAC1B,IAAI,EAAE,IAAA,oBAAM,GAAE;QACd,WAAW,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;QAC/B,IAAI,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;KACzB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAA,kBAAI,EAAC;QACtB,MAAM,EAAE,IAAA,mBAAK,EAAC,MAAM,CAAC,MAAM,CAAC,mBAAW,CAAC,CAAC;QACzC,UAAU,EAAE,aAAa;QACzB,WAAW,EAAE,IAAA,sBAAQ,EAAC,aAAa,CAAC;QACpC,QAAQ,EAAE,iBAAiB;QAC3B,SAAS,EAAE,iBAAiB;QAC5B,SAAS,EAAE,IAAA,oBAAM,GAAE;QACnB,UAAU,EAAE,IAAA,oBAAM,GAAE;QACpB,QAAQ,EAAE,cAAc;KACzB,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,UAAU,CAAC;IAEpC,MAAM,WAAW,GAAG,IAAA,kBAAI,EAAC;QACvB,SAAS,EAAE,IAAA,oBAAM,GAAE;QACnB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,iBAAiB;QAC3B,cAAc,EAAE,IAAA,oBAAM,GAAE;QACxB,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,iBAAiB;QAC5B,eAAe,EAAE,IAAA,oBAAM,GAAE;QACzB,OAAO,EAAE,IAAA,oBAAM,EAAC,IAAA,mBAAK,EAAC,MAAM,CAAC,MAAM,CAAC,eAAO,CAAC,CAAC,EAAE,aAAa,CAAC;QAC7D,QAAQ,EAAE,IAAA,oBAAM,GAAE;QAClB,OAAO,EAAE,IAAA,mBAAK,EAAC,IAAA,oBAAM,GAAE,CAAC;QACxB,KAAK,EAAE,IAAA,mBAAK,EAAC,UAAU,CAAC;QACxB,MAAM,EAAE,IAAA,sBAAQ,EAAC,gBAAgB,CAAC;KACnC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,kBAAI,EAAC;QACxB,OAAO,EAAE,IAAA,oBAAM,GAAE;QACjB,EAAE,EAAE,gBAAgB;QACpB,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,IAAA,kBAAI,EAAC;QAC/B,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,IAAA,sBAAQ,EAAC,YAAY,CAAC;QAChC,KAAK,EAAE,IAAA,mBAAK,EAAC,CAAC,YAAY,EAAE,IAAA,oBAAM,GAAE,CAAC,CAAC;QACtC,gCAAgC,EAAE,IAAA,oBAAM,GAAE;KAC3C,CAAC,CAAC;IAEH,OAAO,IAAA,gBAAE,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;AACvC,CAAC,CAAC;AAzDW,QAAA,qBAAqB,yBAyDhC","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  string,\n  boolean,\n  number,\n  type,\n  is,\n  record,\n  array,\n  nullable,\n  optional,\n  enums,\n  define,\n  union,\n} from '@metamask/superstruct';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport type { BridgeAsset, FeatureFlagResponse, QuoteResponse } from '../types';\nimport { ActionTypes, BridgeFlag, FeeType } from '../types';\n\nconst HexAddressSchema = define('HexAddress', (v: unknown) =>\n  isValidHexAddress(v as string, { allowNonPrefixed: false }),\n);\n\nconst HexStringSchema = define('HexString', (v: unknown) =>\n  isStrictHexString(v as string),\n);\n\nexport const truthyString = (s: string) => Boolean(s?.length);\nconst TruthyDigitStringSchema = define(\n  'TruthyDigitString',\n  (v: unknown) =>\n    truthyString(v as string) && Boolean((v as string).match(/^\\d+$/u)),\n);\n\nconst ChainIdSchema = number();\n\nconst BridgeAssetSchema = type({\n  chainId: ChainIdSchema,\n  address: string(),\n  assetId: string(),\n  symbol: string(),\n  name: string(),\n  decimals: number(),\n  icon: optional(string()),\n  iconUrl: optional(string()),\n});\n\nexport const validateFeatureFlagsResponse = (\n  data: unknown,\n): data is FeatureFlagResponse => {\n  const ChainConfigurationSchema = type({\n    isActiveSrc: boolean(),\n    isActiveDest: boolean(),\n    refreshRate: optional(number()),\n    topAssets: optional(array(string())),\n  });\n\n  const ConfigSchema = type({\n    refreshRate: number(),\n    maxRefreshCount: number(),\n    support: boolean(),\n    chains: record(string(), ChainConfigurationSchema),\n  });\n\n  // Create schema for FeatureFlagResponse\n  const FeatureFlagResponseSchema = type({\n    [BridgeFlag.EXTENSION_CONFIG]: ConfigSchema,\n    [BridgeFlag.MOBILE_CONFIG]: ConfigSchema,\n  });\n\n  return is(data, FeatureFlagResponseSchema);\n};\n\nexport const validateSwapsTokenObject = (\n  data: unknown,\n): data is BridgeAsset => {\n  return is(data, BridgeAssetSchema);\n};\n\nexport const validateQuoteResponse = (data: unknown): data is QuoteResponse => {\n  const FeeDataSchema = type({\n    amount: TruthyDigitStringSchema,\n    asset: BridgeAssetSchema,\n  });\n\n  const ProtocolSchema = type({\n    name: string(),\n    displayName: optional(string()),\n    icon: optional(string()),\n  });\n\n  const StepSchema = type({\n    action: enums(Object.values(ActionTypes)),\n    srcChainId: ChainIdSchema,\n    destChainId: optional(ChainIdSchema),\n    srcAsset: BridgeAssetSchema,\n    destAsset: BridgeAssetSchema,\n    srcAmount: string(),\n    destAmount: string(),\n    protocol: ProtocolSchema,\n  });\n\n  const RefuelDataSchema = StepSchema;\n\n  const QuoteSchema = type({\n    requestId: string(),\n    srcChainId: ChainIdSchema,\n    srcAsset: BridgeAssetSchema,\n    srcTokenAmount: string(),\n    destChainId: ChainIdSchema,\n    destAsset: BridgeAssetSchema,\n    destTokenAmount: string(),\n    feeData: record(enums(Object.values(FeeType)), FeeDataSchema),\n    bridgeId: string(),\n    bridges: array(string()),\n    steps: array(StepSchema),\n    refuel: optional(RefuelDataSchema),\n  });\n\n  const TxDataSchema = type({\n    chainId: number(),\n    to: HexAddressSchema,\n    from: HexAddressSchema,\n    value: HexStringSchema,\n    data: HexStringSchema,\n    gasLimit: nullable(number()),\n  });\n\n  const QuoteResponseSchema = type({\n    quote: QuoteSchema,\n    approval: optional(TxDataSchema),\n    trade: union([TxDataSchema, string()]),\n    estimatedProcessingTimeInSeconds: number(),\n  });\n\n  return is(data, QuoteResponseSchema);\n};\n"]}

package/dist/utils/validators.d.cts

@@ -1,7 +1,6 @@
-import type { SwapsTokenObject } from "../constants/tokens.cjs";
-import type { FeatureFlagResponse, QuoteResponse } from "../types.cjs";
+import type { BridgeAsset, FeatureFlagResponse, QuoteResponse } from "../types.cjs";
 export declare const truthyString: (s: string) => boolean;
 export declare const validateFeatureFlagsResponse: (data: unknown) => data is FeatureFlagResponse;
-export declare const validateSwapsTokenObject: (data: unknown) => data is SwapsTokenObject;
+export declare const validateSwapsTokenObject: (data: unknown) => data is BridgeAsset;
 export declare const validateQuoteResponse: (data: unknown) => data is QuoteResponse;
 //# sourceMappingURL=validators.d.cts.map

package/dist/utils/validators.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.cts","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gCAA4B;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,qBAAiB;AAWnE,eAAO,MAAM,YAAY,MAAO,MAAM,YAAuB,CAAC;AAa9D,eAAO,MAAM,4BAA4B,SACjC,OAAO,gCAqBd,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAC7B,OAAO,6BAGd,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,OAAO,0BAoElD,CAAC"}
+{"version":3,"file":"validators.d.cts","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,aAAa,EAAE,qBAAiB;AAWhF,eAAO,MAAM,YAAY,MAAO,MAAM,YAAuB,CAAC;AAoB9D,eAAO,MAAM,4BAA4B,SACjC,OAAO,gCAuBd,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAC7B,OAAO,wBAGd,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,OAAO,0BAyDlD,CAAC"}

package/dist/utils/validators.d.mts

@@ -1,7 +1,6 @@
-import type { SwapsTokenObject } from "../constants/tokens.mjs";
-import type { FeatureFlagResponse, QuoteResponse } from "../types.mjs";
+import type { BridgeAsset, FeatureFlagResponse, QuoteResponse } from "../types.mjs";
 export declare const truthyString: (s: string) => boolean;
 export declare const validateFeatureFlagsResponse: (data: unknown) => data is FeatureFlagResponse;
-export declare const validateSwapsTokenObject: (data: unknown) => data is SwapsTokenObject;
+export declare const validateSwapsTokenObject: (data: unknown) => data is BridgeAsset;
 export declare const validateQuoteResponse: (data: unknown) => data is QuoteResponse;
 //# sourceMappingURL=validators.d.mts.map

package/dist/utils/validators.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.mts","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gCAA4B;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,qBAAiB;AAWnE,eAAO,MAAM,YAAY,MAAO,MAAM,YAAuB,CAAC;AAa9D,eAAO,MAAM,4BAA4B,SACjC,OAAO,gCAqBd,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAC7B,OAAO,6BAGd,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,OAAO,0BAoElD,CAAC"}
+{"version":3,"file":"validators.d.mts","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,aAAa,EAAE,qBAAiB;AAWhF,eAAO,MAAM,YAAY,MAAO,MAAM,YAAuB,CAAC;AAoB9D,eAAO,MAAM,4BAA4B,SACjC,OAAO,gCAuBd,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAC7B,OAAO,wBAGd,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,OAAO,0BAyDlD,CAAC"}

package/dist/utils/validators.mjs

@@ -1,20 +1,28 @@
 import { isValidHexAddress } from "@metamask/controller-utils";
-import { string, boolean, number, type, is, record, array, nullable, optional, enums, define, intersection, size } from "@metamask/superstruct";
+import { string, boolean, number, type, is, record, array, nullable, optional, enums, define, union } from "@metamask/superstruct";
 import { isStrictHexString } from "@metamask/utils";
 import { ActionTypes, BridgeFlag, FeeType } from "../types.mjs";
 const HexAddressSchema = define('HexAddress', (v) => isValidHexAddress(v, { allowNonPrefixed: false }));
 const HexStringSchema = define('HexString', (v) => isStrictHexString(v));
 export const truthyString = (s) => Boolean(s?.length);
 const TruthyDigitStringSchema = define('TruthyDigitString', (v) => truthyString(v) && Boolean(v.match(/^\d+$/u)));
-const SwapsTokenObjectSchema = type({
+const ChainIdSchema = number();
+const BridgeAssetSchema = type({
+    chainId: ChainIdSchema,
+    address: string(),
+    assetId: string(),
+    symbol: string(),
+    name: string(),
     decimals: number(),
-    address: intersection([string(), HexAddressSchema]),
-    symbol: size(string(), 1, 12),
+    icon: optional(string()),
+    iconUrl: optional(string()),
 });
 export const validateFeatureFlagsResponse = (data) => {
     const ChainConfigurationSchema = type({
         isActiveSrc: boolean(),
         isActiveDest: boolean(),
+        refreshRate: optional(number()),
+        topAssets: optional(array(string())),
     });
     const ConfigSchema = type({
         refreshRate: number(),
@@ -30,18 +38,9 @@ export const validateFeatureFlagsResponse = (data) => {
     return is(data, FeatureFlagResponseSchema);
 };
 export const validateSwapsTokenObject = (data) => {
-    return is(data, SwapsTokenObjectSchema);
+    return is(data, BridgeAssetSchema);
 };
 export const validateQuoteResponse = (data) => {
-    const ChainIdSchema = number();
-    const BridgeAssetSchema = type({
-        chainId: ChainIdSchema,
-        address: string(),
-        symbol: string(),
-        name: string(),
-        decimals: number(),
-        icon: optional(string()),
-    });
     const FeeDataSchema = type({
         amount: TruthyDigitStringSchema,
         asset: BridgeAssetSchema,
@@ -65,10 +64,10 @@ export const validateQuoteResponse = (data) => {
     const QuoteSchema = type({
         requestId: string(),
         srcChainId: ChainIdSchema,
-        srcAsset: SwapsTokenObjectSchema,
+        srcAsset: BridgeAssetSchema,
         srcTokenAmount: string(),
         destChainId: ChainIdSchema,
-        destAsset: SwapsTokenObjectSchema,
+        destAsset: BridgeAssetSchema,
         destTokenAmount: string(),
         feeData: record(enums(Object.values(FeeType)), FeeDataSchema),
         bridgeId: string(),
@@ -87,7 +86,7 @@ export const validateQuoteResponse = (data) => {
     const QuoteResponseSchema = type({
         quote: QuoteSchema,
         approval: optional(TxDataSchema),
-        trade: TxDataSchema,
+        trade: union([TxDataSchema, string()]),
         estimatedProcessingTimeInSeconds: number(),
     });
     return is(data, QuoteResponseSchema);

package/dist/utils/validators.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validators.mjs","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  string,\n  boolean,\n  number,\n  type,\n  is,\n  record,\n  array,\n  nullable,\n  optional,\n  enums,\n  define,\n  intersection,\n  size,\n} from '@metamask/superstruct';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport type { SwapsTokenObject } from '../constants/tokens';\nimport type { FeatureFlagResponse, QuoteResponse } from '../types';\nimport { ActionTypes, BridgeFlag, FeeType } from '../types';\n\nconst HexAddressSchema = define('HexAddress', (v: unknown) =>\n  isValidHexAddress(v as string, { allowNonPrefixed: false }),\n);\n\nconst HexStringSchema = define('HexString', (v: unknown) =>\n  isStrictHexString(v as string),\n);\n\nexport const truthyString = (s: string) => Boolean(s?.length);\nconst TruthyDigitStringSchema = define(\n  'TruthyDigitString',\n  (v: unknown) =>\n    truthyString(v as string) && Boolean((v as string).match(/^\\d+$/u)),\n);\n\nconst SwapsTokenObjectSchema = type({\n  decimals: number(),\n  address: intersection([string(), HexAddressSchema]),\n  symbol: size(string(), 1, 12),\n});\n\nexport const validateFeatureFlagsResponse = (\n  data: unknown,\n): data is FeatureFlagResponse => {\n  const ChainConfigurationSchema = type({\n    isActiveSrc: boolean(),\n    isActiveDest: boolean(),\n  });\n\n  const ConfigSchema = type({\n    refreshRate: number(),\n    maxRefreshCount: number(),\n    support: boolean(),\n    chains: record(string(), ChainConfigurationSchema),\n  });\n\n  // Create schema for FeatureFlagResponse\n  const FeatureFlagResponseSchema = type({\n    [BridgeFlag.EXTENSION_CONFIG]: ConfigSchema,\n    [BridgeFlag.MOBILE_CONFIG]: ConfigSchema,\n  });\n\n  return is(data, FeatureFlagResponseSchema);\n};\n\nexport const validateSwapsTokenObject = (\n  data: unknown,\n): data is SwapsTokenObject => {\n  return is(data, SwapsTokenObjectSchema);\n};\n\nexport const validateQuoteResponse = (data: unknown): data is QuoteResponse => {\n  const ChainIdSchema = number();\n\n  const BridgeAssetSchema = type({\n    chainId: ChainIdSchema,\n    address: string(),\n    symbol: string(),\n    name: string(),\n    decimals: number(),\n    icon: optional(string()),\n  });\n\n  const FeeDataSchema = type({\n    amount: TruthyDigitStringSchema,\n    asset: BridgeAssetSchema,\n  });\n\n  const ProtocolSchema = type({\n    name: string(),\n    displayName: optional(string()),\n    icon: optional(string()),\n  });\n\n  const StepSchema = type({\n    action: enums(Object.values(ActionTypes)),\n    srcChainId: ChainIdSchema,\n    destChainId: optional(ChainIdSchema),\n    srcAsset: BridgeAssetSchema,\n    destAsset: BridgeAssetSchema,\n    srcAmount: string(),\n    destAmount: string(),\n    protocol: ProtocolSchema,\n  });\n\n  const RefuelDataSchema = StepSchema;\n\n  const QuoteSchema = type({\n    requestId: string(),\n    srcChainId: ChainIdSchema,\n    srcAsset: SwapsTokenObjectSchema,\n    srcTokenAmount: string(),\n    destChainId: ChainIdSchema,\n    destAsset: SwapsTokenObjectSchema,\n    destTokenAmount: string(),\n    feeData: record(enums(Object.values(FeeType)), FeeDataSchema),\n    bridgeId: string(),\n    bridges: array(string()),\n    steps: array(StepSchema),\n    refuel: optional(RefuelDataSchema),\n  });\n\n  const TxDataSchema = type({\n    chainId: number(),\n    to: HexAddressSchema,\n    from: HexAddressSchema,\n    value: HexStringSchema,\n    data: HexStringSchema,\n    gasLimit: nullable(number()),\n  });\n\n  const QuoteResponseSchema = type({\n    quote: QuoteSchema,\n    approval: optional(TxDataSchema),\n    trade: TxDataSchema,\n    estimatedProcessingTimeInSeconds: number(),\n  });\n\n  return is(data, QuoteResponseSchema);\n};\n"]}
+{"version":3,"file":"validators.mjs","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  string,\n  boolean,\n  number,\n  type,\n  is,\n  record,\n  array,\n  nullable,\n  optional,\n  enums,\n  define,\n  union,\n} from '@metamask/superstruct';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport type { BridgeAsset, FeatureFlagResponse, QuoteResponse } from '../types';\nimport { ActionTypes, BridgeFlag, FeeType } from '../types';\n\nconst HexAddressSchema = define('HexAddress', (v: unknown) =>\n  isValidHexAddress(v as string, { allowNonPrefixed: false }),\n);\n\nconst HexStringSchema = define('HexString', (v: unknown) =>\n  isStrictHexString(v as string),\n);\n\nexport const truthyString = (s: string) => Boolean(s?.length);\nconst TruthyDigitStringSchema = define(\n  'TruthyDigitString',\n  (v: unknown) =>\n    truthyString(v as string) && Boolean((v as string).match(/^\\d+$/u)),\n);\n\nconst ChainIdSchema = number();\n\nconst BridgeAssetSchema = type({\n  chainId: ChainIdSchema,\n  address: string(),\n  assetId: string(),\n  symbol: string(),\n  name: string(),\n  decimals: number(),\n  icon: optional(string()),\n  iconUrl: optional(string()),\n});\n\nexport const validateFeatureFlagsResponse = (\n  data: unknown,\n): data is FeatureFlagResponse => {\n  const ChainConfigurationSchema = type({\n    isActiveSrc: boolean(),\n    isActiveDest: boolean(),\n    refreshRate: optional(number()),\n    topAssets: optional(array(string())),\n  });\n\n  const ConfigSchema = type({\n    refreshRate: number(),\n    maxRefreshCount: number(),\n    support: boolean(),\n    chains: record(string(), ChainConfigurationSchema),\n  });\n\n  // Create schema for FeatureFlagResponse\n  const FeatureFlagResponseSchema = type({\n    [BridgeFlag.EXTENSION_CONFIG]: ConfigSchema,\n    [BridgeFlag.MOBILE_CONFIG]: ConfigSchema,\n  });\n\n  return is(data, FeatureFlagResponseSchema);\n};\n\nexport const validateSwapsTokenObject = (\n  data: unknown,\n): data is BridgeAsset => {\n  return is(data, BridgeAssetSchema);\n};\n\nexport const validateQuoteResponse = (data: unknown): data is QuoteResponse => {\n  const FeeDataSchema = type({\n    amount: TruthyDigitStringSchema,\n    asset: BridgeAssetSchema,\n  });\n\n  const ProtocolSchema = type({\n    name: string(),\n    displayName: optional(string()),\n    icon: optional(string()),\n  });\n\n  const StepSchema = type({\n    action: enums(Object.values(ActionTypes)),\n    srcChainId: ChainIdSchema,\n    destChainId: optional(ChainIdSchema),\n    srcAsset: BridgeAssetSchema,\n    destAsset: BridgeAssetSchema,\n    srcAmount: string(),\n    destAmount: string(),\n    protocol: ProtocolSchema,\n  });\n\n  const RefuelDataSchema = StepSchema;\n\n  const QuoteSchema = type({\n    requestId: string(),\n    srcChainId: ChainIdSchema,\n    srcAsset: BridgeAssetSchema,\n    srcTokenAmount: string(),\n    destChainId: ChainIdSchema,\n    destAsset: BridgeAssetSchema,\n    destTokenAmount: string(),\n    feeData: record(enums(Object.values(FeeType)), FeeDataSchema),\n    bridgeId: string(),\n    bridges: array(string()),\n    steps: array(StepSchema),\n    refuel: optional(RefuelDataSchema),\n  });\n\n  const TxDataSchema = type({\n    chainId: number(),\n    to: HexAddressSchema,\n    from: HexAddressSchema,\n    value: HexStringSchema,\n    data: HexStringSchema,\n    gasLimit: nullable(number()),\n  });\n\n  const QuoteResponseSchema = type({\n    quote: QuoteSchema,\n    approval: optional(TxDataSchema),\n    trade: union([TxDataSchema, string()]),\n    estimatedProcessingTimeInSeconds: number(),\n  });\n\n  return is(data, QuoteResponseSchema);\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-controller",
-  "version": "9.0.0",
+  "version": "11.0.0",
   "description": "Manages bridge-related quote fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -54,17 +54,21 @@
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^8.0.0",
     "@metamask/controller-utils": "^11.6.0",
+    "@metamask/keyring-api": "^17.2.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
+    "@metamask/multichain-network-controller": "^0.3.0",
     "@metamask/polling-controller": "^13.0.0",
+    "@metamask/snaps-utils": "^8.10.0",
     "@metamask/utils": "^11.2.0"
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
-    "@metamask/network-controller": "^23.0.0",
+    "@metamask/network-controller": "^23.1.0",
+    "@metamask/snaps-controllers": "^9.19.0",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/transaction-controller": "^51.0.0",
+    "@metamask/transaction-controller": "^52.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
@@ -79,7 +83,8 @@
   "peerDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
     "@metamask/network-controller": "^23.0.0",
-    "@metamask/transaction-controller": "^51.0.0"
+    "@metamask/snaps-controllers": "^9.19.0",
+    "@metamask/transaction-controller": "^52.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"