pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 06:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix over/under flow risk in OnDilution (#2548)

Browse Source 
* fix over/under flow risk in OnDilution

* bump impl
This commit is contained in:
joe petrowski
2019-05-14 12:07:32 +02:00
committed by Gavin Wood
parent e5627e2480
commit 580432d822
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/node/runtime/src/lib.rs
+1 -1
View File
@@ -59,7 +59,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("substrate-node"), impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10, authoring_version: 10,
spec_version: 78, spec_version: 78,
impl_version: 78, impl_version: 79,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
}; };
substrate/srml/treasury/src/lib.rs
+9 -3
View File
@@ -64,7 +64,9 @@ use serde::{Serialize, Deserialize};
use rstd::prelude::*; use rstd::prelude::*;
use srml_support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure}; use srml_support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure};
use srml_support::traits::{Currency, ReservableCurrency, OnDilution, OnUnbalanced, Imbalance}; use srml_support::traits::{Currency, ReservableCurrency, OnDilution, OnUnbalanced, Imbalance};
use runtime_primitives::{Permill, traits::{Zero, EnsureOrigin, StaticLookup}}; use runtime_primitives::{Permill,
traits::{Zero, EnsureOrigin, StaticLookup, Saturating, CheckedSub, CheckedMul}
};
use parity_codec::{Encode, Decode}; use parity_codec::{Encode, Decode};
use system::ensure_signed; use system::ensure_signed;
@@ -291,8 +293,12 @@ impl<T: Trait> OnDilution<BalanceOf<T>> for Module<T> {
// pre dilution and post-dilution. // pre dilution and post-dilution.
if !minted.is_zero() && !portion.is_zero() { if !minted.is_zero() && !portion.is_zero() {
let total_issuance = T::Currency::total_issuance(); let total_issuance = T::Currency::total_issuance();
let funding = (total_issuance - portion) / portion * minted; if let Some(funding) = total_issuance.checked_sub(&portion) {
<Pot<T>>::mutate(|x| *x += funding); let funding = funding / portion;
if let Some(funding) = funding.checked_mul(&minted) {
<Pot<T>>::mutate(|x| *x = x.saturating_add(funding));
}
}
} }
} }
} }