Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prevent duplicate denoms #70

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

prevent duplicate denoms #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
930989d
prevent duplicate denoms
ivmidable Sep 15, 2022
e6dbd65
forgot to run cargo fmt
ivmidable Sep 15, 2022
903c6d1
add 2 more tests
ivmidable Sep 15, 2022
bbc8e72
Merge branch 'Wasmswap:main' into collision
ivmidable Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ pub fn instantiate(
};
TOKEN2.save(deps.storage, &token2)?;

prevent_duplicate_denoms(&msg.token1_denom, &msg.token2_denom)?;

let owner = msg.owner.map(|h| deps.api.addr_validate(&h)).transpose()?;
OWNER.save(deps.storage, &owner)?;

Expand Down Expand Up @@ -391,6 +393,29 @@ fn validate_input_amount(
}
}

fn prevent_duplicate_denoms(token1: &Denom, token2: &Denom) -> Result<(), ContractError> {
match token1 {
Denom::Cw20(token1_address) => match token2 {
Denom::Cw20(token2_address) => {
if *token1_address == *token2_address {
return Err(ContractError::DuplicateDenom {});
}
Ok(())
}
Denom::Native(_) => Ok(()),
},
Denom::Native(token1_denom) => match token2 {
Denom::Cw20(_) => Ok(()),
Denom::Native(token2_denom) => {
if token1_denom == token2_denom {
return Err(ContractError::DuplicateDenom {});
}
Ok(())
}
},
}
}

