Skip to content

fix: scope keyring send token to subject address #9749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
n3ps wants to merge 3 commits into
base: main
Choose a base branch
from
+149 −1
Open

fix: scope keyring send token to subject address #9749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc6f291
fix: get correct token movement in non-evm send
n3ps Aug 1, 2026
51c1914
chore(client-utils): changelog for subject-scoped send mapping
n3ps Aug 1, 2026
9c81416
fix(client-utils): order changelog Fixed after Changed
n3ps Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/client-utils/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Bump `@metamask/core-backend` from `^8.0.0` to `^8.1.0` ([#9735](https://github.com/MetaMask/core/pull/9735))
- Bump `@metamask/transaction-controller` from `^69.3.0` to `^69.4.0` ([#9735](https://github.com/MetaMask/core/pull/9735))

### Fixed

- Prefer the subject's fungible `from` movement when mapping keyring send activity, so multi-party Solana txs (e.g. bridge source legs) no longer surface another address's token as the sent asset ([#9749](https://github.com/MetaMask/core/pull/9749))

## [1.5.0]

### Added
Expand Down
23 changes: 23 additions & 0 deletions packages/client-utils/src/mappers/keyring-transaction-mapper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,29 @@ describe('mapKeyringTransaction', () => {
});
});

it('uses the subject outflow for a Solana bridge send', () => {
const item = mapKeyringTransaction(
keyringTransactionFixtures.mapArgs.solanaBridgeSendWithForeignUsdc,
);

expect(item).toMatchObject({
type: 'send',
chainId: SolScope.Mainnet,
status: 'success',
hash: '3Tph6Faw2YMshJt7pkCaCbTHTX4mYJLE6h72DR6Q4uDta9HmrNCfReXuDDPKUCbCxn7NUNALvgNjii19fKdgWBfA',
data: {
from: keyringTransactionFixtures.addresses.solanaSubject,
to: keyringTransactionFixtures.addresses.solanaCounterparty,
token: {
amount: '0.00531264',
assetId: `${SolScope.Mainnet}/slip44:501`,
direction: 'out',
symbol: 'SOL',
},
},
});
});

it('maps trustline approve TokenApprove to assetActivation', () => {
const item = mapKeyringTransaction(
keyringTransactionFixtures.mapArgs.trustlineApprove,
Expand Down
5 changes: 4 additions & 1 deletion packages/client-utils/src/mappers/keyring-transaction-mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ export function mapKeyringTransaction({

switch (type) {
case KeyringTransactionType.Send: {
const fromToken = getToken(transaction.from, 'out');
const fromSubject = subjectAddress
? transaction.from.filter(({ address }) => address === subjectAddress)

@n3ps n3ps Aug 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Point of interest

: transaction.from;
const fromToken = getToken(fromSubject, 'out');
const token =
!fromToken && chainId.startsWith('bip122:')
? getToken(transaction.to, 'out')
Expand Down
118 changes: 118 additions & 0 deletions packages/client-utils/test/fixtures/keyring-transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export const keyringTransactionFixtures = {
senderAddress: 'sender-address',
bitcoinSubject: 'bc1qcj8v4ft5uvt59jjrxd856a48xegclwne78h0ye',
bitcoinOutput: 'bc1qc5tzsfpd3zjecma6529kanjtug69rf58mtfxmu',
solanaSubject: 'EsEduLCwNdAbJZ2oTr1wB1ymQw76NuwswWwG6imzQN7H',
solanaCounterparty: '8ekCy2jHHUbW2yeNGFWYJT9Hm9FW7SvZcZK66dSZCDiF',
},
constants: {
uint256Max:
Expand Down Expand Up @@ -394,5 +396,121 @@ export const keyringTransactionFixtures = {
events: [],
} as never,
},
// MultichainTransactionsController payload for a Solana→Base bridge source
// leg. First fungible in `from` is another party's USDC; the subject's
// outflow is SOL.
solanaBridgeSendWithForeignUsdc: {
subjectAddress: 'EsEduLCwNdAbJZ2oTr1wB1ymQw76NuwswWwG6imzQN7H',
transaction: {
account: '625152a4-4667-4328-99bd-b38db43658f5',
chain: SolScope.Mainnet,
events: [
{
status: TransactionStatus.Confirmed,
timestamp: 1784776645,
},
],
fees: [
{
asset: {
amount: '0.000005',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
type: 'base',
},
{
asset: {
amount: '0.000050564',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
type: 'priority',
},
],
from: [
{
address: '8ekCy2jHHUbW2yeNGFWYJT9Hm9FW7SvZcZK66dSZCDiF',
asset: {
amount: '0.069181',
fungible: true,
type: `${SolScope.Mainnet}/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v`,
unit: 'USDC',
},
},
{
address: 'EsEduLCwNdAbJZ2oTr1wB1ymQw76NuwswWwG6imzQN7H',
asset: {
amount: '0.00531264',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
},
],
id: '3Tph6Faw2YMshJt7pkCaCbTHTX4mYJLE6h72DR6Q4uDta9HmrNCfReXuDDPKUCbCxn7NUNALvgNjii19fKdgWBfA',
status: TransactionStatus.Confirmed,
timestamp: 1784776645,
to: [
{
address: '8ekCy2jHHUbW2yeNGFWYJT9Hm9FW7SvZcZK66dSZCDiF',
asset: {
amount: '0.000892125',
fungible: true,
type: `${SolScope.Mainnet}/token:So11111111111111111111111111111111111111112`,
unit: '',
},
},
{
address: '2Gr2S7Nk7nbXzWkzGD1FSqvgHqdPnyN2rLJWsQnenP3w',
asset: {
amount: '0.069181',
fungible: true,
type: `${SolScope.Mainnet}/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v`,
unit: 'USDC',
},
},
{
address: '2Gr2S7Nk7nbXzWkzGD1FSqvgHqdPnyN2rLJWsQnenP3w',
asset: {
amount: '0.00237336',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
},
{
address: '47YRE7eLAdYzvGqSH1XLg2o8xUtywk7sS5BKv1oR4Y7i',
asset: {
amount: '0.000007875',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
},
{
address: 'AyJKchXeuZgW8ZQ2uC2EvgPJXE9bKJRYmWs9gt3Ug8JP',
asset: {
amount: '0.00203928',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
},
{
address: '5pVN5XZB8cYBjNLFrsBCPWkCQBan5K5Mq2dWGzwPgGJV',
asset: {
amount: '0.000892125',
fungible: true,
type: `${SolScope.Mainnet}/slip44:501`,
unit: 'SOL',
},
},
],
type: TransactionType.Send,
} as never,
},
},
};