added ibc3 feature & switched relayer fee receiver to ibc relayer

Author: ducphamle2

contracts/cw-ics20-latest/Cargo.toml

@@ -24,7 +24,7 @@ cw2 = "1.0.1"
 cw20 = "1.0.1"
 cw20-ics20-msg = { path = "../../packages/cw20-ics20-msg" }
 oraiswap = "1.0.1"
-cosmwasm-std = { version = "1.1.0", features = ["stargate"] }
+cosmwasm-std = { version = "1.1.0", features = ["stargate", "ibc3"] }
 cw-storage-plus = "1.0.1"
 cw-controllers = "1.0.1"
 schemars = "0.8.1"

contracts/cw-ics20-latest/src/contract.rs

@@ -1387,6 +1387,7 @@ mod test {
     #[test]
     fn proper_checks_on_execute_native_transfer_back_to_remote() {
         // arrange
+        let relayer = Addr::unchecked("relayer");
         let remote_channel = "channel-5";
         let remote_address = "cosmos1603j3e4juddh7cuhfquxspl0p0nsun046us7n0";
         let custom_addr = "custom-addr";
@@ -1467,7 +1468,7 @@ mod test {
             mock_receive_packet(remote_channel, local_channel, amount, denom, custom_addr);
 
         // receive some tokens. Assume that the function works perfectly because the test case is elsewhere
-        let ibc_msg = IbcPacketReceiveMsg::new(recv_packet.clone());
+        let ibc_msg = IbcPacketReceiveMsg::new(recv_packet.clone(), relayer);
         ibc_packet_receive(deps.as_mut(), mock_env(), ibc_msg).unwrap();
         // need to trigger increase channel balance because it is executed through submsg
         execute(
@@ -1590,6 +1591,7 @@ mod test {
     #[test]
     fn proper_checks_on_execute_cw20_transfer_back_to_remote() {
         // arrange
+        let relayer = Addr::unchecked("relayer");
         let remote_channel = "channel-5";
         let remote_address = "cosmos1603j3e4juddh7cuhfquxspl0p0nsun046us7n0";
         let custom_addr = "custom-addr";
@@ -1665,7 +1667,7 @@ mod test {
             mock_receive_packet(remote_channel, local_channel, amount, denom, custom_addr);
 
         // receive some tokens. Assume that the function works perfectly because the test case is elsewhere
-        let ibc_msg = IbcPacketReceiveMsg::new(recv_packet.clone());
+        let ibc_msg = IbcPacketReceiveMsg::new(recv_packet.clone(), relayer);
         ibc_packet_receive(deps.as_mut(), mock_env(), ibc_msg).unwrap();
         // need to trigger increase channel balance because it is executed through submsg
         execute(

contracts/cw-ics20-latest/src/ibc.rs

@@ -3,11 +3,11 @@ use std::ops::Mul;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     attr, coin, entry_point, from_binary, to_binary, Addr, Api, Binary, CosmosMsg, Decimal, Deps,
-    DepsMut, Env, IbcBasicResponse, IbcChannel, IbcChannelCloseMsg, IbcChannelConnectMsg,
-    IbcChannelOpenMsg, IbcEndpoint, IbcMsg, IbcOrder, IbcPacket, IbcPacketAckMsg,
-    IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, IbcTimeout, Order,
-    QuerierWrapper, Reply, Response, StdError, StdResult, Storage, SubMsg, SubMsgResult, Timestamp,
-    Uint128,
+    DepsMut, Env, Ibc3ChannelOpenResponse, IbcBasicResponse, IbcChannel, IbcChannelCloseMsg,
+    IbcChannelConnectMsg, IbcChannelOpenMsg, IbcEndpoint, IbcMsg, IbcOrder, IbcPacket,
+    IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, IbcTimeout,
+    Order, QuerierWrapper, Reply, Response, StdError, StdResult, Storage, SubMsg, SubMsgResult,
+    Timestamp, Uint128,
 };
 use cw20_ics20_msg::helper::{
     denom_to_asset_info, get_prefix_decode_bech32, parse_asset_info_denom,
@@ -202,9 +202,9 @@ pub fn ibc_channel_open(
     _deps: DepsMut,
     _env: Env,
     msg: IbcChannelOpenMsg,
-) -> Result<(), ContractError> {
+) -> Result<Option<Ibc3ChannelOpenResponse>, ContractError> {
     enforce_order_and_version(msg.channel(), msg.counterparty_version())?;
-    Ok(())
+    Ok(None)
 }
 
 #[entry_point]
@@ -271,7 +271,15 @@ pub fn ibc_packet_receive(
 ) -> Result<IbcReceiveResponse, Never> {
     let packet = msg.packet;
 
-    do_ibc_packet_receive(deps.storage, deps.api, &deps.querier, env, &packet).or_else(|err| {
+    do_ibc_packet_receive(
+        deps.storage,
+        deps.api,
+        &deps.querier,
+        env,
+        &packet,
+        &msg.relayer.into_string(),
+    )
+    .or_else(|err| {
         // reset relayer & token fees to prevent re-entrancy when failing
         TOKEN_FEE_ACCUMULATOR.clear(deps.storage);
         RELAYER_FEE_ACCUMULATOR.clear(deps.storage);
@@ -353,6 +361,7 @@ fn do_ibc_packet_receive(
     querier: &QuerierWrapper,
     env: Env,
     packet: &IbcPacket,
+    relayer: &str,
 ) -> Result<IbcReceiveResponse, ContractError> {
     let msg: Ics20Packet = from_binary(&packet.data)?;
     // let channel = packet.dest.channel_id.clone();
@@ -364,7 +373,7 @@ fn do_ibc_packet_receive(
     // if denom is native, we handle it the native way
     if denom.1 {
         return handle_ibc_packet_receive_native_remote_chain(
-            storage, api, &querier, env, &denom.0, &packet, &msg,
+            storage, api, &querier, env, &denom.0, &packet, &msg, relayer,
         );
     }
 
@@ -379,6 +388,7 @@ fn handle_ibc_packet_receive_native_remote_chain(
     denom: &str,
     packet: &IbcPacket,
     msg: &Ics20Packet,
+    relayer: &str,
 ) -> Result<IbcReceiveResponse, ContractError> {
     let config = CONFIG.load(storage)?;
 
@@ -430,7 +440,7 @@ fn handle_ibc_packet_receive_native_remote_chain(
     )?;
     cosmos_msgs.append(&mut collect_fee_msgs(
         storage,
-        config.relayer_fee_receiver.to_string(),
+        relayer.to_string(),
         RELAYER_FEE_ACCUMULATOR,
     )?);
     // increase channel balance submsg. We increase it first before doing other tasks
@@ -448,14 +458,17 @@ fn handle_ibc_packet_receive_native_remote_chain(
         .set_ack(ack_success())
         .add_messages(cosmos_msgs)
         .add_submessages(submsgs)
-        .add_attribute("action", "receive_native")
-        .add_attribute("sender", msg.sender.clone())
-        .add_attribute("receiver", msg.receiver.clone())
-        .add_attribute("denom", denom)
-        .add_attribute("amount", msg.amount.to_string())
-        .add_attribute("success", "true")
-        .add_attribute("token_fee", token_fee)
-        .add_attribute("relayer_fee", relayer_fee);
+        .add_attributes(vec![
+            ("action", "receive_native"),
+            ("sender", &msg.sender),
+            ("receiver", &msg.receiver),
+            ("denom", denom),
+            ("amount", &msg.amount.to_string()),
+            ("success", "true"),
+            ("token_fee", &token_fee.to_string()),
+            ("relayer_fee", &relayer_fee.to_string()),
+            ("relayer", relayer),
+        ]);
     if !ibc_error_msg.is_empty() {
         res = res.add_attribute("ibc_error_msg", ibc_error_msg);
     }

contracts/cw-ics20-latest/src/ibc_tests.rs

@@ -200,6 +200,7 @@ mod test {
 
     #[test]
     fn send_native_from_remote_mapping_not_found() {
+        let relayer = Addr::unchecked("relayer");
         let send_channel = "channel-9";
         let cw20_addr = "token-addr";
         let custom_addr = "custom-addr";
@@ -220,7 +221,7 @@ mod test {
         );
 
         // we can receive this denom, channel balance should increase
-        let msg = IbcPacketReceiveMsg::new(recv_packet.clone());
+        let msg = IbcPacketReceiveMsg::new(recv_packet.clone(), relayer);
         let res = ibc_packet_receive(deps.as_mut(), mock_env(), msg).unwrap();
         // assert_eq!(res, StdError)
         assert_eq!(
@@ -235,6 +236,7 @@ mod test {
 
     #[test]
     fn send_from_remote_to_local_receive_happy_path() {
+        let relayer = Addr::unchecked("relayer");
         let send_channel = "channel-9";
         let cw20_addr = "token-addr";
         let custom_addr = "custom-addr";
@@ -285,7 +287,7 @@ mod test {
         );
 
         // we can receive this denom, channel balance should increase
-        let msg = IbcPacketReceiveMsg::new(recv_packet.clone());
+        let msg = IbcPacketReceiveMsg::new(recv_packet.clone(), relayer);
         let res = ibc_packet_receive(deps.as_mut(), mock_env(), msg).unwrap();
         println!("res: {:?}", res);
         // TODO: fix test cases. Possibly because we are adding two add_submessages?