Merge pull request #51 from privacy-scaling-explorations/fix/factory-arg-type

Author: ctrlc03

packages/contracts/test/sdk/deploy.test.ts

@@ -17,7 +17,7 @@ describe("deploy", () => {
             queryFilter: () => Promise.resolve([{ args: [ZeroAddress] }]),
             filters: { CloneDeployed: "CloneDeployed" },
             deploy: () => Promise.resolve({ wait: () => Promise.resolve(receipt) })
-        } as unknown as IFactoryLike<unknown[]>,
+        } as unknown as IFactoryLike,
         signer: {} as Signer,
         args: []
     }

packages/contracts/ts/deploy.ts

@@ -30,13 +30,13 @@ export const getProxyContract = async <T = BaseContract>({
  * @param args deploy proxy clone arguments
  * @returns clone contract
  */
-export const deployProxyClone = async <C = BaseContract, T = unknown[]>({
+export const deployProxyClone = async <C = BaseContract, T extends unknown[] = []>({
     factory,
     proxyFactory,
     signer,
     args
 }: IDeployCloneArgs<T>): Promise<C> => {
-    const receipt = await proxyFactory.deploy(args).then((tx) => tx.wait())
+    const receipt = await proxyFactory.deploy(...args).then((tx) => tx.wait())
 
     return getProxyContract<C>({
         factory,

packages/contracts/ts/types.ts

@@ -5,15 +5,15 @@ import type { TypedContractMethod } from "../typechain-types/common"
 /**
  * Type for the factory like contract
  */
-export type IFactoryLike<P extends unknown[] = []> = Factory &
+export type IFactoryLike = Factory &
     BaseContract & {
-        deploy: TypedContractMethod<P, [], "nonpayable">
+        deploy: TypedContractMethod<unknown[], unknown, "nonpayable">
     }
 
 /**
  * Interface that represents deploy clone arguments
  */
-export interface IDeployCloneArgs<T = unknown[]> {
+export interface IDeployCloneArgs<T extends unknown[] = unknown[]> {
     /**
      * Arguments for clone initialization
      */
@@ -27,7 +27,7 @@ export interface IDeployCloneArgs<T = unknown[]> {
     /**
      * Proxy contract factory
      */
-    proxyFactory: IFactoryLike<T[]>
+    proxyFactory: IFactoryLike
 
     /**
      * Ethereum signer