feat(staking): add ability to call hook contract on stake action

New endpoint enter_with_hook { contract_address: Addr, msg: Binary } allows stake ASTRO to xASTRO and immediately pass all resulting xASTRO to the hook contract.

Cargo.toml

@@ -24,7 +24,7 @@ thiserror = "1.0"
 itertools = "0.12"
 cosmwasm-schema = "1.5"
 cw-utils = "1"
-astroport = { path = "./packages/astroport", version = "5.3.0" }
+astroport = { path = "./packages/astroport", version = "5.4.0" }
 
 [profile.release]
 opt-level = "z"

contracts/tokenomics/staking/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "astroport-staking"
-version = "2.1.0"
+version = "2.2.0"
 authors = ["Astroport"]
 edition = "2021"
 description = "Astroport Staking Contract"
@@ -28,7 +28,8 @@ cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
 cw-storage-plus.workspace = true
 thiserror.workspace = true
 cw2.workspace = true
-astroport = "4"
+astroport.workspace = true
+astroport_v4 = { package = "astroport", version = "4" }
 cw-utils.workspace = true
 osmosis-std = "0.21.0"
 
@@ -37,4 +38,4 @@ anyhow = "1"
 itertools.workspace = true
 cosmwasm-schema.workspace = true
 cw-multi-test = { git = "https://github.com/astroport-fi/cw-multi-test", branch = "feat/bank_with_send_hooks", features = ["cosmwasm_1_1"] }
-astroport-tokenfactory-tracker = "1.0.0"
+astroport-tokenfactory-tracker = "1"

contracts/tokenomics/staking/src/contract.rs

@@ -1,7 +1,7 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    attr, coin, ensure, to_json_binary, BankMsg, Binary, CosmosMsg, Deps, DepsMut, Env,
+    attr, coin, ensure, to_json_binary, BankMsg, Binary, Coin, CosmosMsg, Deps, DepsMut, Env,
     MessageInfo, Reply, Response, StdError, StdResult, SubMsg, Uint128, WasmMsg,
 };
 use cw2::set_contract_version;
@@ -13,7 +13,7 @@ use osmosis_std::types::osmosis::tokenfactory::v1beta1::{
 };
 
 use astroport::staking::{
-    Config, ExecuteMsg, InstantiateMsg, QueryMsg, StakingResponse, TrackerData,
+    Config, ExecuteMsg, InstantiateMsg, QueryMsg, StakingResponse, TrackerData, HOOK_GAS_LIMIT,
 };
 
 use crate::error::ContractError;
@@ -115,7 +115,34 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, ContractError> {
     match msg {
-        ExecuteMsg::Enter { receiver } => execute_enter(deps, env, info, receiver),
+        ExecuteMsg::Enter { receiver } => {
+            // xASTRO is minted to the receiver if provided or to the sender.
+            let recipient = receiver.unwrap_or_else(|| info.sender.to_string());
+            execute_enter(deps, env, info).map(|(resp, minted_coins)| {
+                resp.add_message(BankMsg::Send {
+                    to_address: recipient.clone(),
+                    amount: vec![minted_coins],
+                })
+                .add_attributes([("action", "enter"), ("recipient", recipient.as_str())])
+            })
+        }
+        ExecuteMsg::EnterWithHook {
+            contract_address,
+            msg,
+        } => execute_enter(deps, env, info).map(|(resp, minted_coins)| {
+            resp.add_submessage(
+                SubMsg::new(WasmMsg::Execute {
+                    contract_addr: contract_address.clone(),
+                    msg,
+                    funds: vec![minted_coins],
+                })
+                .with_gas_limit(HOOK_GAS_LIMIT),
+            )
+            .add_attributes([
+                ("action", "enter_with_hook"),
+                ("next_contract", &contract_address),
+            ])
+        }),
         ExecuteMsg::Leave {} => execute_leave(deps, env, info),
     }
 }
