fix: fix base token being displayed as ERC20 (#2714)

* set correct token standard * fix base token approvals * fix decimal places for erc20 smr * fix local activity
bloomwalletio · Jul 10, 2024 · 1850af5 · 1850af5
1 parent 8a50352
commit 1850af5
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 18 deletions.
diff --git a/...sktop/views/dashboard/wallet/tab-section/activity/components/AssetPillsForActivity.svelte b/...sktop/views/dashboard/wallet/tab-section/activity/components/AssetPillsForActivity.svelte
@@ -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'
@@ -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 ?? '')

diff --git a/packages/shared/src/lib/core/activity/types/evm/evm-token-approval-activity.type.ts b/packages/shared/src/lib/core/activity/types/evm/evm-token-approval-activity.type.ts
@@ -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
     }

diff --git a/...ages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts b/...ages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
@@ -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'
@@ -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,
                 },
@@ -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),
                 },
@@ -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,
                 },

diff --git a/...s/shared/src/lib/core/activity/utils/evm/getSmartContractDataFromBlockscoutTransaction.ts b/...s/shared/src/lib/core/activity/utils/evm/getSmartContractDataFromBlockscoutTransaction.ts
@@ -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
           }

diff --git a/packages/shared/src/lib/core/activity/utils/getTokenIdFromActivity.ts b/packages/shared/src/lib/core/activity/utils/getTokenIdFromActivity.ts
@@ -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
             ) {

diff --git a/packages/shared/src/lib/core/layer-2/interfaces/parsed-contract-data.interface.ts b/packages/shared/src/lib/core/layer-2/interfaces/parsed-contract-data.interface.ts
@@ -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
 }
@@ -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

diff --git a/packages/shared/src/lib/core/layer-2/utils/parseSmartContractDataFromTransactionData.ts b/packages/shared/src/lib/core/layer-2/utils/parseSmartContractDataFromTransactionData.ts
@@ -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: {