Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { convertTransactions } from '../../tokens/converters'
import { ETHER_MAINNET } from '../../common/config'
import type { TokenAccount, TokenTransaction } from '../../tokens/types'

const account: TokenAccount = {
id: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
balance: 0,
contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7'
}

const baseTransaction: TokenTransaction = {
blockNumber: '1',
timeStamp: '1658608646',
hash: '0x90bb0dcbe8fa38387145aa17d6ad99f57da91d4c6d4b65b5f7cf56454f73234b',
nonce: '1',
blockHash: '0x1',
from: '0x1111111111111111111111111111111111111111',
contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7',
to: account.id,
value: '1000000',
tokenName: 'Tether USD',
tokenSymbol: 'USDT',
tokenDecimal: '6',
transactionIndex: '1',
gas: '21000',
gasPrice: '1000000000',
gasUsed: '21000',
cumulativeGasUsed: '21000',
input: 'deprecated',
confirmations: '1'
}

describe('token convertTransactions', () => {
it('filters out movements with absolute value below 0.01', () => {
const list = convertTransactions(
account,
[{ ...baseTransaction, value: '1' }],
ETHER_MAINNET
)

expect(list).toHaveLength(0)
})

it('does not leave fee-only transaction when payment amount is below 0.01', () => {
const list = convertTransactions(
account,
[{
...baseTransaction,
from: account.id,
to: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
value: '1'
}],
ETHER_MAINNET
)

expect(list).toHaveLength(0)
})

it('keeps movements with absolute value at least 0.01', () => {
const list = convertTransactions(
account,
[{ ...baseTransaction, value: '10000' }],
ETHER_MAINNET
)

expect(list).toHaveLength(1)
expect(list[0].movements[0].sum).toBe(0.01)
})
})
8 changes: 7 additions & 1 deletion src/plugins/etherscan/ether/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
import { ETHER_MAINNET, Instruments } from '../common/config'
import type { EthereumAccount, EthereumTransaction } from './types'

const MIN_MOVEMENT_SUM = 0.01

function convertWeiToUETH (value: number): number {
return Math.round(value / 10 ** 12)
}
Expand Down Expand Up @@ -85,7 +87,11 @@ export function convertTransactions (
const list = transactions
.map((transaction) => convertTransaction(account, transaction))
.filter((transaction): transaction is Transaction =>
Boolean(transaction?.movements.some((movement) => movement.sum !== 0))
Boolean(
transaction?.movements.some((movement) =>
movement.sum !== null && Math.abs(movement.sum) >= MIN_MOVEMENT_SUM
)
)
)

return list
Expand Down
12 changes: 11 additions & 1 deletion src/plugins/etherscan/tokens/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { ETHER_MAINNET } from '../common/config'
import { getTransactionFee } from '../ether/converters'
import type { EthereumTransaction } from '../ether/types'

const MIN_MOVEMENT_SUM = 0.01

function convertAccount (account: TokenAccount, chain: Chain): Account | null {
const token = SUPPORTED_TOKENS[chain].find(
(token) => token.contractAddress === account.contractAddress
Expand Down Expand Up @@ -64,6 +66,10 @@ export function convertTransaction (
const operationValue = token.convertBalance(Number(transaction.value))
const { gas, hash, timeStamp } = transaction

if (Math.abs(operationValue) < MIN_MOVEMENT_SUM) {
return null
}

const transactions = []
const TokenTransaction: Transaction = {
hold: null,
Expand Down Expand Up @@ -128,7 +134,11 @@ export function convertTransactions (
const list = transactions
.flatMap((transaction) => convertTransaction(account, transaction, chain))
.filter((transaction): transaction is Transaction =>
Boolean(transaction?.movements.some((movement) => movement.sum !== 0))
Boolean(
transaction?.movements.some((movement) =>
movement.sum !== null && Math.abs(movement.sum) >= MIN_MOVEMENT_SUM
)
)
)

return list
Expand Down