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

fix(minor-interchain-token-service): ignore empty event attributes #656

Merged
merged 14 commits into from
Oct 15, 2024
Merged

fix(minor-interchain-token-service): ignore empty event attributes #656

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5645075
fix(interchain-token-service): ignore empty event attributes
milapsheth Oct 1, 2024
466e32d
add nonempty HexBinary
milapsheth Oct 10, 2024
f0810e4
update ITS message primitives
milapsheth Oct 11, 2024
6d03115
update abi encode/decode
milapsheth Oct 11, 2024
882508d
update event
milapsheth Oct 11, 2024
c978357
update tests
milapsheth Oct 11, 2024
950653b
update testdata
milapsheth Oct 11, 2024
d5e69df
fmt
milapsheth Oct 11, 2024
bbacc16
add test coverage
milapsheth Oct 11, 2024
09e1fef
use nonempty uint256
milapsheth Oct 11, 2024
b8b903d
fmt
milapsheth Oct 11, 2024
aaf9529
typo
milapsheth Oct 11, 2024
4e897f5
add helper
milapsheth Oct 11, 2024
535c34e
address comments
milapsheth Oct 15, 2024
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
250 changes: 172 additions & 78 deletions contracts/interchain-token-service/src/abi.rs
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 14 additions & 8 deletions contracts/interchain-token-service/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,13 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(its_address).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: HexBinary::from_hex(its_address)
.unwrap()
.try_into()
.unwrap(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};

Expand All @@ -276,10 +279,13 @@ mod tests {
destination_chain: source_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(its_address).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: HexBinary::from_hex(its_address)
.unwrap()
.try_into()
.unwrap(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};

Expand Down
100 changes: 54 additions & 46 deletions contracts/interchain-token-service/src/contract/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axelar_core_std::nexus;
use axelar_wasm_std::{nonempty, FnExt, IntoContractError};
use cosmwasm_std::{Coin, DepsMut, HexBinary, QuerierWrapper, Response, Storage, Uint128};
use cosmwasm_std::{Coin, DepsMut, HexBinary, QuerierWrapper, Response, Storage, Uint128, Uint256};
use error_stack::{bail, ensure, report, Result, ResultExt};
use router_api::{Address, ChainName, ChainNameRaw, CrossChainId};
use sha3::{Digest, Keccak256};
Expand Down Expand Up @@ -158,7 +158,8 @@ fn gateway_token_transfer(
match (gateway_denom, message) {
(Some(denom), Message::InterchainTransfer { amount, .. }) => Ok(Some(Coin {
denom: denom.to_string(),
amount: Uint128::try_from(*amount).change_context(Error::TransferAmountOverflow)?,
amount: Uint128::try_from(Uint256::from(*amount))
milapsheth marked this conversation as resolved.
Show resolved Hide resolved
.change_context(Error::TransferAmountOverflow)?,
})),
_ => Ok(None),
}
Expand Down Expand Up @@ -242,8 +243,8 @@ mod tests {
use axelar_core_std::nexus;
use axelar_core_std::nexus::query::IsChainRegisteredResponse;
use axelar_core_std::query::AxelarQueryMsg;
use axelar_wasm_std::assert_err_contains;
use axelar_wasm_std::msg_id::HexTxHashAndEventIndex;
use axelar_wasm_std::{assert_err_contains, nonempty};
use axelarnet_gateway::msg::QueryMsg;
use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage};
use cosmwasm_std::{
Expand All @@ -262,6 +263,13 @@ mod tests {
const GATEWAY_TOKEN_DENOM: &str = "eth";
const ITS_ADDRESS: &str = "68d30f47F19c07bCCEf4Ac7FAE2Dc12FCa3e0dC9";

fn dummy_its_address() -> nonempty::HexBinary {
HexBinary::from_hex(ITS_ADDRESS)
.unwrap()
.try_into()
.unwrap()
}

#[test]
fn gateway_token_id_should_be_idempotent() {
let mut deps = init();
Expand Down Expand Up @@ -328,10 +336,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
assert_ok!(execute_message(
Expand All @@ -352,10 +360,10 @@ mod tests {
destination_chain: source_chain.clone(),
message: Message::InterchainTransfer {
token_id,
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};

Expand Down Expand Up @@ -401,10 +409,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: [0u8; 32].into(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
let res = execute_message(
Expand Down Expand Up @@ -454,10 +462,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: amount_in_msg.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: amount_in_msg.try_into().unwrap(),
data: None,
},
};
let res = execute_message(
Expand Down Expand Up @@ -508,10 +516,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
let res = execute_message(
Expand Down Expand Up @@ -560,10 +568,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
let res = execute_message(
Expand Down Expand Up @@ -612,10 +620,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
let res = assert_ok!(execute_message(
Expand Down Expand Up @@ -651,10 +659,10 @@ mod tests {
destination_chain: second_destination_chain.clone(),
message: Message::InterchainTransfer {
token_id,
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};

Expand Down Expand Up @@ -699,10 +707,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: Uint256::one(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: dummy_its_address(),
amount: Uint256::one().try_into().unwrap(),
data: None,
},
};

Expand Down Expand Up @@ -742,10 +750,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::InterchainTransfer {
token_id: token_id.clone(),
source_address: source_address.clone(),
destination_address: HexBinary::from_hex(ITS_ADDRESS).unwrap(),
amount: coin.amount.into(),
data: HexBinary::from_hex("").unwrap(),
source_address: source_address.clone().try_into().unwrap(),
destination_address: dummy_its_address(),
amount: coin.amount.try_into().unwrap(),
data: None,
},
};
let res = execute_message(
Expand Down Expand Up @@ -791,10 +799,10 @@ mod tests {
destination_chain: destination_chain.clone(),
message: Message::DeployInterchainToken {
token_id: token_id.clone(),
name: "foobar".to_string(),
symbol: "FOO".to_string(),
name: "foobar".try_into().unwrap(),
symbol: "FOO".try_into().unwrap(),
decimals: 10u8,
minter: HexBinary::from([0u8; 32]),
minter: Some(HexBinary::from([0u8; 32]).try_into().unwrap()),
},
};
let res = execute_message(
Expand Down
Loading
Loading