Skip to content

chore(zkgm): allow empty/invalid mm address on ack #5113

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(zkgm): allow empty/invalid mm address on ack #5113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 18 additions & 24 deletions cosmwasm/ibc-union/app/ucs03-zkgm/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,23 +972,21 @@ fn acknowledge_fungible_asset_order_v2(
let minter = TOKEN_MINTER.load(deps.storage)?;

if order.kind == TOKEN_ORDER_KIND_UNESCROW {
let market_maker = deps
.api
.addr_validate(
str::from_utf8(ack.market_maker.as_ref())
.map_err(|_| ContractError::InvalidReceiver)?,
)
.map_err(|_| ContractError::UnableToValidateMarketMaker)?;
// Mint tokens to market maker (EVM: IZkgmERC20(address(baseToken)).mint(marketMaker, order.baseAmount))
messages.push(make_wasm_msg(
WrappedTokenMsg::MintTokens {
denom: base_denom,
amount: base_amount.into(),
mint_to_address: market_maker,
},
minter,
vec![],
)?);
if let Some(market_maker) = str::from_utf8(ack.market_maker.as_ref())
.ok()
.and_then(|x| deps.api.addr_validate(x).ok())
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe emit an event if unable to parse?

messages.push(make_wasm_msg(
WrappedTokenMsg::MintTokens {
denom: base_denom,
amount: base_amount.into(),
mint_to_address: market_maker,
},
minter,
vec![],
)?);
}
} else {
// Decrease channel balance and transfer (EVM: _decreaseOutstandingV2 + safeTransfer)
decrease_channel_balance_v2(
Expand All @@ -1013,14 +1011,10 @@ fn acknowledge_fungible_asset_order_v2(
minter,
vec![],
)?);
} else {
let market_maker = deps
.api
.addr_validate(
str::from_utf8(ack.market_maker.as_ref())
.map_err(|_| ContractError::InvalidReceiver)?,
)
.map_err(|_| ContractError::UnableToValidateMarketMaker)?;
} else if let Some(market_maker) = str::from_utf8(ack.market_maker.as_ref())
.ok()
.and_then(|x| deps.api.addr_validate(x).ok())
{
messages.push(make_wasm_msg(
LocalTokenMsg::Unescrow {
denom: base_denom,
Expand Down
28 changes: 19 additions & 9 deletions evm/contracts/apps/ucs/03-zkgm/TokenOrder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,13 +615,15 @@ contract UCS03ZkgmTokenOrderImpl is Versioned, TokenBucket, UCS03ZkgmStore {
} else if (assetOrderAck.fillType == ZkgmLib.FILL_TYPE_MARKETMAKER)
{
// A market maker filled, we pay with the sent asset.
address marketMaker =
address(bytes20(assetOrderAck.marketMaker));
address baseToken = address(bytes20(order.baseToken));
if (order.kind == ZkgmLib.TOKEN_ORDER_KIND_UNESCROW) {
IZkgmERC20(address(baseToken)).mint(
marketMaker, order.baseAmount
);
if (assetOrderAck.marketMaker.length == 20) {
address marketMaker =
address(bytes20(assetOrderAck.marketMaker));
IZkgmERC20(address(baseToken)).mint(
marketMaker, order.baseAmount
);
}
} else {
_decreaseOutstandingV2(
ibcPacket.sourceChannelId,
Expand All @@ -631,14 +633,22 @@ contract UCS03ZkgmTokenOrderImpl is Versioned, TokenBucket, UCS03ZkgmStore {
order.baseAmount
);
// Check if the counterparty minted and wants us to burn to net.
if (marketMaker == address(0)) {
if (
assetOrderAck.marketMaker.eq(
abi.encodePacked(address(0))
)
) {
IZkgmERC20(baseToken).burn(
address(this), order.baseAmount
);
} else {
IERC20(baseToken).safeTransfer(
marketMaker, order.baseAmount
);
if (assetOrderAck.marketMaker.length == 20) {
address marketMaker =
address(bytes20(assetOrderAck.marketMaker));
IERC20(baseToken).safeTransfer(
marketMaker, order.baseAmount
);
}
}
}
} else {
Expand Down