Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions packages/client-utils/src/mappers/api-transaction-mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import {
getFees,
getNftPaymentTransfer,
getTokenAmountFromTransfer,
getTokenMetadataFromKnownToken,
parseValueTransfers,
} from './helpers/transactions.js';
import { getKnownTokenMetadata } from './helpers/token-metadata.js';

/**
* Maps an indexed API transaction into the shared activity item shape.
Expand Down Expand Up @@ -102,9 +102,17 @@ export function mapApiTransaction({
const assetId = contractAddress
? formatAddressToAssetId(contractAddress, chainId)
: undefined;
const token =
getTokenMetadataFromKnownToken(contractAddress, direction, chainId) ??
(assetId ? { direction, assetId } : undefined);

const tokenMetadata = getKnownTokenMetadata(chainId, contractAddress);
const token = assetId
? {
direction,
assetType: 'erc20',
symbol: tokenMetadata?.symbol,
decimals: tokenMetadata?.decimals,
assetId: tokenMetadata?.assetId ?? assetId,
}
: undefined;

return {
type: 'approveSpendingCap',
Expand Down
51 changes: 0 additions & 51 deletions packages/client-utils/src/mappers/helpers/transactions.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import * as tokenMetadata from './token-metadata.js';
import {
getFees,
getLocalTransactionFees,
getLocalTransactionStatus,
getNftPaymentTransfer,
getTokenAmountFromTransfer,
getTokenMetadataFromKnownToken,
isNftStandard,
parseValueTransfers,
} from './transactions.js';
Expand Down Expand Up @@ -202,55 +200,6 @@ describe('transaction helpers', () => {
});
});

describe('getTokenMetadataFromKnownToken', () => {
it('returns metadata without a symbol when it is missing', () => {
jest.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
decimals: 18,
assetId: 'eip155:1/erc20:0x1111111111111111111111111111111111111111',
});

expect(
getTokenMetadataFromKnownToken(
'0x1111111111111111111111111111111111111111',
'out',
'eip155:1',
),
).toStrictEqual({
direction: 'out',
decimals: 18,
assetId: 'eip155:1/erc20:0x1111111111111111111111111111111111111111',
assetType: 'erc20',
});
});

it('returns partial metadata when some fields are missing', () => {
jest.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
symbol: 'TKN',
});

expect(
getTokenMetadataFromKnownToken(
'0x1111111111111111111111111111111111111111',
'out',
'eip155:1',
),
).toMatchObject({
direction: 'out',
symbol: 'TKN',
});
});

it('returns undefined for unknown tokens', () => {
expect(
getTokenMetadataFromKnownToken(
'0x1111111111111111111111111111111111111111',
'out',
'eip155:1',
),
).toBeUndefined();
});
});

describe('getLocalTransactionFees', () => {
it('resolves fee assetId via ETH symbol when chainlist only has testnet slip44:1', () => {
// 0x539 = Geth Testnet (1337); chainlist slip44 is 1, which we skip.
Expand Down
23 changes: 0 additions & 23 deletions packages/client-utils/src/mappers/helpers/transactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
getNativeAsset,
resolveNativeAssetId,
} from './caip.js';
import { getKnownTokenMetadata } from './token-metadata.js';

// Adds optional `isSmartTransaction` to `TransactionMeta`.
export type TransactionGroup = {
Expand Down Expand Up @@ -408,25 +407,3 @@ export function getTokenAmountFromTransfer(
...(assetType ? { assetType } : {}),
};
}

export function getTokenMetadataFromKnownToken(
contractAddress: string | undefined,
direction: TokenAmount['direction'],
chainId: CaipChainId,
): TokenAmount | undefined {
const tokenMetadata = getKnownTokenMetadata(chainId, contractAddress);

if (!tokenMetadata) {
return undefined;
}

return {
direction,
assetType: 'erc20',
...(tokenMetadata.symbol ? { symbol: tokenMetadata.symbol } : {}),
...(tokenMetadata.decimals === undefined
? {}
: { decimals: tokenMetadata.decimals }),
...(tokenMetadata.assetId ? { assetId: tokenMetadata.assetId } : {}),
};
}
6 changes: 6 additions & 0 deletions packages/client-utils/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export type ActivityItem =
'approveSpendingCap' | 'revokeSpendingCap' | 'increaseSpendingCap',
{
from?: string;
to?: string;
token?: TokenAmount;
fees?: Fee[];
}
Expand All @@ -123,6 +124,7 @@ export type ActivityItem =
'assetActivation' | 'assetDeactivation',
{
from?: string;
to?: string;
token?: TokenAmount;
fees?: Fee[];
}
Expand Down Expand Up @@ -155,6 +157,7 @@ export type ActivityItem =
| 'unwrap',
{
from?: string;
to?: string;
sourceToken?: TokenAmount;
destinationToken?: TokenAmount;
fees?: Fee[];
Expand All @@ -164,13 +167,15 @@ export type ActivityItem =
'buy' | 'claim' | 'deposit' | 'claimMusdBonus',
{
from?: string;
to?: string;
token?: TokenAmount;
}
>
| ActivityData<
'perpsAddFunds' | 'perpsWithdraw',
{
from?: string;
to?: string;
fiat?: FiatAmount;
networkFee?: FiatAmount;
token?: TokenAmount;
Expand Down Expand Up @@ -225,6 +230,7 @@ export type ActivityItem =
'rampBuy' | 'rampSell',
{
from?: string;
to?: string;
fiat?: FiatAmount;
token?: TokenAmount;
fees?: Fee[];
Expand Down
Loading