[AMM pool] Changed approvals + locking logic #1771
Conversation
There was a problem hiding this comment.
All tokens deposited to the pool contract are locked by default. Users can withdraw immediately with the help of a signature of the operator. They can also do an Ethereum transaction themselves to unlock the funds with a delay.
Can we make join part of the deposit operation so users don't have to do it using another tx? Or just add another parameter to enable auto join/exit.
| for (uint i = 0; i < tokens.length; i++) { | ||
| address token = tokens[i].addr; | ||
| for (uint i = 0; i < tokens.length + 1; i++) { | ||
| address token = (i < tokens.length) ? tokens[i].addr : address(this); |
There was a problem hiding this comment.
if token == address(this), then the safeTransferFromAndVerify will fail, won't it?
| @@ -204,17 +211,18 @@ contract AmmPool is IBlockReceiver, IAgent { | |||
| } | |||
| } | |||
|
|
|||
| /// @param amounts The amounts to deposit + the amount of pool tokens to deposit | |||
There was a problem hiding this comment.
Not sure I understand: why do we support depositing pool tokens (liquidity tokens)?
|
|
Brecht, please go ahead with this implementation. |
# Conflicts: # packages/loopring_v3/contracts/test/AmmPool.sol
* [protocol 3.6] AMM pool testing * [protocol 3.6] More AMM pool testing * [protocol 3.6] Improved AMM pool + testing * [protocol 3.6] Small optimizations * [protocol 3.6] Misc improvements/fixes AMM pool * unify submitBlocksCompressedWithCallbacks (#1761) * unify submitBlocksCompressedWithCallbacks * unify submitBlocksCompressedWithCallbacks * Amm approve erc20 on setup (#1762) * approve upon setup * approve upon setup * allow withdraw all tokens (#1763) * make agent explicitly inherit IAgent (#1765) * [protocol 3.6] Small fixes * [protocol 3.6] uint96 safe math (#1766) * [AMM Pool] Rename variables and extract methods (#1772) * rename variables * extract methods * extract methods * [AMM Pool] Some small improvements (#1773) * add changes based on my questions * more Co-authored-by: wangdong <wangdong@zhongan.io> Co-authored-by: Brechtpd <Brechtp.Devos@gmail.com> * [AMM pool] Changed approvals + locking logic (#1771) * [protocol 3.6] Changed approvals + locking logic * [protocol 3.6] LP tokens * [protocol 3.6] Use minPoolAmountOut for joins * [protocol 3.6] AMM pool signature assisted L1 withdrawals + fixes * [protocol 3.6] Small improvements/fixes Co-authored-by: Daniel Wang <daniel@loopring.org> Co-authored-by: wangdong <wangdong@zhongan.io>
This is the basic idea, still room for improvement and probably some bugs but will wait on feedback if this setup is okay.