From 966176692d17d18bacf0370a77b43bf628fc6e29 Mon Sep 17 00:00:00 2001
From: Antonio Morrone <antonio@iovlabs.org>
Date: Fri, 21 Oct 2022 15:15:24 +0200
Subject: [PATCH] build: fix tsc errors and disable eslint on some lines

---
 scripts/deploy.ts                    |  2 +-
 utils/deployment/deployment.utils.ts | 12 +++++++++++-
 utils/scripts/types.ts               |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
index 40368d25..eee3feff 100644
--- a/scripts/deploy.ts
+++ b/scripts/deploy.ts
@@ -39,7 +39,7 @@ export const updateConfig = (
 
   return {
     ...getExistingConfig(),
-    contractAddresses,
+    [`${network}.${chainId}`]: contractAddresses,
   };
 };
 
diff --git a/utils/deployment/deployment.utils.ts b/utils/deployment/deployment.utils.ts
index 6fdc0972..00d25a32 100644
--- a/utils/deployment/deployment.utils.ts
+++ b/utils/deployment/deployment.utils.ts
@@ -1,8 +1,10 @@
 import {
   Contract as Contract,
   ContractFactory as EthersContractFactory,
+  Signer,
 } from 'ethers/lib/ethers';
 import { ethers } from 'hardhat';
+import { FactoryOptions } from 'hardhat/types';
 
 export interface ContractFactory<C extends Contract>
   extends EthersContractFactory {
@@ -11,6 +13,7 @@ export interface ContractFactory<C extends Contract>
 
 export type DeployerParam<
   C extends Contract,
+  // eslint-disable-next-line @typescript-eslint/ban-types
   A extends {} = ContractFactory<C>['deploy']
 > = {
   contractName: string;
@@ -18,13 +21,19 @@ export type DeployerParam<
   contractFactory?: ContractFactory<C>;
 };
 
+type ContractFactoryOpt = {
+  contractName: string,
+  signerOrOptions?: Signer | FactoryOptions
+}
+
+
 export const getContractFactory = async <
   C extends Contract,
   F extends ContractFactory<C>
 >({
   contractName,
   signerOrOptions,
-}: typeof ethers.getContractFactory.arguments) =>
+}: ContractFactoryOpt) =>
   ethers.getContractFactory(contractName, signerOrOptions) as Promise<F>;
 
 export type DeployerReturnType<C extends Contract> = Promise<{
@@ -34,6 +43,7 @@ export type DeployerReturnType<C extends Contract> = Promise<{
 
 export const deployContract = async <
   C extends Contract,
+  // eslint-disable-next-line @typescript-eslint/ban-types
   A extends {} = ContractFactory<C>['deploy']
 >({
   contractName,
diff --git a/utils/scripts/types.ts b/utils/scripts/types.ts
index 4b8e7ab3..c5a49878 100644
--- a/utils/scripts/types.ts
+++ b/utils/scripts/types.ts
@@ -9,7 +9,7 @@ const factoryList = {
   } as const;
   
   export type FactoryName = Exclude<Extract<keyof typeof factoryList, `${string}__factory`>,
-    'Migrations__factory'>;
+    'Migrations__factory' | 'Collector__factory' | 'Ownable__factory'>;
   
   export type ContractName = FactoryName extends `${infer Prefix}__factory`
     ? Prefix