feat!: version 3.1

.github/workflows/pr.yml

@@ -15,16 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup node.js
-        uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
-          node-version-file: ".nvmrc"
-
-      - name: Install dependencies
-        run: |
-          yarn install --frozen-lockfile
-
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
@@ -43,7 +33,3 @@ jobs:
 
       - name: Run gas tests
         run: forge test --mt test_G -vv
-
-      - name: Perform checks
-        run: |
-          yarn prettier:ci

.gitignore

@@ -1,24 +1,18 @@
-.history/
-.idea/
-abi/
-node_modules/
+# Compiler files
 cache/
-build/
-typechain/
-artifacts/
-coverage*
+/out/
+/node_modules/
+
+# Ignores development broadcast logs
+!/broadcast
+/broadcast/*/31337/
+/broadcast/**/dry-run/
+
+# Docs
+docs/
+
+# Dotenv file
 .env
-.verifier*
-.DS_Store
-/security/Peckshield.sol
-/security/ClickerAttackSolution.sol
-/security/TickerBombAttackSolution.sol
-/.env.local
-out/
-forge-out/
-.mainnet.test.cache
+
+# Logs
 *.log
-.eslintcache
-.eslint.local.json
-.favorites.json
-dist/

.gitmodules

@@ -1,4 +1,12 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.3.0
+[submodule "lib/@gearbox-protocol/sdk-gov"]
+	path = lib/@gearbox-protocol/sdk-gov
+	url = https://github.com/Gearbox-protocol/sdk-gov
+[submodule "lib/@1inch/solidity-utils"]
+	path = lib/@1inch/solidity-utils
+	url = https://github.com/1inch/solidity-utils
+[submodule "lib/@openzeppelin"]
+	path = lib/@openzeppelin
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts

.prettierignore

@@ -1,5 +1,3 @@
 node_modules
-artifacts
 cache
-types
-forge-out
+out

.releaserc.json

@@ -13,6 +13,12 @@
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/npm",
-    "@semantic-release/github"
+    [
+      "@semantic-release/github",
+      {
+        "successComment": false,
+        "failTitle": false
+      }
+    ]
   ]
 }

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "JuanBlanco.solidity",
-    "dbaeumer.vscode-eslint"
-  ]
+  "recommendations": ["esbenp.prettier-vscode", "JuanBlanco.solidity"]
 }

.vscode/settings.json

@@ -6,14 +6,12 @@
     "editor.defaultFormatter": "JuanBlanco.solidity",
     "editor.tabSize": 4
   },
-
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.tabSize": 2,
-  "eslint.validate": ["javascript", "typescript"],
   "files.eol": "\n",
   "solidity.packageDefaultDependenciesContractsDirectory": "contracts",
-  "solidity.packageDefaultDependenciesDirectory": "node_modules",
+  "solidity.packageDefaultDependenciesDirectory": "lib",
   "solidity.compileUsingRemoteVersion": "v0.8.17",
   "solidity.formatter": "forge"
 }

contracts/core/AccountFactoryV3.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 // Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Foundation, 2023.
+// (c) Gearbox Foundation, 2024.
 pragma solidity ^0.8.17;
 pragma abicoder v1;
 
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 
 import {CreditAccountV3} from "../credit/CreditAccountV3.sol";
@@ -14,8 +15,6 @@ import {
     CreditAccountIsInUseException,
     MasterCreditAccountAlreadyDeployedException
 } from "../interfaces/IExceptions.sol";
-import {ACLTrait} from "../traits/ACLTrait.sol";
-import {ContractsRegisterTrait} from "../traits/ContractsRegisterTrait.sol";
 
 /// @dev Struct holding factory and queue params for a credit manager
 /// @param masterCreditAccount Address of the contract to clone to create new accounts for the credit manager
