Issue 141 claim to backstop #142
Merged
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
mootz12
reviewed
Nov 9, 2023
backstop/src/emissions/claim.rs
Outdated
Comment on lines
30
to
35
| TokenClient::new(e, &blnd_id).approve( | ||
| &e.current_contract_address(), | ||
| &lp_id, | ||
| &claimed, | ||
| &(e.ledger().sequence() + 10), | ||
| ); |
There was a problem hiding this comment.
we can omit this approval after the merge of the Comet update
There was a problem hiding this comment.
This being said, this PR should probably follow the Comet one.
Comment on lines
+47
to
+60
| let mut pool_balance = storage::get_pool_balance(e, &pool_id); | ||
| let mut user_balance = storage::get_user_balance(e, &pool_id, to); | ||
|
|
||
| // Deposit LP tokens into pool backstop | ||
| let to_mint = pool_balance.convert_to_shares(deposit_amount); | ||
| pool_balance.deposit(deposit_amount, to_mint); | ||
| user_balance.add_shares(to_mint); | ||
|
|
||
| storage::set_pool_balance(e, &pool_id, &pool_balance); | ||
| storage::set_user_balance(e, &pool_id, to, &user_balance); | ||
| e.events().publish( | ||
| (Symbol::new(&e, "deposit"), pool_id, to), | ||
| (deposit_amount, to_mint), | ||
| ); |
There was a problem hiding this comment.
not a massive fan of this logic being duplicated, but there doesn't seem to be that easy of a way around it without a bunch of refactoring to make things consistent
backstop/src/storage.rs
Outdated
Comment on lines
44
to
45
| pub pool: Address, | ||
| pub user: Address, |
There was a problem hiding this comment.
not sure I see why these needed to be public?
There was a problem hiding this comment.
I needed them public for tests and forgot to remove whoops
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.
User claims now are deposited directly into whatever backstop module they previously deposited in