thirdweb-dev · codypharm · Oct 16, 2023 · Oct 17, 2023 · Oct 20, 2023 · Oct 20, 2023
diff --git a/contracts/prebuilts/account/dynamic/DynamicAccount.sol b/contracts/prebuilts/account/dynamic/DynamicAccount.sol
@@ -23,15 +23,15 @@ contract DynamicAccount is AccountCore, BaseRouter {
                     Constructor and Initializer
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
-        AccountCore(_entrypoint, msg.sender)
-        BaseRouter(_defaultExtensions)
-    {
+    constructor(
+        IEntryPoint _entrypoint,
+        Extension[] memory _defaultExtensions
+    ) AccountCore(_entrypoint, msg.sender) BaseRouter(_defaultExtensions) {
         _disableInitializers();
     }
 
     /// @notice Initializes the smart contract wallet.
-    function initialize(address _defaultAdmin, bytes calldata) public override initializer {
+    function initialize(address _defaultAdmin, bytes calldata, address _accountLock) public override initializer {
         __BaseRouter_init();
         AccountCoreStorage.data().firstAdmin = _defaultAdmin;
         _setAdmin(_defaultAdmin, true);

diff --git a/contracts/prebuilts/account/dynamic/DynamicAccountFactory.sol b/contracts/prebuilts/account/dynamic/DynamicAccountFactory.sol
@@ -26,9 +26,10 @@ contract DynamicAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, IExtension.Extension[] memory _defaultExtensions)
-        BaseAccountFactory(payable(address(new DynamicAccount(_entrypoint, _defaultExtensions))), address(_entrypoint))
-    {
+    constructor(
+        IEntryPoint _entrypoint,
+        IExtension.Extension[] memory _defaultExtensions
+    ) BaseAccountFactory(payable(address(new DynamicAccount(_entrypoint, _defaultExtensions))), address(_entrypoint)) {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
@@ -37,12 +38,8 @@ contract DynamicAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
     //////////////////////////////////////////////////////////////*/
 
     /// @dev Called in `createAccount`. Initializes the account contract created in `createAccount`.
-    function _initializeAccount(
-        address _account,
-        address _admin,
-        bytes calldata _data
-    ) internal override {
-        DynamicAccount(payable(_account)).initialize(_admin, _data);
+    function _initializeAccount(address _account, address _admin, bytes calldata _data) internal override {
+        DynamicAccount(payable(_account)).initialize(_admin, _data, address(accountLock));
     }
 
     /// @dev Returns whether contract metadata can be set in the given execution context.

diff --git a/contracts/prebuilts/account/managed/ManagedAccountFactory.sol b/contracts/prebuilts/account/managed/ManagedAccountFactory.sol
@@ -26,7 +26,10 @@ contract ManagedAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
+    constructor(
+        IEntryPoint _entrypoint,
+        Extension[] memory _defaultExtensions
+    )
         BaseRouter(_defaultExtensions)
         BaseAccountFactory(payable(address(new ManagedAccount(_entrypoint, address(this)))), address(_entrypoint))
     {
@@ -43,12 +46,8 @@ contract ManagedAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
     //////////////////////////////////////////////////////////////*/
 
     /// @dev Called in `createAccount`. Initializes the account contract created in `createAccount`.
-    function _initializeAccount(
-        address _account,
-        address _admin,
-        bytes calldata _data
-    ) internal override {
-        ManagedAccount(payable(_account)).initialize(_admin, _data);
+    function _initializeAccount(address _account, address _admin, bytes calldata _data) internal override {
+        ManagedAccount(payable(_account)).initialize(_admin, _data, address(accountLock));
     }
 
     /// @dev Returns whether all relevant permission and other checks are met before any upgrade.

diff --git a/contracts/prebuilts/account/non-upgradeable/Account.sol b/contracts/prebuilts/account/non-upgradeable/Account.sol
@@ -19,7 +19,7 @@ import "../../../eip/ERC1271.sol";
 import "../utils/Helpers.sol";
 import "../../../external-deps/openzeppelin/utils/cryptography/ECDSA.sol";
 import "../utils/BaseAccountFactory.sol";
-
+import "forge-std/console.sol";
 import { Guardian } from "../utils/Guardian.sol";
 import { AccountLock } from "../utils/AccountLock.sol";
 
@@ -37,17 +37,15 @@ contract Account is AccountCore, ContractMetadata, ERC1271, ERC721Holder, ERC115
     using EnumerableSet for EnumerableSet.AddressSet;
     bool public paused;
     Guardian guardian;
-    address accountLock;
 
-    error NotAuthorizedToLock(address locker);
+    error NotAuthorizedToLock(address locker, address accountLock);
 
     /*///////////////////////////////////////////////////////////////
                     Constructor, Initializer, Modifiers
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, address _factory, address _accountLock) AccountCore(_entrypoint, _factory) {
+    constructor(IEntryPoint _entrypoint, address _factory) AccountCore(_entrypoint, _factory) {
         paused = false;
-        accountLock = _accountLock;
     }
 
     /// @notice Checks whether the caller is the EntryPoint contract or the admin.
@@ -58,8 +56,9 @@ contract Account is AccountCore, ContractMetadata, ERC1271, ERC721Holder, ERC115
 
     /// @notice The account can be paused only by the AccountLock contract
     modifier onlyAccountLock(address locker) {
+        console.log("AccountLock address in Account.sol", accountLock);
         if (locker != accountLock) {
-            revert NotAuthorizedToLock(locker);
+            revert NotAuthorizedToLock(locker, accountLock);
         }
         _;
     }
@@ -139,6 +138,7 @@ contract Account is AccountCore, ContractMetadata, ERC1271, ERC721Holder, ERC115
 
     function setPaused(bool pauseStatus) external onlyAccountLock(msg.sender) {
         paused = pauseStatus;
+        AccountLock(accountLock).addLockAccountToList(address(this));
     }
 
     /*///////////////////////////////////////////////////////////////

diff --git a/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol b/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol
@@ -17,6 +17,8 @@ import "../interface/IEntrypoint.sol";
 import { Account } from "./Account.sol";
 import { Guardian } from "../utils/Guardian.sol";
 
+import "forge-std/console.sol";
+
 //   $$\     $$\       $$\                 $$\                         $$\
 //   $$ |    $$ |      \__|                $$ |                        $$ |
 // $$$$$$\   $$$$$$$\  $$\  $$$$$$\   $$$$$$$ |$$\  $$\  $$\  $$$$$$\  $$$$$$$\
@@ -33,7 +35,7 @@ contract AccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnum
 
     constructor(
         IEntryPoint _entrypoint
-    ) BaseAccountFactory(address(new Account(_entrypoint, address(this), address(accountLock))), address(_entrypoint)) {
+    ) BaseAccountFactory(address(new Account(_entrypoint, address(this))), address(_entrypoint)) {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
@@ -43,7 +45,9 @@ contract AccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnum
 
     /// @dev Called in `createAccount`. Initializes the account contract created in `createAccount`.
     function _initializeAccount(address _account, address _admin, bytes calldata _data) internal override {
-        Account(payable(_account)).initialize(_admin, _data);
+        console.log("AccountLock address in AccountFactory used to initialize account clone", address(accountLock));
+
+        Account(payable(_account)).initialize(_admin, _data, address(accountLock));
     }
 
     /// @dev Returns whether contract metadata can be set in the given execution context.

diff --git a/contracts/prebuilts/account/utils/AccountCore.sol b/contracts/prebuilts/account/utils/AccountCore.sol
@@ -21,7 +21,6 @@ import { AccountExtension } from "./AccountExtension.sol";
 import "../../../external-deps/openzeppelin/utils/cryptography/ECDSA.sol";
 
 import "../interface/IAccountCore.sol";
-import { AccountLock } from "./AccountLock.sol";
 
 //   $$\     $$\       $$\                 $$\                         $$\
 //   $$ |    $$ |      \__|                $$ |                        $$ |
@@ -40,6 +39,8 @@ contract AccountCore is IAccountCore, Initializable, Multicall, BaseAccount, Acc
                                 State
     //////////////////////////////////////////////////////////////*/
 
+    address public accountLock;
+
     /// @notice EIP 4337 factory for this contract.
     address public immutable factory;
 
@@ -57,12 +58,12 @@ contract AccountCore is IAccountCore, Initializable, Multicall, BaseAccount, Acc
     }
 
     /// @notice Initializes the smart contract wallet.
-    function initialize(address _defaultAdmin, bytes calldata) public virtual initializer {
+    function initialize(address _defaultAdmin, bytes calldata, address _accountLock) public virtual initializer {
         // This is passed as data in the `_registerOnFactory()` call in `AccountExtension` / `Account`.
         AccountCoreStorage.data().firstAdmin = _defaultAdmin;
         _setAdmin(_defaultAdmin, true);
 
-        // deployAccountGuardian(_accountClone, _accountLock);
+        accountLock = _accountLock;
     }
 
     /*///////////////////////////////////////////////////////////////

diff --git a/contracts/prebuilts/account/utils/AccountLock.sol b/contracts/prebuilts/account/utils/AccountLock.sol
@@ -26,14 +26,14 @@ struct RegistrationParams {
     uint96 amount;
 }
 
-contract AccountLock is IAccountLock, AutomationCompatibleInterface {
+contract AccountLock is IAccountLock {
     Guardian public guardianContract;
     uint8 public constant DECIMAL = 8;
     int256 public constant INITIAL_LINK_PRICE = 2000e8;
     int256 public constant INITIAL_GAS_PRICE = 2e8;
     uint96 public constant FUND_UPKEEP_LINK_TOKEN = 5e18;
     uint256 public constant LOCK_REQUEST_TIME_TO_EVALUATION = 604800; // 7 days
-    address[] internal _lockedAccounts;
+    address[] public lockedAccounts;
     mapping(address => bytes32) private accountToLockRequest;
     mapping(bytes32 => uint256) private lockRequestToCreationTime;
     mapping(bytes32 => bool) private lockRequestEvaluationStatus;
@@ -45,30 +45,30 @@ contract AccountLock is IAccountLock, AutomationCompatibleInterface {
     // (TODO: To be moved to a script file)//
     //////////////////////////////////////////
 
-    MockLinkToken mockLinkToken = new MockLinkToken();
+    // MockLinkToken mockLinkToken = new MockLinkToken();
 
-    MockV3Aggregator linkNativePriceFeed = new MockV3Aggregator(DECIMAL, INITIAL_LINK_PRICE);
+    // MockV3Aggregator linkNativePriceFeed = new MockV3Aggregator(DECIMAL, INITIAL_LINK_PRICE);
 
-    MockV3Aggregator fastGasPriceFeed = new MockV3Aggregator(DECIMAL, INITIAL_LINK_PRICE);
+    // MockV3Aggregator fastGasPriceFeed = new MockV3Aggregator(DECIMAL, INITIAL_LINK_PRICE);
 
-    KeeperRegistryBase2_0Mock keeperRegistryBase =
-        new KeeperRegistryBase2_0Mock(
-            KeeperRegistryBase2_0Mock.Mode.DEFAULT,
-            address(mockLinkToken),
-            address(linkNativePriceFeed),
-            address(fastGasPriceFeed)
-        );
+    // KeeperRegistryBase2_0Mock keeperRegistryBase =
+    //     new KeeperRegistryBase2_0Mock(
+    //         KeeperRegistryBase2_0Mock.Mode.DEFAULT,
+    //         address(mockLinkToken),
+    //         address(linkNativePriceFeed),
+    //         address(fastGasPriceFeed)
+    //     );
 
-    KeeperRegistry2_0Mock chainlinkKeeperRegistry = new KeeperRegistry2_0Mock(keeperRegistryBase);
+    // KeeperRegistry2_0Mock chainlinkKeeperRegistry = new KeeperRegistry2_0Mock(keeperRegistryBase);
 
-    KeeperRegistrar2_0Mock chainlinkKeeperRegistrar =
-        new KeeperRegistrar2_0Mock(
-            address(mockLinkToken),
-            KeeperRegistrar2_0Mock.AutoApproveType.ENABLED_ALL,
-            type(uint16).max,
-            address(chainlinkKeeperRegistry),
-            FUND_UPKEEP_LINK_TOKEN
-        );
+    // KeeperRegistrar2_0Mock chainlinkKeeperRegistrar =
+    //     new KeeperRegistrar2_0Mock(
+    //         address(mockLinkToken),
+    //         KeeperRegistrar2_0Mock.AutoApproveType.ENABLED_ALL,
+    //         type(uint16).max,
+    //         address(chainlinkKeeperRegistry),
+    //         FUND_UPKEEP_LINK_TOKEN
+    //     );
 
     constructor(Guardian _guardian) {
         guardianContract = _guardian;
@@ -111,7 +111,7 @@ contract AccountLock is IAccountLock, AutomationCompatibleInterface {
 
         bytes memory chainlinkUpkeepCheckData = abi.encode(lockRequestHash, account);
 
-        _registerAndFundUpKeepForEvaluationUsingTimeBasedTrigger(chainlinkUpkeepCheckData);
+        // _registerAndFundUpKeepForEvaluationUsingTimeBasedTrigger(chainlinkUpkeepCheckData);
         return lockRequestHash;
     }
 
@@ -148,47 +148,51 @@ contract AccountLock is IAccountLock, AutomationCompatibleInterface {
         }
     }
 
+    function addLockAccountToList(address account) public {
+        lockedAccounts.push(account);
+    }
+
     /////////////////////////////////
     /////// Chainlink Automation /////
     ////////////////////////////////
 
-    function checkUpkeep(bytes memory checkData) public view returns (bool upkeepNeeded, bytes memory performData) {
-        // assembly {
-        //         mstore(add(lockRequest, 0x20), mload(add(checkData, 0x20)))
-        //         mstore(add(account, 0x20), mload(add(checkData, 0x40)))
-        //     }
+    // function checkUpkeep(bytes memory checkData) public view returns (bool upkeepNeeded, bytes memory performData) {
+    //     // assembly {
+    //     //         mstore(add(lockRequest, 0x20), mload(add(checkData, 0x20)))
+    //     //         mstore(add(account, 0x20), mload(add(checkData, 0x40)))
+    //     //     }
 
-        (bytes32 lockRequest, address account) = abi.decode(checkData, (bytes32, address));
+    //     (bytes32 lockRequest, address account) = abi.decode(checkData, (bytes32, address));
 
-        if (lockRequestEvaluationStatus[lockRequest]) {
-            return (false, checkData);
-        }
+    //     if (lockRequestEvaluationStatus[lockRequest]) {
+    //         return (false, checkData);
+    //     }
 
-        uint256 lockRequestTimeElapsedSinceCreation = block.timestamp - lockRequestToCreationTime[lockRequest];
+    //     uint256 lockRequestTimeElapsedSinceCreation = block.timestamp - lockRequestToCreationTime[lockRequest];
 
-        if (lockRequestTimeElapsedSinceCreation >= LOCK_REQUEST_TIME_TO_EVALUATION) {
-            return (true, checkData);
-        } else {
-            return (false, checkData);
-        }
-    }
+    //     if (lockRequestTimeElapsedSinceCreation >= LOCK_REQUEST_TIME_TO_EVALUATION) {
+    //         return (true, checkData);
+    //     } else {
+    //         return (false, checkData);
+    //     }
+    // }
 
-    function performUpkeep(bytes calldata performData) external {
-        (bool upkeepNeeded, bytes memory performData) = checkUpkeep(performData);
+    // function performUpkeep(bytes calldata performData) external {
+    //     (bool upkeepNeeded, bytes memory performData) = checkUpkeep(performData);
 
-        if (upkeepNeeded) {
-            // retrieving the lockRequest and account address from performData
-            (bytes32 lockRequest, address account) = abi.decode(performData, (bytes32, address));
+    //     if (upkeepNeeded) {
+    //         // retrieving the lockRequest and account address from performData
+    //         (bytes32 lockRequest, address account) = abi.decode(performData, (bytes32, address));
 
-            lockRequestEvaluation(lockRequest, account);
-        }
-    }
+    //         lockRequestEvaluation(lockRequest, account);
+    //     }
+    // }
 
     /////////////////////////////////
     /////// View Func //////////////
     ////////////////////////////////
     function activeLockRequestExists(address account) public view returns (bool) {
-        if (accountToLockRequest[account].length > 0) {
+        if (accountToLockRequest[account] != bytes32(0)) {
             return true;
         } else {
             return false;
@@ -216,8 +220,8 @@ contract AccountLock is IAccountLock, AutomationCompatibleInterface {
     /////////////////////////////////
 
     function _isLocked(address account) internal view returns (bool) {
-        for (uint256 a = 0; a < _lockedAccounts.length; a++) {
-            if (_lockedAccounts[a] == account) {
+        for (uint256 a = 0; a < lockedAccounts.length; a++) {
+            if (lockedAccounts[a] == account) {
                 return true;
             }
         }
@@ -247,21 +251,21 @@ contract AccountLock is IAccountLock, AutomationCompatibleInterface {
     /**
      * @notice Function to register & fund an upkeep that'll be responsible for evaluating the lock request responses using a time based Chainlink Automation
      */
-    function _registerAndFundUpKeepForEvaluationUsingTimeBasedTrigger(bytes memory chainlinkUpkeepCheckData) internal {
-        mockLinkToken.transferAndCall(address(chainlinkKeeperRegistrar), FUND_UPKEEP_LINK_TOKEN, "");
-
-        KeeperRegistrar2_0Mock.RegistrationParams memory registrationParams = KeeperRegistrar2_0Mock
-            .RegistrationParams({
-                name: string(abi.encodePacked("Lock Request Upkeep", chainlinkUpkeepCheckData)),
-                encryptedEmail: new bytes(0),
-                upkeepContract: address(this),
-                gasLimit: 500000,
-                adminAddress: address(0x689EcF264657302052c3dfBD631e4c20d3ED0baB),
-                checkData: chainlinkUpkeepCheckData,
-                offchainConfig: new bytes(0),
-                amount: 5e18
-            });
-
-        chainlinkKeeperRegistrar.registerUpkeep(registrationParams);
-    }
+    // function _registerAndFundUpKeepForEvaluationUsingTimeBasedTrigger(bytes memory chainlinkUpkeepCheckData) internal {
+    //     mockLinkToken.transferAndCall(address(chainlinkKeeperRegistrar), FUND_UPKEEP_LINK_TOKEN, "");
+
+    //     KeeperRegistrar2_0Mock.RegistrationParams memory registrationParams = KeeperRegistrar2_0Mock
+    //         .RegistrationParams({
+    //             name: string(abi.encodePacked("Lock Request Upkeep", chainlinkUpkeepCheckData)),
+    //             encryptedEmail: new bytes(0),
+    //             upkeepContract: address(this),
+    //             gasLimit: 500000,
+    //             adminAddress: address(0x689EcF264657302052c3dfBD631e4c20d3ED0baB),
+    //             checkData: chainlinkUpkeepCheckData,
+    //             offchainConfig: new bytes(0),
+    //             amount: 5e18
+    //         });
+
+    //     chainlinkKeeperRegistrar.registerUpkeep(registrationParams);
+    // }
 }