fix: use algod for application results and fallback to indexer (#61)

* chore: fix AssetResult imports
* fix: use algod for application results and fallback to indexer

Author: neilcampbell

src/features/accounts/data/types.ts

@@ -1,6 +1,6 @@
+import { ApplicationResult } from '@/features/applications/data/types'
 import { NoStringIndex } from '@/features/common/data/types'
 import {
-  ApplicationResult as IndexerApplicationResult,
   AssetHolding as IndexerAssetHolding,
   AssetResult as IndexerAssetResult,
   AppLocalState as IndexerAppLocalState,
@@ -12,7 +12,6 @@ export type Address = string
 
 export type AppLocalState = Omit<IndexerAppLocalState, 'closed-out-at-round' | 'deleted' | 'opted-in-at-round'>
 export type AssetHoldingResult = Omit<IndexerAssetHolding, 'deleted' | 'opted-in-at-round' | 'opted-out-at-round'>
-export type ApplicationResult = Omit<IndexerApplicationResult, 'created-at-round' | 'deleted' | 'deleted-at-round'>
 export type AssetResult = {
   index: number
   params: IndexerAssetResult['params']

src/features/applications/data/application-metadata.ts

@@ -1,6 +1,5 @@
-import { ApplicationResult } from '@/features/accounts/data/types'
 import { atomsInAtom } from '@/features/common/data/atoms-in-atom'
-import { ApplicationMetadataResult } from './types'
+import { ApplicationMetadataResult, ApplicationResult } from './types'
 import { indexer } from '@/features/common/data'
 import { flattenTransactionResult } from '@/features/transactions/utils/flatten-transaction-result'
 import { TransactionResult } from '@algorandfoundation/algokit-utils/types/indexer'

src/features/applications/data/application-result.ts

@@ -1,15 +1,26 @@
-import { indexer } from '@/features/common/data'
-import { ApplicationLookupResult } from '@algorandfoundation/algokit-utils/types/indexer'
-import { ApplicationId } from './types'
+import { algod, indexer } from '@/features/common/data'
+import { ApplicationId, ApplicationResult } from './types'
 import { atomsInAtom } from '@/features/common/data/atoms-in-atom'
+import { asError, is404 } from '@/utils/error'
 
-const getApplicationResult = (applicationId: ApplicationId) =>
-  indexer
-    .lookupApplications(applicationId)
-    .includeAll(true)
-    .do()
-    .then((result) => {
-      return (result as ApplicationLookupResult).application
-    })
+const getApplicationResult = async (applicationId: ApplicationId) => {
+  try {
+    // Check algod first, as there can be some syncing delays to indexer
+    return await algod
+      .getApplicationByID(applicationId)
+      .do()
+      .then((result) => result as ApplicationResult)
+  } catch (e: unknown) {
+    if (is404(asError(e))) {
+      // Handle deleted applications or applications that may not be available in algod potentially due to the node type
+      return await indexer
+        .lookupApplications(applicationId)
+        .includeAll(true)
+        .do()
+        .then((result) => result.application as ApplicationResult)
+    }
+    throw e
+  }
+}
 
 export const [applicationResultsAtom, getApplicationResultAtom] = atomsInAtom(getApplicationResult, (applicationId) => applicationId)

src/features/applications/data/types.ts

@@ -1,5 +1,9 @@
+import { ApplicationResult as IndexerApplicationResult } from '@algorandfoundation/algokit-utils/types/indexer'
+
 export type ApplicationId = number
 
 export type ApplicationMetadataResult = {
   name: string
 } | null
+
+export type ApplicationResult = Omit<IndexerApplicationResult, 'created-at-round' | 'deleted-at-round'>

src/features/applications/mappers/index.ts

@@ -1,9 +1,8 @@
 import { Application, ApplicationGlobalStateType, ApplicationGlobalStateValue, ApplicationSummary } from '../models'
-import { ApplicationResult } from '@algorandfoundation/algokit-utils/types/indexer'
 import { getApplicationAddress, modelsv2, encodeAddress } from 'algosdk'
 import isUtf8 from 'isutf8'
 import { Buffer } from 'buffer'
-import { ApplicationMetadataResult } from '../data/types'
+import { ApplicationMetadataResult, ApplicationResult } from '../data/types'
 import { asJson } from '@/utils/as-json'
 
 export const asApplicationSummary = (application: ApplicationResult): ApplicationSummary => {

src/features/applications/pages/application-page.test.tsx

@@ -8,7 +8,7 @@ import {
   applicationInvalidIdMessage,
   applicationNotFoundMessage,
 } from './application-page'
-import { indexer } from '@/features/common/data'
+import { algod, indexer } from '@/features/common/data'
 import { HttpError } from '@/tests/errors'
 import { applicationResultMother } from '@/tests/object-mother/application-result'
 import { atom, createStore } from 'jotai'
@@ -48,6 +48,7 @@ describe('application-page', () => {
   describe('when rendering an application with application Id that does not exist', () => {
     it('should display not found message', () => {
       vi.mocked(useParams).mockImplementation(() => ({ applicationId: '123456' }))
+      vi.mocked(algod.getApplicationByID(0).do).mockImplementation(() => Promise.reject(new HttpError('boom', 404)))
       vi.mocked(indexer.lookupApplications(0).includeAll(true).do).mockImplementation(() => Promise.reject(new HttpError('boom', 404)))
 
       return executeComponentTest(

src/features/assets/data/asset-metadata.ts

@@ -1,8 +1,8 @@
-import { AssetResult, TransactionResult, TransactionSearchResults } from '@algorandfoundation/algokit-utils/types/indexer'
+import { TransactionResult, TransactionSearchResults } from '@algorandfoundation/algokit-utils/types/indexer'
 import { indexer } from '@/features/common/data'
 import { flattenTransactionResult } from '@/features/transactions/utils/flatten-transaction-result'
 import { TransactionType } from 'algosdk'
-import { Arc3MetadataResult, Arc69MetadataResult, AssetMetadataResult, AssetMetadataStandard } from './types'
+import { Arc3MetadataResult, Arc69MetadataResult, AssetMetadataResult, AssetMetadataStandard, AssetResult } from './types'
 import { getArc19Url, isArc19Url } from '../utils/arc19'
 import { getArc3Url, isArc3Url } from '../utils/arc3'
 import { base64ToUtf8 } from '@/utils/base64-to-utf8'

src/features/assets/data/types.ts

@@ -1,11 +1,8 @@
-import { AssetParams } from '@algorandfoundation/algokit-utils/types/indexer'
+import { AssetResult as IndexerAssetResult } from '@algorandfoundation/algokit-utils/types/indexer'
 
 export type AssetId = number
 
-export type AssetResult = {
-  index: AssetId
-  params: AssetParams
-}
+export type AssetResult = Omit<IndexerAssetResult, 'created-at-round' | 'destroyed-at-round'>
 
 type Arc16MetadataProperties = {
   traits?: Record<string, unknown>

src/features/assets/mappers/asset-summary.ts

@@ -1,4 +1,4 @@
-import { AssetResult } from '@algorandfoundation/algokit-utils/types/indexer'
+import { AssetResult } from '../data/types'
 import { AssetSummary } from '../models'
 
 export const asAssetSummary = (assetResult: AssetResult): AssetSummary => {

src/features/assets/mappers/asset.ts

@@ -1,7 +1,6 @@
-import { AssetResult } from '@algorandfoundation/algokit-utils/types/indexer'
 import { asAssetSummary } from './asset-summary'
 import { Asset, AssetMediaType, AssetStandard, AssetType } from '../models'
-import { AssetId, AssetMetadataResult, AssetMetadataStandard } from '../data/types'
+import { AssetId, AssetMetadataResult, AssetMetadataStandard, AssetResult } from '../data/types'
 import { getArc3Url, isArc3Url } from '../utils/arc3'
 import { replaceIpfsWithGatewayIfNeeded } from '../utils/replace-ipfs-with-gateway-if-needed'
 import Decimal from 'decimal.js'