fn get_cw20_transfer_from_msg(
owner: &Addr,
recipient: &Addr,
Expand Down
3 changes: 3 additions & 0 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,7 @@ pub enum ContractError {

#[error("Failed to instantiate lp token")]
InstantiateLpTokenError {},

#[error("Duplicate denom is not allowed")]
DuplicateDenom {},
}
171 changes: 149 additions & 22 deletions src/integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ fn get_info(router: &App, contract_addr: &Addr) -> InfoResponse {
fn create_amm(
router: &mut App,
owner: &Addr,
cash: &Cw20Contract,
native_denom: String,
token1_denom: &Denom,
token2_denom: &Denom,
lp_fee_percent: Decimal,
protocol_fee_percent: Decimal,
protocol_fee_recipient: String,
Expand All @@ -56,8 +56,8 @@ fn create_amm(
let cw20_id = router.store_code(contract_cw20());
let amm_id = router.store_code(contract_amm());
let msg = InstantiateMsg {
token1_denom: Denom::Native(native_denom),
token2_denom: Denom::Cw20(cash.addr()),
token1_denom: token1_denom.clone(),
token2_denom: token2_denom.clone(),
lp_token_code_id: cw20_id,
owner: Some(owner.to_string()),
lp_fee_percent,
Expand Down Expand Up @@ -129,8 +129,8 @@ fn test_instantiate() {
let amm_addr = create_amm(
&mut router,
&owner,
&cw20_token,
NATIVE_TOKEN_DENOM.into(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(cw20_token.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
Expand Down Expand Up @@ -199,8 +199,8 @@ fn amm_add_and_remove_liquidity() {
let amm_addr = create_amm(
&mut router,
&owner,
&cw20_token,
NATIVE_TOKEN_DENOM.into(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(cw20_token.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
Expand Down Expand Up @@ -584,8 +584,8 @@ fn swap_tokens_happy_path() {
let amm_addr = create_amm(
&mut router,
&owner,
&cw20_token,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(cw20_token.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
Expand Down Expand Up @@ -791,8 +791,8 @@ fn swap_with_fee_split() {
let amm_addr = create_amm(
&mut router,
&owner,
&cw20_token,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(cw20_token.addr()),
lp_fee_percent,
protocol_fee_percent,
protocol_fee_recipient.to_string(),
Expand Down Expand Up @@ -1015,8 +1015,8 @@ fn update_config() {
let amm_addr = create_amm(
&mut router,
&owner,
&cw20_token,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(cw20_token.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
Expand Down Expand Up @@ -1334,17 +1334,17 @@ fn token_to_token_swap_with_fee_split() {
let amm1 = create_amm(
&mut router,
&owner,
&token1,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(token1.addr()),
lp_fee_percent,
protocol_fee_percent,
protocol_fee_recipient.to_string(),
);
let amm2 = create_amm(
&mut router,
&owner,
&token2,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(token2.addr()),
lp_fee_percent,
protocol_fee_percent,
protocol_fee_recipient.to_string(),
Expand Down Expand Up @@ -1541,17 +1541,17 @@ fn token_to_token_swap() {
let amm1 = create_amm(
&mut router,
&owner,
&token1,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(token1.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
);
let amm2 = create_amm(
&mut router,
&owner,
&token2,
NATIVE_TOKEN_DENOM.to_string(),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Cw20(token2.addr()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
Expand Down Expand Up @@ -1691,3 +1691,130 @@ fn token_to_token_swap() {
assert_eq!(info_amm2.token2_reserve, token2_balance);
assert_eq!(info_amm2.token1_reserve, amm2_native_balance.amount);
}

#[test]
#[should_panic(expected = "Duplicate denom is not allowed")]
fn cw20_token1_to_token1_swap() {
let mut router = mock_app();

const NATIVE_TOKEN_DENOM: &str = "juno";

let owner = Addr::unchecked("owner");
let funds = coins(2000, NATIVE_TOKEN_DENOM);
router.borrow_mut().init_modules(|router, _, storage| {
router.bank.init_balance(storage, &owner, funds).unwrap()
});

let cw20_token = create_cw20(
&mut router,
&owner,
"token1".to_string(),
"TOKENONE".to_string(),
Uint128::new(5000),
);

let lp_fee_percent = Decimal::from_str("0.3").unwrap();
let protocol_fee_percent = Decimal::zero();
let _amm = create_amm(
&mut router,
&owner,
&Denom::Cw20(cw20_token.addr().clone()),
&Denom::Cw20(cw20_token.addr().clone()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
);
}

#[test]
fn cw20_token1_token2_swap() {
let mut router = mock_app();

const NATIVE_TOKEN_DENOM: &str = "juno";

let owner = Addr::unchecked("owner");
let funds = coins(2000, NATIVE_TOKEN_DENOM);
router.borrow_mut().init_modules(|router, _, storage| {
router.bank.init_balance(storage, &owner, funds).unwrap()
});

let token1 = create_cw20(
&mut router,
&owner,
"token1".to_string(),
"TOKENONE".to_string(),
Uint128::new(5000),
);

let token2 = create_cw20(
&mut router,
&owner,
"token2".to_string(),
"TOKENTWO".to_string(),
Uint128::new(5000),
);

let lp_fee_percent = Decimal::from_str("0.3").unwrap();
let protocol_fee_percent = Decimal::zero();
let _amm = create_amm(
&mut router,
&owner,
&Denom::Cw20(token1.addr().clone()),
&Denom::Cw20(token2.addr().clone()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
);
}

#[test]
#[should_panic(expected = "Duplicate denom is not allowed")]
fn native_token1_to_token1_swap() {
let mut router = mock_app();

const NATIVE_TOKEN_DENOM: &str = "juno";

let owner = Addr::unchecked("owner");
let funds = coins(2000, NATIVE_TOKEN_DENOM);
router.borrow_mut().init_modules(|router, _, storage| {
router.bank.init_balance(storage, &owner, funds).unwrap()
});

let lp_fee_percent = Decimal::from_str("0.3").unwrap();
let protocol_fee_percent = Decimal::zero();
let _amm = create_amm(
&mut router,
&owner,
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
);
}

#[test]
fn native_token1_to_token2_swap() {
let mut router = mock_app();

const NATIVE_TOKEN_DENOM: &str = "juno";
const NATIVE_TOKEN_DENOM2: &str = "stars";

let owner = Addr::unchecked("owner");
let funds = coins(2000, NATIVE_TOKEN_DENOM);
router.borrow_mut().init_modules(|router, _, storage| {
router.bank.init_balance(storage, &owner, funds).unwrap()
});

let lp_fee_percent = Decimal::from_str("0.3").unwrap();
let protocol_fee_percent = Decimal::zero();
let _amm = create_amm(
&mut router,
&owner,
&Denom::Native(NATIVE_TOKEN_DENOM.into()),
&Denom::Native(NATIVE_TOKEN_DENOM2.into()),
lp_fee_percent,
protocol_fee_percent,
owner.to_string(),
);
}