feat: do not deduct tax in ibc token

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.8.0
+
+* [39d869](https://github.com/terraswap/classic-terraswap/pull/16/commits/39d869e9056d92a3094b1995b032e93fe7068ddb) Do not deduct tax in ibc token
+
 # 2.7.0
 
 * [a189de](https://github.com/terraswap/classic-terraswap/pull/15/commits/a189de88440f5a26e4104aa950fddbcb259a457e) Prevention of share calculation overflow

contracts/terraswap_factory/Cargo.toml

@@ -42,7 +42,7 @@ cw-storage-plus = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 protobuf = { version = "2", features = ["with-bytes"] }
-classic_terraswap = { path = "../../packages/classic_terraswap", default-features = false, version = "2.7.0"}
+classic_terraswap = { path = "../../packages/classic_terraswap", default-features = false, version = "2.8.0"}
 
 [dev-dependencies]
 cosmwasm-schema = { version = "1.0.0"}

contracts/terraswap_pair/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "terraswap-pair"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Terraform Labs, PTE.", "DELIGHT LABS"]
 edition = "2021"
 description = "A Terraswap pair contract"
@@ -44,7 +44,7 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 protobuf = { version = "2", features = ["with-bytes"] }
 classic-bindings = { version = "0.1.1" }
-classic_terraswap = { path = "../../packages/classic_terraswap", default-features = false, version = "2.7.0"}
+classic_terraswap = { path = "../../packages/classic_terraswap", default-features = false, version = "2.8.0"}
 
 [dev-dependencies]
 cosmwasm-schema = { version = "1.0.0" }

contracts/terraswap_pair/src/contract.rs

@@ -868,7 +868,7 @@ pub fn assert_minimum_assets(
     Ok(())
 }
 
-const TARGET_CONTRACT_VERSION: &str = "0.1.1";
+const TARGET_CONTRACT_VERSION: &str = "0.2.0";
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(
     deps: DepsMut<TerraQuery>,

contracts/terraswap_router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "terraswap-router"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Terraform Labs, PTE.", "DELIGHT LABS"]
 edition = "2021"
 description = "A Terraswap router contract - provides multi-step operations to facilitate single sign operation"
@@ -37,7 +37,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 cw2 = { version = "0.14.0" }
 cw20 = { version = "0.14.0" }
 cosmwasm-std = { version = "1.0.0" }
-classic_terraswap = { path = "../../packages/classic_terraswap", version = "2.7.0" }
+classic_terraswap = { path = "../../packages/classic_terraswap", version = "2.8.0" }
 classic-bindings = { version = "0.1.1" }
 cw-storage-plus = { version = "1.0.0"}
 integer-sqrt = "0.1.5"

contracts/terraswap_router/src/contract.rs

@@ -20,7 +20,7 @@ use classic_terraswap::router::{
     ConfigResponse, Cw20HookMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
     SimulateSwapOperationsResponse, SwapOperation,
 };
-use classic_terraswap::util::assert_deadline;
+use classic_terraswap::util::{assert_deadline, migrate_version};
 use cw20::Cw20ReceiveMsg;
 use std::collections::HashMap;
 
@@ -216,8 +216,7 @@ fn assert_minimum_receive(
 
     if swap_amount < minium_receive {
         return Err(StdError::generic_err(format!(
-            "assertion failed; minimum receive amount: {}, swap amount: {}",
-            minium_receive, swap_amount
+            "assertion failed; minimum receive amount: {minium_receive}, swap amount: {swap_amount}",
         )));
     }
 
@@ -638,8 +637,19 @@ fn test_invalid_operations() {
     .is_err());
 }
 
+const TARGET_CONTRACT_VERSION: &str = "0.1.0";
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+pub fn migrate(
+    deps: DepsMut<TerraQuery>,
+    _env: Env,
+    _msg: MigrateMsg,
+) -> StdResult<Response<TerraMsg>> {
+    migrate_version(
+        deps,
+        TARGET_CONTRACT_VERSION,
+        CONTRACT_NAME,
+        CONTRACT_VERSION,
+    )?;
+
     Ok(Response::default())
 }

contracts/terraswap_router/src/querier.rs

@@ -1,3 +1,4 @@
+use classic_terraswap::asset::IBC_REX;
 use cosmwasm_std::{Decimal, Decimal256, QuerierWrapper, StdResult, Uint128, Uint256};
 use std::ops::Mul;
 
@@ -10,6 +11,10 @@ pub fn compute_tax(
     amount: Uint128,
     denom: String,
 ) -> StdResult<Uint128> {
+    if IBC_REX.is_match(&denom) {
+        return Ok(Uint128::zero());
+    }
+
     let terra_querier = TerraQuerier::new(querier);
     let tax_rate: Decimal = (terra_querier.query_tax_rate()?).rate;
     let tax_cap: Uint128 = (terra_querier.query_tax_cap(denom)?).cap;
@@ -27,6 +32,10 @@ pub fn compute_reverse_tax(
     amount: Uint128,
     denom: String,
 ) -> StdResult<Uint128> {
+    if IBC_REX.is_match(&denom) {
+        return Ok(Uint128::zero());
+    }
+
     let terra_querier = TerraQuerier::new(querier);
     let tax_rate: Decimal = (terra_querier.query_tax_rate()?).rate;
     let tax_cap: Uint128 = (terra_querier.query_tax_cap(denom)?).cap;

contracts/terraswap_token/Cargo.toml

@@ -26,7 +26,7 @@ cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
-classic_terraswap = { path = "../../packages/classic_terraswap", version = "2.7.0" }
+classic_terraswap = { path = "../../packages/classic_terraswap", version = "2.8.0" }
 
 [dev-dependencies]
 # we only need to enable this if we use integration tests

packages/classic_terraswap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "classic_terraswap"
-version = "2.7.0"
+version = "2.8.0"
 authors = ["Terraform Labs, PTE.", "DELIGHT LABS"]
 edition = "2021"
 description = "Common terraswap types"
@@ -25,6 +25,7 @@ cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 protobuf = { version = "2", features = ["with-bytes"] }
+lazy-regex = {version = "3.0.2", default-features = false, features = ["lite"]}
 
 [dev-dependencies]
 cosmwasm-schema = { version = "1.0.0" }

packages/classic_terraswap/src/asset.rs

@@ -1,3 +1,4 @@
+use lazy_regex::*;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt;
@@ -10,6 +11,8 @@ use cosmwasm_std::{
 };
 use cw20::Cw20ExecuteMsg;
 
+pub static IBC_REX: Lazy<Regex> = lazy_regex!("^ibc/[A-F0-9]{64}$");
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct Asset {
     pub info: AssetInfo,
@@ -32,6 +35,10 @@ impl Asset {
     pub fn compute_tax(&self, querier: &QuerierWrapper<TerraQuery>) -> StdResult<Uint128> {
         let amount = self.amount;
         if let AssetInfo::NativeToken { denom } = &self.info {
+            if self.info.is_ibc_token() {
+                return Ok(Uint128::zero());
+            }
+
             let terra_querier = TerraQuerier::new(querier);
             let tax_rate: Decimal = (terra_querier.query_tax_rate()?).rate;
             let tax_cap: Uint128 = (terra_querier.query_tax_cap(denom.to_string())?).cap;
@@ -140,8 +147,8 @@ pub enum AssetInfo {
 impl fmt::Display for AssetInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            AssetInfo::NativeToken { denom } => write!(f, "{}", denom),
-            AssetInfo::Token { contract_addr } => write!(f, "{}", contract_addr),
+            AssetInfo::NativeToken { denom } => write!(f, "{denom}"),
+            AssetInfo::Token { contract_addr } => write!(f, "{contract_addr}"),
         }
     }
 }
@@ -164,6 +171,20 @@ impl AssetInfo {
             AssetInfo::Token { .. } => false,
         }
     }
+
+    pub fn is_ibc_token(&self) -> bool {
+        match self {
+            AssetInfo::NativeToken { denom } => {
+                if IBC_REX.is_match(denom) {
+                    return true;
+                }
+
+                false
+            }
+            AssetInfo::Token { .. } => false,
+        }
+    }
+
     pub fn query_pool(
         &self,
         querier: &QuerierWrapper<TerraQuery>,

packages/classic_terraswap/src/mock_querier.rs

@@ -135,7 +135,7 @@ impl Querier for WasmMockQuerier {
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
-                    error: format!("Parsing query request: {}", e),
+                    error: format!("Parsing query request: {e}"),
                     request: bin_request.into(),
                 })
             }
@@ -248,9 +248,8 @@ impl WasmMockQuerier {
                                     None => {
                                         return SystemResult::Err(SystemError::InvalidRequest {
                                             error: format!(
-                                                "No balance info exists for the contract {}",
-                                                contract_addr
-                                            ),
+                                        "No balance info exists for the contract {contract_addr}"
+                                    ),
                                             request: msg.as_slice().into(),
                                         })
                                     }
@@ -279,9 +278,8 @@ impl WasmMockQuerier {
                                     None => {
                                         return SystemResult::Err(SystemError::InvalidRequest {
                                             error: format!(
-                                                "No balance info exists for the contract {}",
-                                                contract_addr
-                                            ),
+                                        "No balance info exists for the contract {contract_addr}"
+                                    ),
                                             request: msg.as_slice().into(),
                                         })
                                     }