@0xtorch/evm 0.0.122 → 0.0.124

package/chain/definitions/fantom.ts

@@ -59,11 +59,12 @@ export const createFantomChainCustom = ({
 })
 
 export const fantomHttpRpcs: HttpRpc[] = [
-  {
-    url: 'https://rpc.ankr.com/fantom/',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 3000n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://rpc.ankr.com/fantom/',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 3000n,
+  // },
   {
     url: 'https://rpcapi.fantom.network',
     getLogsIsUsable: true,
@@ -84,11 +85,12 @@ export const fantomHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 40_000n,
   },
-  {
-    url: 'https://fantom.blockpi.network/v1/rpc/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 1024n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://fantom.blockpi.network/v1/rpc/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 1024n,
+  // },
   {
     url: 'https://fantom.drpc.org/',
     getLogsIsUsable: true,

package/chain/definitions/linea.ts

@@ -59,11 +59,12 @@ export const createLineaChainCustom = ({
 })
 
 export const lineaHttpRpcs: HttpRpc[] = [
-  {
-    url: 'https://linea.blockpi.network/v1/rpc/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 1024n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://linea.blockpi.network/v1/rpc/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 1024n,
+  // },
   {
     url: 'https://1rpc.io/linea',
     getLogsIsUsable: true,

package/chain/definitions/mantaPacific.ts

@@ -68,11 +68,12 @@ export const mantaPacificHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 20_000n,
   },
-  {
-    url: 'https://www.tencentcloud-rpc.com/v2/manta/manta-rpc',
-    getLogsIsUsable: false,
-    getLogsMaxBlockRange: 0n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://www.tencentcloud-rpc.com/v2/manta/manta-rpc',
+  //   getLogsIsUsable: false,
+  //   getLogsMaxBlockRange: 0n,
+  // },
   {
     url: 'https://r1.pacific.manta.systems/http',
     getLogsIsUsable: true,

package/chain/definitions/opBnb.ts

@@ -81,8 +81,8 @@ export const opBnbHttpRpcs: HttpRpc[] = [
   },
   {
     url: 'https://opbnb-mainnet.4everland.org/v1/37fa9972c1b1cd5fab542c7bdd4cde2f',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
+    getLogsIsUsable: false,
+    getLogsMaxBlockRange: 0n,
   },
   {
     url: 'https://opbnb-mainnet.nodereal.io/v1/64a9df0874fb4a93b9d0a3849de012d3',

package/chain/definitions/optimism.ts

@@ -95,11 +95,12 @@ export const optimismHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 1024n,
   },
-  {
-    url: 'https://endpoints.omniatech.io/v1/op/mainnet/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 3000n,
-  },
+  // Not archiving receipts
+  // {
+  //   url: 'https://endpoints.omniatech.io/v1/op/mainnet/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 3000n,
+  // },
   {
     url: 'https://optimism.api.onfinality.io/public',
     getLogsIsUsable: true,
@@ -111,11 +112,12 @@ export const optimismHttpRpcs: HttpRpc[] = [
   //   getLogsIsUsable: true,
   //   getLogsMaxBlockRange: 4000n,
   // },
-  {
-    url: 'https://optimism-rpc.publicnode.com',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Not archiving receipts
+  // {
+  //   url: 'https://optimism-rpc.publicnode.com',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
   // Not archiving receipts
   // {
   //   url: 'https://optimism.meowrpc.com',
@@ -128,11 +130,12 @@ export const optimismHttpRpcs: HttpRpc[] = [
   //   getLogsIsUsable: true,
   //   getLogsMaxBlockRange: 10_000n,
   // },
-  {
-    url: 'https://optimism.publicnode.com',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Not archiving receipts
+  // {
+  //   url: 'https://optimism.publicnode.com',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
   // Not archiving receipts
   // {
   //   url: 'https://optimism.meowrpc.com',
@@ -174,14 +177,15 @@ export const optimismHttpRpcs: HttpRpc[] = [
   // },
   {
     url: 'https://opt-mainnet.4everland.org/v1/37fa9972c1b1cd5fab542c7bdd4cde2f',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
-  {
-    url: 'https://optimism.rpc.subquery.network/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
+    getLogsIsUsable: false,
+    getLogsMaxBlockRange: 0n,
   },
+  // Not archiving receipts
+  // {
+  //   url: 'https://optimism.rpc.subquery.network/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
 ]
 
 export const optimismWebsocketRpcUrls: readonly string[] = [

package/chain/definitions/polygonPos.ts

@@ -59,11 +59,12 @@ export const createPolygonPosChainCustom = ({
 })
 
 export const polygonPosHttpRpcs: HttpRpc[] = [
-  {
-    url: 'https://endpoints.omniatech.io/v1/matic/mainnet/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Not archiving receipts
+  // {
+  //   url: 'https://endpoints.omniatech.io/v1/matic/mainnet/public',
+  //   getLogsIsUsable: false,
+  //   getLogsMaxBlockRange: 0n,
+  // },
   {
     url: 'https://polygon-rpc.com',
     getLogsIsUsable: true,
@@ -175,8 +176,8 @@ export const polygonPosHttpRpcs: HttpRpc[] = [
   },
   {
     url: 'https://polygon-mainnet.4everland.org/v1/37fa9972c1b1cd5fab542c7bdd4cde2f',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
+    getLogsIsUsable: false,
+    getLogsMaxBlockRange: 0n,
   },
 ]
 

package/chain/definitions/polygonZkEvm.ts

@@ -75,11 +75,12 @@ export const polygonZkEvmHttpRpcs: HttpRpc[] = [
   //   getLogsIsUsable: true,
   //   getLogsMaxBlockRange: 10_000n,
   // },
-  {
-    url: 'https://polygon-zkevm.blockpi.network/v1/rpc/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://polygon-zkevm.blockpi.network/v1/rpc/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
   {
     url: 'https://polygon-zkevm-mainnet.public.blastapi.io',
     getLogsIsUsable: false,

package/chain/definitions/ronin.ts

@@ -66,16 +66,18 @@ export const roninHttpRpcs: HttpRpc[] = [
   //   getLogsIsUsable: true,
   //   getLogsMaxBlockRange: 20_000n,
   // },
-  {
-    url: 'https://api-gateway.skymavis.com/rpc?apikey=9aqYLBbxSC6LROynQJBvKkEIsioqwHmr',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 500n,
-  },
-  {
-    url: 'https://ronin.drpc.org',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://api-gateway.skymavis.com/rpc?apikey=9aqYLBbxSC6LROynQJBvKkEIsioqwHmr',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 500n,
+  // },
+  // Not archiving receipts
+  // {
+  //   url: 'https://ronin.drpc.org',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
 ]
 
 export const roninWebsocketRpcUrls: readonly string[] = []

package/chain/definitions/scroll.ts

@@ -80,15 +80,16 @@ export const scrollHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 10_000n,
   },
-  {
-    url: 'https://scroll.blockpi.network/v1/rpc/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 1024n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://scroll.blockpi.network/v1/rpc/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 1024n,
+  // },
   {
     url: 'https://1rpc.io/scroll',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 1000n,
+    getLogsIsUsable: false,
+    getLogsMaxBlockRange: 0n,
   },
   {
     url: 'https://scroll.drpc.org',

package/chain/definitions/zkSyncEra.ts

@@ -64,11 +64,12 @@ export const zksyncEraHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 10_000n,
   },
-  {
-    url: 'https://zksync-era.blockpi.network/v1/rpc/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 1024n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://zksync-era.blockpi.network/v1/rpc/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 1024n,
+  // },
   // Not archiving receipts
   // {
   //   url: 'https://go.getblock.io/f76c09905def4618a34946bf71851542',
@@ -92,11 +93,12 @@ export const zksyncEraHttpRpcs: HttpRpc[] = [
     getLogsIsUsable: true,
     getLogsMaxBlockRange: 1000n,
   },
-  {
-    url: 'https://endpoints.omniatech.io/v1/zksync-era/mainnet/public',
-    getLogsIsUsable: true,
-    getLogsMaxBlockRange: 10_000n,
-  },
+  // Endpoint is not working
+  // {
+  //   url: 'https://endpoints.omniatech.io/v1/zksync-era/mainnet/public',
+  //   getLogsIsUsable: true,
+  //   getLogsMaxBlockRange: 10_000n,
+  // },
   // Not archiving receipts
   // {
   //   url: 'https://api.zan.top/zksync-mainnet',

package/client/create.ts

@@ -10,7 +10,9 @@ import {
   InvalidInputRpcError,
   JsonRpcVersionUnsupportedError,
   type MulticallParameters,
+  type MulticallReturnType,
   type PublicClient,
+  type ReadContractParameters,
   RpcRequestError,
   TransactionNotFoundError,
   TransactionReceiptNotFoundError,
@@ -21,6 +23,68 @@ import type { LowerHex } from '../types'
 import { bigIntMin } from '../utils'
 import type { Client } from './types'
 
+class Semaphore {
+  #endpoints: readonly string[]
+  #usingIndexSet = new Set<number>()
+  #queue: Array<{
+    call: () => void
+    timeoutId: ReturnType<typeof setTimeout>
+  }> = []
+
+  constructor(endpoints: readonly string[]) {
+    this.#endpoints = endpoints
+  }
+
+  async acquire(timeout: number): Promise<string> {
+    if (this.#usingIndexSet.size < this.#endpoints.length) {
+      const index = this.#endpoints.findIndex(
+        (_, index) => !this.#usingIndexSet.has(index),
+      )
+      this.#usingIndexSet.add(index)
+      const endpoint = this.#endpoints[index]
+      return Promise.resolve(endpoint)
+    }
+
+    return new Promise<string>((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        const index = this.#queue.findIndex(
+          (item) => item.timeoutId === timeoutId,
+        )
+        if (index !== -1) {
+          this.#queue.splice(index, 1)
+          reject(new Error('Timeout while waiting for semaphore'))
+        }
+      }, timeout)
+
+      this.#queue.push({
+        call: () => {
+          const index = this.#endpoints.findIndex(
+            (_, index) => !this.#usingIndexSet.has(index),
+          )
+          this.#usingIndexSet.add(index)
+          const endpoint = this.#endpoints[index]
+          resolve(endpoint)
+        },
+        timeoutId,
+      })
+    })
+  }
+
+  async release(endpoint: string, cooldown?: number): Promise<void> {
+    if (cooldown !== undefined) {
+      await new Promise((resolve) => setTimeout(resolve, cooldown))
+    }
+    const index = this.#endpoints.indexOf(endpoint)
+    this.#usingIndexSet.delete(index)
+    const next = this.#queue.shift()
+    if (next !== undefined) {
+      const { call, timeoutId } = next
+      clearTimeout(timeoutId)
+      call()
+    }
+  }
+}
+
 type CreateClientParameters = {
   chain: Chain
   httpRpcs: HttpRpc[]
@@ -31,6 +95,7 @@ export const createClient = ({
   httpRpcs,
 }: CreateClientParameters): Client => {
   const endpoints = httpRpcs.map((httpRpc) => httpRpc.url)
+  const semaphore = new Semaphore(endpoints)
   const getLogsIsUsableEndpoints = new Set<string>()
   const endpointGetLogsMaxBlockRanges = new Map<string, bigint>()
   for (const httpRpc of httpRpcs) {
@@ -87,7 +152,8 @@ export const createClient = ({
     timeout?: number
   }): Promise<T> => {
     const start = Date.now()
-    const endpoint = await getAvailableEndpoint(timeout)
+    const endpoint = await semaphore.acquire(timeout)
+    let cooldown: number | undefined
     console.debug(`Call ${callName ?? ''} on ${endpoint}`)
     try {
       const client = createPublicClient({
@@ -104,27 +170,19 @@ export const createClient = ({
       ])
     } catch (error) {
       if (
-        (error instanceof HttpRequestError &&
-          (error.status === 429 || error.status === 503)) ||
-        (error instanceof ContractFunctionExecutionError &&
-          (error.message.includes('Status: 429') ||
-            error.message.includes('Status: 503'))) ||
-        (error instanceof CallExecutionError &&
-          (error.message.includes('429') || error.message.includes('503'))) ||
-        error instanceof RpcRequestError ||
-        error instanceof JsonRpcVersionUnsupportedError ||
-        error instanceof InternalRpcError ||
+        isRequestError(error) ||
         (error instanceof Error &&
           (error.message.includes('The request timed out.') ||
             error.message.includes('Timeout')))
       ) {
         console.debug(error)
-        cooldownEndpoint(endpoint)
+        cooldown = 60_000
         return await call({
           clientCall,
           timeout: timeout - (Date.now() - start),
         })
       }
+
       if (
         error instanceof TransactionNotFoundError ||
         error instanceof TransactionReceiptNotFoundError ||
@@ -132,26 +190,16 @@ export const createClient = ({
         error instanceof InvalidInputRpcError
       ) {
         console.debug(error)
-        cooldownEndpoint(endpoint, 5000)
-        return await call({
-          clientCall,
-          timeout: timeout - (Date.now() - start),
-        })
-      }
-      if (
-        error instanceof RpcRequestError &&
-        error.details.includes('Unparsable response type')
-      ) {
-        console.debug(error)
-        cooldownEndpoint(endpoint, 1000 * 60 * 60)
+        cooldown = 5000
         return await call({
           clientCall,
           timeout: timeout - (Date.now() - start),
         })
       }
+
       throw error
     } finally {
-      busyEndpoints.delete(endpoint)
+      semaphore.release(endpoint, cooldown)
     }
   }
 
@@ -206,16 +254,7 @@ export const createClient = ({
         currentFromBlock = currentToBlock + 1n
       } catch (error) {
         if (
-          (error instanceof HttpRequestError &&
-            (error.status === 429 || error.status === 503)) ||
-          (error instanceof ContractFunctionExecutionError &&
-            (error.message.includes('Status: 429') ||
-              error.message.includes('Status: 503'))) ||
-          (error instanceof CallExecutionError &&
-            (error.message.includes('429') || error.message.includes('503'))) ||
-          error instanceof RpcRequestError ||
-          error instanceof JsonRpcVersionUnsupportedError ||
-          error instanceof InternalRpcError ||
+          isRequestError(error) ||
           (error instanceof Error &&
             (error.message.includes('The request timed out.') ||
               error.message.includes('Timeout')))
@@ -224,6 +263,7 @@ export const createClient = ({
           cooldownEndpoint(endpoint)
           continue
         }
+
         if (
           error instanceof TransactionNotFoundError ||
           error instanceof TransactionReceiptNotFoundError ||
@@ -234,14 +274,7 @@ export const createClient = ({
           cooldownEndpoint(endpoint, 5000)
           continue
         }
-        if (
-          error instanceof RpcRequestError &&
-          error.details.includes('Unparsable response type')
-        ) {
-          console.debug(error)
-          cooldownEndpoint(endpoint, 1000 * 60 * 60)
-          continue
-        }
+
         throw error
       } finally {
         busyEndpoints.delete(endpoint)
@@ -256,10 +289,47 @@ export const createClient = ({
   }: {
     args: MulticallParameters<T>
     timeout?: number
-  }) => {
+  }): Promise<MulticallReturnType<T>> => {
     const start = Date.now()
-    const endpoint = await getAvailableEndpoint(timeout)
-    console.debug('Multicall on', endpoint)
+
+    if (chain.contracts?.multicall3?.address === undefined) {
+      // multicall を使用しないで並列実行
+      if (args.contracts.length === 0) {
+        return [] as unknown as MulticallReturnType<T>
+      }
+      const results = await Promise.all(
+        args.contracts.map((contract) =>
+          (async () => {
+            try {
+              const result = await call({
+                clientCall: (client) =>
+                  client.readContract(contract as ReadContractParameters),
+                timeout,
+              })
+              return {
+                result,
+                status: 'success',
+              }
+            } catch (error) {
+              if (
+                error instanceof Error &&
+                error.message === 'Timeout while waiting for semaphore'
+              ) {
+                throw error
+              }
+              return {
+                error,
+                status: 'failure',
+              }
+            }
+          })(),
+        ),
+      )
+      return results as MulticallReturnType<T>
+    }
+
+    const endpoint = await semaphore.acquire(timeout)
+    let cooldown: number | undefined
     try {
       const client = createPublicClient({
         chain,
@@ -281,40 +351,17 @@ export const createClient = ({
         return results
       }
       const { error } = result0
-      if (error instanceof ContractFunctionExecutionError) {
+      if (isRequestError(error)) {
         throw error
       }
       return results
     } catch (error) {
-      if (error instanceof ContractFunctionExecutionError) {
-        if (
-          error.message.includes('Status: 429') ||
-          error.message.includes('Status: 503') ||
-          error.message.includes('The request timed out.') ||
-          error.message.includes('RPC Request failed')
-        ) {
-          console.debug(error)
-          cooldownEndpoint(endpoint)
-          return await multicall({
-            args,
-            timeout: timeout - (Date.now() - start),
-          })
-        }
-        if (
-          error.message.includes('Status: 404') ||
-          error.message.includes('HTTP request failed')
-        ) {
-          console.debug(error)
-          cooldownEndpoint(endpoint, 5000)
-          return await multicall({
-            args,
-            timeout: timeout - (Date.now() - start),
-          })
-        }
-      }
-      if (error instanceof Error && error.message.includes('Timeout')) {
+      if (
+        isRequestError(error) ||
+        (error instanceof Error && error.message.includes('Timeout'))
+      ) {
         console.debug(error)
-        cooldownEndpoint(endpoint)
+        cooldown = 60_000
         return await multicall({
           args,
           timeout: timeout - (Date.now() - start),
@@ -322,7 +369,7 @@ export const createClient = ({
       }
       throw error
     } finally {
-      busyEndpoints.delete(endpoint)
+      semaphore.release(endpoint, cooldown)
     }
   }
 
@@ -333,3 +380,41 @@ export const createClient = ({
     multicall,
   }
 }
+
+const requestErrorMessages: readonly string[] = [
+  'Failed to fetch',
+  'HTTP request failed',
+  'RPC Request failed',
+  'Status: 404',
+  'Status: 429',
+  'Status: 503',
+  'The request timed out.',
+  'Unparsable response type',
+]
+
+const isRequestError = (error: unknown): boolean => {
+  if (
+    error instanceof HttpRequestError ||
+    error instanceof RpcRequestError ||
+    error instanceof JsonRpcVersionUnsupportedError ||
+    error instanceof InternalRpcError
+  ) {
+    return true
+  }
+
+  if (error instanceof ContractFunctionExecutionError) {
+    for (const message of requestErrorMessages) {
+      if (error.message.includes(message)) {
+        return true
+      }
+    }
+  }
+
+  if (
+    error instanceof CallExecutionError &&
+    (error.message.includes('429') || error.message.includes('503'))
+  ) {
+    return true
+  }
+  return false
+}

package/package.json

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