fix: methodId might not exist in response of Etherscan (#11398)

DimensionDev · Feb 18, 2024 · bbe352d · bbe352d
1 parent 2a4eaf1
commit bbe352d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 23 deletions.
diff --git a/packages/web3-providers/src/Chainbase/apis/RedPacketAPI.ts b/packages/web3-providers/src/Chainbase/apis/RedPacketAPI.ts
@@ -7,14 +7,30 @@ import {
     createPageable,
     pageableToIterator,
 } from '@masknet/shared-base'
-import type { ChainId, SchemaType } from '@masknet/web3-shared-evm'
+import { ChainId, type SchemaType } from '@masknet/web3-shared-evm'
 import { TRANSACTIONS_BY_CONTRACT_METHOD_ENDPOINT, MAX_SIZE_PER_PAGE } from '../constants.js'
 import type { Tx } from '../types.js'
 import { fetchJSON } from '../../helpers/fetchJSON.js'
 import type { RedPacketBaseAPI } from '../../entry-types.js'
 
-class ChainbaseRedPacketAPI implements RedPacketBaseAPI.Provider<ChainId, SchemaType> {
-    async getHistoryTransactions(
+export class ChainbaseRedPacketAPI implements RedPacketBaseAPI.Provider<ChainId, SchemaType> {
+    /**
+     * @see https://docs.chainbase.com/reference/supported-chains
+     */
+    static isSupportedChain(chainId: ChainId) {
+        const supported = [
+            ChainId.Mainnet,
+            ChainId.Matic,
+            ChainId.BSC,
+            ChainId.Avalanche,
+            ChainId.Arbitrum,
+            ChainId.Base,
+            /** zkSync */ 324,
+        ].includes(chainId)
+        console.error('Unsupported chain by ChainBase, see https://docs.chainbase.com/reference/supported-chains')
+        return supported
+    }
+    static async getHistoryTransactions(
         chainId: ChainId,
         senderAddress: string,
         contractAddress: string,

diff --git a/packages/web3-providers/src/Etherscan/apis/RedPacketAPI.ts b/packages/web3-providers/src/Etherscan/apis/RedPacketAPI.ts
@@ -31,8 +31,12 @@ class EtherscanRedPacketAPI implements RedPacketBaseAPI.Provider<ChainId, Schema
         if (!result) return
 
         methodId = methodId.toLowerCase()
+        const methodIdLength = methodId.length
         return result
-            .filter((x) => x.methodId?.toLowerCase() === methodId && isSameAddress(x.from, senderAddress))
+            .filter((x) => {
+                const txMethodId = x.methodId || x.input?.slice(0, methodIdLength)
+                return txMethodId?.toLowerCase() === methodId && isSameAddress(x.from, senderAddress)
+            })
             .map((x) => ({ ...x, chainId }))
     }
 }

diff --git a/packages/web3-providers/src/RedPacket/index.ts b/packages/web3-providers/src/RedPacket/index.ts
@@ -8,7 +8,7 @@ import REDPACKET_ABI from '@masknet/web3-contracts/abis/HappyRedPacketV4.json'
 import NFT_REDPACKET_ABI from '@masknet/web3-contracts/abis/NftRedPacket.json'
 import { DSEARCH_BASE_URL } from '../DSearch/constants.js'
 import { fetchFromDSearch } from '../DSearch/helpers.js'
-import { ChainbaseRedPacket } from '../Chainbase/index.js'
+import { ChainbaseRedPacketAPI } from '../Chainbase/index.js'
 import { EtherscanRedPacket } from '../Etherscan/index.js'
 import { ContractRedPacket } from './api.js'
 import {
@@ -89,24 +89,24 @@ class RedPacketAPI implements RedPacketBaseAPI.Provider<ChainId, SchemaType> {
         fromBlock: number,
         endBlock: number,
     ) {
-        return attemptUntil(
-            [
-                () => {
-                    return ChainbaseRedPacket.getHistoryTransactions(chainId, senderAddress, contractAddress, methodId)
-                },
-                () => {
-                    return EtherscanRedPacket.getHistoryTransactions(
-                        chainId,
-                        senderAddress,
-                        contractAddress,
-                        methodId,
-                        fromBlock,
-                        endBlock,
-                    )
-                },
-            ],
-            [],
-        )
+        const attempts = [
+            () => {
+                return EtherscanRedPacket.getHistoryTransactions(
+                    chainId,
+                    senderAddress,
+                    contractAddress,
+                    methodId,
+                    fromBlock,
+                    endBlock,
+                )
+            },
+        ]
+        if (ChainbaseRedPacketAPI.isSupportedChain(chainId)) {
+            attempts.unshift(() => {
+                return ChainbaseRedPacketAPI.getHistoryTransactions(chainId, senderAddress, contractAddress, methodId)
+            })
+        }
+        return attemptUntil(attempts, [])
     }
 
     async getCollectionsByOwner(