chore: remove runner as contract parameter

packages/protocol-kit/src/contracts/BaseContract.ts

@@ -70,8 +70,7 @@ class BaseContract<ContractAbiType extends Abi> {
  defaultAbi: ContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: ContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: ContractAbiType
  ) {
  const deployment = getContractDeployment(safeVersion, chainId, contractName)
 
@@ -94,7 +93,7 @@ class BaseContract<ContractAbiType extends Abi> {
  (deployment?.abi as unknown as ContractAbiType) || // this cast is required because abi is set as any[] in safe-deployments
  defaultAbi // if no customAbi and no abi is present in the safe-deployments we use our hardcoded abi
 
- this.runner = runner || safeProvider.getExternalProvider()
+ this.runner = safeProvider.getExternalProvider()
  this.safeProvider = safeProvider
  }
 

packages/protocol-kit/src/contracts/CompatibilityFallbackHandler/CompatibilityFallbackHandlerBaseContract.ts

@@ -4,7 +4,6 @@ import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import { SafeVersion } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * Abstract class CompatibilityFallbackHandlerBaseContract extends BaseContract to specifically integrate with the CompatibilityFallbackHandler contract.
@@ -41,8 +40,7 @@ abstract class CompatibilityFallbackHandlerBaseContract<
  defaultAbi: CompatibilityFallbackHandlerContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: CompatibilityFallbackHandlerContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: CompatibilityFallbackHandlerContractAbiType
  ) {
  const contractName = 'compatibilityFallbackHandler'
 
@@ -53,8 +51,7 @@ abstract class CompatibilityFallbackHandlerBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName

packages/protocol-kit/src/contracts/CreateCall/CreateCallBaseContract.ts

@@ -4,7 +4,6 @@ import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import { SafeVersion } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * Abstract class CreateCallBaseContract extends BaseContract to specifically integrate with the CreateCall contract.
@@ -41,8 +40,7 @@ abstract class CreateCallBaseContract<
  defaultAbi: CreateCallContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: CreateCallContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: CreateCallContractAbiType
  ) {
  const contractName = 'createCallVersion'
 
@@ -53,8 +51,7 @@ abstract class CreateCallBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName

packages/protocol-kit/src/contracts/Safe/v1.0.0/SafeContract_v1_0_0.ts

@@ -317,7 +317,7 @@ class SafeContract_v1_0_0
  options
  ))
 
- const converted = await this.convertOptions({ ...options, gasLimit })
+ const converted = this.convertOptions({ ...options, gasLimit })
  const txResult = await simulateContract(this.runner, {
  address: this.contractAddress,
  functionName: 'execTransaction',

packages/protocol-kit/src/contracts/Safe/v1.1.1/SafeContract_v1_1_1.ts

@@ -281,7 +281,7 @@ class SafeContract_v1_1_1
  options
  ))
 
- const converted = await this.convertOptions({ ...options, gasLimit })
+ const converted = this.convertOptions({ ...options, gasLimit })
  const txResult = await simulateContract(this.runner, {
  address: this.contractAddress,
  functionName: 'execTransaction',

packages/protocol-kit/src/contracts/Safe/v1.2.0/SafeContract_v1_2_0.ts

@@ -282,7 +282,7 @@ class SafeContract_v1_2_0
  options
  ))
 
- const converted = await this.convertOptions({ ...options, gasLimit })
+ const converted = this.convertOptions({ ...options, gasLimit })
  const txResult = await simulateContract(this.runner, {
  address: this.contractAddress,
  functionName: 'execTransaction',

packages/protocol-kit/src/contracts/Safe/v1.3.0/SafeContract_v1_3_0.ts

@@ -214,7 +214,7 @@ class SafeContract_v1_3_0
  options
  ))
 
- const converted = await this.convertOptions({ ...options, gasLimit })
+ const converted = this.convertOptions({ ...options, gasLimit })
  const txResult = await simulateContract(this.runner, {
  address: this.contractAddress,
  functionName: 'execTransaction',

packages/protocol-kit/src/contracts/Safe/v1.4.1/SafeContract_v1_4_1.ts

@@ -214,7 +214,7 @@ class SafeContract_v1_4_1
  options
  ))
 
