an attempt to fix the CI

safe-global · Mar 6, 2024 · 3f4f4b0 · 3f4f4b0
1 parent d355e21
commit 3f4f4b0
Show file tree

Hide file tree

Showing 4 changed files with 18,157 additions and 3,117 deletions.
diff --git a/modules/4337/package.json b/modules/4337/package.json
@@ -74,7 +74,7 @@
   },
   "overrides": {
     "@safe-global/safe-contracts": {
-      "ethers": "^6.8.0"
+      "ethers": "^6.11.0"
     }
   },
   "dependencies": {

diff --git a/modules/passkey/package.json b/modules/passkey/package.json
@@ -51,7 +51,7 @@
   },
   "overrides": {
     "@safe-global/safe-contracts": {
-      "ethers": "^6.8.0"
+      "ethers": "^6.11.0"
     }
   },
   "dependencies": {

diff --git a/modules/passkey/src/deploy/safe.ts b/modules/passkey/src/deploy/safe.ts
@@ -4,15 +4,16 @@ import SafeL2 from '@safe-global/safe-contracts/build/artifacts/contracts/SafeL2
 import Safe4337Module from '@safe-global/safe-erc4337/build/artifacts/contracts/Safe4337Module.sol/Safe4337Module.json'
 import SafeModuleSetup from '@safe-global/safe-erc4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
 import { DeployFunction } from 'hardhat-deploy/types'
+import { LAUNCHPAD_DEPLOYMENT_ENTRY_POINT_ADDRESS } from '../constants'
 
 const deploy: DeployFunction = async ({ deployments, getNamedAccounts, network }) => {
   if (!network.tags.safe && !network.tags.test) {
     return
   }
 
-  const entryPoint = await deployments.getOrNull('EntryPoint')
+  const entryPoint = (await deployments.getOrNull('EntryPoint').then((d) => d?.address)) || LAUNCHPAD_DEPLOYMENT_ENTRY_POINT_ADDRESS
   if (!entryPoint) {
-    throw new Error('EntryPoint is not deployed')
+    throw new Error('Entry point contract should be deployed or set in LAUNCHPAD_DEPLOYMENT_ENTRY_POINT_ADDRESS')
   }
 
   const { deployer } = await getNamedAccounts()
@@ -49,7 +50,7 @@ const deploy: DeployFunction = async ({ deployments, getNamedAccounts, network }
   await deploy('Safe4337Module', {
     from: deployer,
     contract: Safe4337Module,
-    args: [entryPoint.address],
+    args: [entryPoint],
     log: true,
     deterministicDeployment: true,
   })