Swap non vault funds #715
Swap non vault funds #715
Conversation
# Conflicts: # smart-contracts/osmosis/contracts/cl-vault/src/vault/any_deposit.rs # smart-contracts/osmosis/contracts/cl-vault/src/vault/range.rs # smart-contracts/osmosis/contracts/cl-vault/src/vault/swap.rs
# Conflicts: # smart-contracts/osmosis/contracts/cl-vault/src/vault/any_deposit.rs
# Conflicts: # smart-contracts/osmosis/contracts/cl-vault/src/vault/deposit.rs
smart-contracts/osmosis/contracts/cl-vault/tests/test-tube/autocompound.rs
Outdated
Show resolved
Hide resolved
smart-contracts/osmosis/contracts/cl-vault/src/vault/deposit.rs
Outdated
Show resolved
Hide resolved
smart-contracts/osmosis/contracts/cl-vault/src/vault/deposit.rs
Outdated
Show resolved
Hide resolved
| // .checked_add(expected_amount_rewards_to_base.into()) | ||
| // .unwrap(), | ||
| // balances_after_swap_base, | ||
| // &deposit_ratio_approx |
There was a problem hiding this comment.
There are few assert_approx i had to comment out temporarily as the deposit_ratio_approx is not dynamic and doesnt allow to approx correctly. Numbers are correct tho. We need to find a way to assert that consistently.
smart-contracts/osmosis/contracts/cl-vault/tests/test-tube/autocompound.rs
Outdated
Show resolved
Hide resolved
smart-contracts/osmosis/contracts/cl-vault/tests/test-tube/autocompound.rs
Outdated
Show resolved
Hide resolved
smart-contracts/osmosis/contracts/cl-vault/tests/test-tube/autocompound.rs
Outdated
Show resolved
Hide resolved
| * position_balance.1.to_string().parse::<f64>().unwrap()) as u128, | ||
| ); | ||
|
|
||
| // TODO: Validate that the swap_operation.pool_id_0 is about token_in_denom and pool_config.token0 assets or throw error |
There was a problem hiding this comment.
Validate that the swap_operation.pool_id_base is about token_in.denom we are swapping, and the base token we are swapping into, which in this case should be pool_config.token0 assets, or throw an error. We need to ensure that the twap_price is retrieved in a consistent way before passing it to the calculate_swap_amount alongside the direction of the swap.
| .swap_msg, | ||
| ); | ||
|
|
||
| // TODO: Validate that the swap_operation.pool_id_1 is about token_in_denom and pool_config.token1 assets or throw error |
There was a problem hiding this comment.
Validate that the swap_operation.pool_id_quote is about token_in.denom we are swapping, and the quote token we are swapping into, which in this case should be pool_config.token1 assets, or throw an error. We need to ensure that the twap_price is retrieved in a consistent way before passing it to the calculate_swap_amount alongside the direction of the swap.
| &pool_config.token1, | ||
| token_in_amount | ||
| .checked_multiply_ratio(twap_price.numerator(), twap_price.denominator()), | ||
| (twap_price.numerator(), twap_price.denominator()), // TODO: Check if this is correct order for AnyToOne |
There was a problem hiding this comment.
As in the previous two comments, we should check that the way we use twap_price here is consistent with how we inject arguments from above. The exact_deposit and any_deposit workflows are hardcoding the right assets on the requests, as we know we always work with asset0 and asset1 (base and quote). This is not the case for the SwapNonVaultFunds, which are accepting arbitrary routes and token ins from outside, and this could be hijackable.
|
Closing this in favor of #782 |
1. Overview
As the PR has grown a bit too much, here is a list of the file changes that have been logically impacted, and the ones that have been simply renamed and do not contain any logical changes.
No logical file changes:
Logical file changes:
2. Implementation details
3. How to test/use
4. Checklist
5. Limitations (optional)
6. Future Work (optional)