Emission cycle fix #153
Merged
Emission cycle fix #153
Conversation
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
Contributor
mootz12
commented
Dec 1, 2023
•
mootz12
commented
- Add queue/timelock for emissions swaps
- Can cancel at any point during the timelock
- Update emitter to track distributions on a backstop basis to ensure no missed emissions during a swap
- Remove emission cycle logic and distribute exact amounts instead
- Update backstop to stop calculating EPS when distributing emissions to pools, causing emissions to get missed
- Update pool to consume emissions from backstop, and distribute them to reserves
- Fix integration tests
markuspluna
previously approved these changes
Dec 4, 2023
There was a problem hiding this comment.
Looks good - spent some time on it and I agree this eliminates like all the edge cases I could think of and feels more robust
Left a few comments just about code documentation and leftover commented out lines - feel free to fix now or we could fix as part of a wider codebase cleanup
backstop/src/storage.rs
Outdated
| @@ -217,6 +244,16 @@ pub fn set_user_balance(e: &Env, pool: &Address, user: &Address, balance: &UserB | |||
| /// * `pool` - The pool the deposit is associated with | |||
| pub fn get_pool_balance(e: &Env, pool: &Address) -> PoolBalance { | |||
| let key = BackstopDataKey::PoolBalance(pool.clone()); | |||
| // if let Some(result) = e.storage().persistent().get::<BackstopDataKey, PoolBalance>(&key) { | |||
There was a problem hiding this comment.
should probably remove this commented out section as it could be confusing
backstop/src/storage.rs
Outdated
| pub fn get_pool_eps(e: &Env, pool: &Address) -> i128 { | ||
| let key = BackstopDataKey::PoolEPS(pool.clone()); | ||
| pub fn get_pool_emissions(e: &Env, pool: &Address) -> i128 { | ||
| let key = BackstopDataKey::PoolEmis(pool.clone()); | ||
| get_persistent_default(e, &key, 0i128, LEDGER_THRESHOLD_SHARED, LEDGER_BUMP_SHARED) | ||
| } | ||
|
|
||
| /// Set the current emissions EPS the backstop is distributing to the pool |
There was a problem hiding this comment.
There are a lot of references to EPS in the backstop that are confusing now as we don't store eps in the backstop anymore
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.