Skip to content

Amm v2 improve2 #2462

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jun 7, 2021
Merged

Amm v2 improve2 #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
398717d
[AMM] Fix pools with active asset manager
Brechtpd May 31, 2021
fbe83ae
Feedback
Brechtpd Jun 1, 2021
1b23f59
Add exit mode and pool reuse
Brechtpd Jun 2, 2021
fe2c30f
Allow setupPool to be called by the controller
Brechtpd Jun 2, 2021
f2400de
Amm v2 - More flexible virtual balances (#2454)
Brechtpd Jun 5, 2021
9e7e17c
minor improvement
Jun 5, 2021
c345888
minor improvement
Jun 5, 2021
1443d00
minor improvement
Jun 5, 2021
16f40af
minor improvement
Jun 5, 2021
68c26f3
Amm v2 - Exit mode and pool reuse (#2450)
Brechtpd Jun 5, 2021
df6065c
Merge branch 'amm_v2_am_fix' into amm_v2_exit_impv
dong77 Jun 5, 2021
1f46b56
merge
Jun 5, 2021
f120bd6
Consistent format for solidity code (#2459)
dong77 Jun 5, 2021
bff512a
minor change
Jun 5, 2021
f5f312b
AMM v2: add extra virtual balance check
Jun 6, 2021
4b0decf
AMM v2: add extra virtual balance check
Jun 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/loopring_v3/contracts/amm/AmplifiedAmmController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ contract AmplifiedAmmController is IAmmController, Claimable
uint96[] memory vTokenBalancesL2 = new uint96[](joinAmounts.length);
for (uint i = 0; i < joinAmounts.length; i++) {
vTokenBalancesL2[i] = (uint(joinAmounts[i]).mul(amplificationFactor) / AMPLIFICATION_FACTOR_BASE).toUint96();
require(vTokenBalancesL2[i] > 0, "ZERO_VIRTUAL_BALANCE");
}
return vTokenBalancesL2;
}
Expand Down Expand Up @@ -128,11 +129,11 @@ contract AmplifiedAmmController is IAmmController, Claimable
returns (bool authorized)
{
uint timestamp = curveChangeAuthorization[pool];
authorized = (timestamp <= block.timestamp) &&
authorized = (timestamp <= block.timestamp) &&
(block.timestamp <= timestamp + CURVE_CHANGE_AUTH_WINDOW);

// Remove authorization
if (timestamp > 0) {
if (authorized) {
delete curveChangeAuthorization[pool];
}
}
Expand Down
4 changes: 0 additions & 4 deletions packages/loopring_v3/contracts/amm/libamm/AmmDepositProcess.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ library AmmDepositProcess
internal
view
{
if (amount == 0) {
return;
}

// Verify deposit data
// Start by reading the first 27 bytes into packedData
uint txsDataPtr = ctx.txsDataPtr + 27;
Expand Down
1 change: 1 addition & 0 deletions packages/loopring_v3/contracts/amm/libamm/AmmJoinProcess.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ library AmmJoinProcess

// Update virtual balances
ctx.vTokenBalancesL2[i] = (uint(ctx.vTokenBalancesL2[i]).mul(newTotalSupply) / ctx.totalSupply).toUint96();
require(ctx.vTokenBalancesL2[i] > 0, "ZERO_VIRTUAL_BALANCE");
}

slippageOK = (mintAmount >= join.mintMinAmount);
Expand Down
4 changes: 0 additions & 4 deletions packages/loopring_v3/contracts/amm/libamm/AmmWithdrawProcess.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ library AmmWithdrawProcess
internal
view
{
if (amount == 0) {
return;
}

bytes20 onchainDataHash = WithdrawTransaction.hashOnchainData(
0, // Withdrawal needs to succeed no matter the gas coast
address(this), // Withdraw to this contract first
Expand Down