fix: writeContract parameter compat with prepareWriteContract (#2589

) fix: writeContract parameters
wevm · Jun 21, 2023 · 9680c34 · 9680c34
1 parent 9ecad6d
commit 9680c34
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.changeset/tidy-dodos-enjoy.md b/.changeset/tidy-dodos-enjoy.md
@@ -0,0 +1,6 @@
+---
+"@wagmi/core": patch
+"wagmi": patch
+---
+
+Fixed `writeContract` parameters to be compatible with `prepareWriteContract`.
diff --git a/packages/core/src/actions/contracts/writeContract.test.ts b/packages/core/src/actions/contracts/writeContract.test.ts
@@ -51,13 +51,13 @@ describe('writeContract', () => {
 
       it('prepared', async () => {
         await connect({ connector })
-        const { request } = await prepareWriteContract({
+        const config = await prepareWriteContract({
           ...wagmiContractConfig,
           functionName: 'mint',
           args: [getRandomTokenId()],
           account,
         })
-        const { hash } = await writeContract(request)
+        const { hash } = await writeContract(config)
         const { from } = await getPublicClient().getTransaction({ hash })
         expect(from).toEqual(account)
       })

diff --git a/packages/core/src/actions/contracts/writeContract.ts b/packages/core/src/actions/contracts/writeContract.ts
@@ -17,10 +17,11 @@ export type WriteContractMode = 'prepared' | undefined
 export type WriteContractPreparedArgs<
   TAbi extends Abi | readonly unknown[] = readonly unknown[],
   TFunctionName extends string = string,
-> = WriteContractParameters<TAbi, TFunctionName, Chain, Account> & {
-  mode: 'prepared'
+> = {
   /** Chain id. */
   chainId?: number
+  mode: 'prepared'
+  request: WriteContractParameters<TAbi, TFunctionName, Chain, Account>
 }
 
 export type WriteContractUnpreparedArgs<
@@ -30,9 +31,9 @@ export type WriteContractUnpreparedArgs<
   WriteContractParameters<TAbi, TFunctionName, Chain, Account>,
   'chain'
 > & {
-  mode?: never
   /** Chain id. */
   chainId?: number
+  mode?: never
 }
 
 export type WriteContractArgs<
@@ -74,7 +75,7 @@ export async function writeContract<
 
   let request: WriteContractParameters<TAbi, TFunctionName, Chain, Account>
   if (config.mode === 'prepared') {
-    request = config
+    request = config.request
   } else {
     const { chainId: _, mode: __, ...args } = config
     const res = await prepareWriteContract(args as PrepareWriteContractConfig)

diff --git a/packages/react/src/hooks/contracts/useContractWrite.ts b/packages/react/src/hooks/contracts/useContractWrite.ts
@@ -109,7 +109,7 @@ function mutationFn(
     if (!config.request) throw new Error('request is required')
     return writeContract({
       mode: 'prepared',
-      ...config.request,
+      request: config.request,
     })
   }