ref: apply andr macros to rates and address list

Author: joemonem

contracts/modules/andromeda-address-list/Cargo.toml

@@ -25,8 +25,8 @@ andromeda-std = { workspace = true, features = [] }
 andromeda-modules = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-multi-test = { workspace = true, optional = true }
 cw-orch = { workspace = true }
 
 [dev-dependencies]

contracts/modules/andromeda-address-list/src/contract.rs

@@ -5,6 +5,7 @@ use andromeda_std::{
     ado_base::{permissioning::LocalPermission, InstantiateMsg as BaseInstantiateMsg, MigrateMsg},
     ado_contract::ADOContract,
     amp::AndrAddr,
+    andr_execute_fn,
     common::{context::ExecuteContext, encode_binary},
     error::ContractError,
 };
@@ -13,7 +14,6 @@ use cosmwasm_std::{
     attr, ensure, entry_point, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response,
     StdError,
 };
-use cw_utils::nonpayable;
 
 use crate::state::{add_actors_permission, includes_actor, PERMISSIONS};
 // version info for migration info
@@ -62,25 +62,8 @@ pub fn instantiate(
     Ok(inst_resp)
 }
 
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn execute(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> Result<Response, ContractError> {
-    let _contract = ADOContract::default();
-    let ctx = ExecuteContext::new(deps, info, env);
-
-    match msg {
-        ExecuteMsg::AMPReceive(pkt) => {
-            ADOContract::default().execute_amp_receive(ctx, pkt, handle_execute)
-        }
-        _ => handle_execute(ctx, msg),
-    }
-}
-
-pub fn handle_execute(ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Response, ContractError> {
+#[andr_execute_fn]
+pub fn execute(ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Response, ContractError> {
     match msg {
         ExecuteMsg::PermissionActors { actors, permission } => {
             execute_permission_actors(ctx, actors, permission)
@@ -95,12 +78,7 @@ fn execute_permission_actors(
     actors: Vec<AndrAddr>,
     permission: LocalPermission,
 ) -> Result<Response, ContractError> {
-    let ExecuteContext { deps, info, .. } = ctx;
-    nonpayable(&info)?;
-    ensure!(
-        ADOContract::default().is_owner_or_operator(deps.storage, info.sender.as_str())?,
-        ContractError::Unauthorized {}
-    );
+    let ExecuteContext { deps, .. } = ctx;
     if let LocalPermission::Limited { .. } = permission {
         return Err(ContractError::InvalidPermission {
             msg: "Limited permission is not supported in address list contract".to_string(),
@@ -127,12 +105,7 @@ fn execute_remove_permissions(
     ctx: ExecuteContext,
     actors: Vec<AndrAddr>,
 ) -> Result<Response, ContractError> {
-    let ExecuteContext { deps, info, .. } = ctx;
-    nonpayable(&info)?;
-    ensure!(
-        ADOContract::default().is_owner_or_operator(deps.storage, info.sender.as_str())?,
-        ContractError::Unauthorized {}
-    );
+    let ExecuteContext { deps, .. } = ctx;
     ensure!(!actors.is_empty(), ContractError::NoActorsProvided {});
 
     for actor in actors.clone() {

contracts/modules/andromeda-address-list/src/testing/tests.rs

@@ -10,6 +10,7 @@ use andromeda_std::ado_base::permissioning::LocalPermission;
 use andromeda_std::amp::AndrAddr;
 use andromeda_std::error::ContractError;
 
+use andromeda_testing::economics_msg::generate_economics_message;
 use cosmwasm_std::{attr, from_json, Addr, DepsMut, MessageInfo};
 use cosmwasm_std::{
     testing::{mock_env, mock_info},
@@ -87,11 +88,13 @@ fn test_add_remove_actor() {
     };
 
     let res = execute(deps.as_mut(), env.clone(), info.clone(), msg.clone()).unwrap();
-    let expected = Response::default().add_attributes(vec![
-        attr("action", "add_actor_permission"),
-        attr("actor", actor.clone()),
-        attr("permission", permission.to_string()),
-    ]);
+    let expected = Response::default()
+        .add_attributes(vec![
+            attr("action", "add_actor_permission"),
+            attr("actor", actor.clone()),
+            attr("permission", permission.to_string()),
+        ])
+        .add_submessage(generate_economics_message("creator", "PermissionActors"));
     assert_eq!(expected, res);
 
     // Check that the actor and permission have been saved.
@@ -161,11 +164,13 @@ fn test_add_remove_multiple_actors() {
     };
 
     let res = execute(deps.as_mut(), env.clone(), info.clone(), msg.clone()).unwrap();
-    let expected = Response::default().add_attributes(vec![
-        attr("action", "add_actor_permission"),
-        attr("actor", "actor1, actor2"),
-        attr("permission", permission.to_string()),
-    ]);
+    let expected = Response::default()
+        .add_attributes(vec![
+            attr("action", "add_actor_permission"),
+            attr("actor", "actor1, actor2"),
+            attr("permission", permission.to_string()),
+        ])
+        .add_submessage(generate_economics_message("creator", "PermissionActors"));
     assert_eq!(expected, res);
 
     // Check that the actor and permission have been saved.

contracts/modules/andromeda-rates/src/contract.rs

@@ -7,17 +7,17 @@ use andromeda_std::{
         InstantiateMsg as BaseInstantiateMsg, MigrateMsg,
     },
     ado_contract::ADOContract,
+    andr_execute_fn,
     common::{context::ExecuteContext, deduct_funds, encode_binary, Funds},
     error::ContractError,
 };
 
 use cosmwasm_std::{
-    attr, coin, ensure, Binary, Coin, Deps, DepsMut, Env, Event, MessageInfo, Reply, Response,
-    StdError, SubMsg,
+    attr, coin, Binary, Coin, Deps, DepsMut, Env, Event, MessageInfo, Reply, Response, StdError,
+    SubMsg,
 };
 use cosmwasm_std::{entry_point, from_json};
 use cw20::Cw20Coin;
-use cw_utils::nonpayable;
 // version info for migration info
 const CONTRACT_NAME: &str = "crates.io:andromeda-rates";
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -52,24 +52,8 @@ pub fn instantiate(
     Ok(inst_resp)
 }
 
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn execute(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> Result<Response, ContractError> {
-    let ctx = ExecuteContext::new(deps, info, env);
-
-    match msg {
-        ExecuteMsg::AMPReceive(pkt) => {
-            ADOContract::default().execute_amp_receive(ctx, pkt, handle_execute)
-        }
-        _ => handle_execute(ctx, msg),
-    }
-}
-
-pub fn handle_execute(ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Response, ContractError> {
+#[andr_execute_fn]
+pub fn execute(ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Response, ContractError> {
     match msg {
         ExecuteMsg::SetRate { action, rate } => execute_set_rate(ctx, action, rate),
         ExecuteMsg::RemoveRate { action } => execute_remove_rate(ctx, action),
@@ -82,13 +66,8 @@ fn execute_set_rate(
     action: String,
     rate: LocalRate,
 ) -> Result<Response, ContractError> {
-    let ExecuteContext { deps, info, .. } = ctx;
-    nonpayable(&info)?;
+    let ExecuteContext { deps, .. } = ctx;
 
-    ensure!(
-        ADOContract::default().is_contract_owner(deps.storage, info.sender.as_str())?,
-        ContractError::Unauthorized {}
-    );
     rate.validate(deps.as_ref())?;
 
     RATES.save(deps.storage, &action, &rate)?;
@@ -97,13 +76,8 @@ fn execute_set_rate(
 }
 
 fn execute_remove_rate(ctx: ExecuteContext, action: String) -> Result<Response, ContractError> {
-    let ExecuteContext { deps, info, .. } = ctx;
-    nonpayable(&info)?;
+    let ExecuteContext { deps, .. } = ctx;
 
-    ensure!(
-        ADOContract::default().is_contract_owner(deps.storage, info.sender.as_str())?,
-        ContractError::Unauthorized {}
-    );
     if RATES.has(deps.storage, &action) {
         RATES.remove(deps.storage, &action);
         Ok(Response::new().add_attributes(vec![attr("action", "remove_rates")]))

contracts/modules/andromeda-rates/src/testing/tests.rs

@@ -10,6 +10,7 @@ use andromeda_std::common::Funds;
 use andromeda_std::testing::mock_querier::{MOCK_CW20_CONTRACT, MOCK_UANDR};
 use andromeda_std::{amp::recipient::Recipient, common::encode_binary};
 
+use andromeda_testing::economics_msg::generate_economics_message;
 use cosmwasm_std::{attr, Event};
 use cosmwasm_std::{
     coin, coins,
@@ -83,7 +84,9 @@ fn test_andr_receive() {
 
     let res = execute(deps.as_mut(), env, info, msg).unwrap();
     assert_eq!(
-        Response::new().add_attributes(vec![attr("action", "set_rate")]),
+        Response::new()
+            .add_attributes(vec![attr("action", "set_rate")])
+            .add_submessage(generate_economics_message("owner", "SetRate")),
         res
     );
 }

packages/andromeda-modules/src/address_list.rs

@@ -21,11 +21,13 @@ pub struct ActorPermission {
 #[cw_serde]
 pub enum ExecuteMsg {
     /// Adds an actor key and a permission value
+    #[attrs(restricted, nonpayable)]
     PermissionActors {
         actors: Vec<AndrAddr>,
         permission: LocalPermission,
     },
     /// Removes actor alongisde his permission
+    #[attrs(restricted, nonpayable)]
     RemovePermissions { actors: Vec<AndrAddr> },
 }
 

packages/andromeda-modules/src/rates.rs

@@ -11,7 +11,9 @@ pub struct InstantiateMsg {
 #[andr_exec]
 #[cw_serde]
 pub enum ExecuteMsg {
+    #[attrs(restricted, nonpayable)]
     SetRate { action: String, rate: LocalRate },
+    #[attrs(restricted, nonpayable)]
     RemoveRate { action: String },
 }