@@ -163,7 +190,7 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
                 WasmMsg::Instantiate {
                     admin: Some(tracker_data.admin),
                     code_id: tracker_data.code_id,
-                    msg: to_json_binary(&astroport::tokenfactory_tracker::InstantiateMsg {
+                    msg: to_json_binary(&astroport_v4::tokenfactory_tracker::InstantiateMsg {
                         tokenfactory_module_address: tracker_data.token_factory_addr,
                         tracked_denom: new_token_denom.clone(),
                     })?,
@@ -204,13 +231,14 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
 }
 
 /// Enter stakes TokenFactory ASTRO for xASTRO.
-/// xASTRO is minted to the receiver if provided or to the sender.
+/// Returns composed Response object and minted xASTRO in the form of [`Coin`].
+/// Subsequent messages are added after,
+/// depending on whether it is a plain enter or enter with hook endpoint.
 fn execute_enter(
     deps: DepsMut,
     env: Env,
     info: MessageInfo,
-    receiver: Option<String>,
-) -> Result<Response, ContractError> {
+) -> Result<(Response, Coin), ContractError> {
     let config = CONFIG.load(deps.storage)?;
 
     // Ensure that the correct denom is sent. Sending zero tokens is prohibited on chain level
@@ -255,7 +283,7 @@ fn execute_enter(
 
     let minted_coins = coin(mint_amount.u128(), config.xastro_denom);
 
-    // Mint new xASTRO tokens to the sender
+    // Mint new xASTRO tokens to the staking contract
     messages.push(
         MsgMint {
             sender: env.contract.address.to_string(),
@@ -265,34 +293,23 @@ fn execute_enter(
         .into(),
     );
 
-    let recipient = receiver.unwrap_or_else(|| info.sender.to_string());
-
-    // TokenFactory minting only allows minting to the sender for now, thus we
-    // need to send the minted tokens to the recipient
-    messages.push(
-        BankMsg::Send {
-            to_address: recipient.clone(),
-            amount: vec![minted_coins],
-        }
-        .into(),
-    );
-
     // Set the data to be returned in set_data to easy integration with
     // other contracts
     let staking_response = to_json_binary(&StakingResponse {
         astro_amount: amount,
         xastro_amount: mint_amount,
     })?;
 
-    Ok(Response::new()
-        .add_messages(messages)
-        .set_data(staking_response)
-        .add_attributes([
-            attr("action", "enter"),
-            attr("recipient", recipient),
-            attr("astro_amount", amount),
-            attr("xastro_amount", mint_amount),
-        ]))
+    Ok((
+        Response::new()
+            .add_messages(messages)
+            .set_data(staking_response)
+            .add_attributes([
+                attr("astro_amount", amount),
+                attr("xastro_amount", mint_amount),
+            ]),
+        minted_coins,
+    ))
 }
 
 /// Leave unstakes TokenFactory xASTRO for ASTRO. xASTRO is burned and ASTRO
@@ -397,7 +414,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
                 let tracker_config = TRACKER_DATA.load(deps.storage)?;
                 deps.querier.query_wasm_smart(
                     tracker_config.tracker_addr,
-                    &astroport::tokenfactory_tracker::QueryMsg::BalanceAt { address, timestamp },
+                    &astroport_v4::tokenfactory_tracker::QueryMsg::BalanceAt { address, timestamp },
                 )?
             };
 
@@ -411,7 +428,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
                 let tracker_config = TRACKER_DATA.load(deps.storage)?;
                 deps.querier.query_wasm_smart(
                     tracker_config.tracker_addr,
-                    &astroport::tokenfactory_tracker::QueryMsg::TotalSupplyAt { timestamp },
+                    &astroport_v4::tokenfactory_tracker::QueryMsg::TotalSupplyAt { timestamp },
                 )?
             };
 

contracts/tokenomics/staking/src/migrate.rs

@@ -14,7 +14,7 @@ pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, C
 
     match contract_version.contract.as_ref() {
         "astroport-staking" => match contract_version.version.as_ref() {
-            "2.0.0" => {}
+            "2.0.0" | "2.1.0" => {}
             _ => return Err(ContractError::MigrationError {}),
         },
         _ => return Err(ContractError::MigrationError {}),

contracts/tokenomics/staking/tests/common/helper.rs

@@ -1,10 +1,11 @@
 #![allow(dead_code)]
 
 use anyhow::Result as AnyResult;
+use cosmwasm_schema::serde::Serialize;
 use cosmwasm_std::testing::MockApi;
 use cosmwasm_std::{
-    coins, Addr, Coin, DepsMut, Empty, Env, GovMsg, IbcMsg, IbcQuery, MemoryStorage, MessageInfo,
-    Response, StdResult, Uint128,
+    coins, to_json_binary, Addr, Coin, DepsMut, Empty, Env, GovMsg, IbcMsg, IbcQuery,
+    MemoryStorage, MessageInfo, Response, StdResult, Uint128,
 };
 use cw_multi_test::{
     App, AppResponse, BankKeeper, BasicAppBuilder, Contract, ContractWrapper, DistributionKeeper,
@@ -130,6 +131,24 @@ impl Helper {
         )
     }
 
+    pub fn stake_with_hook<T: Serialize + ?Sized>(
+        &mut self,
+        sender: &Addr,
+        amount: u128,
+        contract_address: String,
+        msg: &T,
+    ) -> AnyResult<AppResponse> {
+        self.app.execute_contract(
+            sender.clone(),
+            self.staking.clone(),
+            &ExecuteMsg::EnterWithHook {
+                contract_address,
+                msg: to_json_binary(msg)?,
+            },
+            &coins(amount, ASTRO_DENOM),
+        )
+    }
+
     pub fn unstake(&mut self, sender: &Addr, amount: u128) -> AnyResult<AppResponse> {
         self.app.execute_contract(
             sender.clone(),