feat: Improved macros and execution flow for AMP (#741)

Co-authored-by: Joe Monem <[email protected]>

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- feat: Improved macros and execution flow for AMP [(#741)](https://github.com/andromedaprotocol/andromeda-core/pull/741)
+
 ### Fixed
 
 ## Release 4

Cargo.toml

@@ -14,7 +14,7 @@ members = [
     "contracts/math/*",
 
     #Internal
-    "tests-integration",
+    "e2e-tests",
     "ibc-tests",
 ]
 resolver = "2"
@@ -34,7 +34,7 @@ strip = true
 andromeda-std = { path = "./packages/std", default-features = false, features = [
     "deploy",
 ] }
-andromeda-macros = { path = "./packages/std/macros", default-features = false, version = "1.0.0" }
+andromeda-macros = { path = "./packages/std/macros", default-features = false }
 andromeda-non-fungible-tokens = { path = "./packages/andromeda-non-fungible-tokens", version = "1.0.0" }
 andromeda-fungible-tokens = { path = "./packages/andromeda-fungible-tokens", version = "1.0.0" }
 andromeda-finance = { path = "./packages/andromeda-finance", version = "1.0.0" }

Makefile

@@ -49,13 +49,13 @@ unit-test:
 	@echo "Unit tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
 
 # Runs integration tests
-integration-test:
+e2e-test:
 	@echo "Running integration tests..."
-	@cargo test -p tests-integration --quiet
+	@cargo test -p e2e-tests --quiet
 	@echo "Integration tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
 
 # Runs all tests
-test: unit-test integration-test
+test: unit-test e2e-test
 	@echo "All tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
 
 # Deploys OS to specified blockchain

contracts/accounts/andromeda-fixed-multisig/src/contract.rs

@@ -6,12 +6,13 @@ use andromeda_accounts::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{
     ado_base::{InstantiateMsg as BaseInstantiateMsg, MigrateMsg},
     ado_contract::ADOContract,
-    common::{context::ExecuteContext, encode_binary},
+    andr_execute_fn,
+    common::encode_binary,
     error::ContractError,
 };
 use cw2::set_contract_version;
 
-use crate::execute::handle_execute;
+use crate::execute::{execute_close, execute_execute, execute_propose, execute_vote};
 use crate::query::{
     list_proposals, list_voters, list_votes, query_proposal, query_threshold, query_vote,
     query_voter, reverse_proposals,
@@ -87,19 +88,22 @@ pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, Contract
     Ok(Response::default())
 }
 
-#[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);
+// This contains functionality derived from the cw3-fixed-multisig contract.
+// Source: https://github.com/CosmWasm/cw-plus/blob/main/contracts/cw3-fixed-multisig
+// License: Apache-2.0
+#[andr_execute_fn]
+pub fn execute(ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Response, ContractError> {
     match msg {
-        ExecuteMsg::AMPReceive(pkt) => {
-            ADOContract::default().execute_amp_receive(ctx, pkt, handle_execute)
-        }
-        _ => handle_execute(ctx, msg),
+        ExecuteMsg::Propose {
+            title,
+            description,
+            msgs,
+            latest,
+        } => execute_propose(ctx, title, description, msgs, latest),
+        ExecuteMsg::Vote { proposal_id, vote } => execute_vote(ctx, proposal_id, vote),
+        ExecuteMsg::Execute { proposal_id } => execute_execute(ctx, proposal_id),
+        ExecuteMsg::Close { proposal_id } => execute_close(ctx, proposal_id),
+        _ => ADOContract::default().execute(ctx, msg),
     }
 }