Simple rollover operation #3

aalavandhan · 2022-02-22T15:58:32Z

Tranche rollover. User deposits tranches in queue for tranches in icebox ..

contracts/ACash.sol

contracts/interfaces/IPricingStrategy.sol

contracts/FeeStrategy.sol

contracts/ACash.sol

brandoniles · 2022-02-23T00:13:10Z

contracts/ACash.sol

+        uint256 trancheInAmt
+    ) external returns (uint256) {
+        require(bondQueue.contains(trancheIn.bondController()), "New tranche should be of bonds in bond queue");
+        require(!bondQueue.contains(trancheOut.bondController()), "Old tranche should NOT be of bonds in bond queue");


So you're saying you can only rollover from icebox? I thought we could only rollover from the icebox or the end of the queue.

since bonds in the end of the queue will be configured to expire out into the future .. i think we can keep it simple and only allow rollover from the icebox

contracts/ACash.sol

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

contracts/ACash.sol

brandoniles · 2022-02-28T17:55:47Z

contracts/ACash.sol

+        IBondController bondOut = IBondController(trancheOut.bond());
+
+        require(address(bondIn) == bondQueue.tail(), "Tranche in should be of minting bond");
+        require(!bondQueue.contains(address(bondOut)), "Tranche out should NOT be of bonds in bond queue");


Alternate design, which I'm partial to rn:
require(address(bondOut) == bondQueue.head() || !bondQueue.contains(address(bondOut)))

Meaning, you rollover the oldest in the queue but you can always rollover out of the icebox if you want. This keeps the queue fresh as much as possible, and treats the icebox more as a fallback.

Makes sense 👍

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

brandoniles

Ok I think this is good to move forward with. Thanks!

* fee policy restructure * updated perp fee and rebalance handling, audit cleanup * updated vault fee and rebalance handling, audit cleanup * interface and lib updates * updated unit tests * code review fixes #1 * code review fixes #2 * code review fix #3 * Removed subscription ratio for a global vault:perp tvl (or system ratio) (#254) * Using a system ratio target * using system state to calculate fees * using system state for fees and removed subscription liquidity check * interface updates * unit test updates * rename

* Bump coverallsapp/github-action from 2.3.0 to 2.3.3 (#228) Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.0 to 2.3.3. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](coverallsapp/github-action@v2.3.0...v2.3.3) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * updated cdr pricer (#229) * Deployed v4.1.0 implementations * Bump coverallsapp/github-action from 2.3.3 to 2.3.4 (#230) Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.3 to 2.3.4. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](coverallsapp/github-action@v2.3.3...v2.3.4) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * updated spot subgraph to keep track of vault swap volume * Vault Refactor & Meta Oracle (#224) * removed pricing strategies in favor of meta oracle * Bill broker refactor, using new meta oracle * Charm vault refactor, using new meta oracle * Updated Interfaces and Errors * updated unit tests * code review changes * Scalable usdc spot strategy (#231) Apply suggestions from code review Co-authored-by: Brandon Iles <brandon@fragments.org> review fix caching bool instead of prev deviation * billy subgraph (#234) * Deployed new oracle contract and managers (#233) * deployed new oracle and managers * updated readme * Staking subgraph (#235) * staking subgraph, refreshing store on rebase * charm wampl vault subgraph * adds timestamp to swap events subgraph (#236) * adds timestamp to swap events subgraph Signed-off-by: nms-7 <nixon.ubud@gmail.com> * linting Signed-off-by: nms-7 <nixon.ubud@gmail.com> * fixed null swap creation with 0 timestamp Signed-off-by: nms-7 <nixon.ubud@gmail.com> --------- Signed-off-by: nms-7 <nixon.ubud@gmail.com> * Bump coverallsapp/github-action from 2.3.4 to 2.3.6 (#238) Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.4 to 2.3.6. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](coverallsapp/github-action@v2.3.4...v2.3.6) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bill broker fee curve change (#237) * using fee factor instead of percentages to support -ve fees * unit tests * code review * convergent fee curve * updated charm fee yield logic (#239) * Fee curve update (#232) * fee curve update * code review fixes * Rollover fee curve update (#240) * rollover fee handles undersubscribed vault * bumped up hardhat * code review comments * DR based flash swap fees * comment updates * updated unit tests to use ethers v6, using custom mocking library * updated tasks and deps * updated perp mint fees to be paid to the vault * removed perp share of fees from flash swaps, all fees go to the vault * added configurable dr soft bounds (curve cutoff point) to flash swap fees * updated unit tests * removed rollover fees from perp * Daily Rebalance * updated unit tests * constant rate enrichment/debasement * mint2, redeem2 * added linked library to limit contract size * unit tests * melding perps immediately after rebalance * Apply suggestions from code review Suggestions Co-authored-by: Brandon Iles <brandon@fragments.org> * Update spot-contracts/contracts/FeePolicy.sol Co-authored-by: Brandon Iles <brandon@fragments.org> * code review fixes * code review fixes v2 * code review fixes v3 * code review v4 * during rebalance, vault pays perps by transferring tranches into perp's reserve * rebalance eql * configurable rebalance freq * code review v5 * Apply suggestions from code review Co-authored-by: Brandon Iles <brandon@fragments.org> * code review fixes * Code review fixes Co-authored-by: Brandon Iles <brandon@fragments.org> * bill broker single sided deposit fix (#253) * Dev Audit Changes (#252) * fee policy restructure * updated perp fee and rebalance handling, audit cleanup * updated vault fee and rebalance handling, audit cleanup * interface and lib updates * updated unit tests * code review fixes #1 * code review fixes #2 * code review fix #3 * Removed subscription ratio for a global vault:perp tvl (or system ratio) (#254) * Using a system ratio target * using system state to calculate fees * using system state for fees and removed subscription liquidity check * interface updates * unit test updates * rename * updated deps --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nms-7 <nixon.ubud@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: nms-7 <57442379+nms-7@users.noreply.github.com> Co-authored-by: Brandon Iles <brandon@fragments.org>

aalavandhan requested a review from brandoniles February 22, 2022 15:58

aalavandhan force-pushed the rollover branch from 87f05be to 9f32aa4 Compare February 22, 2022 16:04

brandoniles requested a review from nms-7 February 22, 2022 18:23

simple rollover function

be05c4b

aalavandhan force-pushed the rollover branch from 9f32aa4 to be05c4b Compare February 22, 2022 20:36

aalavandhan added 3 commits February 22, 2022 15:48

fee handling

170553e

renamed inclusion function

572a5a3

renamed paramter

00efb54

aalavandhan commented Feb 22, 2022

View reviewed changes

contracts/ACash.sol Outdated Show resolved Hide resolved

aalavandhan commented Feb 22, 2022

View reviewed changes

contracts/ACash.sol Outdated Show resolved Hide resolved

Apply suggestions from code review

0c56f8f

brandoniles reviewed Feb 23, 2022

View reviewed changes

aalavandhan and others added 6 commits February 22, 2022 20:24

Update contracts/ACash.sol

cc10c31

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

Update contracts/FeeStrategy.sol

2ae84a7

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

gas optimization

10bf436

applying yield on tranche

d50c3a6

Added burn function

c78aa4b

updated pricing math

583e1cb

aalavandhan force-pushed the rollover branch from e99463b to 583e1cb Compare February 23, 2022 15:52

aalavandhan added 2 commits February 23, 2022 11:07

using uint8 for decimals

3d13411

updated fee logic

e38f8f8

aalavandhan force-pushed the rollover branch from 23b8786 to 63c2d20 Compare February 25, 2022 13:45

Added yield to rollover function

27d3648

aalavandhan force-pushed the rollover branch from 63c2d20 to 27d3648 Compare February 25, 2022 18:52

added duration to issuer

f4ffa37

aalavandhan force-pushed the rollover branch from f64dc81 to f4ffa37 Compare February 25, 2022 20:32

aalavandhan and others added 2 commits February 25, 2022 15:35

updated bond config handling

0b1d5dd

computing seniority from memory

6dc56e6

aalavandhan force-pushed the rollover branch from 3e8447e to 6dc56e6 Compare February 26, 2022 14:36

brandoniles reviewed Feb 28, 2022

View reviewed changes

aalavandhan and others added 2 commits February 28, 2022 13:50

Update contracts/ACash.sol

d231c00

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

code review fixes

a35f2a8

brandoniles approved these changes Mar 2, 2022

View reviewed changes

aalavandhan merged commit 10bcbc1 into main Mar 2, 2022

aalavandhan deleted the rollover branch March 2, 2022 18:22

brandoniles mentioned this pull request Jan 22, 2024

Contract code cleanup and unit tests #190

Merged

aalavandhan added a commit that referenced this pull request May 6, 2025

code review fix #3

08f3ee4

Simple rollover operation #3

Simple rollover operation #3

Uh oh!

Conversation

aalavandhan commented Feb 22, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brandoniles Feb 23, 2022

Choose a reason for hiding this comment

Uh oh!

aalavandhan Feb 23, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brandoniles Feb 28, 2022

Choose a reason for hiding this comment

Uh oh!

aalavandhan Feb 28, 2022

Choose a reason for hiding this comment

Uh oh!

brandoniles left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants