Rollover vault #112

aalavandhan · 2022-11-15T17:31:32Z

Users deposit AMPL for vault notes
Vault "deploys" ampl by tranching and performing rollover, it "recovers" AMPL by redeeming mature tranches
On redemption users get a slice of all the assets held by the vault

At any given time the vault could hold, the underlying asset (deposit asset AMPL), the earned asset (SPOT) and the deployed assets (tranches).

spot-contracts/contracts/_utils/BondHelpers.sol

spot-contracts/contracts/vaults/RolloverVault.sol

aalavandhan · 2023-02-10T15:12:17Z

spot-contracts/contracts/vaults/RolloverVault.sol

+                if (!bond.isMature()) {
+                    bond.mature();
+                }
+                bond.redeemMature(address(tranche), tranche.balanceOf(address(this)));


Something to be cognizant of is that this can revert when the entire supply is redeemed and brick our recoverAndRedeploy workflow.

https://github.com/buttonwood-protocol/tranche/blob/main/contracts/BondController.sol#L225

Options:

We could wrap around try-catch

Add logic to compute amounts discounting the min condition

Handle manually if we ever run into this (deposit small amount of funds into the bond)

@nms-7 @brandoniles

Oh, that's right, good point. Could happen on deposit too if we don't deploy enough. I would say (2) compute the amounts, but since MINIMUM_VALID_DEBT isn't exposed, (1) try-catch works

Yeah agree with @nms-7. #2 if it's possible.

I think try-catch is safe enough here though, since if it fails and continues, it's just a matter of lost capital efficiency. And it could be made more efficiently with a permissionless manual action.

brandoniles

This covers up through deposit() in RolloverVault.sol

spot-contracts/contracts/vaults/RolloverVault.sol

brandoniles · 2023-03-10T13:38:04Z

spot-contracts/contracts/vaults/RolloverVault.sol

+        _redeemTranches();
+    }
+
+    /// @notice Deposits the provided asset from {msg.sender} into the vault and mints notes.


Should probably add a note saying it could be a good idea to call recover and deploy afterward.

spot-contracts/contracts/vaults/RolloverVault.sol

Co-authored-by: Brandon Iles <brandon@fragments.org>

brandoniles

Covers up to right before the private write methods

brandoniles · 2023-03-17T15:54:14Z

spot-contracts/contracts/vaults/RolloverVault.sol

