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 Multitoken VP to avoid overflow #2443

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Fix Multitoken VP to avoid overflow #2443

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
060efa9
check diffs
yito88 Jan 25, 2024
db5702b
fix all tokens
yito88 Jan 25, 2024
5845bc1
add changelog
yito88 Jan 25, 2024
7af0769
vp/multitoken: refactor maps and sets usage
tzemanovic Jan 25, 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
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/2443-fix-multitoken-vp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Avoid diff overflow in Multitoken VP
([\#2443](https://github.com/anoma/namada/issues/2443))
100 changes: 82 additions & 18 deletions crates/namada/src/ledger/native_vp/multitoken.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::token::storage_key::{
is_any_minted_balance_key, is_any_minter_key, is_any_token_balance_key,
minter_key,
};
use crate::token::{Amount, Change};
use crate::token::Amount;
use crate::types::address::{Address, InternalAddress};
use crate::types::storage::{Key, KeySeg};
use crate::vm::WasmCacheAccess;
Expand Down Expand Up @@ -51,26 +51,71 @@ where
keys_changed: &BTreeSet<Key>,
verifiers: &BTreeSet<Address>,
) -> Result<bool> {
let mut changes = HashMap::new();
let mut mints = HashMap::new();
let mut inc_changes: HashMap<Address, Amount> = HashMap::new();
let mut dec_changes: HashMap<Address, Amount> = HashMap::new();
let mut inc_mints: HashMap<Address, Amount> = HashMap::new();
let mut dec_mints: HashMap<Address, Amount> = HashMap::new();
for key in keys_changed {
if let Some([token, _]) = is_any_token_balance_key(key) {
let pre: Amount = self.ctx.read_pre(key)?.unwrap_or_default();
let post: Amount = self.ctx.read_post(key)?.unwrap_or_default();
let diff = post.change() - pre.change();
match changes.get_mut(token) {
Some(change) => *change += diff,
None => _ = changes.insert(token, diff),
match post.checked_sub(pre) {
Some(diff) => {
let change =
inc_changes.entry(token.clone()).or_default();
*change =
change.checked_add(diff).ok_or_else(|| {
Error::NativeVpError(
native_vp::Error::SimpleMessage(
"Overflowed in balance check",
),
)
})?;
}
None => {
let diff = pre
.checked_sub(post)
.expect("Underflow shouldn't happen here");
let change =
dec_changes.entry(token.clone()).or_default();
*change =
change.checked_add(diff).ok_or_else(|| {
Error::NativeVpError(
native_vp::Error::SimpleMessage(
"Overflowed in balance check",
),
)
})?;
}
}
} else if let Some(token) = is_any_minted_balance_key(key) {
let pre: Amount = self.ctx.read_pre(key)?.unwrap_or_default();
let post: Amount = self.ctx.read_post(key)?.unwrap_or_default();
let diff = post.change() - pre.change();
match mints.get_mut(token) {
Some(mint) => *mint += diff,
None => _ = mints.insert(token, diff),
match post.checked_sub(pre) {
Some(diff) => {
let mint = inc_mints.entry(token.clone()).or_default();
*mint = mint.checked_add(diff).ok_or_else(|| {
Error::NativeVpError(
native_vp::Error::SimpleMessage(
"Overflowed in balance check",
),
)
})?;
}
None => {
let diff = pre
.checked_sub(post)
.expect("Underflow shouldn't happen here");
let mint = dec_mints.entry(token.clone()).or_default();
*mint = mint.checked_add(diff).ok_or_else(|| {
Error::NativeVpError(
native_vp::Error::SimpleMessage(
"Overflowed in balance check",
),
)
})?;
}
}

// Check if the minter is set
if !self.is_valid_minter(token, verifiers)? {
return Ok(false);
Expand All @@ -90,12 +135,31 @@ where
}
}

Ok(changes.iter().all(|(token, change)| {
let mint = match mints.get(token) {
Some(mint) => *mint,
None => Change::zero(),
};
*change == mint
let mut all_tokens = BTreeSet::new();
all_tokens.extend(inc_changes.keys().cloned());
all_tokens.extend(dec_changes.keys().cloned());
all_tokens.extend(inc_mints.keys().cloned());
all_tokens.extend(dec_mints.keys().cloned());

Ok(all_tokens.iter().all(|token| {
let inc_change =
inc_changes.get(token).cloned().unwrap_or_default();
let dec_change =
dec_changes.get(token).cloned().unwrap_or_default();
let inc_mint = inc_mints.get(token).cloned().unwrap_or_default();
let dec_mint = dec_mints.get(token).cloned().unwrap_or_default();

if inc_change >= dec_change && inc_mint >= dec_mint {
inc_change.checked_sub(dec_change)
== inc_mint.checked_sub(dec_mint)
} else if (inc_change < dec_change && inc_mint >= dec_mint)
|| (inc_change >= dec_change && inc_mint < dec_mint)
{
false
} else {
dec_change.checked_sub(inc_change)
== dec_mint.checked_sub(inc_mint)
}
}))
}
}
Expand Down
Loading