Skip to content
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

fix: fix base token being displayed as ERC20 #2714

Merged
merged 5 commits into from
Jul 10, 2024
Merged

fix: fix base token being displayed as ERC20 #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47aca9a
set correct token standard
MarkNerdi Jul 8, 2024
e8b5fb6
fix base token approvals
MarkNerdi Jul 10, 2024
38ceb5a
fix decimal places for erc20 smr
MarkNerdi Jul 10, 2024
735df26
fix local activity
MarkNerdi Jul 10, 2024
e1c3d78
Merge branch 'develop' into 2400----incorrect-label-for-shimmer-activ…
jeeanribeiro Jul 10, 2024
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
11 changes: 8 additions & 3 deletions ...sktop/views/dashboard/wallet/tab-section/activity/components/AssetPillsForActivity.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Pill } from '@bloomwalletio/ui'
import { Activity, StardustActivityType, isEvmTokenActivity } from '@core/activity'
import { getTokenFromActivity } from '@core/activity/utils/getTokenFromActivity'
import { BASE_TOKEN_ID } from '@core/token'
import { BASE_TOKEN_ID, TokenStandard } from '@core/token'
import { getNftByIdForAccount } from '@core/nfts/stores'
import { selectedAccountIndex } from '@core/account/stores'
import { NetworkNamespace } from '@core/network/enums'
Expand Down Expand Up @@ -53,8 +53,13 @@
standardPill = ''
} else if (isEvmTokenActivity(activity)) {
const standard = activity.tokenTransfer.standard
standardPill = standard
typePill = standard === NftStandard.Erc721 || standard === NftStandard.Irc27 ? 'nft' : 'token'
standardPill = standard === TokenStandard.BaseToken ? '' : standard
typePill =
standard === NftStandard.Erc721 || standard === NftStandard.Irc27
? 'nft'
: standard === TokenStandard.BaseToken
? 'baseCoin'
: 'token'
} else if (activity.type === EvmActivityType.ContractCall) {
typePill = ''
standardPill = convertCamelCaseToPhrase(activity.method ?? '')
Expand Down
7 changes: 6 additions & 1 deletion packages/shared/src/lib/core/activity/types/evm/evm-token-approval-activity.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ import { IParsedInput } from '@core/layer-2/interfaces'
export type EvmTokenApprovalActivity = BaseEvmActivity & {
type: EvmActivityType.TokenApproval
tokenTransfer: {
standard: TokenStandard.Erc20 | TokenStandard.Irc30 | NftStandard.Irc27 | NftStandard.Erc721
standard:
| TokenStandard.BaseToken
| TokenStandard.Erc20
| TokenStandard.Irc30
| NftStandard.Irc27
| NftStandard.Erc721
tokenId: string
rawAmount: bigint
}
Expand Down
9 changes: 4 additions & 5 deletions ...ages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import {
} from '@core/activity/types'
import { parseSmartContractDataFromTransactionData } from '@core/layer-2/utils/parseSmartContractDataFromTransactionData'
import { IEvmNetwork } from '@core/network'
import { NftStandard } from '@core/nfts'
import { BASE_TOKEN_ID, TokenStandard } from '@core/token'
import { BASE_TOKEN_ID } from '@core/token'
import { LocalEvmTransaction } from '@core/transactions'
import { SubjectType } from '@core/wallet'
import { generateBaseEvmActivity } from './generateBaseEvmActivity'
Expand Down Expand Up @@ -81,7 +80,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
...baseActivity,
type: EvmActivityType.TokenTransfer,
tokenTransfer: {
standard: TokenStandard.Erc20,
standard: parsedData.standard,
tokenId: parsedData.tokenId,
rawAmount: parsedData.rawAmount,
},
Expand All @@ -91,7 +90,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
...baseActivity,
type: EvmActivityType.TokenTransfer,
tokenTransfer: {
standard: NftStandard.Erc721,
standard: parsedData.standard,
tokenId: parsedData.nftId,
rawAmount: BigInt(1),
},
Expand All @@ -101,7 +100,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
...baseActivity,
type: EvmActivityType.TokenApproval,
tokenTransfer: {
standard: TokenStandard.Erc20,
standard: parsedData.standard,
tokenId: parsedData.tokenId,
rawAmount: parsedData.rawAmount,
},
Expand Down
7 changes: 6 additions & 1 deletion ...s/shared/src/lib/core/activity/utils/evm/getSmartContractDataFromBlockscoutTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ export function getSmartContractDataFromBlockscoutTransaction(
| undefined
let tokenTransfer:
| {
standard: TokenStandard.Erc20 | TokenStandard.Irc30 | NftStandard.Irc27 | NftStandard.Erc721
standard:
| TokenStandard.BaseToken
| TokenStandard.Erc20
| TokenStandard.Irc30
| NftStandard.Irc27
| NftStandard.Erc721
tokenId: string
rawAmount: bigint
}
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/lib/core/activity/utils/getTokenIdFromActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function getTokenIdFromActivity(activity: Activity): string | undefined {
return BASE_TOKEN_ID
} else if (isEvmTokenActivity(activity)) {
if (
activity.tokenTransfer.standard === TokenStandard.BaseToken ||
activity.tokenTransfer.standard === TokenStandard.Erc20 ||
activity.tokenTransfer.standard === TokenStandard.Irc30
) {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/lib/core/layer-2/interfaces/parsed-contract-data.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface IParsedCoinTransfer extends Omit<IParsedSmartContractData, 'typ

export interface IParsedTokenTransfer extends Omit<IParsedSmartContractData, 'type'> {
type: ParsedSmartContractType.TokenTransfer
standard: TokenStandard.Erc20 | TokenStandard.Irc30
standard: TokenStandard.Erc20 | TokenStandard.Irc30 | TokenStandard.BaseToken
tokenId: string
rawAmount: bigint
}
Expand All @@ -22,7 +22,7 @@ export interface IParsedNftTransfer extends Omit<IParsedSmartContractData, 'type

export interface IParsedTokenApproval extends Omit<IParsedSmartContractData, 'type'> {
type: ParsedSmartContractType.TokenApproval
standard: TokenStandard.Erc20
standard: TokenStandard.Erc20 | TokenStandard.BaseToken
spender: string
tokenId: string
rawAmount: bigint
Expand Down
28 changes: 22 additions & 6 deletions packages/shared/src/lib/core/layer-2/utils/parseSmartContractDataFromTransactionData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,26 +180,42 @@ function parseSmartContractDataWithErc20Abi(
case 'transfer': {
return {
type: ParsedSmartContractType.TokenTransfer,
standard: TokenStandard.Erc20,
tokenId: recipientAddress,
rawAmount: BigInt(decodedData.inputs._value.value),
rawData,
rawMethod,
parsedMethod,
recipientAddress: decodedData.inputs._to.value,
...(recipientAddress === ISC_BASE_COIN_ADDRESS
? {
standard: TokenStandard.BaseToken,
tokenId: BASE_TOKEN_ID,
rawAmount: BigInt(decodedData.inputs._value.value) * BigInt(10 ** 12),
}
: {
standard: TokenStandard.Erc20,
tokenId: recipientAddress,
rawAmount: BigInt(decodedData.inputs._value.value),
}),
}
}
case 'approve': {
return {
type: ParsedSmartContractType.TokenApproval,
standard: TokenStandard.Erc20,
tokenId: recipientAddress,
spender: decodedData.inputs._spender.value,
rawAmount: BigInt(decodedData.inputs._value.value),
rawData,
rawMethod,
parsedMethod,
recipientAddress,
...(recipientAddress === ISC_BASE_COIN_ADDRESS
? {
standard: TokenStandard.BaseToken,
tokenId: BASE_TOKEN_ID,
rawAmount: BigInt(decodedData.inputs._value.value) * BigInt(10 ** 12),
}
: {
standard: TokenStandard.Erc20,
tokenId: recipientAddress,
rawAmount: BigInt(decodedData.inputs._value.value),
}),
}
}
default: {
Expand Down
Loading