Send lp dust back to users on CL migration

packages/vesting-base-lp/src/handlers.rs

@@ -19,6 +19,7 @@ use astroport::common::{claim_ownership, drop_ownership_proposal, propose_new_ow
 use astroport::pair::{
     Cw20HookMsg as PairCw20HookMsg, ExecuteMsg as PairExecuteMsg, QueryMsg as PairQueryMsg,
 };
+
 use cosmwasm_std::{
     attr, from_binary, to_binary, Addr, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut, Env,
     MessageInfo, Response, StdError, StdResult, Storage, SubMsg, Uint128, WasmMsg,
@@ -38,6 +39,7 @@ pub fn execute(
         match msg {
             ExecuteMsg::MigrateLiquidity {
                 slippage_tolerance: _,
+                batch_size: _,
             } => {}
             ExecuteMsg::Callback(..) => {}
             _ => return Err(ContractError::MigrationIncomplete {}),
@@ -101,9 +103,10 @@ pub fn execute(
         ExecuteMsg::HistoricalExtension { msg } => {
             handle_execute_historical_msg(deps, env, info, msg)
         }
-        ExecuteMsg::MigrateLiquidity { slippage_tolerance } => {
-            execute_migrate_liquidity(deps, env, slippage_tolerance)
-        }
+        ExecuteMsg::MigrateLiquidity {
+            slippage_tolerance,
+            batch_size,
+        } => execute_migrate_liquidity(deps, env, slippage_tolerance, batch_size),
         ExecuteMsg::Callback(msg) => _handle_callback(deps, env, info, msg),
     }
 }
@@ -299,17 +302,23 @@ fn execute_migrate_liquidity(
     deps: DepsMut,
     env: Env,
     slippage_tolerance: Option<Decimal>,
+    batch_size: Option<u32>,
 ) -> Result<Response, ContractError> {
     let migration_state: MigrationState = MIGRATION_STATUS.load(deps.storage)?;
     if migration_state == MigrationState::Completed {
         return Err(ContractError::MigrationComplete {});
     }
     let migration_config: XykToClMigrationConfig = XYK_TO_CL_MIGRATION_CONFIG.load(deps.storage)?;
 
+    let batch = if Some(batch_size).is_some() {
+        batch_size
+    } else {
+        Some(migration_config.batch_size)
+    };
     let vesting_infos = read_vesting_infos(
         deps.as_ref(),
         migration_config.last_processed_user,
-        Some(migration_config.batch_size),
+        batch,
         None,
     )?;
 
@@ -329,7 +338,23 @@ fn execute_migrate_liquidity(
         .query_wasm_smart(migration_config.xyk_pair.clone(), &PairQueryMsg::Pair {})?;
 
     for user in vesting_accounts.into_iter() {
-        let user_amount = compute_share(&user.info)?;
+        let user_share = compute_share(&user.info)?;
+        let user_amount = if user_share < migration_config.dust_threshold {
+            if !user_share.is_zero() {
+                resp = resp.add_message(CosmosMsg::Wasm(WasmMsg::Execute {
+                    contract_addr: pair_info.liquidity_token.to_string(),
+                    msg: to_binary(&Cw20ExecuteMsg::Transfer {
+                        recipient: user.address.to_string(),
+                        amount: user_share,
+                    })?,
+                    funds: vec![],
+                }));
+            }
+
+            Uint128::zero()
+        } else {
+            user_share
+        };
 
         if let Some(slippage_tolerance) = slippage_tolerance {
             if slippage_tolerance.gt(&migration_config.max_slippage) {
@@ -440,7 +465,6 @@ fn migrate_liquidity_to_cl_pair_callback(
         .amount;
 
     let mut msgs: Vec<CosmosMsg> = vec![];
-
     // push message to withdraw liquidity from the xyk pair
     if !amount.is_zero() {
         msgs.push(CosmosMsg::Wasm(WasmMsg::Execute {
@@ -495,7 +519,6 @@ fn provide_liquidity_to_cl_pair_after_withdrawal_callback(
     let withdrawn_ntrn_amount = ntrn_balance_after_withdrawal.checked_sub(ntrn_init_balance)?;
     let withdrawn_paired_asset_amount =
         paired_asset_balance_after_withdrawal.checked_sub(paired_asset_init_balance)?;
-
     let mut msgs: Vec<CosmosMsg> = vec![];
 
     if !withdrawn_ntrn_amount.is_zero() && !withdrawn_paired_asset_amount.is_zero() {
@@ -708,6 +731,7 @@ pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> Result<Response, Con
             batch_size: msg.batch_size,
             last_processed_user: None,
             new_lp_token: deps.api.addr_validate(msg.new_lp_token.as_str())?,
+            dust_threshold: msg.dust_threshold,
         },
     )?;
     config.vesting_token = Some(AssetInfo::Token {

packages/vesting-base-lp/src/msg.rs

@@ -50,7 +50,10 @@ pub enum ExecuteMsg {
     /// Contains messages associated with the historical extension for vesting contracts.
     HistoricalExtension { msg: ExecuteMsgHistorical },
     ///
-    MigrateLiquidity { slippage_tolerance: Option<Decimal> },
+    MigrateLiquidity {
+        slippage_tolerance: Option<Decimal>,
+        batch_size: Option<u32>,
+    },
     /// Callbacks; only callable by the contract itself.
     Callback(CallbackMsg),
 }
@@ -161,6 +164,7 @@ pub struct MigrateMsg {
     pub cl_pair: String,
     pub new_lp_token: String,
     pub batch_size: u32,
+    pub dust_threshold: Uint128,
 }
 /// This structure describes a CW20 hook message.
 #[cw_serde]

packages/vesting-base-lp/src/types.rs

@@ -100,6 +100,7 @@ pub struct XykToClMigrationConfig {
     pub new_lp_token: Addr,
     pub last_processed_user: Option<Addr>,
     pub batch_size: u32,
+    pub dust_threshold: Uint128,
 }
 
 #[cw_serde]