+    /// @return The amount of notes.
+    function deposit(IERC20Upgradeable token, uint256 amount) external nonReentrant whenNotPaused returns (uint256) {
+        // NOTE: The vault only accepts the underlying asset tokens.
+        if (token != underlying) {


Something I was thinking about was making underlying immutable to give another layer of protection. Anytime a caller can specify a token to interact with, there's some danger of malicious code injection.

We'd have to add a constructor, though, in addition to the init function.

I dont think we can have constructors in the proxy?

We could still get rid of the token parameter, don't think we need to generalize now. I'm okay with underlying not being strictly immutable, if the code doesn't have methods change it.

https://forum.openzeppelin.com/t/upgradable-contracts-instantiating-an-immutable-value/28763/2

Agree, that all sounds good to me 👍

spot-contracts/contracts/vaults/RolloverVault.sol

Co-authored-by: Brandon Iles <brandon@fragments.org>

spot-contracts/contracts/vaults/RolloverVault.sol

brandoniles

_rollover

spot-contracts/contracts/vaults/RolloverVault.sol

Co-authored-by: Brandon Iles <brandon@fragments.org>

brandoniles

LGTM

aalavandhan requested review from brandoniles and nms-7 November 15, 2022 17:31

aalavandhan force-pushed the rollover-vault branch 4 times, most recently from 2f93f0c to b15925c Compare November 16, 2022 14:46

aalavandhan changed the base branch from main to dev November 16, 2022 16:08

aalavandhan force-pushed the rollover-vault branch from b15925c to 7875d90 Compare November 18, 2022 19:19

aalavandhan force-pushed the rollover-vault branch from 9a9a753 to 11dcabd Compare November 29, 2022 18:52

aalavandhan force-pushed the rollover-vault branch from 11dcabd to 515a658 Compare December 29, 2022 03:29

aalavandhan changed the title ~~Rollover vault~~ WIP: Rollover vault Dec 29, 2022

aalavandhan removed request for brandoniles and nms-7 December 29, 2022 03:30

aalavandhan force-pushed the rollover-vault branch from 4a1c8de to 8e98164 Compare January 4, 2023 15:14

aalavandhan force-pushed the rollover-vault branch 2 times, most recently from 37ea215 to 57bb76c Compare January 12, 2023 16:59

aalavandhan changed the base branch from dev to main January 18, 2023 08:38

aalavandhan changed the base branch from main to perp-updates January 18, 2023 08:39

aalavandhan changed the title ~~WIP: Rollover vault~~ Rollover vault Jan 18, 2023

aalavandhan requested review from brandoniles and nms-7 January 18, 2023 08:40

aalavandhan force-pushed the rollover-vault branch from 57bb76c to f5ac016 Compare January 23, 2023 16:25

aalavandhan added the next-release Changes for upcoming release label Feb 1, 2023

nms-7 reviewed Feb 9, 2023

View reviewed changes

aalavandhan commented Feb 10, 2023

View reviewed changes

aalavandhan force-pushed the perp-updates branch 3 times, most recently from e2979d2 to 8ba96c7 Compare February 20, 2023 20:04

Base automatically changed from perp-updates to main February 23, 2023 15:06

added helper to compute redeemable tranche balances

535309d

code review updates

bda1ce4

aalavandhan force-pushed the rollover-vault branch from 9788855 to bda1ce4 Compare March 1, 2023 16:57

brandoniles reviewed Mar 10, 2023

View reviewed changes

aalavandhan and others added 4 commits March 10, 2023 13:05

Apply suggestions from code review

31d5a61

Co-authored-by: Brandon Iles <brandon@fragments.org>

code review updates

feeb6d5

fixed perp initialization

732716a

Added todo

ab91895

brandoniles reviewed Mar 17, 2023

View reviewed changes

aalavandhan and others added 2 commits March 19, 2023 10:47

Apply suggestions from code review

5ce29c4

Co-authored-by: Brandon Iles <brandon@fragments.org>

code review feedback

e22180b

aalavandhan force-pushed the rollover-vault branch from 2aafa2e to e22180b Compare March 19, 2023 14:53

code review comments

cb08332

brandoniles reviewed Mar 22, 2023

View reviewed changes

spot-contracts/contracts/vaults/RolloverVault.sol Show resolved Hide resolved

spot-contracts/contracts/vaults/RolloverVault.sol Show resolved Hide resolved

spot-contracts/contracts/vaults/RolloverVault.sol Show resolved Hide resolved

brandoniles reviewed Mar 22, 2023

View reviewed changes

spot-contracts/contracts/vaults/RolloverVault.sol Outdated Show resolved Hide resolved

spot-contracts/contracts/vaults/RolloverVault.sol Outdated Show resolved Hide resolved

spot-contracts/contracts/vaults/RolloverVault.sol Outdated Show resolved Hide resolved

aalavandhan force-pushed the rollover-vault branch 5 times, most recently from 545ba47 to 2c16c13 Compare March 28, 2023 19:02

rollover comments

baadd9d

aalavandhan force-pushed the rollover-vault branch from 2c16c13 to baadd9d Compare March 29, 2023 16:36

brandoniles reviewed Mar 29, 2023

View reviewed changes

aalavandhan and others added 2 commits March 29, 2023 15:28

Apply suggestions from code review

d002822

Co-authored-by: Brandon Iles <brandon@fragments.org>

code review comments

04c3640

aalavandhan force-pushed the rollover-vault branch from 8fc8985 to 04c3640 Compare March 29, 2023 19:48

reduced allowance to the amount to be transferred

feff303

aalavandhan force-pushed the rollover-vault branch from e60adee to feff303 Compare March 30, 2023 14:35

brandoniles approved these changes Apr 7, 2023

View reviewed changes

aalavandhan merged commit 4e49b37 into main Apr 10, 2023

aalavandhan deleted the rollover-vault branch April 10, 2023 13:40

Rollover vault #112

Rollover vault #112

Uh oh!

Conversation

aalavandhan commented Nov 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

aalavandhan Feb 10, 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!

nms-7 Feb 10, 2023

Choose a reason for hiding this comment

Uh oh!

brandoniles Mar 29, 2023

Choose a reason for hiding this comment

Uh oh!

brandoniles left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brandoniles Mar 10, 2023

Choose a reason for hiding this comment

Uh oh!

aalavandhan Mar 10, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

brandoniles left a comment

Choose a reason for hiding this comment

Uh oh!

brandoniles Mar 17, 2023

Choose a reason for hiding this comment

Uh oh!

aalavandhan Mar 19, 2023

Choose a reason for hiding this comment

Uh oh!

brandoniles Mar 22, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brandoniles left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brandoniles left a comment

Choose a reason for hiding this comment

aalavandhan commented Nov 15, 2022 •

edited

Loading

aalavandhan Feb 10, 2023 •

edited

Loading