533 add correct explorer link to l2 activities (#534)

* refactor: add source and destination network to activity * enhancement: add explorer url for testnet * add shimmer evm explorer to whitelist --------- Co-authored-by: Mark Nardi <[email protected]>
bloomwalletio · Aug 30, 2023 · 65f9790 · 65f9790
1 parent 833995f
commit 65f9790
Show file tree

Hide file tree

Showing 29 changed files with 128 additions and 100 deletions.
diff --git a/packages/desktop/components/popups/ActivityDetailsPopup.svelte b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
@@ -16,7 +16,6 @@
     import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { ownedNfts, selectedNftId } from '@core/nfts/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
-    import { activeProfile } from '@core/profile/stores'
     import { CollectiblesRoute, DashboardRoute, collectiblesRouter, dashboardRouter } from '@core/router'
     import { setClipboard, truncateString } from '@core/utils'
     import { claimActivity, rejectActivity } from '@core/wallet'
@@ -35,8 +34,6 @@
     export let activityId: string
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 
-    const explorerUrl = getDefaultExplorerUrl($activeProfile?.network?.id)
-
     $: activity = $selectedAccountActivities.find((_activity) => _activity.id === activityId)
     $: isTimelocked = activity?.asyncData?.asyncStatus === ActivityAsyncStatus.Timelocked
     $: isActivityIncomingAndUnclaimed =
@@ -50,6 +47,7 @@
             ? getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
             : undefined
     $: nftIsOwned = nft ? $ownedNfts.some((_onMountnft) => _onMountnft.id === nft?.id) : false
+    $: explorerUrl = getDefaultExplorerUrl(activity?.sourceNetworkId, ExplorerEndpoint.Transaction)
 
     let title: string | undefined = localize('popups.activityDetails.title.fallback')
     $: void setTitle(activity)
@@ -66,7 +64,7 @@
     }
 
     function onExplorerClick(_activity: Activity): void {
-        openUrlInBrowser(`${explorerUrl}/${ExplorerEndpoint.Transaction}/${_activity.transactionId}`)
+        openUrlInBrowser(`${explorerUrl}/${_activity.transactionId}`)
     }
 
     function onTransactionIdClick(_activity: Activity): void {

diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -9,7 +9,6 @@
     import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { allAccountNfts, selectedNftId } from '@core/nfts/stores'
     import { getBaseToken } from '@core/profile/actions'
-    import { activeProfile } from '@core/profile/stores'
     import { collectiblesRouter } from '@core/router/routers'
     import { formatTokenAmountPrecise } from '@core/token'
     import { getTimeDifference } from '@core/utils'
@@ -28,8 +27,8 @@
 
     let modal: Modal
 
-    const explorerUrl = getDefaultExplorerUrl($activeProfile?.network?.id)
     const nft: INft = getNftByIdFromAllAccountNfts($selectedAccountIndex, $selectedNftId)
+    const explorerUrl = getDefaultExplorerUrl(nft?.networkId, ExplorerEndpoint.Nft)
 
     const { id, name, issuer, address, metadata, downloadMetadata, storageDeposit } = nft ?? {}
     const { standard, version, type, uri, description, issuerName, collectionName, attributes, soonaverseAttributes } =
@@ -155,7 +154,7 @@
     }
 
     function onExplorerClick(): void {
-        openUrlInBrowser(`${explorerUrl}/${ExplorerEndpoint.Nft}/${id}`)
+        openUrlInBrowser(`${explorerUrl}/${id}`)
     }
 
     function onSendClick(): void {

diff --git a/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { getNameFromNetworkId } from '@core/network'
     import { type IItem, Table } from '@bloomwalletio/ui'
     import { Activity } from '@core/activity'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
@@ -28,10 +29,10 @@
     function setItems(_activity: Activity): void {
         items = []
 
-        if (_activity?.destinationNetwork) {
+        if (_activity?.destinationNetworkId) {
             items.push({
                 key: localize('general.destinationNetwork'),
-                value: _activity?.destinationNetwork,
+                value: getNameFromNetworkId(_activity?.destinationNetworkId),
             })
         }
         if (_activity?.time) {

diff --git a/packages/shared/src/components/tiles/ActivityTile.svelte b/packages/shared/src/components/tiles/ActivityTile.svelte
@@ -31,7 +31,7 @@
         if (persistedToken?.verification?.status === NotVerifiedStatus.New) {
             const token: IToken = {
                 ...persistedToken,
-                networkId: activity.networkId,
+                networkId: activity.sourceNetworkId,
                 balance: {
                     total: 0,
                     available: 0,

diff --git a/packages/shared/src/components/tiles/tileContents/TransactionActivityTileContent.svelte b/packages/shared/src/components/tiles/tileContents/TransactionActivityTileContent.svelte
@@ -34,6 +34,6 @@
 
 {#if token}
     <ActivityTileContent {action} {subject} {formattedAsset}>
-        <TokenIcon slot="icon" persistedToken={token} networkId={activity.networkId} />
+        <TokenIcon slot="icon" persistedToken={token} networkId={activity.sourceNetworkId} />
     </ActivityTileContent>
 {/if}
diff --git a/packages/shared/src/lib/core/activity/types/base-activity.type.ts b/packages/shared/src/lib/core/activity/types/base-activity.type.ts
@@ -21,9 +21,9 @@ export type BaseActivity = {
     subject: Subject | undefined
     metadata?: string
     tag?: string
-    networkId: NetworkId
+    sourceNetworkId: NetworkId
+    destinationNetworkId: NetworkId
     asyncData?: AsyncData
-    destinationNetwork?: string
     parsedLayer2Metadata?: Layer2Metadata
 }
 
@@ -33,6 +33,6 @@ export type AsyncData = {
     expirationDate: Date
     isRejected: boolean
     isClaiming: boolean
-    claimingTransactionId: string
-    claimedDate: Date
+    claimingTransactionId?: string
+    claimedDate?: Date
 }
diff --git a/packages/shared/src/lib/core/activity/types/sender-info.type.ts b/packages/shared/src/lib/core/activity/types/sender-info.type.ts
@@ -1,6 +1,8 @@
 import { Subject } from '@core/wallet/types'
 
 export type SenderInfo = {
+    sender: Subject | undefined
+    recipient: Subject
     subject: Subject | undefined
     isInternal: boolean
 }
diff --git a/packages/shared/src/lib/core/activity/utils/generateActivityFromEvmTransaction.ts b/packages/shared/src/lib/core/activity/utils/generateActivityFromEvmTransaction.ts
@@ -18,6 +18,7 @@ export async function generateActivityFromEvmTransaction(
     return {
         type: ActivityType.Basic,
         id: transaction.transactionHash,
+        transactionId: transaction.transactionHash,
         time: new Date(Number(timestamp) * 1000),
         inclusionState: InclusionState.Confirmed,
         containsValue: true,
@@ -31,6 +32,7 @@ export async function generateActivityFromEvmTransaction(
         rawBaseCoinAmount: Number(transaction.value) / Number(WEI_PER_GLOW),
         rawAmount: Number(transaction.value) / Number(WEI_PER_GLOW),
         tokenId: getCoinType(),
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
     }
 }
diff --git a/packages/shared/src/lib/core/activity/utils/generateBalanceChangeActivity.ts b/packages/shared/src/lib/core/activity/utils/generateBalanceChangeActivity.ts
@@ -28,6 +28,7 @@ export function generateBalanceChangeActivity(
         rawBaseCoinAmount: Math.abs(difference),
         rawAmount: Math.abs(difference),
         tokenId: tokenId === '0x' ? getCoinType() : tokenId,
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
     }
 }
diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleAliasActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleAliasActivity.ts
@@ -59,7 +59,8 @@ export function generateSingleAliasActivity(
         time,
         metadata,
         tag,
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
         inclusionState,
         containsValue,
         asyncData,

diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleBasicActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleBasicActivity.ts
@@ -1,6 +1,9 @@
 import { isShimmerClaimingTransaction } from '@contexts/onboarding/stores'
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters } from '@core/activity/types'
+import { parseLayer2Metadata } from '@core/layer-2'
+import { getNetworkIdFromAddress } from '@core/layer-2/actions'
+import { NetworkId } from '@core/network/types'
 import { getCoinType } from '@core/profile/actions'
 import { activeProfileId } from '@core/profile/stores'
 import { IBasicOutput } from '@iota/types'
@@ -17,7 +20,6 @@ import {
     getTagFromOutput,
 } from './helper'
 import { getNativeTokenFromOutput } from './outputs'
-import { NetworkId } from '@core/network/types'
 
 export function generateSingleBasicActivity(
     account: IAccountState,
@@ -43,12 +45,19 @@ export function generateSingleBasicActivity(
     const metadata = getMetadataFromOutput(output)
     const publicNote = ''
 
-    const sendingInfo = getSendingInformation(processedTransaction, output, account, networkId)
+    const { sender, recipient, subject, isInternal } = getSendingInformation(
+        processedTransaction,
+        output,
+        account,
+        networkId
+    )
+    const sourceNetworkId = getNetworkIdFromAddress(sender?.address, networkId)
+    const destinationNetworkId = getNetworkIdFromAddress(recipient?.address, sourceNetworkId)
+
     const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
+    const parsedLayer2Metadata = parseLayer2Metadata(metadata)
 
-    // const { parsedLayer2Metadata, destinationNetwork } = getLayer2ActivityInformation(metadata, sendingInfo)
-    // const gasLimit = Number(parsedLayer2Metadata?.gasLimit ?? '0')
-    const gasLimit = 0
+    const gasLimit = Number(parsedLayer2Metadata?.gasLimit ?? '0')
 
     const storageDeposit = getStorageDepositFromOutput(output)
 
@@ -83,11 +92,12 @@ export function generateSingleBasicActivity(
         publicNote,
         metadata,
         tag,
-        networkId,
+        sourceNetworkId,
+        destinationNetworkId,
         tokenId,
         asyncData,
-        // destinationNetwork,
-        // parsedLayer2Metadata,
-        ...sendingInfo,
+        parsedLayer2Metadata,
+        subject,
+        isInternal,
     }
 }
diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleConsolidationActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleConsolidationActivity.ts
@@ -54,7 +54,8 @@ export function generateSingleConsolidationActivity(
         storageDeposit,
         metadata,
         tag,
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
         asyncData,
         amountConsolidatedInputs,
         ...sendingInfo,

diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleFoundryActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleFoundryActivity.ts
@@ -70,7 +70,8 @@ export function generateSingleFoundryActivity(
         isHidden,
         metadata,
         tag,
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
         asyncData,
         ...sendingInfo,
     }

diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleGovernanceActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleGovernanceActivity.ts
@@ -52,7 +52,8 @@ export function generateSingleGovernanceActivity(
         storageDeposit,
         metadata,
         tag,
-        networkId,
+        sourceNetworkId: networkId,
+        destinationNetworkId: networkId,
         asyncData: undefined,
         ...governanceInfo,
         ...sendingInfo,

diff --git a/packages/shared/src/lib/core/activity/utils/generateSingleNftActivity.ts b/packages/shared/src/lib/core/activity/utils/generateSingleNftActivity.ts
@@ -1,19 +1,20 @@
 import { IAccountState } from '@core/account'
+import { parseLayer2Metadata } from '@core/layer-2'
+import { getNetworkIdFromAddress } from '@core/layer-2/actions'
+import { NetworkId } from '@core/network/types'
+import type { INftOutput } from '@iota/types'
 import { ActivityType } from '../enums'
 import { NftActivity } from '../types'
-import type { INftOutput } from '@iota/types'
+import { IActivityGenerationParameters } from '../types/activity-generation-parameters.interface'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
-    getLayer2ActivityInformation,
     getMetadataFromOutput,
     getSendingInformation,
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { IActivityGenerationParameters } from '../types/activity-generation-parameters.interface'
 import { getNftId } from './outputs'
-import { NetworkId } from '@core/network/types'
 
 export function generateSingleNftActivity(
     account: IAccountState,
@@ -34,23 +35,29 @@ export function generateSingleNftActivity(
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
-    const sendingInfo = getSendingInformation(processedTransaction, output, account, networkId)
-    const { subject, isInternal } = sendingInfo
-
     const rawBaseCoinAmount = getAmountFromOutput(output)
     const storageDeposit = getStorageDepositFromOutput(output)
 
-    const layer2ActivityInformation = getLayer2ActivityInformation(metadata, sendingInfo)
+    const { sender, recipient, subject, isInternal } = getSendingInformation(
+        processedTransaction,
+        output,
+        account,
+        networkId
+    )
+    const sourceNetworkId = getNetworkIdFromAddress(sender?.address, networkId)
+    const destinationNetworkId = getNetworkIdFromAddress(recipient?.address, sourceNetworkId)
 
     const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
+    const parsedLayer2Metadata = parseLayer2Metadata(metadata)
 
     return {
         type: ActivityType.Nft,
         id,
         transactionId,
         outputId,
         nftId,
-        networkId,
+        sourceNetworkId,
+        destinationNetworkId: destinationNetworkId,
         time,
         isHidden,
         action,
@@ -65,6 +72,6 @@ export function generateSingleNftActivity(
         subject,
         isInternal,
         direction,
-        ...layer2ActivityInformation,
+        parsedLayer2Metadata,
     }
 }
diff --git a/packages/shared/src/lib/core/activity/utils/getTransactionAssets.ts b/packages/shared/src/lib/core/activity/utils/getTransactionAssets.ts
@@ -19,7 +19,7 @@ export function getTransactionAssets(
       }
     | undefined {
     if (activity.type === ActivityType.Nft) {
-        const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.networkId)
+        const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.sourceNetworkId)
         const nft = getNftByIdFromAllAccountNfts(accountIndex, activity.nftId)
         return {
             nft,
@@ -29,10 +29,10 @@ export function getTransactionAssets(
             },
         }
     } else if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
-        const tokenWithBalance = getTokenFromSelectedAccountTokens(activity.tokenId, activity.networkId)
+        const tokenWithBalance = getTokenFromSelectedAccountTokens(activity.tokenId, activity.sourceNetworkId)
         const persistedToken = getPersistedToken(activity.tokenId)
         const token: IToken = {
-            networkId: activity.networkId,
+            networkId: activity.sourceNetworkId,
             balance: {
                 total: 0,
                 available: 0,
@@ -48,7 +48,7 @@ export function getTransactionAssets(
                 },
             }
         } else {
-            const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.networkId)
+            const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.sourceNetworkId)
             return {
                 tokenTransfer: {
                     rawAmount: String(activity.rawAmount),
@@ -61,7 +61,7 @@ export function getTransactionAssets(
             }
         }
     } else if (activity.type === ActivityType.Governance) {
-        const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.networkId)
+        const baseCoin = getTokenFromSelectedAccountTokens(getCoinType(), activity.sourceNetworkId)
 
         const isVotingPowerActivity =
             activity.governanceAction === GovernanceAction.DecreaseVotingPower ||

diff --git a/packages/shared/src/lib/core/activity/utils/helper/getAsyncDataFromOutput.ts b/packages/shared/src/lib/core/activity/utils/helper/getAsyncDataFromOutput.ts
@@ -10,9 +10,9 @@ import { AsyncData, IClaimData } from '@core/activity/types'
 export function getAsyncDataFromOutput(
     output: Output,
     outputId: string,
-    claimingData: IClaimData,
+    claimingData: IClaimData | undefined,
     account: IAccountState
-): AsyncData {
+): AsyncData | undefined {
     const isAsync = isOutputAsync(output)
     if (isAsync) {
         const isClaiming = false
@@ -42,6 +42,6 @@ export function getAsyncDataFromOutput(
             claimedDate,
         }
     } else {
-        return null
+        return undefined
     }
 }