@0xtorch/evm 0.0.95 → 0.0.97

package/explorer/blockscout/client.ts

@@ -13,9 +13,17 @@ export type BlockscoutClient = {
   }) => Promise<Output>
 }
 
-export const createBlockscoutClient = (
-  apiBaseUrl: string,
-): BlockscoutClient => {
+type CreateBlockscoutClientParameters = {
+  apiBaseUrl: string
+  proxyUrl?: string
+  headers?: Record<string, string>
+}
+
+export const createBlockscoutClient = ({
+  apiBaseUrl,
+  proxyUrl,
+  headers,
+}: CreateBlockscoutClientParameters): BlockscoutClient => {
   const rateLimitPerSecond = 5
   const requestTimestamps: number[] = []
 
@@ -73,9 +81,19 @@ export const createBlockscoutClient = (
         url.searchParams.append(key, value)
       }
       console.debug(`[GET] ${url.toString()}`)
-      const { status, message, result } = await rest(url.toString(), {
-        schema: responseSchema,
-      })
+      const { status, message, result } = await rest(
+        proxyUrl === undefined
+          ? url.toString()
+          : `${proxyUrl}${encodeURIComponent(url.toString())}`,
+        {
+          schema: responseSchema,
+          fetchOptions: {
+            headers: {
+              ...headers,
+            },
+          },
+        },
+      )
       if (status !== '1') {
         throw typeof result === 'string'
           ? new Error(result)
@@ -98,7 +116,6 @@ export const createBlockscoutClient = (
         await new Promise((resolve) => setTimeout(resolve, 5000))
         return await get({ path, query, resultSchema }, repeat + 1)
       }
-
       throw error
     }
   }

package/explorer/blockscout/create.ts

@@ -17,14 +17,18 @@ type CreateBlockscoutParameters = {
   name: string
   baseUrl: string
   apiBaseUrl: string
+  proxyUrl?: string
+  headers?: Record<string, string>
 }
 
 export const createBlockscout = ({
   name,
   baseUrl,
   apiBaseUrl,
+  proxyUrl,
+  headers,
 }: CreateBlockscoutParameters): Explorer => {
-  const client = createBlockscoutClient(apiBaseUrl)
+  const client = createBlockscoutClient({ apiBaseUrl, proxyUrl, headers })
 
   return {
     name,

package/explorer/etherscan/create.ts

@@ -22,6 +22,7 @@ type CreateEtherscanParameters = {
   apiKey?: string
   proxyUrl?: string
   headers?: Record<string, string>
+  pageSize?: number
 }
 
 export const createEtherscan = ({
@@ -31,6 +32,7 @@ export const createEtherscan = ({
   apiKey,
   proxyUrl,
   headers,
+  pageSize = 10_000,
 }: CreateEtherscanParameters): Explorer => {
   const client = createEtherscanClient({
     apiBaseUrl,
@@ -49,13 +51,13 @@ export const createEtherscan = ({
       >()
       let startblock = fromBlock
       const endblock = toBlock
-      const maxPageSize = 10_000
       while (true) {
         const result = await getListOfInternalTransactionsByAddress({
           client,
           address,
           startblock,
           endblock,
+          offset: pageSize,
         })
         for (const transaction of result) {
           const id = createInternalTransactionId(transaction)
@@ -63,7 +65,7 @@ export const createEtherscan = ({
             internalTransactions.set(id, transaction)
           }
         }
-        if (result.length < maxPageSize) {
+        if (result.length < pageSize) {
           break
         }
         const maxBlockNumber = Math.max(...result.map((x) => x.blockNumber))
@@ -75,20 +77,20 @@ export const createEtherscan = ({
       const indexes = new Map<LowerHex, TransactionIndex>()
       let startblock = fromBlock
       const endblock = toBlock
-      const maxPageSize = 10_000
       while (true) {
         const result = await getListOfNormalTransactionsByAddress({
           client,
           address,
           startblock,
           endblock,
+          offset: pageSize,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
             indexes.set(index.hash, index)
           }
         }
-        if (result.length < maxPageSize) {
+        if (result.length < pageSize) {
           break
         }
         const maxBlockNumber = Math.max(...result.map((x) => x.blockNumber))
@@ -98,7 +100,6 @@ export const createEtherscan = ({
     },
     getAddressTokenTransferIndexes: async ({ address, fromBlock, toBlock }) => {
       const indexes = new Map<LowerHex, TransactionIndex>()
-      const maxPageSize = 10_000
       const endblock = toBlock
 
       // ERC20
@@ -109,13 +110,14 @@ export const createEtherscan = ({
           address,
           startblock,
           endblock,
+          offset: pageSize,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
             indexes.set(index.hash, index)
           }
         }
-        if (result.length < maxPageSize) {
+        if (result.length < pageSize) {
           break
         }
         const maxBlockNumber = Math.max(...result.map((x) => x.blockNumber))
@@ -130,13 +132,14 @@ export const createEtherscan = ({
           address,
           startblock,
           endblock,
+          offset: pageSize,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
             indexes.set(index.hash, index)
           }
         }
-        if (result.length < maxPageSize) {
+        if (result.length < pageSize) {
           break
         }
         const maxBlockNumber = Math.max(...result.map((x) => x.blockNumber))
@@ -151,13 +154,14 @@ export const createEtherscan = ({
           address,
           startblock,
           endblock,
+          offset: pageSize,
         })
         for (const index of result) {
           if (!indexes.has(index.hash)) {
             indexes.set(index.hash, index)
           }
         }
-        if (result.length < maxPageSize) {
+        if (result.length < pageSize) {
           break
         }
         const maxBlockNumber = Math.max(...result.map((x) => x.blockNumber))

package/logic/analyzeTransaction/decodeTransaction/index.ts

@@ -1,5 +1,10 @@
 import type { Nft } from '@0xtorch/core'
-import type { Erc20Token, Erc20TokenTransfer, LowerHex } from '../../../types'
+import type {
+  Erc20Token,
+  Erc20TokenTransfer,
+  InternalTransaction,
+  LowerHex,
+} from '../../../types'
 import type { EvmAddress } from '../../../types/address'
 import type { TransactionDecoded } from '../../../types/transactionDecoded'
 import type { TransactionDetail } from '../../../types/transactionDetail'
@@ -9,6 +14,8 @@ import { parseToErc20TokenTransfer } from './parseToErc20TokenTransfer'
 import { parseToErc721TokenTransfer } from './parseToErc721TokenTransfer'
 import { parseToErc1155TokenTransfer } from './parseToErc1155TokenTransfer'
 
+const zkSyncEraChainId = 324
+
 type DecodeTransactionParameters = {
   transaction: TransactionDetail
   addresses: readonly EvmAddress[]
@@ -95,7 +102,6 @@ export const decodeTransaction = ({
 
   // chain 毎固有の条件に応じて ERC20 transfer をフィルタリング
   const filteredErc20Transfers: Erc20TokenTransfer[] = []
-  const zkSyncEraChainId = 324
   // zkSync でのトランザクションの場合、fee 関連の transfer を除外・native transfer と同様の transfer を除外
   if (transaction.chainId === zkSyncEraChainId) {
     const feeAddress = '0x0000000000000000000000000000000000008001'
@@ -119,9 +125,19 @@ export const decodeTransaction = ({
     filteredErc20Transfers.push(...erc20Transfers)
   }
 
+  // chain 毎固有の条件に応じて internal transaction をフィルタリング
+  let filteredInternalTransactions: InternalTransaction[]
+  if (transaction.chainId === zkSyncEraChainId) {
+    // zkSync の場合 internal transaction は除外する
+    filteredInternalTransactions = []
+  } else {
+    filteredInternalTransactions = transaction.internalTransactions
+  }
+
   // データを統合して TransactionDecoded に変形
   return {
     ...transaction,
+    internalTransactions: filteredInternalTransactions,
     erc20Transfers: filteredErc20Transfers,
     erc721Transfers,
     erc1155Transfers,

package/package.json

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