-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add requestDeposit router invariant #414
Open
ilinzweilin
wants to merge
2
commits into
router-invariants
Choose a base branch
from
request-deposit-router-invariant
base: router-invariants
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -119,6 +119,102 @@ abstract contract RouterFunctions is BaseTargetFunctions, Properties { | |
} | ||
} | ||
|
||
// === request Deposit === // | ||
function router_requestDeposit(uint256 assets) public { | ||
address owner = actor; | ||
address controller = actor; // TODO: test with different address wen multi-actor supported | ||
|
||
uint256 balanceOfEscrowB4 = token.balanceOf(address(escrow)); | ||
uint256 balanceOfRouterEscrowB4 = token.balanceOf(address(routerEscrow)); | ||
uint256 balanceOfOwnerB4 = token.balanceOf(owner); | ||
assets = between(assets, 0, _getTokenAndBalanceForVault()); | ||
|
||
bool hasReverted; | ||
|
||
token.approve(address(vault), assets); // owner = self -> allow to transfer tokens - need to test edge cacse | ||
// without allowance | ||
|
||
try router.requestDeposit(address(vault), assets, controller, owner, 0) { | ||
// TODO: test topup | ||
sumOfDepositRequestsRouter[address(token)] += assets; | ||
requestDepositAssets[actor][address(token)] += assets; | ||
} catch { | ||
hasReverted = true; | ||
} | ||
|
||
if (!poolManager.isAllowedAsset(poolId, address(token))) { | ||
// TODO: Ensure this works via actor switch | ||
t(hasReverted, "Router-x Must Revert"); | ||
} | ||
|
||
// If not member | ||
(bool isMember,) = restrictionManager.isMember(address(trancheToken), controller); | ||
if (!isMember) { | ||
t(hasReverted, "LP-1 Must Revert"); | ||
} | ||
if (restrictionManager.isFrozen(address(trancheToken), controller) == true) { | ||
t(hasReverted, "LP-2 Must Revert"); | ||
} | ||
if (!poolManager.isAllowedAsset(poolId, address(token))) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That is a duplicate of Line:145 |
||
t(hasReverted, "LP-3 Must Revert"); | ||
} | ||
|
||
// After Balances and Checks | ||
uint256 balanceOfEscrowAfter = token.balanceOf(address(escrow)); | ||
uint256 balanceOfOwnerAfter = token.balanceOf(owner); | ||
uint256 balanceOfRouterEscrowAfter = token.balanceOf(address(routerEscrow)); | ||
|
||
// NOTE: We only enforce the check if the tx didn't revert | ||
if (!hasReverted) { | ||
uint256 deltaEscrow = balanceOfEscrowAfter - balanceOfEscrowB4; | ||
uint256 deltaOwner = balanceOfOwnerB4 - balanceOfOwnerAfter; | ||
uint256 deltaRouterEscrow = balanceOfRouterEscrowB4 - balanceOfRouterEscrowAfter; | ||
|
||
eq(deltaEscrow, assets, "Router-x"); | ||
eq(deltaOwner, assets, "Router-x"); | ||
eq(deltaRouterEscrow, 0, "Router-x"); | ||
} | ||
} | ||
|
||
function router_requestRedeem(uint256 shares) public { | ||
address owner = actor; | ||
address controller = actor; | ||
|
||
uint256 balanceOfEscrowB4 = trancheToken.balanceOf(address(escrow)); | ||
uint256 balanceOfRouterEscrowB4 = trancheToken.balanceOf(address(routerEscrow)); | ||
uint256 balanceOfOwnerB4 = trancheToken.balanceOf(owner); | ||
shares = between(shares, 0, balanceOfOwnerB4); | ||
|
||
bool hasReverted; | ||
|
||
trancheToken.approve(address(vault), shares); | ||
|
||
try router.requestRedeem(address(vault), shares, controller, owner, 0) { | ||
sumOfRedeemRequestsRouter[address(trancheToken)] += shares; | ||
requestRedeemShares[actor][address(trancheToken)] += shares; | ||
} catch { | ||
hasReverted = true; | ||
} | ||
if (restrictionManager.isFrozen(address(trancheToken), controller)) { | ||
t(hasReverted, "Router-Redeem-Frozen Must Revert"); | ||
} | ||
// After Balances and Checks | ||
uint256 balanceOfEscrowAfter = trancheToken.balanceOf(address(escrow)); | ||
uint256 balanceOfOwnerAfter = trancheToken.balanceOf(owner); | ||
uint256 balanceOfRouterEscrowAfter = trancheToken.balanceOf(address(routerEscrow)); | ||
|
||
// NOTE: We only enforce the check if the tx didn't revert | ||
if (!hasReverted) { | ||
uint256 deltaEscrow = balanceOfEscrowAfter - balanceOfEscrowB4; | ||
uint256 deltaOwner = balanceOfOwnerB4 - balanceOfOwnerAfter; | ||
uint256 deltaRouterEscrow = balanceOfRouterEscrowB4 - balanceOfRouterEscrowAfter; | ||
|
||
eq(deltaEscrow, shares, "Router-x"); | ||
eq(deltaOwner, shares, "Router-x"); | ||
eq(deltaRouterEscrow, 0, "Router-x"); | ||
} | ||
} | ||
|
||
// TODO: once we have multi actor support, include receiver != controller case | ||
function router_claimDeposit(address sender) public { | ||
// Bal b4 | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is clear just from the name