From 47568812985bcfb4bd6368325baa3af7494168d1 Mon Sep 17 00:00:00 2001 From: taiki1frsh Date: Fri, 18 Aug 2023 18:18:49 +0900 Subject: [PATCH] add output_denom data in config for reference --- contracts/ibc-denom-resolver/src/contract.rs | 3 ++- contracts/ibc-denom-resolver/src/execute/swap.rs | 4 ++-- contracts/ibc-denom-resolver/src/msgs.rs | 3 ++- contracts/ibc-denom-resolver/src/types.rs | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contracts/ibc-denom-resolver/src/contract.rs b/contracts/ibc-denom-resolver/src/contract.rs index e7e654c..88035c3 100644 --- a/contracts/ibc-denom-resolver/src/contract.rs +++ b/contracts/ibc-denom-resolver/src/contract.rs @@ -31,7 +31,8 @@ pub fn instantiate( let config = Config { owner: info.sender, - denom: msg.denom, + input_denom: msg.input_denom, + output_denom: msg.output_denom, first_forward_contract, routes: msg.routes, treasury, diff --git a/contracts/ibc-denom-resolver/src/execute/swap.rs b/contracts/ibc-denom-resolver/src/execute/swap.rs index 03ae87c..d1036db 100644 --- a/contracts/ibc-denom-resolver/src/execute/swap.rs +++ b/contracts/ibc-denom-resolver/src/execute/swap.rs @@ -22,8 +22,8 @@ pub fn execute_swap( return Err(ContractError::InvalidReceiversLength); } - if !is_correct_denom(&coin.denom, &config.denom) { - ContractError::WrongDenom(coin.denom.clone(), config.denom.clone()); + if !is_correct_denom(&coin.denom, &config.input_denom) { + ContractError::WrongDenom(coin.denom.clone(), config.input_denom.clone()); } let (fee, subtracted) = fee_and_subtracted( diff --git a/contracts/ibc-denom-resolver/src/msgs.rs b/contracts/ibc-denom-resolver/src/msgs.rs index 90ab24c..b2c557b 100644 --- a/contracts/ibc-denom-resolver/src/msgs.rs +++ b/contracts/ibc-denom-resolver/src/msgs.rs @@ -4,7 +4,8 @@ use std::time::Duration; #[cw_serde] pub struct InstantiateMsg { - pub denom: String, + pub input_denom: String, + pub output_denom: String, pub first_forward_contract: String, pub routes: Vec, pub treasury: String, diff --git a/contracts/ibc-denom-resolver/src/types.rs b/contracts/ibc-denom-resolver/src/types.rs index cc09c44..2a9268a 100644 --- a/contracts/ibc-denom-resolver/src/types.rs +++ b/contracts/ibc-denom-resolver/src/types.rs @@ -7,7 +7,8 @@ use std::time::Duration; #[cw_serde] pub struct Config { pub owner: Addr, - pub denom: String, + pub input_denom: String, + pub output_denom: String, pub first_forward_contract: Addr, pub routes: Vec, pub treasury: Addr,