viem 1.6.0 → 1.6.3

package/src/actions/public/multicall.ts

@@ -80,8 +80,8 @@ export type MulticallReturnType<
  * // [{ result: 424122n, status: 'success' }, { result: 1000000n, status: 'success' }]
  */
 export async function multicall<
-  TChain extends Chain | undefined,
   TContracts extends ContractFunctionConfig[],
+  TChain extends Chain | undefined,
   TAllowFailure extends boolean = true,
 >(
   client: Client<Transport, TChain>,
@@ -92,7 +92,7 @@ export async function multicall<
     batchSize: batchSize_,
     blockNumber,
     blockTag,
-    contracts: contracts_,
+    contracts,
     multicallAddress: multicallAddress_,
   } = args
 
@@ -102,9 +102,6 @@ export async function multicall<
       client.batch.multicall.batchSize) ||
       1_024)
 
-  // Fix type cast from `Narrow` in type definition.
-  const contracts = contracts_ as readonly [...MulticallContracts<TContracts>]
-
   let multicallAddress = multicallAddress_
   if (!multicallAddress) {
     if (!client.chain)
@@ -129,7 +126,9 @@ export async function multicall<
   let currentChunk = 0
   let currentChunkSize = 0
   for (let i = 0; i < contracts.length; i++) {
-    const { abi, address, args, functionName } = contracts[i]
+    const { abi, address, args, functionName } = contracts[
+      i
+    ] as ContractFunctionConfig
     try {
       const callData = encodeFunctionData({
         abi,
@@ -188,7 +187,9 @@ export async function multicall<
   return results.flat().map(({ returnData, success }, i) => {
     const calls = chunkedCalls.flat()
     const { callData } = calls[i]
-    const { abi, address, functionName, args } = contracts[i]
+    const { abi, address, functionName, args } = contracts[
+      i
+    ] as ContractFunctionConfig
     try {
       if (callData === '0x') throw new AbiDecodingZeroDataError()
       if (!success) throw new RawContractError({ data: returnData })
@@ -196,7 +197,7 @@ export async function multicall<
         abi,
         args,
         data: returnData,
-        functionName: functionName,
+        functionName,
       })
       return allowFailure ? { result, status: 'success' } : result
     } catch (err) {

package/src/actions/public/readContract.ts

@@ -64,7 +64,7 @@ export type ReadContractReturnType<
  */
 export async function readContract<
   TChain extends Chain | undefined,
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
 >(
   client: Client<Transport, TChain>,

package/src/actions/public/simulateContract.ts

@@ -102,7 +102,7 @@ export type SimulateContractReturnType<
  */
 export async function simulateContract<
   TChain extends Chain | undefined,
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
   TChainOverride extends Chain | undefined,
 >(

package/src/actions/public/watchContractEvent.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address, ExtractAbiEvent, Narrow } from 'abitype'
+import type { Abi, AbiEvent, Address, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -68,7 +68,7 @@ export type WatchContractEventParameters<
   /** The address of the contract. */
   address?: Address | Address[]
   /** Contract ABI. */
-  abi: Narrow<TAbi>
+  abi: TAbi
   args?: GetEventArgs<TAbi, TEventName>
   /** Contract event. */
   eventName?: InferEventName<TAbi, TEventName>
@@ -137,7 +137,7 @@ export type WatchContractEventReturnType = () => void
  */
 export function watchContractEvent<
   TChain extends Chain | undefined,
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TEventName extends string,
   TStrict extends boolean | undefined = undefined,
 >(

package/src/actions/public/watchEvent.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address, Narrow } from 'abitype'
+import type { Abi, AbiEvent, Address } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -107,7 +107,7 @@ export type WatchEventParameters<
     }) &
   (
     | {
-        event: Narrow<TAbiEvent>
+        event: TAbiEvent
         events?: never
         args?: MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
         /**
@@ -118,7 +118,7 @@ export type WatchEventParameters<
       }
     | {
         event?: never
-        events?: Narrow<TAbiEvents>
+        events?: TAbiEvents
         args?: never
         /**
          * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
@@ -170,8 +170,8 @@ export type WatchEventReturnType = () => void
  */
 export function watchEvent<
   TChain extends Chain | undefined,
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbiEvents extends
+  const TAbiEvent extends AbiEvent | undefined = undefined,
+  const TAbiEvents extends
     | readonly AbiEvent[]
     | readonly unknown[]
     | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,

package/src/actions/wallet/deployContract.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import type { Account } from '../../accounts/types.js'
 import type { Client } from '../../clients/createClient.js'
@@ -24,7 +24,7 @@ export type DeployContractParameters<
   SendTransactionParameters<TChain, TAccount, TChainOverride>,
   'accessList' | 'chain' | 'to' | 'data'
 > & {
-  abi: Narrow<TAbi>
+  abi: TAbi
   bytecode: Hex
 } & GetChain<TChain, TChainOverride> &
   GetConstructorArgs<TAbi>
@@ -59,7 +59,7 @@ export type DeployContractReturnType = SendTransactionReturnType
  * })
  */
 export function deployContract<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
   TChainOverride extends Chain | undefined,

package/src/actions/wallet/signTypedData.ts

@@ -121,7 +121,7 @@ export type SignTypedDataReturnType = Hex
  * })
  */
 export async function signTypedData<
-  TTypedData extends TypedData | { [key: string]: unknown },
+  const TTypedData extends TypedData | { [key: string]: unknown },
   TPrimaryType extends string,
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,

package/src/actions/wallet/writeContract.ts

@@ -104,7 +104,7 @@ export type WriteContractReturnType = SendTransactionReturnType
 export async function writeContract<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
   TChainOverride extends Chain | undefined,
 >(

package/src/chains/index.ts

@@ -94,6 +94,7 @@ export const polygonZkEvmTestnet = /*#__PURE__*/ defineChain(
 )
 export const pulsechain = /*#__PURE__*/ defineChain(chains.pulsechain)
 export const pulsechainV4 = /*#__PURE__*/ defineChain(chains.pulsechainV4)
+export const scrollSepolia = /*#__PURE__*/ defineChain(chains.scrollSepolia)
 export const scrollTestnet = /*#__PURE__*/ defineChain(chains.scrollTestnet)
 export const sepolia = /*#__PURE__*/ defineChain(chains.sepolia)
 export const skaleBlockBrawlers = /*#__PURE__*/ defineChain(

package/src/clients/decorators/public.ts

@@ -278,7 +278,7 @@ export type PublicActions<
    * })
    */
   createContractEventFilter: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
     TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
     TStrict extends boolean | undefined = undefined,
@@ -325,8 +325,8 @@ export type PublicActions<
    * })
    */
   createEventFilter: <
-    TAbiEvent extends AbiEvent | undefined = undefined,
-    TAbiEvents extends
+    const TAbiEvent extends AbiEvent | undefined = undefined,
+    const TAbiEvents extends
       | readonly AbiEvent[]
       | readonly unknown[]
       | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
@@ -406,7 +406,7 @@ export type PublicActions<
    */
   estimateContractGas: <
     TChain extends Chain | undefined,
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TFunctionName extends string,
   >(
     args: EstimateContractGasParameters<TAbi, TFunctionName, TChain, TAccount>,
@@ -844,7 +844,7 @@ export type PublicActions<
    */
   getFilterChanges: <
     TFilterType extends FilterType,
-    TAbi extends Abi | readonly unknown[] | undefined,
+    const TAbi extends Abi | readonly unknown[] | undefined,
     TEventName extends string | undefined,
     TStrict extends boolean | undefined = undefined,
     TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
@@ -895,7 +895,7 @@ export type PublicActions<
    * const logs = await client.getFilterLogs({ filter })
    */
   getFilterLogs: <
-    TAbi extends Abi | readonly unknown[] | undefined,
+    const TAbi extends Abi | readonly unknown[] | undefined,
     TEventName extends string | undefined,
     TStrict extends boolean | undefined = undefined,
     TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
@@ -951,8 +951,8 @@ export type PublicActions<
    * const logs = await client.getLogs()
    */
   getLogs: <
-    TAbiEvent extends AbiEvent | undefined = undefined,
-    TAbiEvents extends
+    const TAbiEvent extends AbiEvent | undefined = undefined,
+    const TAbiEvents extends
       | readonly AbiEvent[]
       | readonly unknown[]
       | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
@@ -1170,7 +1170,7 @@ export type PublicActions<
    * // 424122n
    */
   readContract: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TFunctionName extends string,
   >(
     args: ReadContractParameters<TAbi, TFunctionName>,
@@ -1206,7 +1206,7 @@ export type PublicActions<
    * })
    */
   simulateContract: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TFunctionName extends string,
     TChainOverride extends Chain | undefined,
   >(
@@ -1383,7 +1383,7 @@ export type PublicActions<
    * })
    */
   watchContractEvent: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TEventName extends string,
     TStrict extends boolean | undefined = undefined,
   >(
@@ -1421,8 +1421,8 @@ export type PublicActions<
    * })
    */
   watchEvent: <
