Merge branch 'main' into feat/mint-nft-from-spc

peterferguson · Mar 17, 2024 · dba0de2 · dba0de2
2 parents 5b6b338 + 8ae4a40
commit dba0de2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
@@ -8,7 +8,7 @@ https://book.getfoundry.sh/
 | Contract              |                                                            Address                                                            | Description                                     |
 | :-------------------- | :---------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------- |
 | Add Modules Lib           | [0x58e912c126f92ccd3c6856a0d1104a30d5260e2b](https://sepolia.basescan.org/address/0x58e912c126f92ccd3c6856a0d1104a30d5260e2b#code) | Utility lib for deploying a Safe with enabled modules |
-| Onit Account Factory   | [0x5c2f5064510eddc536d07129d9bacb4cab5276a2](https://sepolia.basescan.org/address/0x5c2f5064510eddc536d07129d9bacb4cab5276a2#code) | Factory for ERC4337 Module controlled Safes               
+| Onit Account Factory   | [0x42AB880Ea77fC7A09Eb6bA0Fe82FBC9901C114b6](https://sepolia.basescan.org/address/0x42AB880Ea77fC7A09Eb6bA0Fe82FBC9901C114b6#code) | Factory for ERC4337 Module controlled Safes               
 | Example NFT   | [0x4A56fD1D63D99978FDb3aC5C152ea122514b6792](https://sepolia.basescan.org/address/0x4A56fD1D63D99978FDb3aC5C152ea122514b6792#code) | Simple NFT used in tests & demo                        |
 | 
 

diff --git a/packages/contracts/script/deploy/Safe4337FactoryDeployer.s.sol b/packages/contracts/script/deploy/Safe4337FactoryDeployer.s.sol
@@ -11,7 +11,7 @@ contract Safe4337FactoryDeployer is Script {
     // v1.4.1
     address public constant SAFE_SINGLETON_ADDRESS = 0x29fcB43b46531BcA003ddC8FCB67FFE91900C762;
     // Deployed in other script
-    address public constant ADD_MODULES_LIB_ADDRESS = 0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67;
+    address public constant ADD_MODULES_LIB_ADDRESS = 0x58E912c126F92cCD3C6856a0d1104a30D5260E2b;
     // v0.7.0
     address public constant ENTRY_POINT_ADDRESS = 0x0000000071727De22E5E9d8BAf0edAc6f37da032;
 

diff --git a/packages/contracts/src/safe-4337-module/Safe4337Module.sol b/packages/contracts/src/safe-4337-module/Safe4337Module.sol
@@ -5,6 +5,8 @@ import {BaseAccount, IEntryPoint} from "../../lib/account-abstraction/contracts/
 import {PackedUserOperation} from "../../lib/account-abstraction/contracts/interfaces/PackedUserOperation.sol";
 import {HandlerContext} from "../../lib/safe-smart-account/contracts/handler/HandlerContext.sol";
 import {WebAuthn} from "../../lib/webauthn-sol/src/WebAuthn.sol";
+import {CompatibilityFallbackHandler} from
+    "../../lib/safe-smart-account/contracts/handler/CompatibilityFallbackHandler.sol";
 
 import {ISafe} from "../interfaces/ISafe.sol";
 
@@ -21,7 +23,7 @@ import "forge-std/console.sol";
 /**
  * TODO
  */
-contract Safe4337Module is BaseAccount, HandlerContext {
+contract Safe4337Module is BaseAccount, HandlerContext, CompatibilityFallbackHandler {
     /// ----------------------------------------------------------------------------------------
     ///							ACCOUNT STORAGE
     /// ----------------------------------------------------------------------------------------