@@ -41,9 +40,12 @@ struct QueuedAccount {
 ///         - When account is returned to the factory, it is only added to the queue after a certain delay, which
 ///           allows DAO to rescue funds that might have been accidentally left upon account closure, and serves
 ///           as protection against potential attacks involving reopening an account right after closing it
-contract AccountFactoryV3 is IAccountFactoryV3, ACLTrait, ContractsRegisterTrait {
+contract AccountFactoryV3 is IAccountFactoryV3, Ownable {
     /// @notice Contract version
-    uint256 public constant override version = 3_00;
+    uint256 public constant override version = 3_10;
+
+    /// @notice Contract type
+    bytes32 public constant override contractType = "ACCOUNT_FACTORY";
 
     /// @notice Delay after which returned credit accounts can be reused
     uint40 public constant override delay = 3 days;
@@ -55,8 +57,10 @@ contract AccountFactoryV3 is IAccountFactoryV3, ACLTrait, ContractsRegisterTrait
     mapping(address => mapping(uint256 => QueuedAccount)) internal _queuedAccounts;
 
     /// @notice Constructor
-    /// @param addressProvider Address provider contract address
-    constructor(address addressProvider) ACLTrait(addressProvider) ContractsRegisterTrait(addressProvider) {}
+    /// @param owner_ Contract owner
+    constructor(address owner_) {
+        transferOwnership(owner_);
+    }
 
     /// @notice Provides a reusable credit account from the queue to the credit manager.
     ///         If there are no accounts that can be reused in the queue, deploys a new one.
@@ -114,15 +118,14 @@ contract AccountFactoryV3 is IAccountFactoryV3, ACLTrait, ContractsRegisterTrait
     function addCreditManager(address creditManager)
         external
         override
-        configuratorOnly // U:[AF-1]
-        registeredCreditManagerOnly(creditManager) // U:[AF-4A]
+        onlyOwner // U:[AF-1]
     {
         if (_factoryParams[creditManager].masterCreditAccount != address(0)) {
-            revert MasterCreditAccountAlreadyDeployedException(); // U:[AF-4B]
+            revert MasterCreditAccountAlreadyDeployedException(); // U:[AF-4A]
         }
-        address masterCreditAccount = address(new CreditAccountV3(creditManager)); // U:[AF-4C]
-        _factoryParams[creditManager].masterCreditAccount = masterCreditAccount; // U:[AF-4C]
-        emit AddCreditManager(creditManager, masterCreditAccount); // U:[AF-4C]
+        address masterCreditAccount = address(new CreditAccountV3(creditManager)); // U:[AF-4B]
+        _factoryParams[creditManager].masterCreditAccount = masterCreditAccount; // U:[AF-4B]
+        emit AddCreditManager(creditManager, masterCreditAccount); // U:[AF-4B]
     }
 
     /// @notice Executes function call from the account to the target contract with provided data,
@@ -133,18 +136,17 @@ contract AccountFactoryV3 is IAccountFactoryV3, ACLTrait, ContractsRegisterTrait
     /// @param data Data to call the target contract with
     function rescue(address creditAccount, address target, bytes calldata data)
         external
-        configuratorOnly // U:[AF-1]
+        override
+        onlyOwner // U:[AF-1]
     {
         address creditManager = CreditAccountV3(creditAccount).creditManager();
-        _ensureRegisteredCreditManager(creditManager); // U:[AF-5A]
 
         (,,,,,,, address borrower) = CreditManagerV3(creditManager).creditAccountInfo(creditAccount);
         if (borrower != address(0)) {
-            revert CreditAccountIsInUseException(); // U:[AF-5B]
+            revert CreditAccountIsInUseException(); // U:[AF-5A]
         }
 
-        CreditAccountV3(creditAccount).rescue(target, data); // U:[AF-5C]
-
-        emit Rescue(creditAccount, target, data);
+        CreditAccountV3(creditAccount).rescue(target, data); // U:[AF-5B]
+        emit Rescue(creditAccount, target, data); // U:[AF-5B]
     }
 }