Add deploymentType to getInitCode

safe-global · Sep 25, 2024 · 421e5ea · 421e5ea
1 parent 855907c
commit 421e5ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/protocol-kit/src/contracts/BaseContract.ts b/packages/protocol-kit/src/contracts/BaseContract.ts
@@ -9,6 +9,7 @@ import {
   Chain
 } from 'viem'
 import { estimateContractGas, getTransactionReceipt } from 'viem/actions'
+import { SingletonDeployment } from '@safe-global/safe-deployments'
 import { contractName, getContractDeployment } from '@safe-global/protocol-kit/contracts/config'
 import { DeploymentType } from '@safe-global/protocol-kit/types'
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
@@ -26,7 +27,6 @@ import {
   convertTransactionOptions
 } from '@safe-global/protocol-kit/utils'
 import { ExternalClient } from '../types'
-import { SingletonDeployment } from '@safe-global/safe-deployments'
 
 /**
  * Abstract class BaseContract

diff --git a/packages/protocol-kit/src/contracts/utils.ts b/packages/protocol-kit/src/contracts/utils.ts
@@ -259,30 +259,34 @@ export async function getPredictedSafeAddressInitCode({
 
   const {
     safeVersion = DEFAULT_SAFE_VERSION,
-    saltNonce = getChainSpecificDefaultSaltNonce(chainId)
+    saltNonce = getChainSpecificDefaultSaltNonce(chainId),
+    deploymentType
   } = safeDeploymentConfig
 
   const safeProxyFactoryContract = await memoizedGetProxyFactoryContract({
     safeProvider,
     safeVersion,
     customContracts,
-    chainId: chainId.toString()
+    chainId: chainId.toString(),
+    deploymentType
   })
 
   const safeContract = await memoizedGetSafeContract({
     safeProvider,
     safeVersion,
     isL1SafeSingleton,
     customContracts,
-    chainId: chainId.toString()
+    chainId: chainId.toString(),
+    deploymentType
   })
 
   const initializer = await encodeSetupCallData({
     safeProvider,
     safeAccountConfig,
     safeContract,
     customContracts,
-    customSafeVersion: safeVersion // it is more efficient if we provide the safeVersion manually
+    customSafeVersion: safeVersion, // it is more efficient if we provide the safeVersion manually
+    deploymentType
   })
 
   const encodedNonce = safeProvider.encodeParameters('uint256', [saltNonce])