Add ABI properties to ContractNetworkConfig

packages/safe-core-sdk/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryEthersContract.ts

@@ -1,4 +1,4 @@
-import { ContractTransaction, Event } from '@ethersproject/contracts'
+import { Event } from '@ethersproject/contracts'
 import { ProxyFactory as ProxyFactory_V1_1_1 } from '../../../typechain/src/ethers-v5/v1.1.1/ProxyFactory'
 import { ProxyFactory as ProxyFactory_V1_3_0 } from '../../../typechain/src/ethers-v5/v1.3.0/ProxyFactory'
 import GnosisSafeProxyFactoryContract, { CreateProxyProps } from './GnosisSafeProxyFactoryContract'

packages/safe-core-sdk/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts

@@ -1,4 +1,4 @@
-import { PromiEvent, TransactionReceipt } from 'web3-core/types'
+import { TransactionReceipt } from 'web3-core/types'
 import { ProxyFactory as ProxyFactory_V1_1_1 } from '../../../typechain/src/web3-v1/v1.1.1/proxy_factory'
 import { ProxyFactory as ProxyFactory_V1_3_0 } from '../../../typechain/src/web3-v1/v1.3.0/proxy_factory'
 import GnosisSafeProxyFactoryContract, { CreateProxyProps } from './GnosisSafeProxyFactoryContract'

packages/safe-core-sdk/src/managers/contractManager.ts

@@ -28,36 +28,39 @@ class ContractManager {
     contractNetworks
   }: SafeConfig): Promise<void> {
     const chainId = await ethAdapter.getChainId()
+    const customContracts = contractNetworks?.[chainId]
+    this.#contractNetworks = contractNetworks
     const temporarySafeContract = ethAdapter.getSafeContract({
       safeVersion: SAFE_LAST_VERSION,
       chainId,
       isL1SafeMasterCopy,
-      customContractAddress: safeAddress
+      customContractAddress: safeAddress,
+      customContractAbi: customContracts?.safeMasterCopyAbi
     })
     if ((await ethAdapter.getContractCode(temporarySafeContract.getAddress())) === '0x') {
       throw new Error('Safe Proxy contract is not deployed in the current network')
     }
     const safeVersion = (await temporarySafeContract.getVersion()) as SafeVersion
 
-    const customContracts = contractNetworks?.[chainId]
-    this.#contractNetworks = contractNetworks
     this.#isL1SafeMasterCopy = isL1SafeMasterCopy
     const safeContract = ethAdapter.getSafeContract({
       safeVersion,
       chainId,
       isL1SafeMasterCopy,
-      customContractAddress: safeAddress
+      customContractAddress: safeAddress,
+      customContractAbi: customContracts?.safeMasterCopyAbi
     })
     if ((await ethAdapter.getContractCode(safeContract.getAddress())) === '0x') {
       throw new Error('Safe Proxy contract is not deployed in the current network')
     }
     this.#safeContract = safeContract
 
-    const multiSendContract = await ethAdapter.getMultiSendContract(
+    const multiSendContract = await ethAdapter.getMultiSendContract({
       safeVersion,
       chainId,
-      customContracts?.multiSendAddress
-    )
+      customContractAddress: customContracts?.multiSendAddress,
+      customContractAbi: customContracts?.multiSendAbi
+    })
     if ((await ethAdapter.getContractCode(multiSendContract.getAddress())) === '0x') {
       throw new Error('Multi Send contract is not deployed in the current network')
     }

packages/safe-core-sdk/src/safeFactory/index.ts

@@ -75,11 +75,12 @@ class SafeFactory {
     this.#contractNetworks = contractNetworks
     const chainId = await this.#ethAdapter.getChainId()
     const customContracts = contractNetworks?.[chainId]
-    const safeProxyFactoryContract = await ethAdapter.getSafeProxyFactoryContract(
-      this.#safeVersion,
+    const safeProxyFactoryContract = await ethAdapter.getSafeProxyFactoryContract({
+      safeVersion: this.#safeVersion,
       chainId,
-      customContracts?.safeProxyFactoryAddress
-    )
+      customContractAddress: customContracts?.safeProxyFactoryAddress,
+      customContractAbi: customContracts?.safeProxyFactoryAbi
+    })
     if ((await this.#ethAdapter.getContractCode(safeProxyFactoryContract.getAddress())) === '0x') {
       throw new Error('Safe Proxy Factory contract is not deployed in the current network')
     }
@@ -89,7 +90,8 @@ class SafeFactory {
       safeVersion: this.#safeVersion,
       chainId,
       isL1SafeMasterCopy,
-      customContractAddress: customContracts?.safeMasterCopyAddress
+      customContractAddress: customContracts?.safeMasterCopyAddress,
+      customContractAbi: customContracts?.safeMasterCopyAbi
     })
     if ((await this.#ethAdapter.getContractCode(gnosisSafeContract.getAddress())) === '0x') {
       throw new Error('Safe Proxy contract is not deployed in the current network')

packages/safe-core-sdk/src/types/index.ts

@@ -28,10 +28,16 @@ export interface AbiItem {
 export interface ContractNetworkConfig {
   /** multiSendAddress - Address of the MultiSend contract deployed on a specific network */
   multiSendAddress: string
+  /** multiSendAbi - Abi of the MultiSend contract deployed on a specific network */
+  multiSendAbi?: AbiItem[]
   /** safeMasterCopyAddress - Address of the Gnosis Safe Master Copy contract deployed on a specific network */
   safeMasterCopyAddress: string
+  /** safeMasterCopyAbi - Abi of the Gnosis Safe Master Copy contract deployed on a specific network */
+  safeMasterCopyAbi?: AbiItem[]
   /** safeProxyFactoryAddress - Address of the Gnosis Safe Proxy Factory contract deployed on a specific network */
   safeProxyFactoryAddress: string
+  /** safeProxyFactoryAbi - Abi of the Gnosis Safe Proxy Factory contract deployed on a specific network */
+  safeProxyFactoryAbi?: AbiItem[]
 }
 
 export interface ContractNetworksConfig {