viem 1.9.2 → 1.9.5

package/src/actions/public/multicall.ts

@@ -4,7 +4,7 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { multicall3Abi } from '../../constants/abis.js'
 import { AbiDecodingZeroDataError } from '../../errors/abi.js'
-import type { BaseError } from '../../errors/base.js'
+import { BaseError } from '../../errors/base.js'
 import { RawContractError } from '../../errors/contract.js'
 import type { Chain } from '../../types/chain.js'
 import type { ContractFunctionConfig } from '../../types/contract.js'
@@ -136,8 +136,16 @@ export async function multicall<
         functionName,
       } as unknown as EncodeFunctionDataParameters)
 
-      currentChunkSize += callData.length
-      if (batchSize > 0 && currentChunkSize > batchSize) {
+      currentChunkSize += (callData.length - 2) / 2
+      // Check to see if we need to create a new chunk.
+      if (
+        // Check if batching is enabled.
+        batchSize > 0 &&
+        // Check if the current size of the batch exceeds the size limit.
+        currentChunkSize > batchSize &&
+        // Check if the current chunk is not already empty.
+        chunkedCalls[currentChunk].length > 0
+      ) {
         currentChunk++
         currentChunkSize = (callData.length - 2) / 2
         chunkedCalls[currentChunk] = []
@@ -171,7 +179,7 @@ export async function multicall<
     }
   }
 
-  const results = await Promise.all(
+  const aggregate3Results = await Promise.allSettled(
     chunkedCalls.map((calls) =>
       readContract(client, {
         abi: multicall3Abi,
@@ -184,33 +192,64 @@ export async function multicall<
     ),
   )
 
-  const calls = chunkedCalls.flat()
+  const results = []
+  for (let i = 0; i < aggregate3Results.length; i++) {
+    const result = aggregate3Results[i]
 
-  return results.flat().map(({ returnData, success }, i) => {
-    const { callData } = calls[i]
-    const { abi, address, functionName, args } = contracts[
-      i
-    ] as ContractFunctionConfig
-    try {
-      if (callData === '0x') throw new AbiDecodingZeroDataError()
-      if (!success) throw new RawContractError({ data: returnData })
-      const result = decodeFunctionResult({
-        abi,
-        args,
-        data: returnData,
-        functionName,
-      })
-      return allowFailure ? { result, status: 'success' } : result
-    } catch (err) {
-      const error = getContractError(err as BaseError, {
-        abi,
-        address,
-        args,
-        docsPath: '/docs/contract/multicall',
-        functionName,
-      })
-      if (!allowFailure) throw error
-      return { error, result: undefined, status: 'failure' }
+    // If an error occurred in a `readContract` invocation (ie. network error),
+    // then append the failure reason to each contract result.
+    if (result.status === 'rejected') {
+      if (!allowFailure) throw result.reason
+      for (let j = 0; j < chunkedCalls[i].length; j++) {
+        results.push({
+          status: 'failure',
+          error: result.reason,
+          result: undefined,
+        })
+      }
+      continue
+    }
+
+    // If the `readContract` call was successful, then decode the results.
+    const aggregate3Result = result.value
+    for (let j = 0; j < aggregate3Result.length; j++) {
+      // Extract the response from `readContract`
+      const { returnData, success } = aggregate3Result[j]
+
+      // Extract the request call data from the original call.
+      const { callData } = chunkedCalls[i][j]
+
+      // Extract the contract config for this call from the `contracts` argument
+      // for decoding.
+      const { abi, address, functionName, args } = contracts[
+        results.length
+      ] as ContractFunctionConfig
+
+      try {
+        if (callData === '0x') throw new AbiDecodingZeroDataError()
+        if (!success) throw new RawContractError({ data: returnData })
+        const result = decodeFunctionResult({
+          abi,
+          args,
+          data: returnData,
+          functionName,
+        })
+        results.push(allowFailure ? { result, status: 'success' } : result)
+      } catch (err) {
+        const error = getContractError(err as BaseError, {
+          abi,
+          address,
+          args,
+          docsPath: '/docs/contract/multicall',
+          functionName,
+        })
+        if (!allowFailure) throw error
+        results.push({ error, result: undefined, status: 'failure' })
+      }
     }
-  }) as MulticallResults<TContracts, TAllowFailure>
+  }
+
+  if (results.length !== contracts.length)
+    throw new BaseError('multicall results mismatch')
+  return results as MulticallResults<TContracts, TAllowFailure>
 }

package/src/chains/definitions/sepolia.ts

@@ -36,6 +36,11 @@ export const sepolia = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 6507670,
     },
+    ensRegistry: { address: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e' },
+    ensUniversalResolver: {
+      address: '0x21B000Fd62a880b2125A61e36a284BB757b76025',
+      blockCreated: 3914906,
+    },
   },
   testnet: true,
 })

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.9.2'
+export const version = '1.9.5'

package/src/utils/formatters/transaction.ts

@@ -68,13 +68,13 @@ export function formatTransaction(transaction: Partial<RpcTransaction>) {
   }
 
   if (transaction_.type === 'legacy') {
-    delete transaction_['accessList']
-    delete transaction_['maxFeePerGas']
-    delete transaction_['maxPriorityFeePerGas']
+    delete transaction_.accessList
+    delete transaction_.maxFeePerGas
+    delete transaction_.maxPriorityFeePerGas
   }
   if (transaction_.type === 'eip2930') {
-    delete transaction_['maxFeePerGas']
-    delete transaction_['maxPriorityFeePerGas']
+    delete transaction_.maxFeePerGas
+    delete transaction_.maxPriorityFeePerGas
   }
   return transaction_ as Transaction
 }

package/src/utils/hash/getEventSelector.ts

@@ -1,5 +1,5 @@
-import type { EventDefinition } from '../../types/contract.js'
 import type { AbiEvent } from 'abitype'
+import type { EventDefinition } from '../../types/contract.js'
 
 import { hashAbiItem, hashFunction } from './hashFunction.js'
 

package/src/utils/hash/getFunctionSelector.ts

@@ -1,5 +1,5 @@
-import { slice } from '../data/slice.js'
 import type { AbiFunction } from 'abitype'
+import { slice } from '../data/slice.js'
 
 import { hashAbiItem, hashFunction } from './hashFunction.js'
 

package/src/utils/hash/hashFunction.ts

@@ -1,10 +1,10 @@
+import type { AbiEvent, AbiFunction } from 'abitype'
 import { formatAbiItem } from '../abi/formatAbiItem.js'
 import {
   extractFunctionName,
   extractFunctionParams,
 } from '../contract/extractFunctionParts.js'
 import { toBytes } from '../encoding/toBytes.js'
-import type { AbiEvent, AbiFunction } from 'abitype'
 
 import { keccak256 } from './keccak256.js'
 

package/src/utils/signature/hexToSignature.ts

@@ -16,5 +16,5 @@ import { numberToHex } from '../../utils/encoding/toHex.js'
 export function hexToSignature(signatureHex: Hex): Signature {
   const { r, s } = secp256k1.Signature.fromCompact(signatureHex.slice(2, 130))
   const v = BigInt(`0x${signatureHex.slice(130)}`)
-  return { r: numberToHex(r), s: numberToHex(s), v }
+  return { r: numberToHex(r, { size: 32 }), s: numberToHex(s, { size: 32 }), v }
 }