Eth instant withdraw #347

zhoujia6139 · 2023-03-11T03:59:44Z

Security Checklist

⚠️ NOTES ⚠️

Make sure to think about each of these exploits in this PR.

0x8f701 · 2023-03-13T04:12:52Z

contracts/protocol/libraries/types/DataTypes.sol

        // Map of user's ape compound strategies
        mapping(address => ApeCompoundStrategy) _apeCompoundStrategies;
+        // Reserve storage for ape staking
+        uint256[20] __apeStakingReserve;


shall we rename it to be __apeStakingGap

Reserve 有预留的意思，感觉比gap好点吧

contracts/protocol/libraries/logic/ValidationLogic.sol

0x8f701 · 2023-03-13T05:10:51Z

contracts/protocol/libraries/logic/ValidationLogic.sol

+        );
+        uint256 availableLiquidityPlusDebt = availableLiquidity + totalDebt;
+        uint256 usageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
+        require(usageRatio <= 0.8e27, Errors.USAGE_RATIO_TOO_HIGH);


can we make this a constant?

这个主要是不确定需求上是不是个constant

0x8f701 · 2023-03-13T05:26:23Z

contracts/protocol/pool/PoolInstantWithdraw.sol

+                VAULT_CONTRACT,
+                VAULT_CONTRACT,
+                borrowAmount,
+                discountRate


why it's not reserve.currentStableBorrowRate?

Current requirement is using discountRate as borrow rate.

0x8f701 · 2023-03-13T05:53:40Z

contracts/protocol/pool/PoolInstantWithdraw.sol

+        );
+
+        uint256 presentValue = IInstantNFTOracle(WITHDRAW_ORACLE)
+            .getPresentValueByDiscountRate(


this will return static value but the loan collateral's present value should be dynamic right.

Walid 实现不对吧。presentValue肯定与Duration有关，不能只与discountRate有关。

jefmono · 2023-03-14T10:50:46Z

contracts/protocol/pool/PoolInstantWithdraw.sol

+            borrower: msg.sender,
+            collateralAsset: collateralAsset,
+            collateralTokenId: collateralTokenId.toUint64(),
+            collateralAmount: collateralAmount.toUint64(),


collateralAmount 使用 uint64不太够吧,NFT合约那边这个amount 有可能是 32e18 这种数据

这个不同于erc20的amount，不会很大，之前讨论的是1万或是 100万

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: validator launch Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: typo Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: wrong url Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: typo Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: invalidToken Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: chainId Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: validator Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: add setup/shutdown-validators command Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: geth syncing Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: generate deposit data Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: rename to launch-validators Signed-off-by: GopherJ <alex_cj96@foxmail.com> * feat: add depositContract & register-validators Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: rename Signed-off-by: GopherJ <alex_cj96@foxmail.com> * feat: initiate eth withdrawal Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: typo Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: lint Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: address comparison Signed-off-by: GopherJ <alex_cj96@foxmail.com> * feat: use erc1155 instead Signed-off-by: GopherJ <alex_cj96@foxmail.com> * feat: e2e Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: adds the present value oracle logic * fix: build Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: use old formula until the new one is fully ready Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: temporary fix Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: support both goerli & zhejiang Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: switch to task Signed-off-by: GopherJ <alex_cj96@foxmail.com> * fix: zhejiang launch Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: add getter Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: updates the present value formula * fix: typo Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: adds test function helpers for calculating present value * chore: use shares Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: typo fix * chore: typo fix * chore: typo fix * chore: adds more test cases for present value logic * chore: removes unused vars * chore: fixes tests numbers * fix: use shares instead Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: fix invalid command & make goerli the default Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: add missing restart always Signed-off-by: GopherJ <alex_cj96@foxmail.com> * chore: add dummy svg Signed-off-by: GopherJ <alex_cj96@foxmail.com> * feat: add basic svg token uri Signed-off-by: GopherJ <alex_cj96@foxmail.com> --------- Signed-off-by: GopherJ <alex_cj96@foxmail.com> Co-authored-by: 0xwalid <walid.wah@gmail.com>

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

zhoujia6139 added 4 commits March 10, 2023 16:48

chore: add ETH instant withdraw implementation

3955800

chore: use ERC1155 for collateral NFT

d9b8166

Merge branch 'main' into eth_instant_withdraw

3b1aee5

chore: add utilization check

da4867d

zhoujia6139 requested a review from a team as a code owner March 11, 2023 03:59

0x8f701 reviewed Mar 13, 2023

View reviewed changes

contracts/protocol/libraries/logic/ValidationLogic.sol Outdated Show resolved Hide resolved

0x8f701 reviewed Mar 13, 2023

View reviewed changes

chore: fix some issue and add more test case

0ca4da7

0x8f701 reviewed Mar 13, 2023

View reviewed changes

zhoujia6139 added 2 commits March 13, 2023 14:30

chore: fix typo

c251722

chore: merge Oracle interface and withdraw NFT interface

122bbba

jefmono reviewed Mar 14, 2023

View reviewed changes

zhoujia6139 force-pushed the eth_instant_withdraw branch from 5a4499c to 6994559 Compare March 15, 2023 00:11

chore: deployment script(wETH, awETH, stETH, wstETH)

3bb1016

zhoujia6139 force-pushed the eth_instant_withdraw branch from 6994559 to 3bb1016 Compare March 15, 2023 01:51

zhoujia6139 and others added 13 commits March 15, 2023 14:32

chore: add multicall to support complex operation

aab411f

chore: fix deploy

83ba1ae

chore: deploy stable debt token address for all asset

ecfdee6

chore: protect goerli paraproxyinterfaces

8bf3282

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: support mnemonic in anvil fork

3cf9d61

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

fix: warning

cc06130

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: bump hardhat

15722c3

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: bump version

d90d8ea

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

Merge remote-tracking branch 'origin/main' into eth_instant_withdraw

af0e157

fix: add missing stableBorrowing flag

8f033e7

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

Merge branch 'main' into eth_instant_withdraw

f9c90cf

chore: fix lint

47d85f4

chore: fix and extract total debt calculation logic

11526ee

zhoujia6139 and others added 7 commits March 28, 2023 16:08

chore: add event

393306a

fix: build

fd70146

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

fix: size

1062dfa

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: remove unused exitEpoch,withdrawableEpoch

c409605

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: rename

cbf1703

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

chore: use dynamic uri

896d988

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Eth instant withdraw #347

Eth instant withdraw #347

Uh oh!

zhoujia6139 commented Mar 11, 2023

Uh oh!

0x8f701 Mar 13, 2023 •

edited

Loading

Uh oh!

zhoujia6139 Mar 13, 2023

Uh oh!

Uh oh!

0x8f701 Mar 13, 2023

Uh oh!

zhoujia6139 Mar 13, 2023

Uh oh!

0x8f701 Mar 13, 2023

Uh oh!

zhoujia6139 Mar 13, 2023

Uh oh!

0x8f701 Mar 13, 2023

Uh oh!

zhoujia6139 Mar 13, 2023

Uh oh!

jefmono Mar 14, 2023

Uh oh!

zhoujia6139 Mar 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Eth instant withdraw #347

Are you sure you want to change the base?

Eth instant withdraw #347

Uh oh!

Conversation

zhoujia6139 commented Mar 11, 2023

Security Checklist

⚠️ NOTES ⚠️

Uh oh!

0x8f701 Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

0x8f701 Mar 13, 2023 •

edited

Loading