ref: Kernel Handle Local (#820)

Co-authored-by: Dimitrije Dragasevic <[email protected]>

Author: joemonem

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - chore: remove unused contracts & code [(#790)](https://github.com/andromedaprotocol/andromeda-core/pull/790)
 - feat: Recipient in rate limiting withdrawals [(#804)](https://github.com/andromedaprotocol/andromeda-core/pull/804)
 - feat: deploy script validate & build steps [(#736)](https://github.com/andromedaprotocol/andromeda-core/pull/736)
+- ref: Simplify the kernel's handling of its Send ExecuteMsg [(#736)](https://github.com/andromedaprotocol/andromeda-core/pull/736)
 
 ### Fixed
 

contracts/finance/andromeda-fixed-amount-splitter/src/contract.rs

@@ -10,15 +10,18 @@ use andromeda_finance::{
 };
 use andromeda_std::{
     ado_base::{InstantiateMsg as BaseInstantiateMsg, MigrateMsg},
-    amp::{messages::AMPPkt, Recipient},
+    amp::{
+        messages::{AMPMsg, AMPPkt},
+        Recipient,
+    },
     andr_execute_fn,
     common::{encode_binary, expiration::Expiry, Milliseconds},
     error::ContractError,
 };
 use andromeda_std::{ado_contract::ADOContract, common::context::ExecuteContext};
 use cosmwasm_std::{
-    attr, coin, coins, ensure, entry_point, from_json, Binary, Coin, Deps, DepsMut, Env,
-    MessageInfo, Reply, Response, StdError, SubMsg, Uint128,
+    attr, coin, coins, ensure, entry_point, from_json, to_json_binary, Binary, Coin, Deps, DepsMut,
+    Env, MessageInfo, Reply, Response, StdError, SubMsg, Uint128,
 };
 use cw20::{Cw20Coin, Cw20ReceiveMsg};
 
@@ -105,7 +108,7 @@ pub fn handle_receive_cw20(
     let ExecuteContext { ref info, .. } = ctx;
     let asset_sent = info.sender.clone().into_string();
     let amount_sent = receive_msg.amount;
-    let sender = receive_msg.sender;
+    let sender = receive_msg.sender.clone();
 
     ensure!(
         !amount_sent.is_zero(),
@@ -118,6 +121,17 @@ pub fn handle_receive_cw20(
         Cw20HookMsg::Send { config } => {
             execute_send_cw20(ctx, sender, amount_sent, asset_sent, config)
         }
+        Cw20HookMsg::AmpReceive(mut packet) => {
+            let msg = to_json_binary(&ExecuteMsg::Receive(Cw20ReceiveMsg {
+                sender: sender.clone(),
+                amount: amount_sent,
+                msg: to_json_binary(&Cw20HookMsg::Send { config: None })?,
+            }))?;
+            let funds = packet.messages[0].funds.clone();
+            let recipient = packet.messages[0].recipient.clone();
+            packet.messages = vec![AMPMsg::new(recipient, msg, Some(funds))];
+            execute(ctx.deps, ctx.env, ctx.info, ExecuteMsg::AMPReceive(packet))
+        }
     }
 }
 

contracts/finance/andromeda-fixed-amount-splitter/src/interface.rs

@@ -8,3 +8,46 @@ contract_interface!(
     CONTRACT_ID,
     "andromeda_fixed_amount_splitter.wasm"
 );
+
+/// Macro to create a fixed amount splitter instantiate message
+///
+/// # Arguments
+/// * `$env` - The test environment (e.g., juno.aos)
+/// * `$recipients` - A vector of (recipient, denom, amount) tuples
+#[macro_export]
+macro_rules! fixed_amount_splitter_instantiate {
+    // Single recipient with default amount (100)
+    ($env:expr, $recipient:expr, $denom:expr) => {
+        fixed_amount_splitter_instantiate!($env, [($recipient, $denom, Uint128::new(100))])
+    };
+
+    // Single recipient with custom amount
+    ($env:expr, $recipient:expr, $denom:expr, $amount:expr) => {
+        fixed_amount_splitter_instantiate!($env, [($recipient, $denom, $amount)])
+    };
+
+    // Multiple recipients with array syntax
+    ($env:expr, [$(($recipient:expr, $denom:expr, $amount:expr)),*]) => {
+        &andromeda_finance::fixed_amount_splitter::InstantiateMsg {
+            recipients: vec![
+                $(
+                    andromeda_finance::fixed_amount_splitter::AddressAmount {
+                        recipient: Recipient {
+                            address: AndrAddr::from_string($recipient.clone()),
+                            msg: None,
+                            ibc_recovery_address: None,
+                        },
+                        coins: vec![Coin {
+                            denom: $denom.to_string(),
+                            amount: $amount,
+                        }],
+                    }
+                ),*
+            ],
+            default_recipient: None,
+            lock_time: None,
+            kernel_address: $env.kernel.address().unwrap().into_string(),
+            owner: None,
+        }
+    };
+}

contracts/os/andromeda-adodb/src/interface.rs

@@ -8,3 +8,31 @@ use andromeda_std::{
 pub const CONTRACT_ID: &str = "adodb";
 
 contract_interface!(ADODBContract, CONTRACT_ID, "andromeda_adodb.wasm");
+
+/// Macro to register a contract with the ADODB
+///
+/// # Arguments
+/// * `$env` - The test environment (e.g., juno.aos)
+/// * `$contract` - The contract instance
+/// * `$ado_type` - The ADO type as a string
+/// * `$version` - The version string (defaults to "1.0.0")
+#[macro_export]
+macro_rules! register_contract {
+    ($env:expr, $contract:expr, $ado_type:expr) => {
+        register_contract!($env, $contract, $ado_type, "1.0.0")
+    };
+    ($env:expr, $contract:expr, $ado_type:expr, $version:expr) => {
+        $env.adodb
+            .execute(
+                &os::adodb::ExecuteMsg::Publish {
+                    code_id: $contract.code_id().unwrap(),
+                    ado_type: $ado_type.to_string(),
+                    action_fees: None,
+                    version: $version.to_string(),
+                    publisher: None,
+                },
+                None,
+            )
+            .unwrap()
+    };
+}

contracts/os/andromeda-kernel/src/contract.rs

@@ -11,6 +11,7 @@ use cosmwasm_std::{
 };
 
 use crate::execute::handle_receive_cw20;
+// use crate::execute::handle_receive_cw20;
 use crate::ibc::{IBCLifecycleComplete, SudoMsg};
 use crate::reply::{
     on_reply_create_ado, on_reply_ibc_hooks_packet_send, on_reply_ibc_transfer,