Cw20 kernel routing

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- CW20 support for kernel routing [(#723)](https://github.com/andromedaprotocol/andromeda-core/pull/723)
 - feat: Handle username on IBC packets [(#791)](https://github.com/andromedaprotocol/andromeda-core/pull/791)
 
 ### Changed

contracts/finance/andromeda-fixed-amount-splitter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "andromeda-fixed-amount-splitter"
-version = "1.2.0"
+version = "1.2.1-b.1"
 edition = "2021"
 rust-version = "1.75.0"
 

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

@@ -148,8 +148,10 @@ fn execute_send_cw20(
     };
 
     let mut msgs: Vec<SubMsg> = Vec::new();
+    let mut amp_funds: Vec<Coin> = Vec::new();
     let mut remainder_funds = coin.amount;
 
+    let mut pkt = AMPPkt::from_ctx(ctx.amp_ctx, ctx.env.contract.address.to_string());
     for recipient in splitter_recipients.clone() {
         // Find the recipient's corresponding denom for the current iteration of the sent funds
         let recipient_coin = recipient
@@ -167,14 +169,12 @@ fn execute_send_cw20(
             let recipient_funds =
                 cosmwasm_std::coin(recipient_coin.amount.u128(), recipient_coin.denom);
 
-            let amp_msg = recipient.recipient.generate_msg_cw20(
-                &deps.as_ref(),
-                Cw20Coin {
-                    address: recipient_funds.denom.clone(),
-                    amount: recipient_funds.amount,
-                },
-            )?;
-            msgs.push(amp_msg);
+            amp_funds.push(recipient_funds.clone());
+
+            let amp_msg = recipient
+                .recipient
+                .generate_amp_msg(&deps.as_ref(), Some(vec![recipient_funds.clone()]))?;
+            pkt = pkt.add_message(amp_msg);
         }
     }
 
@@ -192,6 +192,12 @@ fn execute_send_cw20(
         msgs.push(cw20_msg);
     }
 
+    let kernel_address = ADOContract::default().get_kernel_address(deps.as_ref().storage)?;
+    if !pkt.messages.is_empty() && !amp_funds.is_empty() {
+        let distro_msg = pkt.to_sub_msg_cw20(kernel_address, amp_funds.clone(), 1)?;
+        msgs.push(distro_msg.clone());
+    }
+
     Ok(Response::new()
         .add_submessages(msgs)
         .add_attribute("action", "send")

contracts/finance/andromeda-splitter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "andromeda-splitter"
-version = "2.3.0"
+version = "2.3.1-b.1"
 edition = "2021"
 rust-version = "1.75.0"
 

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

@@ -233,6 +233,7 @@ fn execute_send_cw20(
     let mut amp_funds: Vec<Coin> = Vec::new();
     let mut remainder_funds = coin(amount.u128(), asset.clone());
 
+    let mut pkt = AMPPkt::from_ctx(ctx.amp_ctx, ctx.env.contract.address.to_string());
     for recipient_addr in splitter_recipients {
         let recipient_percent = recipient_addr.percent;
         let mut vec_coin: Vec<Coin> = Vec::new();
@@ -245,14 +246,10 @@ fn execute_send_cw20(
             remainder_funds.amount = remainder_funds.amount.checked_sub(recip_coin.amount)?;
             vec_coin.push(recip_coin.clone());
             amp_funds.push(recip_coin.clone());
-            let amp_msg = recipient_addr.recipient.generate_msg_cw20(
-                &deps.as_ref(),
-                Cw20Coin {
-                    address: recip_coin.denom.clone(),
-                    amount: recip_coin.amount,
-                },
-            )?;
-            msgs.push(amp_msg);
+            let amp_msg = recipient_addr
+                .recipient
+                .generate_amp_msg(&deps.as_ref(), Some(vec_coin))?;
+            pkt = pkt.add_message(amp_msg);
         }
     }
 
@@ -270,6 +267,11 @@ fn execute_send_cw20(
         msgs.push(cw20_msg);
     }
 
+    let kernel_address = ADOContract::default().get_kernel_address(deps.as_ref().storage)?;
+    if !pkt.messages.is_empty() && !amp_funds.is_empty() {
+        let distro_msg = pkt.to_sub_msg_cw20(kernel_address, amp_funds.clone(), 1)?;
+        msgs.push(distro_msg.clone());
+    }
     Ok(Response::new()
         .add_submessages(msgs)
         .add_attribute("action", "cw20_send")

contracts/os/andromeda-kernel/Cargo.toml

@@ -25,7 +25,8 @@ testing = ["cw-multi-test"]
 cosmwasm-std = { workspace = true, features = ["ibc3"] }
 cosmwasm-schema = { workspace = true }
 cw-storage-plus = { workspace = true }
-
+cw20 = { workspace = true }
+cw-utils = { workspace = true }
 serde-json-wasm = "1.0.1"
 osmosis-std-derive = "0.15.3"
 osmosis-std = "0.1.4"

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

@@ -10,6 +10,7 @@ use cosmwasm_std::{
     entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError,
 };
 
+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,
@@ -91,6 +92,7 @@ pub fn execute(
             execute_env.env,
             packet,
         ),
+        ExecuteMsg::Receive(msg) => handle_receive_cw20(execute_env, msg),
         ExecuteMsg::Send { message } => execute::send(execute_env, message),
         ExecuteMsg::TriggerRelay {
             packet_sequence,