From 007024a684ddbecf924cdc06dd6a8854fc3d5eeb Mon Sep 17 00:00:00 2001 From: J M Rossy Date: Sun, 14 Jan 2024 15:53:07 -0500 Subject: [PATCH] Fix: Remove chainId param from Viem readContract calls (#3443) * Remove chainId param from viem readContract calls * Add changeset * Undo import reordering * chore: up * chore: changeset --------- Co-authored-by: Tom Meagher --- .changeset/loud-cats-sing.md | 8 ++++++++ .changeset/smelly-mouse-help.md | 5 +++++ packages/core/src/actions/getBlock.ts | 4 ++-- packages/core/src/actions/getBlockNumber.ts | 4 ++-- packages/core/src/actions/getBlockTransactionCount.ts | 4 ++-- packages/core/src/actions/getEnsAddress.ts | 4 ++-- packages/core/src/actions/getEnsAvatar.ts | 4 ++-- packages/core/src/actions/getEnsName.ts | 4 ++-- packages/core/src/actions/getEnsResolver.ts | 4 ++-- packages/core/src/actions/getFeeHistory.ts | 4 ++-- packages/core/src/actions/getTransaction.ts | 4 ++-- packages/core/src/actions/readContract.ts | 4 ++-- 12 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 .changeset/loud-cats-sing.md create mode 100644 .changeset/smelly-mouse-help.md diff --git a/.changeset/loud-cats-sing.md b/.changeset/loud-cats-sing.md new file mode 100644 index 0000000000..39a0c81585 --- /dev/null +++ b/.changeset/loud-cats-sing.md @@ -0,0 +1,8 @@ +--- +"@wagmi/connectors": patch +"create-wagmi": patch +"wagmi": patch +--- + +Bumped dependencies. + diff --git a/.changeset/smelly-mouse-help.md b/.changeset/smelly-mouse-help.md new file mode 100644 index 0000000000..546cf61859 --- /dev/null +++ b/.changeset/smelly-mouse-help.md @@ -0,0 +1,5 @@ +--- +"@wagmi/core": patch +--- + +Fixed invalid `chainId` parameter passed through actions to Viem. diff --git a/packages/core/src/actions/getBlock.ts b/packages/core/src/actions/getBlock.ts index df5dbed6c0..36cd709770 100644 --- a/packages/core/src/actions/getBlock.ts +++ b/packages/core/src/actions/getBlock.ts @@ -56,9 +56,9 @@ export async function getBlock< chainId > = {}, ): Promise> { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - const block = await viem_getBlock(client, parameters) + const block = await viem_getBlock(client, rest) return { ...(block as GetBlockReturnType< includeTransactions, diff --git a/packages/core/src/actions/getBlockNumber.ts b/packages/core/src/actions/getBlockNumber.ts index 77bdbec257..987849650e 100644 --- a/packages/core/src/actions/getBlockNumber.ts +++ b/packages/core/src/actions/getBlockNumber.ts @@ -26,7 +26,7 @@ export function getBlockNumber< config: config, parameters: GetBlockNumberParameters = {}, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getBlockNumber(client, parameters) + return viem_getBlockNumber(client, rest) } diff --git a/packages/core/src/actions/getBlockTransactionCount.ts b/packages/core/src/actions/getBlockTransactionCount.ts index 8a45b3fa95..8fdc7f90ec 100644 --- a/packages/core/src/actions/getBlockTransactionCount.ts +++ b/packages/core/src/actions/getBlockTransactionCount.ts @@ -30,7 +30,7 @@ export function getBlockTransactionCount< config: config, parameters: GetBlockTransactionCountParameters = {}, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getBlockTransactionCount(client, parameters) + return viem_getBlockTransactionCount(client, rest) } diff --git a/packages/core/src/actions/getEnsAddress.ts b/packages/core/src/actions/getEnsAddress.ts index 297976b988..e4fc44eb04 100644 --- a/packages/core/src/actions/getEnsAddress.ts +++ b/packages/core/src/actions/getEnsAddress.ts @@ -22,7 +22,7 @@ export function getEnsAddress( config: config, parameters: GetEnsAddressParameters, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getEnsAddress(client, parameters) + return viem_getEnsAddress(client, rest) } diff --git a/packages/core/src/actions/getEnsAvatar.ts b/packages/core/src/actions/getEnsAvatar.ts index a49ccedb15..af8f38a1ee 100644 --- a/packages/core/src/actions/getEnsAvatar.ts +++ b/packages/core/src/actions/getEnsAvatar.ts @@ -22,7 +22,7 @@ export function getEnsAvatar( config: config, parameters: GetEnsAvatarParameters, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getEnsAvatar(client, parameters) + return viem_getEnsAvatar(client, rest) } diff --git a/packages/core/src/actions/getEnsName.ts b/packages/core/src/actions/getEnsName.ts index fa65d89361..99ab793a84 100644 --- a/packages/core/src/actions/getEnsName.ts +++ b/packages/core/src/actions/getEnsName.ts @@ -22,7 +22,7 @@ export function getEnsName( config: config, parameters: GetEnsNameParameters, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getEnsName(client, parameters) + return viem_getEnsName(client, rest) } diff --git a/packages/core/src/actions/getEnsResolver.ts b/packages/core/src/actions/getEnsResolver.ts index 8fc36406c9..7602a20f09 100644 --- a/packages/core/src/actions/getEnsResolver.ts +++ b/packages/core/src/actions/getEnsResolver.ts @@ -22,7 +22,7 @@ export function getEnsResolver( config: config, parameters: GetEnsResolverParameters, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getEnsResolver(client, parameters) + return viem_getEnsResolver(client, rest) } diff --git a/packages/core/src/actions/getFeeHistory.ts b/packages/core/src/actions/getFeeHistory.ts index 2d6a211e6c..a891efefd2 100644 --- a/packages/core/src/actions/getFeeHistory.ts +++ b/packages/core/src/actions/getFeeHistory.ts @@ -26,7 +26,7 @@ export function getFeeHistory< config: config, parameters: GetFeeHistoryParameters, ): Promise { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getFeeHistory(client, parameters) + return viem_getFeeHistory(client, rest) } diff --git a/packages/core/src/actions/getTransaction.ts b/packages/core/src/actions/getTransaction.ts index 5c6deed438..0c941ec177 100644 --- a/packages/core/src/actions/getTransaction.ts +++ b/packages/core/src/actions/getTransaction.ts @@ -39,9 +39,9 @@ export function getTransaction< config: config, parameters: GetTransactionParameters, ): Promise> { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_getTransaction(client, parameters) as unknown as Promise< + return viem_getTransaction(client, rest) as unknown as Promise< GetTransactionReturnType > } diff --git a/packages/core/src/actions/readContract.ts b/packages/core/src/actions/readContract.ts index c581ad79bc..61880fd7d7 100644 --- a/packages/core/src/actions/readContract.ts +++ b/packages/core/src/actions/readContract.ts @@ -50,7 +50,7 @@ export function readContract< config: config, parameters: ReadContractParameters, ): Promise> { - const { chainId } = parameters + const { chainId, ...rest } = parameters const client = config.getClient({ chainId }) - return viem_readContract(client, parameters as any) + return viem_readContract(client, rest as any) }