Add Lens contract to Optimism

.github/workflows/ci_pr.yml

@@ -7,12 +7,12 @@ jobs:
         name: Build and test
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - uses: actions/setup-node@v2
+            - uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 20
 
             - name: Install dependencies
               run: yarn install

.github/workflows/ci_prod.yml

@@ -11,12 +11,12 @@ jobs:
         name: Build and test
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - uses: actions/setup-node@v2
+            - uses: actions/setup-node@v4
               with:
-                  node-version: 16
+                  node-version: 20
 
             - name: Install dependencies
               run: yarn install
@@ -45,14 +45,14 @@ jobs:
               run: yarn hh:test
 
             - name: Run Slither
-              uses: crytic/[email protected].0
+              uses: crytic/[email protected].1
               id: slither
               with:
-                  node-version: 16
+                  node-version: 20
                   sarif: results.sarif
                   fail-on: none
 
             - name: Upload SARIF file
-              uses: github/codeql-action/upload-sarif@v2
+              uses: github/codeql-action/upload-sarif@v3
               with:
                   sarif_file: ${{ steps.slither.outputs.sarif }}

.github/workflows/ci_slither.yml

@@ -7,9 +7,8 @@ jobs:
         name: Run slither
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: crytic/[email protected].0
+            - uses: actions/checkout@v4
+            - uses: crytic/[email protected].1
               with:
-                  node-version: 16
+                  node-version: 20
                   target: "."
-                  slither-args: '--filter-path "test|node_modules|contracts/mocks"'

.gitignore

@@ -13,3 +13,4 @@ docs
 .envrc
 dist
 report
+arguments.js

README.md

