Eth instant withdraw #347
Open
Eth instant withdraw #347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GopherJ
reviewed
Mar 13, 2023
| @@ -386,6 +448,20 @@ library DataTypes { | |||
| uint16 _apeCompoundFee; | |||
| // Map of user's ape compound strategies | |||
| mapping(address => ApeCompoundStrategy) _apeCompoundStrategies; | |||
| // Reserve storage for ape staking | |||
| uint256[20] __apeStakingReserve; | |||
There was a problem hiding this comment.
shall we rename it to be __apeStakingGap
There was a problem hiding this comment.
Reserve 有预留的意思，感觉比gap好点吧
GopherJ
reviewed
Mar 13, 2023
GopherJ
reviewed
Mar 13, 2023
| ); | ||
| uint256 availableLiquidityPlusDebt = availableLiquidity + totalDebt; | ||
| uint256 usageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt); | ||
| require(usageRatio <= 0.8e27, Errors.USAGE_RATIO_TOO_HIGH); |
There was a problem hiding this comment.
can we make this a constant?
There was a problem hiding this comment.
这个主要是不确定需求上是不是个constant
GopherJ
reviewed
Mar 13, 2023
| VAULT_CONTRACT, | ||
| VAULT_CONTRACT, | ||
| borrowAmount, | ||
| discountRate |
There was a problem hiding this comment.
why it's not reserve.currentStableBorrowRate?
There was a problem hiding this comment.
Current requirement is using discountRate as borrow rate.
GopherJ
reviewed
Mar 13, 2023
| ); | ||
|
|
||
| uint256 presentValue = IInstantNFTOracle(WITHDRAW_ORACLE) | ||
| .getPresentValueByDiscountRate( |
There was a problem hiding this comment.
this will return static value but the loan collateral's present value should be dynamic right.
There was a problem hiding this comment.
Walid 实现不对吧。presentValue肯定与Duration有关，不能只与discountRate有关。
jfzhou5
reviewed
Mar 14, 2023
| borrower: msg.sender, | ||
| collateralAsset: collateralAsset, | ||
| collateralTokenId: collateralTokenId.toUint64(), | ||
| collateralAmount: collateralAmount.toUint64(), |
There was a problem hiding this comment.
collateralAmount 使用 uint64不太够吧,NFT合约那边 这个amount 有可能是 32e18 这种数据
There was a problem hiding this comment.
这个不同于erc20的amount，不会很大，之前讨论的是1万 或是 100万
zhoujia6139
force-pushed
the
eth_instant_withdraw
branch
from
5a4499c to
6994559
Compare
zhoujia6139
force-pushed
the
eth_instant_withdraw
branch
from
6994559 to
3bb1016
Compare
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
* chore: validator launch Signed-off-by: GopherJ <[email protected]> * fix: typo Signed-off-by: GopherJ <[email protected]> * fix: wrong url Signed-off-by: GopherJ <[email protected]> * fix: typo Signed-off-by: GopherJ <[email protected]> * fix: invalidToken Signed-off-by: GopherJ <[email protected]> * fix: chainId Signed-off-by: GopherJ <[email protected]> * fix: validator Signed-off-by: GopherJ <[email protected]> * chore: add setup/shutdown-validators command Signed-off-by: GopherJ <[email protected]> * fix: geth syncing Signed-off-by: GopherJ <[email protected]> * chore: generate deposit data Signed-off-by: GopherJ <[email protected]> * chore: rename to launch-validators Signed-off-by: GopherJ <[email protected]> * feat: add depositContract & register-validators Signed-off-by: GopherJ <[email protected]> * chore: rename Signed-off-by: GopherJ <[email protected]> * feat: initiate eth withdrawal Signed-off-by: GopherJ <[email protected]> * fix: typo Signed-off-by: GopherJ <[email protected]> * fix: lint Signed-off-by: GopherJ <[email protected]> * fix: address comparison Signed-off-by: GopherJ <[email protected]> * feat: use erc1155 instead Signed-off-by: GopherJ <[email protected]> * feat: e2e Signed-off-by: GopherJ <[email protected]> * chore: adds the present value oracle logic * fix: build Signed-off-by: GopherJ <[email protected]> * fix: use old formula until the new one is fully ready Signed-off-by: GopherJ <[email protected]> * chore: temporary fix Signed-off-by: GopherJ <[email protected]> * chore: support both goerli & zhejiang Signed-off-by: GopherJ <[email protected]> * chore: switch to task Signed-off-by: GopherJ <[email protected]> * fix: zhejiang launch Signed-off-by: GopherJ <[email protected]> * chore: add getter Signed-off-by: GopherJ <[email protected]> * chore: updates the present value formula * fix: typo Signed-off-by: GopherJ <[email protected]> * chore: adds test function helpers for calculating present value * chore: use shares Signed-off-by: GopherJ <[email protected]> * 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 <[email protected]> * chore: fix invalid command & make goerli the default Signed-off-by: GopherJ <[email protected]> * chore: add missing restart always Signed-off-by: GopherJ <[email protected]> * chore: add dummy svg Signed-off-by: GopherJ <[email protected]> * feat: add basic svg token uri Signed-off-by: GopherJ <[email protected]> --------- Signed-off-by: GopherJ <[email protected]> Co-authored-by: 0xwalid <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Signed-off-by: GopherJ <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Security Checklist
Make sure to think about each of these exploits in this PR.