Recon invariant tests

.gitignore

@@ -37,4 +37,10 @@ bin
 
 .gambit
 .sumo*
-sumo
+sumo
+.idea
+
+# Coverage files
+crytic-export
+echidna
+medusa

.gitmodules

@@ -16,3 +16,9 @@
 [submodule "lib/layerzero-v1"]
 	path = lib/layerzero-v1
 	url = https://github.com/LayerZero-Labs/LayerZero-v1
+[submodule "lib/chimera"]
+	path = lib/chimera
+	url = https://github.com/Recon-Fuzz/chimera
+[submodule "lib/setup-helpers"]
+	path = lib/setup-helpers
+	url = https://github.com/Recon-Fuzz/setup-helpers

.vscode/settings.json

@@ -7,5 +7,7 @@
   "solidity.compileUsingRemoteVersion": "v0.8.28",
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.defaultCompiler": "remote"
+  "solidity.defaultCompiler": "remote",
+  "recon.defaultFuzzer": "echidna",
+  "recon.echidna.workers": 4
 }

LICENSE

@@ -7,13 +7,13 @@ License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
 
 Parameters
 
-Licensor:             CAP Labs
+Licensor:             CAP Labs, Inc.
 
 Licensed Work:        CAP-CONTRACTS
 
 Additional Use Grant: Any uses listed 
 
-Change Date:          The earlier of 2029-04-01 or a date specified 
+Change Date:          The earlier of 2029-06-01 or a date specified 
 
 Change License:       GNU General Public License v2.0 or later
 

access.txt

@@ -0,0 +1,78 @@
+No files changed, compilation skipped
+Script ran successfully.
+
+== Logs ==
+  Checking Access for Delegation Contract...
+  Delegation.slash Lender
+  Delegation.setLastBorrow Lender
+  Delegation.addAgent 🚨 Dev EOA 🚨
+  Delegation.modifyAgent 🚨 Dev EOA 🚨
+  Delegation.registerNetwork 🚨 Dev EOA 🚨
+  Delegation.setLtvBuffer 🚨 Dev EOA 🚨
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Lender Contract...
+  Lender.addAsset 🚨 Dev EOA 🚨
+  Lender.removeAsset 🚨 Dev EOA 🚨
+  Lender.pauseAsset 🚨 Dev EOA 🚨
+  Lender.setMinBorrow 🚨 Dev EOA 🚨
+  Lender.liquidate 🚨 Dev EOA 🚨
+  Vault.removeAsset 🚨 Dev EOA 🚨
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Oracle Contract...
+  PriceOracle.setPriceOracleData 🚨 Dev EOA 🚨
+  PriceOracle.setPriceBackupOracleData 🚨 Dev EOA 🚨
+  PriceOracle.setStaleness 🚨 Dev EOA 🚨
+  RateOracle.setMarketOracleData 🚨 Dev EOA 🚨
+  RateOracle.setUtilizationOracleData 🚨 Dev EOA 🚨
+  RateOracle.setBenchmarkRate 🚨 Dev EOA 🚨
+  RateOracle.setRestakerRate 🚨 Dev EOA 🚨
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Access Control Contract...
+  AccessControl.grantAccess 🚨 Dev EOA 🚨
+  AccessControl.revokeAccess 🚨 Dev EOA 🚨
+
+  Checking Access for Network Contract...
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Network Middleware Contract...
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Fee Auction (cUSD) Contract...
+  FeeAuction.setStartPrice Lender
+  FeeAuction.setStartPrice 🚨 Dev EOA 🚨
+  FeeAuction.setDuration Lender
+  FeeAuction.setDuration 🚨 Dev EOA 🚨
+  FeeAuction.setMinStartPrice Lender
+  FeeAuction.setMinStartPrice 🚨 Dev EOA 🚨
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Fee Receiver (cUSD) Contract...
+  FeeReceiver.setProtocolFeePercentage 🚨 Dev EOA 🚨
+  FeeReceiver.setProtocolFeeReceiver 🚨 Dev EOA 🚨
+
+  Checking Access for Vault (cUSD) Contract...
+  FractionalReserve.investAll 🚨 Dev EOA 🚨
+  FractionalReserve.divestAll 🚨 Dev EOA 🚨
+  FractionalReserve.setFractionalReserveVault 🚨 Dev EOA 🚨
+  FractionalReserve.setReserve 🚨 Dev EOA 🚨
+  Minter.setFeeData 🚨 Dev EOA 🚨
+  Minter.setRedeemFee 🚨 Dev EOA 🚨
+  Minter.setWhitelist 🚨 Dev EOA 🚨
+  Vault.repay Lender
+  Vault.pauseAsset 🚨 Dev EOA 🚨
+  Vault.unpauseAsset 🚨 Dev EOA 🚨
+  Vault.pauseProtocol 🚨 Dev EOA 🚨
+  Vault.unpauseProtocol 🚨 Dev EOA 🚨
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Staked Vault (cUSD) Contract...
+  Proxy.upgrade 🚨 Dev EOA 🚨
+
+  Checking Access for Debt Token 0 of cUSD vault (Debt USD Coin) Contract...
+  DebtToken.mint Lender
+  DebtToken.burn Lender
+  Proxy.upgrade 🚨 Dev EOA 🚨
+