@@ -25,6 +25,11 @@ Built using [foundry](https://book.getfoundry.sh/) and [hardhat](https://hardhat
     -   [contract addresses](https://github.com/unioncredit/union-v2-contracts/blob/master/deployments/optimism-goerli/deployment.json)
     -   [deployment config](https://github.com/unioncredit/union-v2-contracts/blob/master/deployments/optimism-goerli/config.json)
 
+-   Base Sepolia
+
+    -   [contract addresses](https://github.com/unioncredit/union-v2-contracts/blob/master/deployments/optimism-goerli/deployment.json)
+    -   [deployment config](https://github.com/unioncredit/union-v2-contracts/blob/master/deployments/optimism-goerli/config.json)
+
 ## Install
 
 To install dependencies:
@@ -113,3 +118,9 @@ CONFIG=arbitrum FORK_NODE_URL=<URL> FORK_BLOCK=<NUMBER> yarn hh:test
 ```
 yarn format
 ```
+
+## Other Scripts
+
+Deposit to L2
+
+yarn hardhat --network sepolia --config hardhat-task.config.ts op:deposit --pk <private_key> --l1-rpc-url https://eth-sepolia.public.blastapi.io --l2-rpc-url https://sepolia.base.org --l1-union 0xE4ADdfdf5641EB4e15F60a81F63CEd4884B49823 --l2-union 0xB025ee78b54B5348BD638Fe4a6D77Ec2F813f4f9 --amount 10000

codecov.yml

@@ -2,3 +2,8 @@ ignore:
     - "contracts/mocks/"
     - "test/foundry/"
     - "contracts/peripheral"
+coverage:
+    status:
+        project:
+            default:
+                threshold: 1%

contracts/Controller.sol

@@ -109,19 +109,19 @@ abstract contract Controller is Initializable, UUPSUpgradeable {
      * @dev Check if the address provided is the admin
      * @param account Account address
      */
-    function isAdmin(address account) public view returns (bool) {
+    function isAdmin(address account) external view returns (bool) {
         return account == admin;
     }
 
     /**
      * @dev set new admin account
      * @param account Account address
      */
-    function setPendingAdmin(address account) public onlyAdmin {
+    function setPendingAdmin(address account) external onlyAdmin {
         pendingAdmin = account;
     }
 
-    function acceptAdmin() public {
+    function acceptAdmin() external {
         if (pendingAdmin != msg.sender) revert SenderNotPendingAdmin();
         admin = pendingAdmin;
     }
@@ -137,7 +137,7 @@ abstract contract Controller is Initializable, UUPSUpgradeable {
     /**
      * @dev Returns true if the contract is paused, and false otherwise.
      */
-    function paused() public view returns (bool) {
+    function paused() external view returns (bool) {
         return _paused;
     }
 

contracts/ScaledDecimalBase.sol

@@ -0,0 +1,39 @@
+//SPDX-License-Identifier: MIT
+pragma solidity 0.8.16;
+
+/**
+ * @title ScaledDecimalBase
+ * @dev For easy access to the utility functions of scaling decimals
+ */
+abstract contract ScaledDecimalBase {
+    function decimalScaling(uint256 amount, uint8 decimal) internal pure returns (uint256) {
+        if (decimal > 18) {
+            uint8 diff = decimal - 18;
+            return amount / 10 ** diff;
+        } else {
+            uint8 diff = 18 - decimal;
+            return amount * 10 ** diff;
+        }
+    }
+
+    function decimalReducing(uint256 actualAmount, uint8 decimal) internal pure returns (uint256) {
+        if (decimal > 18) {
+            uint8 diff = decimal - 18;
+            return actualAmount * 10 ** diff;
+        } else {
+            uint8 diff = 18 - decimal;
+            return actualAmount / 10 ** diff;
+        }
+    }
+
+    function decimalReducing(uint256 actualAmount, uint8 decimal, bool roundUp) internal pure returns (uint256) {
+        if (decimal > 18) {
+            uint8 diff = decimal - 18;
+            return actualAmount * 10 ** diff;
+        } else {
+            uint8 diff = 18 - decimal;
+            uint256 rounding = roundUp ? 10 ** diff - 1 : 0;
+            return (actualAmount + rounding) / 10 ** diff;
+        }
+    }
+}

contracts/UnionLens.sol

@@ -59,29 +59,59 @@
         IUserManager userManager = IUserManager(marketRegistry.userManagers(underlying));
         IUToken uToken = IUToken(marketRegistry.uTokens(underlying));
 
-        (bool isMember, uint96 stakedAmount, uint96 locked, , , ) = userManager.stakers(user);
+        bool isMember = userManager.checkIsMember(user);
+        uint256 stakedAmount = userManager.getStakerBalance(user);
+        uint256 locked = userManager.getTotalLockedStake(user);
 
         userInfo.isOverdue = uToken.checkIsOverdue(user);
         userInfo.memberFrozen = userManager.memberFrozen(user);
 
         userInfo.isMember = isMember;
-        userInfo.locked = uint256(locked);
-        userInfo.stakedAmount = uint256(stakedAmount);
+        userInfo.locked = locked;
+        userInfo.stakedAmount = stakedAmount;
 
         userInfo.voucherCount = userManager.getVoucherCount(user);
         userInfo.voucheeCount = userManager.getVoucheeCount(user);
 
         userInfo.accountBorrow = uToken.getBorrowed(user);
     }
 
+    function getBorrowerAddresses(address underlying, address account) public view returns (address[] memory) {
+        IUserManager userManager = IUserManager(marketRegistry.userManagers(underlying));
+
+        uint256 voucheeCount = userManager.getVoucheeCount(account);
+        address[] memory addresses = new address[](voucheeCount);
+
+        for (uint256 i = 0; i < voucheeCount; i++) {
+            (address borrower, ) = userManager.vouchees(account, i);
+            addresses[i] = borrower;
+        }
+
+        return addresses;
+    }
+
+    function getStakerAddresses(address underlying, address account) public view returns (address[] memory) {
+        IUserManager userManager = IUserManager(marketRegistry.userManagers(underlying));
+
+        uint256 voucherCount = userManager.getVoucherCount(account);
+        address[] memory addresses = new address[](voucherCount);
+
+        for (uint256 i = 0; i < voucherCount; i++) {
+            (address staker, , ,) = userManager.vouchers(account, i);
+            addresses[i] = staker;
+        }
+
+        return addresses;
+    }
+
     function getVouchInfo(
         address underlying,
         address staker,
         address borrower
     ) public view returns (uint256, uint256, uint256, uint256) {
         IUserManager userManager = IUserManager(marketRegistry.userManagers(underlying));
 
-        (, uint96 stakerStakedAmount, , , , ) = userManager.stakers(staker);
+        uint256 stakerStakedAmount = userManager.getStakerBalance(staker);
 
         bool isSet;
         uint256 idx;
@@ -95,7 +125,7 @@
 
         return (
             uint256(trust),
-            trust > stakerStakedAmount ? stakerStakedAmount : trust, // vouch
+            uint256(trust) > stakerStakedAmount ? stakerStakedAmount : uint256(trust), // vouch
             uint256(locked),
             uint256(lastUpdated)
         );
@@ -106,32 +136,20 @@
         address staker,
         address borrower
     ) public view returns (RelatedInfo memory related) {
-        (
-            uint256 voucherTrust,
-            uint256 voucherVouch,
-            uint256 voucherLocked,
-            uint256 voucherLastUpdated
-        ) = getVouchInfo(underlying, staker, borrower);
-
-        (
-            uint256 voucheeTrust,
-            uint256 voucheeVouch,
-            uint256 voucheeLocked,
-            uint256 voucheeLastUpdated
-        ) = getVouchInfo(underlying, borrower, staker);
-
-        related.voucher = VouchInfo(
-            voucherTrust,
-            voucherVouch,
-            voucherLocked,
-            voucherLastUpdated
+        (uint256 voucherTrust, uint256 voucherVouch, uint256 voucherLocked, uint256 voucherLastUpdated) = getVouchInfo(
+            underlying,
+            staker,
+            borrower
         );
 
-        related.vouchee = VouchInfo(
-            voucheeTrust,
-            voucheeVouch,
-            voucheeLocked,
-            voucheeLastUpdated
+        (uint256 voucheeTrust, uint256 voucheeVouch, uint256 voucheeLocked, uint256 voucheeLastUpdated) = getVouchInfo(
+            underlying,
+            borrower,
+            staker
         );
+
+        related.voucher = VouchInfo(voucherTrust, voucherVouch, voucherLocked, voucherLastUpdated);
+
+        related.vouchee = VouchInfo(voucheeTrust, voucheeVouch, voucheeLocked, voucheeLastUpdated);
     }
 }

contracts/asset/AssetManager.sol

@@ -330,7 +330,7 @@ contract AssetManager is Controller, ReentrancyGuardUpgradeable, IAssetManager {
      *  @param token ERC20 token address
      *  @param account User address
      *  @param amount ERC20 token address
-     *  @return Withdraw amount
+     *  @return The difference between the amount withdrawn and the amount transferred to the caller
      */
     function withdraw(
         address token,

contracts/interfaces/IDai.sol

@@ -14,4 +14,6 @@ interface IDai is IERC20 {
         bytes32 r,
         bytes32 s
     ) external;
+
+    function decimals() external view returns (uint8);
 }

contracts/interfaces/IUserManager.sol

@@ -115,6 +115,8 @@ interface IUserManager {
      */
     function getStakeInfo(address staker) external view returns (bool, uint256, uint256, uint256);
 
+    function getStakeInfoMantissa(address staker) external view returns (bool, uint256, uint256, uint256);
+
     /**
      * @dev Update the frozen info by the comptroller
      * @param staker Staker address

contracts/market/FixedInterestRateModel.sol

@@ -13,9 +13,9 @@ contract FixedInterestRateModel is Ownable, IInterestRateModel {
       Storage 
     ------------------------------------------------------------------- */
     /**
-     * @dev Maximum borrow rate that can ever be applied (0.005% / 12 second)
+     * @dev Maximum borrow rate that can ever be applied (100%, 1e18 / 3600 / 24 / 365)
      */
-    uint256 public constant BORROW_RATE_MAX_MANTISSA = 4_166_666_666_667; // 0.005e16 / 12
+    uint256 public constant BORROW_RATE_MAX_MANTISSA = 31_709_791_983;
 
     /**
      * @dev IInterest rate per second

contracts/market/UDai.sol

@@ -19,7 +19,7 @@ contract UDai is UToken, IUDai {
         erc20Token.permit(msg.sender, address(this), nonce, expiry, true, v, r, s);
 
         if (!accrueInterest()) revert AccrueInterestFailed();
-        uint256 interest = calculatingInterest(borrower);
-        _repayBorrowFresh(msg.sender, borrower, amount, interest);
+        uint256 interest = _calculatingInterest(borrower);
+        _repayBorrowFresh(msg.sender, borrower, decimalScaling(amount, underlyingDecimal), interest);
     }
 }

contracts/market/UErc20.sol

@@ -17,7 +17,7 @@ contract UErc20 is UToken {
         erc20Token.permit(msg.sender, address(this), amount, deadline, v, r, s);
 
         if (!accrueInterest()) revert AccrueInterestFailed();
-        uint256 interest = calculatingInterest(borrower);
-        _repayBorrowFresh(msg.sender, borrower, amount, interest);
+        uint256 interest = _calculatingInterest(borrower);
+        _repayBorrowFresh(msg.sender, borrower, decimalScaling(amount, underlyingDecimal), interest);
     }
 }