feat: CowSwap intent base swap

.gitignore

@@ -34,4 +34,8 @@ scripts/coverage
 !.yarn/versions
 
 # typescript
-packages/*/*.tsbuildinfo
+packages/*/*.tsbuildinfo
+
+# Emacs
+\#*\#
+.#*

eslint-suppressions.json

@@ -770,25 +770,6 @@
       "count": 1
     }
   },
-  "packages/bridge-status-controller/src/bridge-status-controller.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 20
-    },
-    "@typescript-eslint/naming-convention": {
-      "count": 5
-    },
-    "camelcase": {
-      "count": 8
-    },
-    "id-length": {
-      "count": 1
-    }
-  },
-  "packages/bridge-status-controller/src/types.ts": {
-    "@typescript-eslint/naming-convention": {
-      "count": 7
-    }
-  },
   "packages/bridge-status-controller/src/utils/bridge-status.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 3

packages/bridge-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add intent based transaction support ([#6547](https://github.com/MetaMask/core/pull/6547))
+
 ### Changed
 
 - Bump `@metamask/remote-feature-flag-controller` from `^3.1.0` to `^4.0.0` ([#7546](https://github.com/MetaMask/core/pull/7546))

packages/bridge-controller/src/index.ts

@@ -42,6 +42,8 @@ export type {
   QuoteResponse,
   FeeData,
   TxData,
+  Intent,
+  IntentOrderLike,
   BitcoinTradeData,
   TronTradeData,
   BridgeControllerState,

packages/bridge-controller/src/types.ts

@@ -32,6 +32,7 @@ import type {
   ChainConfigurationSchema,
   FeatureId,
   FeeDataSchema,
+  IntentSchema,
   PlatformConfigSchema,
   ProtocolSchema,
   QuoteResponseSchema,
@@ -223,6 +224,7 @@ export type QuoteRequest<
 };
 
 export enum StatusTypes {
+  SUBMITTED = 'SUBMITTED',
   UNKNOWN = 'UNKNOWN',
   FAILED = 'FAILED',
   PENDING = 'PENDING',
@@ -251,6 +253,9 @@ export type Quote = Infer<typeof QuoteSchema>;
 
 export type TxData = Infer<typeof TxDataSchema>;
 
+export type Intent = Infer<typeof IntentSchema>;
+export type IntentOrderLike = Intent['order'];
+
 export type BitcoinTradeData = Infer<typeof BitcoinTradeDataSchema>;
 
 export type TronTradeData = Infer<typeof TronTradeDataSchema>;

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

@@ -192,6 +192,127 @@ export const StepSchema = type({
 
 const RefuelDataSchema = StepSchema;
 
+// Allow digit strings for amounts/validTo for flexibility across providers
+const DigitStringOrNumberSchema = union([TruthyDigitStringSchema, number()]);
+
+/**
+ * Identifier of the intent protocol used for order creation and submission.
+ *
+ * Examples:
+ * - CoW Swap
+ * - Other EIP-712–based intent protocols
+ */
+const IntentProtocolSchema = string();
+
+/**
+ * Schema for an intent-based order used for EIP-712 signing and submission.
+ *
+ * This represents the minimal subset of fields required by intent-based
+ * protocols (e.g. CoW Swap) to build, sign, and submit an order.
+ */
+export const IntentOrderSchema = type({
+  /**
+   * Address of the token being sold.
+   */
+  sellToken: HexAddressSchema,
+
+  /**
+   * Address of the token being bought.
+   */
+  buyToken: HexAddressSchema,
+
+  /**
+   * Optional receiver of the bought tokens.
+   * If omitted, defaults to the signer / order owner.
+   */
+  receiver: optional(HexAddressSchema),
+
+  /**
+   * Order expiration time.
+   *
+   * Can be provided as a UNIX timestamp in seconds, either as a number
+   * or as a digit string, depending on provider requirements.
+   */
+  validTo: DigitStringOrNumberSchema,
+
+  /**
+   * Arbitrary application-specific data attached to the order.
+   */
+  appData: string(),
+
+  /**
+   * Hash of the `appData` field, used for EIP-712 signing.
+   */
+  appDataHash: HexStringSchema,
+
+  /**
+   * Fee amount paid for order execution, expressed as a digit string.
+   */
+  feeAmount: TruthyDigitStringSchema,
+
+  /**
+   * Order kind.
+   *
+   * - `sell`: exact sell amount, variable buy amount
+   * - `buy`: exact buy amount, variable sell amount
+   */
+  kind: enums(['sell', 'buy']),
+
+  /**
+   * Whether the order can be partially filled.
+   */
+  partiallyFillable: boolean(),
+
+  /**
+   * Exact amount of the sell token.
+   *
+   * Required for `sell` orders.
+   */
+  sellAmount: optional(TruthyDigitStringSchema),
+
+  /**
+   * Exact amount of the buy token.
+   *
+   * Required for `buy` orders.
+   */
+  buyAmount: optional(TruthyDigitStringSchema),
+
+  /**
+   * Optional order owner / sender address.
+   *
+   * Provided for convenience when building the EIP-712 domain and message.
+   */
+  from: optional(HexAddressSchema),
+});
+
+/**
+ * Schema representing an intent submission payload.
+ *
+ * Wraps the intent order along with protocol and optional routing metadata
+ * required by the backend or relayer infrastructure.
+ */
+export const IntentSchema = type({
+  /**
+   * Identifier of the intent protocol used to interpret the order.
+   */
+  protocol: IntentProtocolSchema,
+
+  /**
+   * The intent order to be signed and submitted.
+   */
+  order: IntentOrderSchema,
+
+  /**
+   * Optional settlement contract address used for execution.
+   */
+  settlementContract: optional(HexAddressSchema),
+
+  /**
+   * Optional relayer address responsible for order submission.
+   */
+  relayer: optional(HexAddressSchema),
+});
+
 export const QuoteSchema = type({
   requestId: string(),
   srcChainId: ChainIdSchema,
@@ -244,6 +365,7 @@ export const QuoteSchema = type({
       totalFeeAmountUsd: optional(string()),
     }),
   ),
+  intent: optional(IntentSchema),
   /**
    * A third party sponsors the gas. If true, then gasIncluded7702 is also true.
    */

packages/bridge-status-controller/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING** Use CrossChain API instead of the intent manager package for intent order submission ([#6547](https://github.com/MetaMask/core/pull/6547))
 - Upgrade `@metamask/utils` from `^11.8.1` to `^11.9.0` ([#7511](https://github.com/MetaMask/core/pull/7511))
 - Bump `@metamask/network-controller` from `^27.0.0` to `^27.1.0` ([#7534](https://github.com/MetaMask/core/pull/7534))
 - Bump `@metamask/controller-utils` from `^11.16.0` to `^11.17.0` ([#7534](https://github.com/MetaMask/core/pull/7534))
@@ -17,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+>>>>>>> main
 - Bump `@metamask/transaction-controller` from `^62.5.0` to `^62.7.0` ([#7430](https://github.com/MetaMask/core/pull/7430), [#7494](https://github.com/MetaMask/core/pull/7494))
 - Bump `@metamask/bridge-controller` from `^64.1.0` to `^64.2.0` ([#7509](https://github.com/MetaMask/core/pull/7509))
 

packages/bridge-status-controller/jest.config.js

@@ -14,10 +14,12 @@ module.exports = merge(baseConfig, {
   // The display name when running multiple projects
   displayName,
 
+  coverageProvider: 'v8',
+
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 94,
+      branches: 91,
       functions: 100,
       lines: 100,
       statements: 100,

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

@@ -13,6 +13,7 @@ Object {
     "hasApprovalTx": false,
     "initialDestAssetBalance": undefined,
     "isStxEnabled": false,
+    "originalTransactionId": "bridgeTxMetaId1",
     "pricingData": Object {
       "amountSent": "1.234",
       "amountSentInUsd": undefined,
@@ -214,6 +215,7 @@ Object {
     "hasApprovalTx": false,
     "initialDestAssetBalance": undefined,
     "isStxEnabled": false,
+    "originalTransactionId": "bridgeTxMetaId1",
     "pricingData": Object {
       "amountSent": "1.234",
       "amountSentInUsd": undefined,
@@ -415,6 +417,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -650,6 +653,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -885,6 +889,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -1121,6 +1126,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": true,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -1382,6 +1388,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -1617,6 +1624,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -1852,6 +1860,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -2191,6 +2200,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -2446,6 +2456,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -2852,6 +2863,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": true,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -3204,6 +3216,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -3416,6 +3429,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "test-tx-id",
   "pricingData": Object {
     "amountSent": "1.234",
     "amountSentInUsd": "1.01",
@@ -3714,6 +3728,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "signature",
   "pricingData": Object {
     "amountSent": "1",
     "amountSentInUsd": "100",
@@ -4048,6 +4063,7 @@ Object {
   "hasApprovalTx": false,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "signature",
   "pricingData": Object {
     "amountSent": "1",
     "amountSentInUsd": "100",
@@ -4423,6 +4439,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "bridge-signature",
   "pricingData": Object {
     "amountSent": "1",
     "amountSentInUsd": "1",
@@ -4641,6 +4658,7 @@ Object {
   "hasApprovalTx": true,
   "initialDestAssetBalance": undefined,
   "isStxEnabled": false,
+  "originalTransactionId": "swap-signature",
   "pricingData": Object {
     "amountSent": "1",
     "amountSentInUsd": "1",