refactor: integrate IErrandManager into Errantry and ErrantryClientSm…

…artAccount
curiousity-labs · Dec 29, 2024 · aca58ca · aca58ca
1 parent d2bc670
commit aca58ca
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/contracts/src/Errantry.sol b/contracts/src/Errantry.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 import {IErrantry} from "./interfaces/IErrantry.sol";
+import {IErrandManager} from "./interfaces/IErrandManager.sol";
 import {ErrandManager} from "./ErrandManager.sol";
-import {Lib} from "./libraries/Lib.sol";
 import {ErrantryClientSmartAccount} from "./ErrantryClientSmartAccount.sol";
+import {Lib} from "./libraries/Lib.sol";
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "@account-abstraction/contracts/interfaces/PackedUserOperation.sol";
 import "./OnlyOracle.sol";
@@ -54,12 +55,14 @@ contract Errantry is IErrantry, OnlyOracle {
         if (clients[clientAddress].client != address(0)) {
             revert ClientAlreadyRegistered();
         }
+        IErrandManager errandManager = new ErrandManager();
         clients[msg.sender] = Lib.Client({
             client: msg.sender,
-            errandManager: new ErrandManager(),
+            errandManager: errandManager,
             smartAccount: new ErrantryClientSmartAccount(
                 SA_ENTRY_POINT,
-                TRUSTED_ORACLE
+                TRUSTED_ORACLE,
+                errandManager
             )
         });
 

diff --git a/contracts/src/ErrantryClientSmartAccount.sol b/contracts/src/ErrantryClientSmartAccount.sol
@@ -2,13 +2,17 @@
 pragma solidity ^0.8.28;
 
 import {SimpleAccount, IEntryPoint, PackedUserOperation, SIG_VALIDATION_SUCCESS} from "@account-abstraction/contracts/samples/SimpleAccount.sol";
-import {OnlyOracle} from "./OnlyOracle.sol";
+import {IErrantryClientSmartAccount} from "./interfaces/IErrantryClientSmartAccount.sol";
+import {IErrandManager} from "./interfaces/IErrandManager.sol";
 
-contract ErrantryClientSmartAccount is SimpleAccount, OnlyOracle {
+contract ErrantryClientSmartAccount is IErrantryClientSmartAccount {
     constructor(
         IEntryPoint _entryPoint,
-        address _trustedOracle
-    ) SimpleAccount(_entryPoint) OnlyOracle(_trustedOracle) {}
+        address _trustedOracle,
+        IErrandManager _errandManager
+    )
+        IErrantryClientSmartAccount(_entryPoint, _trustedOracle, _errandManager)
+    {}
 
     /* >>>>>>>> general external functions <<<<<<< */
     function _validateSignature(

diff --git a/contracts/src/interfaces/IErrantryClientSmartAccount.sol b/contracts/src/interfaces/IErrantryClientSmartAccount.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import {SimpleAccount, IEntryPoint} from "@account-abstraction/contracts/samples/SimpleAccount.sol";
+import {OnlyOracle} from "../OnlyOracle.sol";
+import {IErrandManager} from "./IErrandManager.sol";
+
+abstract contract IErrantryClientSmartAccount is SimpleAccount, OnlyOracle {
+    IErrandManager private ERRAND_MANAGER;
+
+    constructor(
+        IEntryPoint _entryPoint,
+        address _trustedOracle,
+        IErrandManager _errandManager
+    ) SimpleAccount(_entryPoint) OnlyOracle(_trustedOracle) {
+        ERRAND_MANAGER = _errandManager;
+    }
+}
diff --git a/contracts/src/libraries/Lib.sol b/contracts/src/libraries/Lib.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 import {IErrandManager} from "../interfaces/IErrandManager.sol";
-import {ErrantryClientSmartAccount} from "../ErrantryClientSmartAccount.sol";
+import {IErrantryClientSmartAccount} from "../interfaces/IErrantryClientSmartAccount.sol";
 
 library Lib {
     struct NewClientParams {
@@ -11,7 +11,7 @@ library Lib {
     struct Client {
         address client;
         IErrandManager errandManager;
-        ErrantryClientSmartAccount smartAccount;
+        IErrantryClientSmartAccount smartAccount;
     }
 
     // we are going to restrict this to a single stablecoin for now