blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use safe math in terra 

This uses safe math even in places where it's technically not necessary, but we want to be consistent here.

Change-Id: I5f9c8e2c0a798a38e4459f673541024bc0f07ef4
This commit is contained in:
Hendrik Hofstadt 2021-08-02 17:30:05 +02:00
parent 7f67ba1194
commit b37853f7d9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
terra/contracts/token-bridge/src/contract.rs
View File

@ -370,7 +370,7 @@ fn handle_complete_transfer<S: Storage, A: Api, Q: Querier>(
let (not_supported_amount, mut amount) = transfer_info.amount;
let (not_supported_fee, mut fee) = transfer_info.fee;
amount -= fee;
amount = amount.checked_sub(fee).unwrap();
// Check high 128 bit of amount value to be empty
if not_supported_amount != 0 || not_supported_fee != 0 {
@ -443,8 +443,8 @@ fn handle_complete_transfer<S: Storage, A: Api, Q: Querier>(
let decimals = token_info.decimals;
let multiplier = 10u128.pow((max(decimals, 8u8) - 8u8) as u32);
amount *= multiplier;
fee *= multiplier;
amount = amount.checked_mul(multiplier).unwrap();
fee = fee.checked_mul(multiplier).unwrap();
let mut messages = vec![CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: contract_addr.clone(),
@ -540,8 +540,15 @@ fn handle_initiate_transfer<S: Storage, A: Api, Q: Querier>(
let decimals = token_info.decimals;
let multiplier = 10u128.pow((max(decimals, 8u8) - 8u8) as u32);
// chop off dust
amount = Uint128(amount.u128() - (amount.u128() % multiplier));
fee = Uint128(fee.u128() - (fee.u128() % multiplier));
amount = Uint128(
amount
.u128()
.checked_sub(amount.u128().checked_rem(multiplier).unwrap()).unwrap(),
);
fee = Uint128(
fee.u128()
.checked_sub(fee.u128().checked_rem(multiplier).unwrap()).unwrap(),
);
// This is a regular asset, transfer its balance
messages.push(CosmosMsg::Wasm(WasmMsg::Execute {
@ -557,8 +564,8 @@ fn handle_initiate_transfer<S: Storage, A: Api, Q: Querier>(
asset_chain = CHAIN_ID;
// convert to normalized amounts before recording & posting vaa
amount = Uint128(amount.u128() / multiplier);
fee = Uint128(fee.u128() / multiplier);
amount = Uint128(amount.u128().checked_div(multiplier).unwrap());
fee = Uint128(fee.u128().checked_div(multiplier).unwrap());
send_native(&mut deps.storage, &asset_canonical, amount)?;
}