build: fix tsc errors and disable eslint on some lines

rsksmart · Oct 21, 2022 · 9661766 · 9661766
1 parent 2e46f9a
commit 9661766
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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,20 +13,27 @@ 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;
   constructorArgs: A;
   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
@@ -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