SWAPS-2839 update bridge controllers for bitcoin #6454
Conversation
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
ghgoodreau
changed the title
| import { toHex } from '@metamask/controller-utils'; | ||
| import { SolScope } from '@metamask/keyring-api'; | ||
| import type { |
There was a problem hiding this comment.
nice! I believe you can remove keyring-api from the package.json as well
| { exchangeRate, usdExchangeRate }: ExchangeRate, | ||
| chainId: string | number, | ||
| ) => { | ||
| const { nonEvmFeesInNative } = bridgeQuote; |
There was a problem hiding this comment.
For 1 SOL, is nonEvmFeesInNative equal to 1000000000 or 1?
There was a problem hiding this comment.
For 1 SOL, nonEvmFeesInNative equals 1000000000, and the calcNonEvmTotalNetworkFee function converts this to 1 SOL by dividing by 10^9
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
ghgoodreau
changed the title
| export type SolanaFees = { | ||
| solanaFeesInLamports?: string; // solana fees in lamports, appended by BridgeController.#appendSolanaFees | ||
| export type NonEvmFees = { | ||
| nonEvmFeesInNative?: string; // Non-EVM chain fees in smallest units (lamports for Solana, satoshis for BTC, sun for Tron) |
There was a problem hiding this comment.
Personally I've been calling them atomic units
| * @param chainId - The chain ID to check | ||
| * @returns True if the chain is a supported non-EVM chain, false otherwise | ||
| */ | ||
| export const isNonEvmChainId = ( |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
| if (isSolanaChainId(chainId)) { | ||
| // Solana fees are stored in lamports (smallest units), need to convert to SOL | ||
| const decimals = 9; | ||
| feeInNative = calcTokenAmount(nonEvmFeesInNative ?? '0', decimals); |
There was a problem hiding this comment.
Why do we convert the SOL amount to lamports in bridge-controller.ts if we need to convert it back to SOL here?
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:
instead of SolanaFees, handleNonEvmTx instead of handleSolanaTx)
that work across all non-EVM chains
Key changes:
References
Checklist