@0xtorch/evm 0.0.109 → 0.0.111

package/explorer/etherscan/getListOfErc20TokenTransferEventsByAddress.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
-import { lowerHexSchema } from '../../types/primitive'
+import type { Erc20Transfer } from '../../types'
+import { bigintTextSchema, lowerHexSchema } from '../../types/primitive'
 import type { TransactionIndex } from '../../types/transactionIndex'
 import type { EtherscanClient } from './client'
 
@@ -18,6 +19,10 @@ const transferSchema = z.object({
   blockNumber: z.string().regex(/^\d+$/).transform(Number),
   hash: lowerHexSchema,
   timeStamp: z.string().regex(/^\d+$/).transform(Number),
+  contractAddress: lowerHexSchema,
+  from: lowerHexSchema,
+  to: lowerHexSchema,
+  value: bigintTextSchema,
 })
 const resultSchema = z.array(transferSchema)
 
@@ -31,9 +36,10 @@ export const getListOfErc20TokenTransferEventsByAddress = async ({
   offset = 10_000,
   sort = 'asc',
   headers,
-}: GetListOfErc20TokenTransferEventsByAddressParameters): Promise<
-  TransactionIndex[]
-> => {
+}: GetListOfErc20TokenTransferEventsByAddressParameters): Promise<{
+  indexes: readonly TransactionIndex[]
+  erc20Transfers: readonly Erc20Transfer[]
+}> => {
   try {
     const result = await client.get({
       path: '',
@@ -54,14 +60,32 @@ export const getListOfErc20TokenTransferEventsByAddress = async ({
       resultSchema,
       headers,
     })
-    return result.map((v) => ({
-      blockNumber: v.blockNumber,
-      hash: v.hash,
-      timestamp: v.timeStamp * 1000,
-    }))
+    const indexes: TransactionIndex[] = []
+    const transfers: Erc20Transfer[] = []
+    for (const data of result) {
+      indexes.push({
+        blockNumber: data.blockNumber,
+        hash: data.hash,
+        timestamp: data.timeStamp * 1000,
+      })
+      transfers.push({
+        address: data.contractAddress,
+        from: data.from,
+        logIndex: 0,
+        to: data.to,
+        value: data.value,
+      })
+    }
+    return {
+      indexes,
+      erc20Transfers: transfers,
+    }
   } catch (error) {
     if (error instanceof Error && error.message === 'No transactions found') {
-      return []
+      return {
+        indexes: [],
+        erc20Transfers: [],
+      }
     }
     throw error
   }

package/explorer/etherscan/getListOfNormalTransactionsByAddress.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import type { Hex } from '../../types'
-import { lowerHexSchema } from '../../types/primitive'
+import { bigintTextSchema, lowerHexSchema } from '../../types/primitive'
 import type { TransactionIndex } from '../../types/transactionIndex'
 import type { EtherscanClient } from './client'
 
@@ -19,6 +19,8 @@ const transactionSchema = z.object({
   blockNumber: z.string().regex(/^\d+$/).transform(Number),
   hash: lowerHexSchema,
   timeStamp: z.string().regex(/^\d+$/).transform(Number),
+  input: lowerHexSchema,
+  value: bigintTextSchema,
 })
 const resultSchema = z.array(transactionSchema)
 
@@ -59,6 +61,8 @@ export const getListOfNormalTransactionsByAddress = async ({
       blockNumber: v.blockNumber,
       hash: v.hash,
       timestamp: v.timeStamp * 1000,
+      input: v.input,
+      value: v.value,
     }))
   } catch (error) {
     if (error instanceof Error && error.message === 'No transactions found') {

package/explorer/moralis/create.ts

@@ -1,4 +1,5 @@
 import {
+  type Erc20Transfer,
   type InternalTransactionWithIndex,
   type LowerHex,
   type TransactionIndex,
@@ -123,6 +124,7 @@ export const createMoralisExplorer = ({
               hash: transaction.hash,
               blockNumber: transaction.block_number,
               timestamp: transaction.block_timestamp,
+              value: transaction.value,
             }
             indexes.set(data.hash, data)
           }
@@ -140,9 +142,10 @@ export const createMoralisExplorer = ({
       fromBlock,
       toBlock,
       headers,
-    }): Promise<TransactionIndex[]> => {
+    }) => {
       const lowerAddress = toLowerHex(address)
       const indexes = new Map<LowerHex, TransactionIndex>()
+      const erc20Transfers: Erc20Transfer[] = []
 
       let count = 0
       let cursor: string | undefined = undefined
@@ -165,9 +168,20 @@ export const createMoralisExplorer = ({
               hash: transaction.hash,
               blockNumber: transaction.block_number,
               timestamp: transaction.block_timestamp,
+              value: transaction.value,
             }
             indexes.set(data.hash, data)
           }
+
+          for (const transfer of transaction.erc20_transfers) {
+            erc20Transfers.push({
+              address: transfer.address,
+              from: transfer.from_address,
+              logIndex: transfer.log_index,
+              to: transfer.to_address,
+              value: transfer.value,
+            })
+          }
         }
 
         if (result.result.length < limit) {
@@ -175,7 +189,10 @@ export const createMoralisExplorer = ({
         }
       }
 
-      return [...indexes.values()]
+      return {
+        indexes: [...indexes.values()],
+        erc20Transfers,
+      }
     },
     getBlockNumberOfTimestamp: (): Promise<number> => {
       throw new Error('Function not implemented.')

package/explorer/moralis/getWalletTransactionHistory.ts

@@ -80,7 +80,9 @@ const transactionSchema = z.object({
       to_address: lowerHexSchema,
       // "to_address_label": null,
       // "address": "0xc99a6a985ed2cac1ef41640596c5a5f9f4e19ef5",
+      address: lowerHexSchema,
       // "log_index": 37,
+      log_index: z.number().int(),
       // "value": "6851147569444444",
       value: bigintTextSchema,
       // "possible_spam": false,

package/explorer/types.ts

@@ -1,4 +1,4 @@
-import type { Hex, LowerHex } from '../types'
+import type { Erc20Transfer, Hex, LowerHex } from '../types'
 import type { InternalTransactionWithIndex } from '../types/internalTransaction'
 import type { Log } from '../types/log'
 import type { TransactionIndex } from '../types/transactionIndex'
@@ -50,7 +50,10 @@ type FunctionGetAddressTokenTransferIndexes = (parameters: {
   fromBlock?: number
   toBlock?: number
   headers?: Record<string, string>
-}) => Promise<TransactionIndex[]>
+}) => Promise<{
+  indexes: TransactionIndex[]
+  erc20Transfers: Erc20Transfer[]
+}>
 
 type FunctionGetBlockNumberOfTimestamp = (parameters: {
   /** Unix timestamp in milliseconds */

package/logic/getAddressIndexData.ts

@@ -1,4 +1,5 @@
 import type { Chain } from '../chain'
+import type { Erc20Transfer } from '../types'
 import type { LowerHex } from '../types/hex'
 import type { InternalTransaction } from '../types/internalTransaction'
 import type { TransactionIndex } from '../types/transactionIndex'
@@ -11,8 +12,9 @@ type GetAddressIndexDataParameters = {
 }
 
 type GetAddressIndexDataReturnTypes = {
-  readonly transactionIndexes: readonly TransactionIndex[]
-  readonly internalTransactions: readonly InternalTransaction[]
+  transactionIndexes: readonly TransactionIndex[]
+  internalTransactions: readonly InternalTransaction[]
+  erc20Transfers: readonly Erc20Transfer[]
 }
 
 export const getAddressIndexData = async ({
@@ -21,24 +23,27 @@ export const getAddressIndexData = async ({
   fromBlock,
   toBlock,
 }: GetAddressIndexDataParameters): Promise<GetAddressIndexDataReturnTypes> => {
-  const [transactionIndexes, transferIndexes, internalTransactions] =
-    await Promise.all([
-      chain.explorer.getAddressTransactionIndexes({
-        address,
-        fromBlock,
-        toBlock,
-      }),
-      chain.explorer.getAddressTokenTransferIndexes({
-        address,
-        fromBlock,
-        toBlock,
-      }),
-      chain.explorer.getAddressInternalTransactions({
-        address,
-        fromBlock,
-        toBlock,
-      }),
-    ])
+  const [
+    transactionIndexes,
+    { indexes: transferIndexes, erc20Transfers },
+    internalTransactions,
+  ] = await Promise.all([
+    chain.explorer.getAddressTransactionIndexes({
+      address,
+      fromBlock,
+      toBlock,
+    }),
+    chain.explorer.getAddressTokenTransferIndexes({
+      address,
+      fromBlock,
+      toBlock,
+    }),
+    chain.explorer.getAddressInternalTransactions({
+      address,
+      fromBlock,
+      toBlock,
+    }),
+  ])
 
   const indexes = new Map<LowerHex, TransactionIndex>()
   for (const index of transactionIndexes) {
@@ -64,5 +69,6 @@ export const getAddressIndexData = async ({
   return {
     transactionIndexes: [...indexes.values()],
     internalTransactions,
+    erc20Transfers,
   }
 }

package/logic/getTransactionDetail/index.ts

@@ -13,6 +13,8 @@ type GetTransactionDetailParameters = {
   timestamp?: number
   internalTransactions?: readonly InternalTransaction[]
   timeout?: number
+  input?: LowerHex
+  value?: bigint
 }
 
 export const getTransactionDetail = async ({
@@ -21,12 +23,19 @@ export const getTransactionDetail = async ({
   timestamp: optionalTimestamp,
   internalTransactions = [],
   timeout,
+  input,
+  value,
 }: GetTransactionDetailParameters): Promise<TransactionDetail> => {
   const [transaction, receipt] = await Promise.all([
-    chain.client.call({
-      clientCall: (client) => client.getTransaction({ hash }),
-      timeout,
-    }),
+    input === undefined || value === undefined
+      ? chain.client.call({
+          clientCall: (client) => client.getTransaction({ hash }),
+          timeout,
+        })
+      : {
+          input,
+          value,
+        },
     chain.client.call({
       clientCall: (client) => client.getTransactionReceipt({ hash }),
       timeout,

package/package.json

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

package/types/transactionIndex.ts

@@ -1,10 +1,16 @@
 import type { z } from 'zod'
+import { bigintTextSchema, lowerHexSchema } from './primitive'
 import { transactionDetailSchema } from './transactionDetail'
 
-const transactionIndexSchema = transactionDetailSchema.pick({
-  hash: true,
-  blockNumber: true,
-  timestamp: true,
-})
+const transactionIndexSchema = transactionDetailSchema
+  .pick({
+    hash: true,
+    blockNumber: true,
+    timestamp: true,
+  })
+  .extend({
+    input: lowerHexSchema.optional(),
+    value: bigintTextSchema.optional(),
+  })
 
 export type TransactionIndex = z.infer<typeof transactionIndexSchema>