Skip to content

Remove unchecked arithmetic #1831

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

Merged
athei merged 14 commits into from
Aug 28, 2023
Merged

Remove unchecked arithmetic #1831

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ad9d0e
Remove unchecked arithmetic
athei Jul 1, 2023
9c4e59f
Remove from erc20
athei Jul 2, 2023
8ba8725
Remove from erc1155
athei Jul 2, 2023
9627c86
Remove from erc721
athei Jul 2, 2023
41bc133
Remove from incrementer
athei Jul 2, 2023
0b19225
Remove from payment-channel
athei Jul 2, 2023
526fdfd
Remove from trait-erc20
athei Jul 2, 2023
bea89ad
Remove from trait-incrementer
athei Jul 2, 2023
24da566
Remove from multi-contract-caller
athei Jul 2, 2023
ab9e040
Remove from multisig
athei Jul 2, 2023
b703b49
Remove from set-code-hash
athei Jul 2, 2023
c8e9875
cargo fmt
athei Jul 2, 2023
8675b2e
Merge branch 'master' into at/remove-unchecked-arithmetic
athei Aug 21, 2023
28175ea
Spellcheck
athei Aug 21, 2023
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
Prev Previous commit
Next Next commit
Remove from erc20
  • Loading branch information
@athei
athei committed Jul 2, 2023
commit 9c4e59f6fb2f14d621ef7b0a5d2314a227c0f5aa
8 changes: 6 additions & 2 deletions integration-tests/erc20/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ mod erc20 {
return Err(Error::InsufficientAllowance)
}
self.transfer_from_to(&from, &to, value)?;
// We checked that allowance >= value
#[allow(clippy::arithmetic_side_effects)]
self.allowances
.insert((&from, &caller), &(allowance - value));
Ok(())
Expand All @@ -201,10 +203,12 @@ mod erc20 {
if from_balance < value {
return Err(Error::InsufficientBalance)
}

// We checked that from_balance >= value
#[allow(clippy::arithmetic_side_effects)]
self.balances.insert(from, &(from_balance - value));
let to_balance = self.balance_of_impl(to);
self.balances.insert(to, &(to_balance + value));
self.balances
.insert(to, &(to_balance.checked_add(value).unwrap()));
self.env().emit_event(Transfer {
from: Some(*from),
to: Some(*to),
Expand Down