config/cap-infra.json

@@ -1,4 +1,29 @@
 {
+    "1": {
+        "implems": {
+            "accessControl": "0xc162E91576246f90ff7E5A3B3c9a0daA05BF1Bd5",
+            "capToken": "0x031b51BEd47543Aa87D2f74Ab3B1FCd606c99B24",
+            "debtToken": "0x8868614D7e945ef0b30988B11B63103976edfD6d",
+            "delegation": "0x65721910DaeA0F28CBaa99964F952c68Cd9bBFef",
+            "feeAuction": "0xbD12E50Bfaa25735D074DBfDCF73208b9ccD2e43",
+            "feeReceiver": "0xdDAF4E33Ad99a9Ec7bB453dB0869E064A47255B0",
+            "lender": "0x48C442cb3cC8503690D39582B0E9F36872126749",
+            "oracle": "0xA99C0AE66dd5131AE155F25F42ACEb1D1A00ff6F",
+            "stakedCap": "0x7858d18569E8e232415b07b82B8E1EC896ade1c8"
+        },
+        "infra": {
+            "accessControl": "0x32fd97A5196a6D98656a7F2f191Ae4732ad13170",
+            "delegation": "0xDB34C0849DE02ABC719740E147e6df4ffE4e8163",
+            "lender": "0x1036C242ccE7a6632E2f2649F293eaa881835772",
+            "oracle": "0xe23680f14214c4c9238411d2a85e74A9297ECEF0"
+        },
+        "libs": {
+            "aaveAdapter": "0x05913A7f54Ce258D58D0D57BE38f72ABDF77beA8",
+            "capTokenAdapter": "0xF7e1B01404676CDb1F2B7faA46D915Aa118918ac",
+            "chainlinkAdapter": "0x5e3C5D90054ce319694306bb692e06511fC91B6C",
+            "stakedCapAdapter": "0x0e037A45D28DDF171688954863487FF18635d4ea"
+        }
+    },
     "17000": {
         "implems": {
             "accessControl": "0x6FC075b619ABEEC86A37f2a347C5147348c2033d",

config/cap-symbiotic.json

@@ -1,13 +1,13 @@
 {
-    "11155111": {
+    "1": {
         "adapter": {
-            "network": "0x7DE28046eE237912DD799a596F7Ea4a66f2A8fa3",
-            "networkMiddleware": "0xC0cED3b51222507f5fD16861f90cb3dC4F2C41B5",
-            "slashDuration": 3000
+            "feeAllowed": 1000,
+            "network": "0x0000000000000000000000000000000000000000",
+            "networkMiddleware": "0x0000000000000000000000000000000000000000"
         },
         "implems": {
-            "network": "0xB95E2C9d43EB886EDAb0441A6BFf2b59D7e89e5D",
-            "networkMiddleware": "0xcaadd1b8dD14b1581cB3D3172359C643FaCD82D9"
+            "network": "0x0000000000000000000000000000000000000000",
+            "networkMiddleware": "0x0000000000000000000000000000000000000000"
         }
     },
     "17000": {

config/cap-vaults-1.json

@@ -0,0 +1,42 @@
+{
+    "cUSD": {
+        "assets": [
+            {
+                "asset": {
+                    "address": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+                    "decimals": 6,
+                    "name": "USD Coin",
+                    "symbol": "USDC"
+                }
+            }
+        ],
+        "capOFTLockbox": "0x0000000000000000000000000000000000000000",
+        "capToken": {
+            "address": "0xF79e8E7Ba2dDb5d0a7D98B1F57fCb8A50436E9aA",
+            "decimals": 18,
+            "name": "cap USD",
+            "symbol": "cUSD"
+        },
+        "capZapComposer": "0x0000000000000000000000000000000000000000",
+        "debtTokens": [
+            {
+                "debtToken": {
+                    "address": "0xe20fbE3467436bd6Dd7096aDf0770A0870bAe567",
+                    "decimals": 6,
+                    "name": "Debt USD Coin",
+                    "symbol": "debtUSDC"
+                }
+            }
+        ],
+        "feeAuction": "0x019B65850E3ad55939169845551f3D9C512E52Cd",
+        "feeReceiver": "0xfdeb31951781effbd2a0c5eb3f1da4da5c1b29ac",
+        "stakedCapOFTLockbox": "0x0000000000000000000000000000000000000000",
+        "stakedCapToken": {
+            "address": "0x5349937179F7B7e499FA58C797a27d000156A489",
+            "decimals": 18,
+            "name": "Staked cap USD",
+            "symbol": "stcUSD"
+        },
+        "stakedCapZapComposer": "0x0000000000000000000000000000000000000000"
+    }
+}

contracts/access/Access.sol

@@ -33,6 +33,8 @@ abstract contract Access is IAccess, Initializable, AccessStorageUtils {
     /// @dev Check caller has access to a function, revert overwise
     /// @param _selector Function selector
     function _checkAccess(bytes4 _selector) internal view {
-        IAccessControl(getAccessStorage().accessControl).checkAccess(_selector, address(this), msg.sender);
+        bool hasAccess =
+            IAccessControl(getAccessStorage().accessControl).checkAccess(_selector, address(this), msg.sender);
+        if (!hasAccess) revert AccessDenied();
     }
 }

contracts/access/AccessControl.sol

@@ -28,8 +28,10 @@ contract AccessControl is IAccessControl, UUPSUpgradeable, AccessControlEnumerab
     /// @param _selector Function selector
     /// @param _contract Contract being called
     /// @param _caller Address to check role for
-    function checkAccess(bytes4 _selector, address _contract, address _caller) external view {
+    /// @return hasAccess True if access is granted
+    function checkAccess(bytes4 _selector, address _contract, address _caller) external view returns (bool hasAccess) {
         _checkRole(role(_selector, _contract), _caller);
+        hasAccess = true;
     }
 
     /// @notice Grant access to a specific method on a contract

contracts/delegation/Delegation.sol

@@ -174,11 +174,10 @@ contract Delegation is IDelegation, UUPSUpgradeable, Access, DelegationStorageUt
         if (_liquidationThreshold > 1e27) revert InvalidLiquidationThreshold();
         if (_ltv != 0 && _liquidationThreshold < _ltv + $.ltvBuffer) revert LiquidationThresholdTooCloseToLtv();
 
-        // If the agent already exists, we revert
-        if ($.agents.contains(_agent)) revert DuplicateAgent();
         if (!$.networks.contains(_network)) revert NetworkDoesntExist();
 
-        $.agents.add(_agent);
+        // If the agent already exists, we revert
+        if (!$.agents.add(_agent)) revert DuplicateAgent();
         $.agentData[_agent].network = _network;
         $.agentData[_agent].ltv = _ltv;
         $.agentData[_agent].liquidationThreshold = _liquidationThreshold;
@@ -214,9 +213,7 @@ contract Delegation is IDelegation, UUPSUpgradeable, Access, DelegationStorageUt
         if (_network == address(0)) revert InvalidNetwork();
 
         // Check for duplicates
-        if ($.networks.contains(_network)) revert DuplicateNetwork();
-
-        $.networks.add(_network);
+        if (!$.networks.add(_network)) revert DuplicateNetwork();
         emit RegisterNetwork(_network);
     }
 
@@ -230,7 +227,7 @@ contract Delegation is IDelegation, UUPSUpgradeable, Access, DelegationStorageUt
     /// @notice Set the ltv buffer
     /// @param _ltvBuffer LTV buffer
     function setLtvBuffer(uint256 _ltvBuffer) external checkAccess(this.setLtvBuffer.selector) {
-        if (_ltvBuffer > 1e27) revert InvalidLtvBuffer();
+        if (_ltvBuffer > 1e27 || _ltvBuffer <= 0.01e27) revert InvalidLtvBuffer();
         getDelegationStorage().ltvBuffer = _ltvBuffer;
         emit SetLtvBuffer(_ltvBuffer);
     }

contracts/deploy/interfaces/DeployConfigs.sol

@@ -17,6 +17,7 @@ struct ImplementationsConfig {
     address oracle;
     address debtToken;
     address feeAuction;
+    address feeReceiver;
 }
 
 struct InfraConfig {
@@ -54,6 +55,7 @@ struct VaultConfig {
     address capToken; // also called the vault
     address stakedCapToken;
     address feeAuction;
+    address feeReceiver;
     VaultLzPeriphery lzperiphery;
     address[] assets;
     address[] debtTokens;

contracts/deploy/service/ConfigureOracle.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { IOracle } from "../../interfaces/IOracle.sol";
+import { IOracleTypes } from "../../interfaces/IOracleTypes.sol";
 import { Oracle } from "../../oracle/Oracle.sol";
 
 import { AaveAdapter } from "../../oracle/libraries/AaveAdapter.sol";
@@ -18,7 +19,7 @@ contract ConfigureOracle {
         address asset,
         address priceFeed
     ) internal {
-        IOracle.OracleData memory oracleData = IOracle.OracleData({
+        IOracleTypes.OracleData memory oracleData = IOracleTypes.OracleData({
             adapter: libs.chainlinkAdapter,
             payload: abi.encodeWithSelector(ChainlinkAdapter.price.selector, priceFeed)
         });
@@ -29,7 +30,7 @@ contract ConfigureOracle {
     function _initAaveRateOracle(LibsConfig memory libs, InfraConfig memory infra, address asset, address dataProvider)
         internal
     {
-        IOracle.OracleData memory oracleData = IOracle.OracleData({
+        IOracleTypes.OracleData memory oracleData = IOracleTypes.OracleData({
             adapter: libs.aaveAdapter,
             payload: abi.encodeWithSelector(AaveAdapter.rate.selector, dataProvider, asset)
         });
@@ -43,11 +44,11 @@ contract ConfigureOracle {
     }
 
     function _initVaultOracle(LibsConfig memory libs, InfraConfig memory infra, VaultConfig memory vault) internal {
-        IOracle.OracleData memory cTokenOracleData = IOracle.OracleData({
+        IOracleTypes.OracleData memory cTokenOracleData = IOracleTypes.OracleData({
             adapter: libs.capTokenAdapter,
             payload: abi.encodeWithSelector(CapTokenAdapter.price.selector, vault.capToken)
         });
-        IOracle.OracleData memory stcTokenOracleData = IOracle.OracleData({
+        IOracleTypes.OracleData memory stcTokenOracleData = IOracleTypes.OracleData({
             adapter: libs.stakedCapAdapter,
             payload: abi.encodeWithSelector(StakedCapAdapter.price.selector, vault.stakedCapToken)
         });

contracts/deploy/service/DeployImplems.sol

@@ -9,9 +9,11 @@ import { FeeAuction } from "../../feeAuction/FeeAuction.sol";
 import { Lender } from "../../lendingPool/Lender.sol";
 import { DebtToken } from "../../lendingPool/tokens/DebtToken.sol";
 
+import { FeeReceiver } from "../../feeReceiver/FeeReceiver.sol";
 import { Oracle } from "../../oracle/Oracle.sol";
 import { CapToken } from "../../token/CapToken.sol";
 import { StakedCap } from "../../token/StakedCap.sol";
+
 import { ImplementationsConfig } from "../interfaces/DeployConfigs.sol";
 
 contract DeployImplems {
@@ -24,5 +26,6 @@ contract DeployImplems {
         d.oracle = address(new Oracle());
         d.debtToken = address(new DebtToken());
         d.feeAuction = address(new FeeAuction());
+        d.feeReceiver = address(new FeeReceiver());
     }
 }

contracts/deploy/service/DeployInfra.sol

@@ -4,6 +4,8 @@ pragma solidity ^0.8.0;
 import { AccessControl } from "../../access/AccessControl.sol";
 
 import { Delegation } from "../../delegation/Delegation.sol";
+
+import { FeeReceiver } from "../../feeReceiver/FeeReceiver.sol";
 import { Lender } from "../../lendingPool/Lender.sol";
 import { Oracle } from "../../oracle/Oracle.sol";
 
@@ -36,7 +38,7 @@ contract DeployInfra is ProxyUtils {
 
         // init infra instances
         AccessControl(d.accessControl).initialize(users.access_control_admin);
-        Lender(d.lender).initialize(d.accessControl, d.delegation, d.oracle, 1.33e27, 1 hours, 1 days, 0.1e27, 0.7e27);
+        Lender(d.lender).initialize(d.accessControl, d.delegation, d.oracle, 1.25e27, 1 hours, 1 days, 0.1e27, 0.9e27);
         Oracle(d.oracle).initialize(d.accessControl);
         Delegation(d.delegation).initialize(d.accessControl, d.oracle, _delegationEpochDuration);
     }