SWAPS-2839 update bridge controllers for bitcoin #6454

ghgoodreau · 2025-09-03T20:31:21Z

Explanation

This PR extends the bridge controller to support Bitcoin transactions, building on the existing Solana support to create a more generic non-EVM chain handling system.

Current state: The bridge controller currently only supports EVM chains and Solana for cross-chain transactions.

Solution: This PR:

Renames Solana-specific functions and types to be generic for all non-EVM chains (NonEvmFees
instead of SolanaFees, handleNonEvmTx instead of handleSolanaTx)
Adds support for Bitcoin transactions using PSBT (Partially Signed Bitcoin Transaction) format
Updates the Snap interface to use the new unified computeFee and signAndSendTransaction methods
that work across all non-EVM chains
Maintains backward compatibility while deprecating Solana-specific naming

Key changes:

The nonEvmFeesInNative field now stores fees in the smallest units for each chain
Transaction handling now detects Bitcoin PSBT format alongside string trade data

References

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed, highlighting breaking changes as necessary
I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

…ollers

…troller

aganglada

Sorry for the confusion on the spec. The ClientRequest: bit was only to outline it it's an onClientRequest

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

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

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

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

…troller

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

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

micaelae · 2025-09-11T16:33:03Z

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

 import { toHex } from '@metamask/controller-utils';
