From cacc0374524f4ffffe1ec4eaae8bd560df1a9712 Mon Sep 17 00:00:00 2001
From: codehans <94654388+codehans@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:55:48 +0000
Subject: [PATCH] target_address

---
 src/contract.rs | 17 +++++++++++------
 src/msg.rs      |  6 ++++--
 src/state.rs    | 11 ++++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/contract.rs b/src/contract.rs
index f4b2d1f..afda6d0 100644
--- a/src/contract.rs
+++ b/src/contract.rs
@@ -93,8 +93,10 @@ pub fn reply(deps: DepsMut, env: Env, _msg: Reply) -> Result<Response, ContractE
     let config = Config::load(deps.storage)?;
     let balance = deps
         .querier
-        .query_balance(env.contract.address, config.revenue_denom.to_string())?;
-    let send = config.revenue_denom.send(&fee_address(), &balance.amount);
+        .query_balance(env.contract.address, config.target_denom.to_string())?;
+    let send = config
+        .target_denom
+        .send(&config.target_address, &balance.amount);
     Ok(Response::default()
         .add_message(send)
         .add_event(Event::new("revenue/reply").add_attribute("send", balance.to_string())))
@@ -132,13 +134,14 @@ mod tests {
         let info = mock_info("owner", &vec![]);
         let msg = InstantiateMsg {
             owner: Addr::unchecked("owner"),
-            revenue_denom: Denom::from("ukuji"),
+            target_denom: Denom::from("ukuji"),
+            target_address: fee_address(),
         };
         instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
         let config: ConfigResponse =
             from_json(query(deps.as_ref(), mock_env(), QueryMsg::Config {}).unwrap()).unwrap();
         assert_eq!(config.owner, Addr::unchecked("owner"));
-        assert_eq!(config.revenue_denom, Denom::from("ukuji"));
+        assert_eq!(config.target_denom, Denom::from("ukuji"));
         let status: StatusResponse =
             from_json(query(deps.as_ref(), mock_env(), QueryMsg::Status {}).unwrap()).unwrap();
         assert_eq!(status.last, None);
@@ -152,7 +155,8 @@ mod tests {
         let info = mock_info("owner", &vec![]);
         let msg = InstantiateMsg {
             owner: Addr::unchecked("owner"),
-            revenue_denom: Denom::from("ukuji"),
+            target_denom: Denom::from("ukuji"),
+            target_address: fee_address(),
         };
         instantiate(deps.as_mut(), mock_env(), info.clone(), msg).unwrap();
 
@@ -242,7 +246,8 @@ mod tests {
         let info = mock_info("contract-0", &vec![]);
         let msg = InstantiateMsg {
             owner: Addr::unchecked("owner"),
-            revenue_denom: Denom::from("ukuji"),
+            target_denom: Denom::from("ukuji"),
+            target_address: fee_address(),
         };
         instantiate(deps.as_mut(), mock_env(), info.clone(), msg).unwrap();
 
diff --git a/src/msg.rs b/src/msg.rs
index fc81add..16e4305 100644
--- a/src/msg.rs
+++ b/src/msg.rs
@@ -7,7 +7,8 @@ use crate::state::Action;
 #[cw_serde]
 pub struct InstantiateMsg {
     pub owner: Addr,
-    pub revenue_denom: Denom,
+    pub target_denom: Denom,
+    pub target_address: Addr,
 }
 
 #[cw_serde]
@@ -31,7 +32,8 @@ pub enum QueryMsg {
 #[cw_serde]
 pub struct ConfigResponse {
     pub owner: Addr,
-    pub revenue_denom: Denom,
+    pub target_denom: Denom,
+    pub target_address: Addr,
 }
 
 #[cw_serde]
diff --git a/src/state.rs b/src/state.rs
index 9581d09..fb5600e 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -17,7 +17,10 @@ pub struct Config {
     /// The address permitted to set Actions
     pub owner: Addr,
     /// The denom that is transferred to the fee_collector at the end of every execution
-    pub revenue_denom: Denom,
+    pub target_denom: Denom,
+
+    /// The final destination that `target_denom` is sent to
+    pub target_address: Addr,
 }
 
 impl Config {
@@ -34,7 +37,8 @@ impl From<InstantiateMsg> for Config {
     fn from(value: InstantiateMsg) -> Self {
         Self {
             owner: value.owner,
-            revenue_denom: value.revenue_denom,
+            target_denom: value.target_denom,
+            target_address: value.target_address,
         }
     }
 }
@@ -43,7 +47,8 @@ impl From<Config> for ConfigResponse {
     fn from(value: Config) -> Self {
         Self {
             owner: value.owner,
-            revenue_denom: value.revenue_denom,
+            target_denom: value.target_denom,
+            target_address: value.target_address,
         }
     }
 }