@0xtorch/evm 0.0.157 → 0.0.158

package/explorer/etherscanV2/create.ts

@@ -2,7 +2,7 @@ import type { Erc20Transfer, LowerHex } from '../../types'
 import type { InternalTransactionWithIndex } from '../../types/internalTransaction'
 import type { TransactionIndex } from '../../types/transactionIndex'
 import { createInternalTransactionId } from '../../utils/createInternalTransactionId'
-import type { Explorer, LogWithBlockNumber } from '../types'
+import type { Explorer, HeadersInput, LogWithBlockNumber } from '../types'
 import { createEtherscanV2Client } from './client'
 import { getBlockNumberByTimestamp } from './getBlockNumberByTimestamp'
 import { getContractCreatorAndCreationTxHash } from './getContractCreatorAndCreationTxHash'
@@ -15,6 +15,22 @@ import { getListOfErc1155TokenTransferEventsByAddress } from './getListOfErc1155
 import { getListOfInternalTransactionsByAddress } from './getListOfInternalTransactionsByAddress'
 import { getListOfNormalTransactionsByAddress } from './getListOfNormalTransactionsByAddress'
 
+/**
+ * Resolves headers from either a static object or a function that returns headers.
+ * This allows for dynamic header generation (e.g., refreshing auth tokens).
+ */
+const resolveHeaders = async (
+  headers: HeadersInput,
+): Promise<Record<string, string> | undefined> => {
+  if (headers === undefined) {
+    return undefined
+  }
+  if (typeof headers === 'function') {
+    return await headers()
+  }
+  return headers
+}
+
 type CreateEtherscanV2Parameters = {
   name: string
   baseUrl: string
@@ -54,13 +70,14 @@ export const createEtherscanV2 = ({
       let startblock = fromBlock
       const endblock = toBlock
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getListOfInternalTransactionsByAddress({
           client,
           address,
           startblock,
           endblock,
           offset: pageSize,
-          headers,
+          headers: resolvedHeaders,
         })
         for (const transaction of result) {
           const id = createInternalTransactionId(transaction)
@@ -86,13 +103,14 @@ export const createEtherscanV2 = ({
       let startblock = fromBlock
       const endblock = toBlock
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getListOfNormalTransactionsByAddress({
           client,
           address,
           startblock,
           endblock,
           offset: pageSize,
-          headers,
+          headers: resolvedHeaders,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
@@ -120,6 +138,7 @@ export const createEtherscanV2 = ({
       // ERC20
       let startblock = fromBlock
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const { indexes: resultIndexes, erc20Transfers: resultErc20Transfers } =
           await getListOfErc20TokenTransferEventsByAddress({
             client,
@@ -127,7 +146,7 @@ export const createEtherscanV2 = ({
             startblock,
             endblock,
             offset: pageSize,
-            headers,
+            headers: resolvedHeaders,
           })
         for (const index of resultIndexes) {
           if (!indexes.has(index.hash)) {
@@ -147,13 +166,14 @@ export const createEtherscanV2 = ({
       // ERC721
       startblock = fromBlock
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getListOfErc721TokenTransferEventsByAddress({
           client,
           address,
           startblock,
           endblock,
           offset: pageSize,
-          headers,
+          headers: resolvedHeaders,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
@@ -170,13 +190,14 @@ export const createEtherscanV2 = ({
       // ERC1155
       startblock = fromBlock
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getListOfErc1155TokenTransferEventsByAddress({
           client,
           address,
           startblock,
           endblock,
           offset: pageSize,
-          headers,
+          headers: resolvedHeaders,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
@@ -195,24 +216,33 @@ export const createEtherscanV2 = ({
         erc20Transfers,
       }
     },
-    getBlockNumberOfTimestamp: ({ timestamp, headers }): Promise<number> =>
-      getBlockNumberByTimestamp({
+    getBlockNumberOfTimestamp: async ({
+      timestamp,
+      headers,
+    }): Promise<number> => {
+      const resolvedHeaders = await resolveHeaders(headers)
+      return getBlockNumberByTimestamp({
         client,
         timestamp: Math.floor(timestamp / 1000),
-        headers,
-      }),
-    getContract: ({ address, headers }) =>
-      getContractSourceCodeForVerifiedContract({
+        headers: resolvedHeaders,
+      })
+    },
+    getContract: async ({ address, headers }) => {
+      const resolvedHeaders = await resolveHeaders(headers)
+      return getContractSourceCodeForVerifiedContract({
         client,
         address,
-        headers,
-      }),
-    getContractCreations: ({ addresses, headers }) =>
-      getContractCreatorAndCreationTxHash({
+        headers: resolvedHeaders,
+      })
+    },
+    getContractCreations: async ({ addresses, headers }) => {
+      const resolvedHeaders = await resolveHeaders(headers)
+      return getContractCreatorAndCreationTxHash({
         client,
         contractaddresses: addresses,
-        headers,
-      }),
+        headers: resolvedHeaders,
+      })
+    },
     getEventLogs: async ({
       address,
       topic0,
@@ -224,13 +254,14 @@ export const createEtherscanV2 = ({
       let fromBlock = fromBlockParam ?? 0
       const maxPageSize = 10_000
       while (true) {
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getEventLogsByAddressFilteredByTopics({
           client,
           address,
           topic0,
           fromBlock,
           toBlock,
-          headers,
+          headers: resolvedHeaders,
         })
         logs.push(...result)
         if (result.length < maxPageSize) {
@@ -241,11 +272,13 @@ export const createEtherscanV2 = ({
       }
       return logs
     },
-    getInternalTransactionOfTransaction: ({ hash, headers }) =>
-      getInternalTransactionsByTransactionHash({
+    getInternalTransactionOfTransaction: async ({ hash, headers }) => {
+      const resolvedHeaders = await resolveHeaders(headers)
+      return getInternalTransactionsByTransactionHash({
         client,
         txhash: hash,
-        headers,
-      }),
+        headers: resolvedHeaders,
+      })
+    },
   }
 }

package/explorer/index.ts

@@ -1,6 +1,6 @@
 export { createEtherscan } from './etherscan/create'
 export { createEtherscanV2 } from './etherscanV2/create'
-export type { Explorer } from './types'
+export type { Explorer, HeadersInput } from './types'
 export { createMoralisExplorer } from './moralis/create'
 export { createNoApiExplorer } from './noApiExplorer/create'
 export { createBlockscout } from './blockscout/create'

package/explorer/moralis/create.ts

@@ -6,10 +6,26 @@ import {
   toLowerHex,
 } from '../../types'
 import { createInternalTransactionId } from '../../utils/createInternalTransactionId'
-import type { Explorer } from '../types'
+import type { Explorer, HeadersInput } from '../types'
 import { createMoralisClient } from './client'
 import { getWalletTransactionHistory } from './getWalletTransactionHistory'
 
+/**
+ * Resolves headers from either a static object or a function that returns headers.
+ * This allows for dynamic header generation (e.g., refreshing auth tokens).
+ */
+const resolveHeaders = async (
+  headers: HeadersInput,
+): Promise<Record<string, string> | undefined> => {
+  if (headers === undefined) {
+    return undefined
+  }
+  if (typeof headers === 'function') {
+    return await headers()
+  }
+  return headers
+}
+
 type CreateMoralisExplorerParameters = {
   name: string
   baseUrl: string
@@ -52,6 +68,7 @@ export const createMoralisExplorer = ({
       let cursor: string | undefined = undefined
       while (count < maxRequestCount) {
         count += 1
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getWalletTransactionHistory({
           client,
           address: lowerAddress,
@@ -59,7 +76,7 @@ export const createMoralisExplorer = ({
           fromBlock,
           toBlock,
           cursor,
-          headers,
+          headers: resolvedHeaders,
         })
         cursor = result.cursor ?? undefined
 
@@ -108,6 +125,7 @@ export const createMoralisExplorer = ({
       let cursor: string | undefined = undefined
       while (count < maxRequestCount) {
         count += 1
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getWalletTransactionHistory({
           client,
           address: lowerAddress,
@@ -115,7 +133,7 @@ export const createMoralisExplorer = ({
           fromBlock,
           toBlock,
           cursor,
-          headers,
+          headers: resolvedHeaders,
         })
         cursor = result.cursor ?? undefined
 
@@ -152,6 +170,7 @@ export const createMoralisExplorer = ({
       let cursor: string | undefined = undefined
       while (count < maxRequestCount) {
         count += 1
+        const resolvedHeaders = await resolveHeaders(headers)
         const result = await getWalletTransactionHistory({
           client,
           address: lowerAddress,
@@ -159,7 +178,7 @@ export const createMoralisExplorer = ({
           fromBlock,
           toBlock,
           cursor,
-          headers,
+          headers: resolvedHeaders,
         })
         cursor = result.cursor ?? undefined
 

package/explorer/types.ts

@@ -18,6 +18,11 @@ export type LogWithBlockNumber = Log & {
   blockNumber: number
 }
 
+export type HeadersInput =
+  | Record<string, string>
+  | (() => Promise<Record<string, string> | undefined>)
+  | undefined
+
 export type Explorer = {
   readonly name: string
   readonly baseUrl: string
@@ -35,21 +40,21 @@ type FunctionGetAddressInternalTransactions = (parameters: {
   address: Hex
   fromBlock?: number
   toBlock?: number
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<InternalTransactionWithIndex[]>
 
 type FunctionGetAddressTransactionIndexes = (parameters: {
   address: Hex
   fromBlock?: number
   toBlock?: number
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<TransactionIndex[]>
 
 type FunctionGetAddressTokenTransferIndexes = (parameters: {
   address: Hex
   fromBlock?: number
   toBlock?: number
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<{
   indexes: TransactionIndex[]
   erc20Transfers: Erc20Transfer[]
@@ -58,17 +63,17 @@ type FunctionGetAddressTokenTransferIndexes = (parameters: {
 type FunctionGetBlockNumberOfTimestamp = (parameters: {
   /** Unix timestamp in milliseconds */
   timestamp: number
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<number>
 
 type FunctionGetContract = (parameters: {
   address: Hex
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<Contract | undefined>
 
 type FunctionGetContractCreations = (parameters: {
   addresses: Hex[]
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<ContractCreation[]>
 
 type FunctionGetEventLogs = (parameters: {
@@ -76,10 +81,10 @@ type FunctionGetEventLogs = (parameters: {
   topic0: LowerHex
   fromBlock?: number
   toBlock?: number
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<LogWithBlockNumber[]>
 
 type FunctionGetInternalTransactionOfTransaction = (parameters: {
   hash: LowerHex
-  headers?: Record<string, string>
+  headers?: HeadersInput
 }) => Promise<InternalTransactionWithIndex[]>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.157",
+  "version": "0.0.158",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",