fixed multicall

Author: kolirt

lib/actions/multicall.ts

@@ -1,9 +1,13 @@
-import { type MulticallConfig, multicall as masterMulticall } from '@wagmi/core'
+import { multicall as masterMulticall } from '@wagmi/core'
+import { type ContractFunctionConfig, type MulticallParameters } from 'viem'
 
-import type { MulticallArgs, Writeable } from '../types'
+import type { MulticallArgs } from '../types'
 
-export async function multicall(params: MulticallArgs) {
-  const contracts: Writeable<MulticallConfig['contracts']> = []
+export async function multicall<TContracts extends ContractFunctionConfig[], TAllowFailure extends boolean = true>(
+  params: MulticallArgs<TAllowFailure>
+) {
+  // @ts-ignore
+  const contracts: TContracts = [] as TContracts
 
   params.calls.forEach((item) => {
     item.calls.forEach(([functionName, args]) => {
@@ -16,9 +20,9 @@ export async function multicall(params: MulticallArgs) {
     })
   })
 
-  return await masterMulticall({
+  return await masterMulticall<TContracts, TAllowFailure>({
     chainId: params.chainId,
-    contracts,
+    contracts: contracts as MulticallParameters<TContracts, TAllowFailure>['contracts'],
     multicallAddress: params.multicallAddress,
     blockTag: params.blockTag,
     blockNumber: params.blockNumber,

lib/types.ts

@@ -64,12 +64,12 @@ export type MulticallContract = {
   calls: [string, Array<any>?][]
 }
 
-export type MulticallArgs = {
+export type MulticallArgs<TAllowFailure extends boolean = true> = {
   chainId?: number
   calls: MulticallContract[]
   multicallAddress?: `0x${string}`
   batchSize?: number
-  allowFailure?: boolean
+  allowFailure?: TAllowFailure
 } & (
   | {
       blockNumber?: bigint
@@ -174,5 +174,3 @@ export type SendTransaction = {
   value?: bigint
   confirmations?: number
 }
-
-export type Writeable<T> = { -readonly [P in keyof T]: T[P] }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kolirt/vue-web3-auth",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Web3 authentication for Vue3 apps based on WalletConnect Web3Modal v2",
   "author": "kolirt",
   "license": "MIT",

src/App.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue'
 
-import type { Chain } from '../lib'
 import {
   $off,
   $on,
+  type Chain,
   Events,
   account,
   accountDetails,