-import { SolScope } from '@metamask/keyring-api';
 import type {


nice! I believe you can remove keyring-api from the package.json as well

infiniteflower · 2025-09-19T16:10:02Z

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

+ * @param chainId - The chain ID to check
+ * @returns True if the chain is a supported non-EVM chain, false otherwise
+ */
+export const isNonEvmChainId = (


I wonder if there's an easier way, otherwise we need to keep updating this for every single new non EVM network

How about:

Convert chainId to CAIP

Check CAIP namespace for eip155

If eip155, then it's EVM

What do you think?

I like that idea! It does add some testing scope whereas the current functionality is already tested and working. Is this blocking? If not, I'd prefer to get these changes released to unblock the client PR, and then can update the function next week. Let me know what you think and I can add a // TODO comment @infiniteflower

Yea this is non-blocking, fine with adding a TODO and addressing it in a follow up PR

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

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

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

micaelae · 2025-09-19T19:36:02Z

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

+  if (isSolanaChainId(chainId)) {
+    // Solana fees are stored in lamports (smallest units), need to convert to SOL
+    const decimals = 9;
+    feeInNative = calcTokenAmount(nonEvmFeesInNative ?? '0', decimals);


Why do we convert the SOL amount to lamports in bridge-controller.ts if we need to convert it back to SOL here?

…troller

Gudahtt · 2025-09-23T12:04:00Z

packages/bridge-status-controller/CHANGELOG.md


+### Removed
+
+- Remove direct dependency on `@metamask/keyring-api` - no longer needed with unified Snap interface ([#6454](https://github.com/MetaMask/core/pull/6454))


The dependency was not removed here, this is unaccurate

Welp, I see it was actually listed twice. It's also in the changed section.

Gudahtt · 2025-09-23T12:20:40Z

packages/bridge-status-controller/CHANGELOG.md

+  - Update response handling to support new `transactionId` format from unified interface
+  - Support multiple response formats: string, `{ transactionId }`, `{ result: { signature } }`, and `{ signature }`
+  - Maintain backward compatibility with legacy response formats
+- Rename transaction handling functions for clarity ([#6454](https://github.com/MetaMask/core/pull/6454))


These changelogs are meant for users of the package, not internal contributors. Please don't document internal-only changes such as internal function renames. It makes it much harder to tell what has actually changed for anyone using this package.

Gudahtt · 2025-09-23T12:27:03Z

packages/bridge-status-controller/CHANGELOG.md

 ### Changed

+- Update transaction submission to use new unified Snap interface for all non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
+  - Replace `signAndSendTransactionWithoutConfirmation` with `ClientRequest:signAndSendTransaction` method


This is a breaking change.

I'm told in practice it probably doesn't require client changes because our snaps support ClientRequest:signAndSendTransaction already. But we should still be documenting it properly here so that it's clearly understood that there is a compatibility change here.

Gudahtt · 2025-09-23T12:28:04Z

packages/bridge-status-controller/CHANGELOG.md

+- Update chain ID handling for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
+  - Add fallback chain ID (`0x0`) when CAIP format can't be converted to hex for source chains
+  - Add fallback chain ID (`0x1`) for non-EVM destination chains
+- Update `getClientRequest` to create proper requests for all non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))


This seems like an internal change as well (a subset of "Add support for Bitcoin bridge transactions"). No need to document internal changes like this.

Gudahtt · 2025-09-23T12:30:56Z

packages/bridge-controller/CHANGELOG.md


+- **BREAKING:** Rename fee handling for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
+  - Replace `SolanaFees` type with `NonEvmFees` type
+  - Replace `solanaFeesInLamports` field with `nonEvmFeesInNative` field


It's unclear what is being renamed here, is this a property on a return value? The context made it seem like it was a package export or a method or something. More context would be appreciated here

Gudahtt · 2025-09-23T12:34:29Z

packages/bridge-controller/CHANGELOG.md

+- **BREAKING:** Rename fee handling for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
+  - Replace `SolanaFees` type with `NonEvmFees` type
+  - Replace `solanaFeesInLamports` field with `nonEvmFeesInNative` field
+  - Update `#appendSolanaFees` to `#appendNonEvmFees` to support all non-EVM chains


This line seems like an internal-only change

Gudahtt · 2025-09-23T12:35:44Z

packages/bridge-controller/CHANGELOG.md

+  - Replace `getFeeForTransaction` with `computeFee` method that returns fees in native token units
+  - Update fee calculation to handle different unit conversions per chain
+  - Support fee computation for Bitcoin and Solana chains
+- Update quote validation to support Bitcoin-specific trade data format ([#6454](https://github.com/MetaMask/core/pull/6454))


Nit: This is fine, but maybe better to move these two entries ("Update quote validation" and "Update selectors and utilities") as sub-bullets of "Add support for Bitcoin bridge transactions". It seems like a detail of that addition, I don't think it's as helpful to frame it as a standalone change.

Gudahtt · 2025-09-23T12:36:34Z

packages/bridge-controller/CHANGELOG.md

+  - Update `#appendSolanaFees` to `#appendNonEvmFees` to support all non-EVM chains
+  - The `nonEvmFeesInNative` field stores fees in the smallest units for each chain (lamports for Solana, satoshis for Bitcoin)
+- Update Snap methods to use new unified interface for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
+  - Replace `getFeeForTransaction` with `computeFee` method that returns fees in native token units


This seems like a breaking change as well. This is a change in the expectations we have of snaps this controller inter-operates with.

This reverts commit 1aae93d.

Gudahtt · 2025-09-23T13:04:00Z

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

    snapId: snapId as never,
    origin: 'metamask',
-    handler: 'onRpcRequest' as never,
+    handler: 'onClientRequest' as never,


Why cast to never 🤔 As the name might imply, never should never be resolved on any of our types. It's meant to alert when a conditional type is broken.

) ## Explanation This reverts commit 1aae93d, which was accidentally released as part of v44 with a bunch of undocumented breaking changes. ## References See #6454 ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs), highlighting breaking changes as necessary - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

ghgoodreau added 2 commits September 3, 2025 15:10

feat: updates snap methods to use new implementations in bridge contr…

7f345c7

…ollers

chore: prettier

d488050

ghgoodreau requested a review from a team as a code owner September 3, 2025 20:31

ghgoodreau marked this pull request as draft September 3, 2025 20:31

This comment was marked as outdated.

Sign in to view

ghgoodreau added 9 commits September 3, 2025 16:00

fix: test

299d7f3

chore: lint

e6b2bd5

test updates

9da14ea

test updates

98af283

update tests

5dc551b

cleanup

249acca

more test coverage

eadbd8f

fix final lint issue

58cef05

update changelog

f35d3a2

ghgoodreau changed the title ~~DRAFT: SWAPS-2839 updates snap methods to new interface in bridge controller~~ SWAPS-2839 updates snap methods to new interface in bridge controller Sep 8, 2025

Merge branch 'main' into SWAPS-2839-update-snap-methods-in-bridge-con…

ca9c3d4

…troller

ghgoodreau marked this pull request as ready for review September 8, 2025 18:42

ghgoodreau requested a review from a team as a code owner September 8, 2025 18:42

ghgoodreau marked this pull request as draft September 9, 2025 15:27

aganglada reviewed Sep 9, 2025

View reviewed changes

micaelae reviewed Sep 9, 2025

View reviewed changes

packages/bridge-controller/src/utils/snaps.ts Outdated Show resolved Hide resolved

ghgoodreau and others added 5 commits September 9, 2025 12:10

update computeFee

cae0407

snapshot update

7651b43

fix tests

602645b

move signandsend to status controller

0c1028a

Merge branch 'main' into SWAPS-2839-update-snap-methods-in-bridge-con…

f2d9198

…troller

micaelae reviewed Sep 11, 2025

View reviewed changes

packages/bridge-controller/src/utils/caip-formatters.ts Outdated Show resolved Hide resolved

micaelae reviewed Sep 11, 2025

View reviewed changes

packages/bridge-controller/src/utils/bridge.ts Outdated Show resolved Hide resolved

micaelae reviewed Sep 11, 2025

View reviewed changes

packages/bridge-controller/src/utils/bridge.ts Show resolved Hide resolved

micaelae reviewed Sep 11, 2025

View reviewed changes

infiniteflower reviewed Sep 19, 2025

View reviewed changes

packages/bridge-controller/src/utils/quote.ts Show resolved Hide resolved

remove tron changes

3917e27

infiniteflower reviewed Sep 19, 2025

View reviewed changes

packages/bridge-status-controller/src/utils/snaps.ts Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

ghgoodreau added 2 commits September 19, 2025 14:11

update function naming

1af634d

add TODO for chainID handling in activity for bitcoin

41ce980

cursor bot reviewed Sep 19, 2025

View reviewed changes

packages/bridge-status-controller/src/utils/transaction.ts Show resolved Hide resolved

micaelae reviewed Sep 19, 2025

View reviewed changes

ghgoodreau added 2 commits September 19, 2025 14:56

update test for new fallback

fb63f06

removes redundant conversion of fees for solana

959ddbd

infiniteflower approved these changes Sep 22, 2025

View reviewed changes

micaelae approved these changes Sep 22, 2025

View reviewed changes

Merge branch 'main' into SWAPS-2839-update-snap-methods-in-bridge-con…

0056aec

…troller

micaelae merged commit 1aae93d into main Sep 22, 2025
238 of 239 checks passed

micaelae deleted the SWAPS-2839-update-snap-methods-in-bridge-controller branch September 22, 2025 17:18

Gudahtt reviewed Sep 23, 2025

View reviewed changes

Gudahtt added a commit that referenced this pull request Sep 23, 2025

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

0fcb878

This reverts commit 1aae93d.

Gudahtt mentioned this pull request Sep 23, 2025

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

Merged

4 tasks

Gudahtt added a commit that referenced this pull request Sep 23, 2025

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

dca2b36

This reverts commit 1aae93d.

Gudahtt reviewed Sep 23, 2025

View reviewed changes


		### Removed

		- Remove direct dependency on `@metamask/keyring-api` - no longer needed with unified Snap interface ([#6454](https://github.com/MetaMask/core/pull/6454))

Uh oh!

SWAPS-2839 update bridge controllers for bitcoin #6454

SWAPS-2839 update bridge controllers for bitcoin #6454

Uh oh!

Conversation

ghgoodreau commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Checklist

Uh oh!

This comment was marked as outdated.

Uh oh!

aganglada left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

infiniteflower Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

micaelae Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gudahtt Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ghgoodreau commented Sep 3, 2025 •

edited

Loading

infiniteflower Sep 19, 2025 •

edited

Loading

micaelae Sep 19, 2025 •

edited

Loading

Gudahtt Sep 23, 2025 •

edited

Loading