-    TAbiEvent extends AbiEvent | undefined = undefined,
-    TAbiEvents extends
+    const TAbiEvent extends AbiEvent | undefined = undefined,
+    const TAbiEvents extends
       | readonly AbiEvent[]
       | readonly unknown[]
       | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
@@ -1502,7 +1502,7 @@ export function publicActions<
       getTransactionConfirmations(client, args),
     getTransactionCount: (args) => getTransactionCount(client, args),
     getTransactionReceipt: (args) => getTransactionReceipt(client, args),
-    multicall: (args) => multicall(client, args),
+    multicall: (args) => multicall(client, args as any) as any,
     readContract: (args) => readContract(client, args),
     simulateContract: (args) => simulateContract(client, args),
     verifyMessage: (args) => verifyMessage(client, args),

package/src/clients/decorators/wallet.ts

@@ -112,7 +112,7 @@ export type WalletActions<
    * })
    */
   deployContract: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TChainOverride extends Chain | undefined,
   >(
     args: DeployContractParameters<TAbi, TChain, TAccount, TChainOverride>,
@@ -410,7 +410,7 @@ export type WalletActions<
    * })
    */
   signTypedData: <
-    TTypedData extends TypedData | { [key: string]: unknown },
+    const TTypedData extends TypedData | { [key: string]: unknown },
     TPrimaryType extends string,
   >(
     args: SignTypedDataParameters<TTypedData, TPrimaryType, TAccount>,
@@ -509,7 +509,7 @@ export type WalletActions<
    * const hash = await client.writeContract(request)
    */
   writeContract: <
-    TAbi extends Abi | readonly unknown[],
+    const TAbi extends Abi | readonly unknown[],
     TFunctionName extends string,
     TChainOverride extends Chain | undefined,
   >(

package/src/constants/number.ts

@@ -1,98 +1,98 @@
-export const maxInt8 = 2n ** (8n - 1n)
-export const maxInt16 = 2n ** (16n - 1n)
-export const maxInt24 = 2n ** (24n - 1n)
-export const maxInt32 = 2n ** (32n - 1n)
-export const maxInt40 = 2n ** (40n - 1n)
-export const maxInt48 = 2n ** (48n - 1n)
-export const maxInt56 = 2n ** (56n - 1n)
-export const maxInt64 = 2n ** (64n - 1n)
-export const maxInt72 = 2n ** (72n - 1n)
-export const maxInt80 = 2n ** (80n - 1n)
-export const maxInt88 = 2n ** (88n - 1n)
-export const maxInt96 = 2n ** (96n - 1n)
-export const maxInt104 = 2n ** (104n - 1n)
-export const maxInt112 = 2n ** (112n - 1n)
-export const maxInt120 = 2n ** (120n - 1n)
-export const maxInt128 = 2n ** (128n - 1n)
-export const maxInt136 = 2n ** (136n - 1n)
-export const maxInt144 = 2n ** (144n - 1n)
-export const maxInt152 = 2n ** (152n - 1n)
-export const maxInt160 = 2n ** (160n - 1n)
-export const maxInt168 = 2n ** (168n - 1n)
-export const maxInt176 = 2n ** (176n - 1n)
-export const maxInt184 = 2n ** (184n - 1n)
-export const maxInt192 = 2n ** (192n - 1n)
-export const maxInt200 = 2n ** (200n - 1n)
-export const maxInt208 = 2n ** (208n - 1n)
-export const maxInt216 = 2n ** (216n - 1n)
-export const maxInt224 = 2n ** (224n - 1n)
-export const maxInt232 = 2n ** (232n - 1n)
-export const maxInt240 = 2n ** (240n - 1n)
-export const maxInt248 = 2n ** (248n - 1n)
-export const maxInt256 = 2n ** (256n - 1n)
+export const maxInt8 = 2n ** (8n - 1n) - 1n
+export const maxInt16 = 2n ** (16n - 1n) - 1n
+export const maxInt24 = 2n ** (24n - 1n) - 1n
+export const maxInt32 = 2n ** (32n - 1n) - 1n
+export const maxInt40 = 2n ** (40n - 1n) - 1n
+export const maxInt48 = 2n ** (48n - 1n) - 1n
+export const maxInt56 = 2n ** (56n - 1n) - 1n
+export const maxInt64 = 2n ** (64n - 1n) - 1n
+export const maxInt72 = 2n ** (72n - 1n) - 1n
+export const maxInt80 = 2n ** (80n - 1n) - 1n
+export const maxInt88 = 2n ** (88n - 1n) - 1n
+export const maxInt96 = 2n ** (96n - 1n) - 1n
+export const maxInt104 = 2n ** (104n - 1n) - 1n
+export const maxInt112 = 2n ** (112n - 1n) - 1n
+export const maxInt120 = 2n ** (120n - 1n) - 1n
+export const maxInt128 = 2n ** (128n - 1n) - 1n
+export const maxInt136 = 2n ** (136n - 1n) - 1n
+export const maxInt144 = 2n ** (144n - 1n) - 1n
+export const maxInt152 = 2n ** (152n - 1n) - 1n
+export const maxInt160 = 2n ** (160n - 1n) - 1n
+export const maxInt168 = 2n ** (168n - 1n) - 1n
+export const maxInt176 = 2n ** (176n - 1n) - 1n
+export const maxInt184 = 2n ** (184n - 1n) - 1n
+export const maxInt192 = 2n ** (192n - 1n) - 1n
+export const maxInt200 = 2n ** (200n - 1n) - 1n
+export const maxInt208 = 2n ** (208n - 1n) - 1n
+export const maxInt216 = 2n ** (216n - 1n) - 1n
+export const maxInt224 = 2n ** (224n - 1n) - 1n
+export const maxInt232 = 2n ** (232n - 1n) - 1n
+export const maxInt240 = 2n ** (240n - 1n) - 1n
+export const maxInt248 = 2n ** (248n - 1n) - 1n
+export const maxInt256 = 2n ** (256n - 1n) - 1n
 
-export const minInt8 = -(2n ** 8n)
-export const minInt16 = -(2n ** 16n)
-export const minInt24 = -(2n ** 24n)
-export const minInt32 = -(2n ** 32n)
-export const minInt40 = -(2n ** 40n)
-export const minInt48 = -(2n ** 48n)
-export const minInt56 = -(2n ** 56n)
-export const minInt64 = -(2n ** 64n)
-export const minInt72 = -(2n ** 72n)
-export const minInt80 = -(2n ** 80n)
-export const minInt88 = -(2n ** 88n)
-export const minInt96 = -(2n ** 96n)
-export const minInt104 = -(2n ** 104n)
-export const minInt112 = -(2n ** 112n)
-export const minInt120 = -(2n ** 120n)
-export const minInt128 = -(2n ** 128n)
-export const minInt136 = -(2n ** 136n)
-export const minInt144 = -(2n ** 144n)
-export const minInt152 = -(2n ** 152n)
-export const minInt160 = -(2n ** 160n)
-export const minInt168 = -(2n ** 168n)
-export const minInt176 = -(2n ** 176n)
-export const minInt184 = -(2n ** 184n)
-export const minInt192 = -(2n ** 192n)
-export const minInt200 = -(2n ** 200n)
-export const minInt208 = -(2n ** 208n)
-export const minInt216 = -(2n ** 216n)
-export const minInt224 = -(2n ** 224n)
-export const minInt232 = -(2n ** 232n)
-export const minInt240 = -(2n ** 240n)
-export const minInt248 = -(2n ** 248n)
-export const minInt256 = -(2n ** 256n)
+export const minInt8 = -(2n ** (8n - 1n))
+export const minInt16 = -(2n ** (16n - 1n))
+export const minInt24 = -(2n ** (24n - 1n))
+export const minInt32 = -(2n ** (32n - 1n))
+export const minInt40 = -(2n ** (40n - 1n))
+export const minInt48 = -(2n ** (48n - 1n))
+export const minInt56 = -(2n ** (56n - 1n))
+export const minInt64 = -(2n ** (64n - 1n))
+export const minInt72 = -(2n ** (72n - 1n))
+export const minInt80 = -(2n ** (80n - 1n))
+export const minInt88 = -(2n ** (88n - 1n))
+export const minInt96 = -(2n ** (96n - 1n))
+export const minInt104 = -(2n ** (104n - 1n))
+export const minInt112 = -(2n ** (112n - 1n))
+export const minInt120 = -(2n ** (120n - 1n))
+export const minInt128 = -(2n ** (128n - 1n))
+export const minInt136 = -(2n ** (136n - 1n))
+export const minInt144 = -(2n ** (144n - 1n))
+export const minInt152 = -(2n ** (152n - 1n))
+export const minInt160 = -(2n ** (160n - 1n))
+export const minInt168 = -(2n ** (168n - 1n))
+export const minInt176 = -(2n ** (176n - 1n))
+export const minInt184 = -(2n ** (184n - 1n))
+export const minInt192 = -(2n ** (192n - 1n))
+export const minInt200 = -(2n ** (200n - 1n))
+export const minInt208 = -(2n ** (208n - 1n))
+export const minInt216 = -(2n ** (216n - 1n))
+export const minInt224 = -(2n ** (224n - 1n))
+export const minInt232 = -(2n ** (232n - 1n))
+export const minInt240 = -(2n ** (240n - 1n))
+export const minInt248 = -(2n ** (248n - 1n))
+export const minInt256 = -(2n ** (256n - 1n))
 
-export const maxUint8 = 2n ** 8n
-export const maxUint16 = 2n ** 16n
-export const maxUint24 = 2n ** 24n
-export const maxUint32 = 2n ** 32n
-export const maxUint40 = 2n ** 40n
-export const maxUint48 = 2n ** 48n
-export const maxUint56 = 2n ** 56n
-export const maxUint64 = 2n ** 64n
-export const maxUint72 = 2n ** 72n
-export const maxUint80 = 2n ** 80n
-export const maxUint88 = 2n ** 88n
-export const maxUint96 = 2n ** 96n
-export const maxUint104 = 2n ** 104n
-export const maxUint112 = 2n ** 112n
-export const maxUint120 = 2n ** 120n
-export const maxUint128 = 2n ** 128n
-export const maxUint136 = 2n ** 136n
-export const maxUint144 = 2n ** 144n
-export const maxUint152 = 2n ** 152n
-export const maxUint160 = 2n ** 160n
-export const maxUint168 = 2n ** 168n
-export const maxUint176 = 2n ** 176n
-export const maxUint184 = 2n ** 184n
-export const maxUint192 = 2n ** 192n
-export const maxUint200 = 2n ** 200n
-export const maxUint208 = 2n ** 208n
-export const maxUint216 = 2n ** 216n
-export const maxUint224 = 2n ** 224n
-export const maxUint232 = 2n ** 232n
-export const maxUint240 = 2n ** 240n
-export const maxUint248 = 2n ** 248n
-export const maxUint256 = 2n ** 256n
+export const maxUint8 = 2n ** 8n - 1n
+export const maxUint16 = 2n ** 16n - 1n
+export const maxUint24 = 2n ** 24n - 1n
+export const maxUint32 = 2n ** 32n - 1n
+export const maxUint40 = 2n ** 40n - 1n
+export const maxUint48 = 2n ** 48n - 1n
+export const maxUint56 = 2n ** 56n - 1n
+export const maxUint64 = 2n ** 64n - 1n
+export const maxUint72 = 2n ** 72n - 1n
+export const maxUint80 = 2n ** 80n - 1n
+export const maxUint88 = 2n ** 88n - 1n
+export const maxUint96 = 2n ** 96n - 1n
+export const maxUint104 = 2n ** 104n - 1n
+export const maxUint112 = 2n ** 112n - 1n
+export const maxUint120 = 2n ** 120n - 1n
+export const maxUint128 = 2n ** 128n - 1n
+export const maxUint136 = 2n ** 136n - 1n
+export const maxUint144 = 2n ** 144n - 1n
+export const maxUint152 = 2n ** 152n - 1n
+export const maxUint160 = 2n ** 160n - 1n
+export const maxUint168 = 2n ** 168n - 1n
+export const maxUint176 = 2n ** 176n - 1n
+export const maxUint184 = 2n ** 184n - 1n
+export const maxUint192 = 2n ** 192n - 1n
+export const maxUint200 = 2n ** 200n - 1n
+export const maxUint208 = 2n ** 208n - 1n
+export const maxUint216 = 2n ** 216n - 1n
+export const maxUint224 = 2n ** 224n - 1n
+export const maxUint232 = 2n ** 232n - 1n
+export const maxUint240 = 2n ** 240n - 1n
+export const maxUint248 = 2n ** 248n - 1n
+export const maxUint256 = 2n ** 256n - 1n

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.5.4'
+export const version = '1.6.3'

package/src/index.ts

@@ -597,6 +597,7 @@ export type {
 } from './types/chain.js'
 export type {
   AddEthereumChainParameter,
+  EIP1193EventMap,
   EIP1193Events,
   EIP1193Parameters,
   EIP1193Provider,
@@ -633,6 +634,7 @@ export type { GetTransportConfig } from './types/transport.js'
 export type { HDKey } from '@scure/bip32'
 export type { Log } from './types/log.js'
 export type {
+  MulticallContract,
   MulticallContracts,
   MulticallResult,
   MulticallResults,

package/src/types/eip1193.ts

@@ -51,7 +51,7 @@ export type ProviderMessage = {
   data: unknown
 }
 
-type EIP1193EventMap = {
+export type EIP1193EventMap = {
   accountsChanged(accounts: Address[]): void
   chainChanged(chainId: string): void
   connect(connectInfo: ProviderConnectInfo): void

package/src/types/multicall.ts

@@ -1,4 +1,4 @@
-import type { Abi } from 'abitype'
+import type { Abi, ExtractAbiFunctionNames } from 'abitype'
 
 import type {
   ContractFunctionConfig,
@@ -7,13 +7,16 @@ import type {
 
 type MAXIMUM_DEPTH = 20
 
-export type Contract<
+export type MulticallContract<
   TAbi extends Abi | readonly unknown[] = Abi | readonly unknown[],
-  TFunctionName extends string = string,
+  TFunctionName extends ExtractAbiFunctionNames<
+    TAbi extends Abi ? TAbi : Abi,
+    'pure' | 'view'
+  > = string,
 > = { abi: TAbi; functionName: TFunctionName }
 
 export type MulticallContracts<
-  TContracts extends Contract[],
+  TContracts extends readonly MulticallContract[],
   TProperties extends Record<string, any> = object,
   Result extends any[] = [],
   Depth extends readonly number[] = [],
@@ -21,14 +24,14 @@ export type MulticallContracts<
   ? (ContractFunctionConfig & TProperties)[]
   : TContracts extends []
   ? []
-  : TContracts extends [infer Head extends Contract]
+  : TContracts extends [infer Head extends MulticallContract]
   ? [
       ...Result,
       ContractFunctionConfig<Head['abi'], Head['functionName']> & TProperties,
     ]
   : TContracts extends [
-      infer Head extends Contract,
-      ...infer Tail extends Contract[],
+      infer Head extends MulticallContract,
+      ...infer Tail extends readonly MulticallContract[],
     ]
   ? MulticallContracts<
       [...Tail],
@@ -65,7 +68,7 @@ export type MulticallResult<
   : Result
 
 export type MulticallResults<
-  TContracts extends Contract[],
+  TContracts extends readonly MulticallContract[],
   TAllowFailure extends boolean = true,
   Result extends any[] = [],
   Depth extends readonly number[] = [],
@@ -73,7 +76,7 @@ export type MulticallResults<
   ? MulticallResult<ContractFunctionResult, TAllowFailure>[]
   : TContracts extends []
   ? []
-  : TContracts extends [infer Head extends Contract]
+  : TContracts extends [infer Head extends MulticallContract]
   ? [
       ...Result,
       MulticallResult<
@@ -82,8 +85,8 @@ export type MulticallResults<
       >,
     ]
   : TContracts extends [
-      infer Head extends Contract,
-      ...infer Tail extends Contract[],
+      infer Head extends MulticallContract,
+      ...infer Tail extends readonly MulticallContract[],
     ]
   ? MulticallResults<
       [...Tail],

package/src/types/typedData.ts

@@ -1,5 +1,4 @@
 import type {
-  Narrow,
   TypedData,
   TypedDataDomain,
   TypedDataToPrimitiveTypes,
@@ -74,8 +73,8 @@ export type GetTypedDataTypes<
   TPrimaryType extends string = string,
 > = TPrimaryType extends 'EIP712Domain'
   ? {
-      types?: Narrow<TTypedData>
+      types?: TTypedData
     }
   : {
-      types: Narrow<TTypedData>
+      types: TTypedData
     }