- const converted = await this.convertOptions({ ...options, gasLimit })
+ const converted = this.convertOptions({ ...options, gasLimit })
  const txResult = await simulateContract(this.runner, {
  address: this.contractAddress,
  functionName: 'execTransaction',

packages/protocol-kit/src/contracts/SafeProxyFactory/SafeProxyFactoryBaseContract.ts

@@ -7,7 +7,6 @@ import {
  CreateProxyProps as CreateProxyPropsGeneral
 } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 export interface CreateProxyProps extends CreateProxyPropsGeneral {
  options?: TransactionOptions
@@ -51,8 +50,7 @@ abstract class SafeProxyFactoryBaseContract<
  defaultAbi: SafeProxyFactoryContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: SafeProxyFactoryContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: SafeProxyFactoryContractAbiType
  ) {
  const contractName = 'safeProxyFactoryVersion'
 
@@ -63,8 +61,7 @@ abstract class SafeProxyFactoryBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName

packages/protocol-kit/src/contracts/SafeProxyFactory/v1.0.0/SafeProxyFactoryContract_v1_0_0.ts

@@ -11,7 +11,6 @@ import {
 } from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * SafeProxyFactoryContract_v1_0_0 is the implementation specific to the Safe Proxy Factory contract version 1.0.0.
@@ -37,21 +36,12 @@ class SafeProxyFactoryContract_v1_0_0
  chainId: bigint,
  safeProvider: SafeProvider,
  customContractAddress?: string,
- customContractAbi?: SafeProxyFactoryContract_v1_0_0_Abi,
- runner?: ExternalClient
+ customContractAbi?: SafeProxyFactoryContract_v1_0_0_Abi
  ) {
  const safeVersion = '1.0.0'
  const defaultAbi = safeProxyFactory_1_0_0_ContractArtifacts.abi
 
- super(
- chainId,
- safeProvider,
- defaultAbi,
- safeVersion,
- customContractAddress,
- customContractAbi,
- runner
- )
+ super(chainId, safeProvider, defaultAbi, safeVersion, customContractAddress, customContractAbi)
  }
 
  /**

packages/protocol-kit/src/contracts/SafeProxyFactory/v1.1.1/SafeProxyFactoryContract_v1_1_1.ts

@@ -11,7 +11,6 @@ import {
 } from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * SafeProxyFactoryContract_v1_1_1 is the implementation specific to the Safe Proxy Factory contract version 1.1.1.
@@ -37,21 +36,12 @@ class SafeProxyFactoryContract_v1_1_1
  chainId: bigint,
  safeProvider: SafeProvider,
  customContractAddress?: string,
- customContractAbi?: SafeProxyFactoryContract_v1_1_1_Abi,
- runner?: ExternalClient
+ customContractAbi?: SafeProxyFactoryContract_v1_1_1_Abi
  ) {
  const safeVersion = '1.1.1'
  const defaultAbi = safeProxyFactory_1_1_1_ContractArtifacts.abi
 
- super(
- chainId,
- safeProvider,
- defaultAbi,
- safeVersion,
- customContractAddress,
- customContractAbi,
- runner
- )
+ super(chainId, safeProvider, defaultAbi, safeVersion, customContractAddress, customContractAbi)
  }
 
  /**

packages/protocol-kit/src/contracts/SafeProxyFactory/v1.3.0/SafeProxyFactoryContract_v1_3_0.ts

@@ -11,7 +11,6 @@ import {
 } from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * SafeProxyFactoryContract_v1_3_0 is the implementation specific to the Safe Proxy Factory contract version 1.3.0.
@@ -37,21 +36,12 @@ class SafeProxyFactoryContract_v1_3_0
  chainId: bigint,
  safeProvider: SafeProvider,
  customContractAddress?: string,
- customContractAbi?: SafeProxyFactoryContract_v1_3_0_Abi,
- runner?: ExternalClient
+ customContractAbi?: SafeProxyFactoryContract_v1_3_0_Abi
  ) {
  const safeVersion = '1.3.0'
  const defaultAbi = safeProxyFactory_1_3_0_ContractArtifacts.abi
 
- super(
- chainId,
- safeProvider,
- defaultAbi,
- safeVersion,
- customContractAddress,
- customContractAbi,
- runner
- )
+ super(chainId, safeProvider, defaultAbi, safeVersion, customContractAddress, customContractAbi)
  }
 
  /**

packages/protocol-kit/src/contracts/SafeProxyFactory/v1.4.1/SafeProxyFactoryContract_v1_4_1.ts

@@ -11,7 +11,6 @@ import {
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * SafeProxyFactoryContract_v1_4_1 is the implementation specific to the Safe Proxy Factory contract version 1.4.1.
@@ -37,21 +36,12 @@ class SafeProxyFactoryContract_v1_4_1
  chainId: bigint,
  safeProvider: SafeProvider,
  customContractAddress?: string,
- customContractAbi?: SafeProxyFactoryContract_v1_4_1_Abi,
- runner?: ExternalClient
+ customContractAbi?: SafeProxyFactoryContract_v1_4_1_Abi
  ) {
  const safeVersion = '1.4.1'
  const defaultAbi = safeProxyFactory_1_4_1_ContractArtifacts.abi
 
- super(
- chainId,
- safeProvider,
- defaultAbi,
- safeVersion,
- customContractAddress,
- customContractAbi,
- runner
- )
+ super(chainId, safeProvider, defaultAbi, safeVersion, customContractAddress, customContractAbi)
  }
 
  /**

packages/protocol-kit/src/contracts/SafeWebAuthnSharedSigner/SafeWebAuthnSharedSignerBaseContract.ts

@@ -7,7 +7,6 @@ import {
  CreateProxyProps as CreateProxyPropsGeneral
 } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 export interface CreateProxyProps extends CreateProxyPropsGeneral {
  options?: TransactionOptions
@@ -47,8 +46,7 @@ abstract class SafeWebAuthnSharedSignerBaseContract<
  defaultAbi: SafeWebAuthnSharedSignerContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: SafeWebAuthnSharedSignerContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: SafeWebAuthnSharedSignerContractAbiType
  ) {
  const contractName = 'safeWebAuthnSharedSignerVersion'
 
@@ -59,8 +57,7 @@ abstract class SafeWebAuthnSharedSignerBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName

packages/protocol-kit/src/contracts/SafeWebAuthnSignerFactory/SafeWebAuthnSignerFactoryBaseContract.ts

@@ -7,7 +7,6 @@ import {
  CreateProxyProps as CreateProxyPropsGeneral
 } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 export interface CreateProxyProps extends CreateProxyPropsGeneral {
  options?: TransactionOptions
@@ -47,8 +46,7 @@ abstract class SafeWebAuthnSignerFactoryBaseContract<
  defaultAbi: SafeWebAuthnSignerFactoryContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: SafeWebAuthnSignerFactoryContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: SafeWebAuthnSignerFactoryContractAbiType
  ) {
  const contractName = 'safeWebAuthnSignerFactoryVersion'
 
@@ -59,8 +57,7 @@ abstract class SafeWebAuthnSignerFactoryBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName

packages/protocol-kit/src/contracts/SimulateTxAccessor/SimulateTxAccessorBaseContract.ts

@@ -4,7 +4,6 @@ import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import { SafeVersion } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
-import { ExternalClient } from '@safe-global/protocol-kit/types'
 
 /**
  * Abstract class SimulateTxAccessorBaseContract extends BaseContract to specifically integrate with the SimulateTxAccessor contract.
@@ -41,8 +40,7 @@ abstract class SimulateTxAccessorBaseContract<
  defaultAbi: SimulateTxAccessorContractAbiType,
  safeVersion: SafeVersion,
  customContractAddress?: string,
- customContractAbi?: SimulateTxAccessorContractAbiType,
- runner?: ExternalClient
+ customContractAbi?: SimulateTxAccessorContractAbiType
  ) {
  const contractName = 'simulateTxAccessorVersion'
 
@@ -53,8 +51,7 @@ abstract class SimulateTxAccessorBaseContract<
  defaultAbi,
  safeVersion,
  customContractAddress,
- customContractAbi,
- runner
+ customContractAbi
  )
 
  this.contractName = contractName