viem 2.26.4 → 2.27.0-canary-20250414080022

package/utils/buildRequest.ts

@@ -7,8 +7,16 @@ import {
   type WebSocketRequestErrorType,
 } from '../errors/request.js'
 import {
+  AtomicReadyWalletRejectedUpgradeError,
+  type AtomicReadyWalletRejectedUpgradeErrorType,
+  AtomicityNotSupportedError,
+  type AtomicityNotSupportedErrorType,
+  BundleTooLargeError,
+  type BundleTooLargeErrorType,
   ChainDisconnectedError,
   type ChainDisconnectedErrorType,
+  DuplicateIdError,
+  type DuplicateIdErrorType,
   InternalRpcError,
   type InternalRpcErrorType,
   InvalidInputRpcError,
@@ -43,8 +51,14 @@ import {
   type TransactionRejectedRpcErrorType,
   UnauthorizedProviderError,
   type UnauthorizedProviderErrorType,
+  UnknownBundleIdError,
+  type UnknownBundleIdErrorType,
   UnknownRpcError,
   type UnknownRpcErrorType,
+  UnsupportedChainIdError,
+  type UnsupportedChainIdErrorType,
+  UnsupportedNonOptionalCapabilityError,
+  type UnsupportedNonOptionalCapabilityErrorType,
   UnsupportedProviderMethodError,
   type UnsupportedProviderMethodErrorType,
   UserRejectedRequestError,
@@ -63,8 +77,12 @@ import type { GetSocketRpcClientErrorType } from './rpc/socket.js'
 import { stringify } from './stringify.js'
 
 export type RequestErrorType =
+  | AtomicityNotSupportedErrorType
+  | AtomicReadyWalletRejectedUpgradeErrorType
+  | BundleTooLargeErrorType
   | ChainDisconnectedErrorType
   | CreateBatchSchedulerErrorType
+  | DuplicateIdErrorType
   | HttpRequestErrorType
   | InternalRpcErrorType
   | InvalidInputRpcErrorType
@@ -85,7 +103,10 @@ export type RequestErrorType =
   | TimeoutErrorType
   | TransactionRejectedRpcErrorType
   | UnauthorizedProviderErrorType
+  | UnknownBundleIdErrorType
   | UnknownRpcErrorType
+  | UnsupportedChainIdErrorType
+  | UnsupportedNonOptionalCapabilityErrorType
   | UnsupportedProviderMethodErrorType
   | UserRejectedRequestErrorType
   | WebSocketRequestErrorType
@@ -170,6 +191,7 @@ export function buildRequest<request extends (args: any) => Promise<any>>(
                 // -32006
                 case JsonRpcVersionUnsupportedError.code:
                   throw new JsonRpcVersionUnsupportedError(err)
+
                 // 4001
                 case UserRejectedRequestError.code:
                   throw new UserRejectedRequestError(err)
@@ -188,10 +210,34 @@ export function buildRequest<request extends (args: any) => Promise<any>>(
                 // 4902
                 case SwitchChainError.code:
                   throw new SwitchChainError(err)
+
+                // 5700
+                case UnsupportedNonOptionalCapabilityError.code:
+                  throw new UnsupportedNonOptionalCapabilityError(err)
+                // 5710
+                case UnsupportedChainIdError.code:
+                  throw new UnsupportedChainIdError(err)
+                // 5720
+                case DuplicateIdError.code:
+                  throw new DuplicateIdError(err)
+                // 5730
+                case UnknownBundleIdError.code:
+                  throw new UnknownBundleIdError(err)
+                // 5740
+                case BundleTooLargeError.code:
+                  throw new BundleTooLargeError(err)
+                // 5750
+                case AtomicReadyWalletRejectedUpgradeError.code:
+                  throw new AtomicReadyWalletRejectedUpgradeError(err)
+                // 5760
+                case AtomicityNotSupportedError.code:
+                  throw new AtomicityNotSupportedError(err)
+
                 // CAIP-25: User Rejected Error
                 // https://docs.walletconnect.com/2.0/specs/clients/sign/error-codes#rejected-caip-25
                 case 5000:
                   throw new UserRejectedRequestError(err)
+
                 default:
                   if (err_ instanceof BaseError) throw err_
                   throw new UnknownRpcError(err as Error)

package/utils/ccip.ts

@@ -24,6 +24,10 @@ import { encodeAbiParameters } from './abi/encodeAbiParameters.js'
 import { isAddressEqual } from './address/isAddressEqual.js'
 import { concat } from './data/concat.js'
 import { isHex } from './data/isHex.js'
+import {
+  localBatchGatewayRequest,
+  localBatchGatewayUrl,
+} from './ens/localBatchGatewayRequest.js'
 import { stringify } from './stringify.js'
 
 export const offchainLookupSignature = '0x556f1830'
@@ -84,7 +88,12 @@ export async function offchainLookup<chain extends Chain | undefined>(
     if (!isAddressEqual(to, sender))
       throw new OffchainLookupSenderMismatchError({ sender, to })
 
-    const result = await ccipRequest_({ data: callData, sender, urls })
+    const result = urls.includes(localBatchGatewayUrl)
+      ? await localBatchGatewayRequest({
+          data: callData,
+          ccipRequest: ccipRequest_,
+        })
+      : await ccipRequest_({ data: callData, sender, urls })
 
     const { data: data_ } = await call(client, {
       blockNumber,

package/utils/ens/localBatchGatewayRequest.ts

@@ -0,0 +1,60 @@
+import { batchGatewayAbi } from '../../constants/abis.js'
+import { solidityError } from '../../constants/solidity.js'
+import type { Hex } from '../../types/misc.js'
+import { decodeFunctionData } from '../abi/decodeFunctionData.js'
+import { encodeErrorResult } from '../abi/encodeErrorResult.js'
+import { encodeFunctionResult } from '../abi/encodeFunctionResult.js'
+import type {
+  CcipRequestErrorType,
+  CcipRequestParameters,
+  CcipRequestReturnType,
+} from '../ccip.js'
+
+export const localBatchGatewayUrl = 'x-batch-gateway:true'
+
+export async function localBatchGatewayRequest(parameters: {
+  data: Hex
+  ccipRequest: (
+    parameters: CcipRequestParameters,
+  ) => Promise<CcipRequestReturnType>
+}): Promise<Hex> {
+  const { data, ccipRequest } = parameters
+
+  const {
+    args: [queries],
+  } = decodeFunctionData({ abi: batchGatewayAbi, data })
+
+  const failures: boolean[] = []
+  const responses: Hex[] = []
+  await Promise.all(
+    queries.map(async (query, i) => {
+      try {
+        responses[i] = await ccipRequest(query)
+        failures[i] = false
+      } catch (err) {
+        failures[i] = true
+        responses[i] = encodeError(err as CcipRequestErrorType)
+      }
+    }),
+  )
+
+  return encodeFunctionResult({
+    abi: batchGatewayAbi,
+    functionName: 'query',
+    result: [failures, responses],
+  })
+}
+
+function encodeError(error: CcipRequestErrorType): Hex {
+  if (error.name === 'HttpRequestError' && error.status)
+    return encodeErrorResult({
+      abi: batchGatewayAbi,
+      errorName: 'HttpError',
+      args: [error.status, error.shortMessage],
+    })
+  return encodeErrorResult({
+    abi: [solidityError],
+    errorName: 'Error',
+    args: ['shortMessage' in error ? error.shortMessage : error.message],
+  })
+}