Deploy to Base and support USDC

.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

@@ -113,3 +113,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

contracts/UnionLens.sol

@@ -59,14 +59,16 @@ contract UnionLens {
         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);
@@ -81,7 +83,7 @@ contract UnionLens {
     ) 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 +97,7 @@ contract UnionLens {
 
         return (
             uint256(trust),
-            trust > stakerStakedAmount ? stakerStakedAmount : trust, // vouch
+            uint256(trust) > stakerStakedAmount ? stakerStakedAmount : uint256(trust), // vouch
             uint256(locked),
             uint256(lastUpdated)
         );
@@ -106,32 +108,20 @@ contract UnionLens {
         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/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/UDai.sol

@@ -20,6 +20,6 @@ contract UDai is UToken, IUDai {
 
         if (!accrueInterest()) revert AccrueInterestFailed();
         uint256 interest = calculatingInterest(borrower);
-        _repayBorrowFresh(msg.sender, borrower, amount, interest);
+        _repayBorrowFresh(msg.sender, borrower, decimalScaling(amount, underlyingDecimal), interest);
     }
 }

contracts/market/UErc20.sol

@@ -18,6 +18,6 @@ contract UErc20 is UToken {
 
         if (!accrueInterest()) revert AccrueInterestFailed();
         uint256 interest = calculatingInterest(borrower);
-        _repayBorrowFresh(msg.sender, borrower, amount, interest);
+        _repayBorrowFresh(msg.sender, borrower, decimalScaling(amount, underlyingDecimal), interest);
     }
 }