Merge pull request #911 from graphprotocol/pcv/fix-cli-wrapcalls

fix: override type in CLI to allow wrapping contract calls
graphprotocol · Jan 12, 2024 · 14785af · 14785af
2 parents 4827631 + 78bb79f
commit 14785af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/contracts/cli/contracts.ts b/packages/contracts/cli/contracts.ts
@@ -45,6 +45,10 @@ import { IL2Staking } from '../build/types/IL2Staking'
 import { Interface } from 'ethers/lib/utils'
 import { loadArtifact } from './artifacts'
 
+class WrappedContract {
+  // The meta-class properties
+  [key: string]: ContractFunction | any
+}
 export interface NetworkContracts {
   EpochManager: EpochManager
   DisputeManager: DisputeManager
@@ -160,7 +164,7 @@ function getWrappedConnect(
 // Returns a contract with wrapped calls
 // The wrapper will run the tx, wait for confirmation and log the details
 function wrapCalls(contract: Contract, contractName: string): Contract {
-  const wrappedContract = lodash.cloneDeep(contract)
+  const wrappedContract = lodash.cloneDeep(contract) as WrappedContract
 
   for (const fn of Object.keys(contract.functions)) {
     const call: ContractFunction<ContractTransaction> = contract.functions[fn]
@@ -179,7 +183,7 @@ function wrapCalls(contract: Contract, contractName: string): Contract {
     wrappedContract[fn] = override
   }
 
-  return wrappedContract
+  return wrappedContract as Contract
 }
 
 function logContractCall(

diff --git a/packages/sdk/src/deployments/lib/contracts/tx-log.ts b/packages/sdk/src/deployments/lib/contracts/tx-log.ts
@@ -11,6 +11,11 @@ import type {
 import type { Provider } from '@ethersproject/providers'
 import type { ContractParam } from '../types/contract'
 
+class WrappedContract {
+  // The meta-class properties
+  [key: string]: ContractFunction | any
+}
+
 /**
  * Modifies a contract connect function to return a contract wrapped with {@link wrapCalls}
  *
@@ -45,7 +50,7 @@ export function getWrappedConnect(
  * @returns the wrapped contract
  */
 export function wrapCalls(contract: Contract, contractName: string): Contract {
-  const wrappedContract = lodash.cloneDeep(contract)
+  const wrappedContract = lodash.cloneDeep(contract) as WrappedContract
 
   for (const fn of Object.keys(contract.functions)) {
     const call: ContractFunction<ContractTransaction> = contract.functions[fn]
@@ -60,13 +65,11 @@ export function wrapCalls(contract: Contract, contractName: string): Contract {
       return tx
     }
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
     wrappedContract[fn] = override
     wrappedContract.functions[fn] = override
   }
 
-  return wrappedContract
+  return wrappedContract as Contract
 }
 
 function logContractCall(