pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Fees in Substrate (#4421)

Browse Source 
* Fix fees

* Add comment to explain saturated multiply accumulate

* Fix final fee calculation

* Fix doc

* improve doc

* grumble

* Update tests

* Fix executor tests
This commit is contained in:
Shawn Tabrizi
2019-12-19 14:03:00 +01:00
committed by Gavin Wood
parent 9a1bb75809
commit 1d04d5a05e
2 changed files with 125 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/node/executor/src/lib.rs
+6 -6
View File
@@ -87,14 +87,14 @@ mod tests {
/// Default transfer fee
fn transfer_fee<E: Encode>(extrinsic: &E, fee_multiplier: Fixed64) -> Balance {
let length_fee = TransactionBaseFee::get() +
TransactionByteFee::get() *
(extrinsic.encode().len() as Balance);
let length_fee = TransactionByteFee::get() * (extrinsic.encode().len() as Balance);
let weight = default_transfer_call().get_dispatch_info().weight;
let weight_fee = <Runtime as pallet_transaction_payment::Trait>::WeightToFee::convert(weight);
fee_multiplier.saturated_multiply_accumulate(length_fee + weight_fee) + TransferFee::get()
let base_fee = TransactionBaseFee::get();
base_fee + fee_multiplier.saturated_multiply_accumulate(length_fee + weight_fee) + TransferFee::get()
}
fn default_transfer_call() -> pallet_balances::Call<Runtime> {
@@ -537,7 +537,7 @@ mod tests {
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(1984780231392)),
event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(1984788199392)),
topics: vec![],
},
EventRecord {
@@ -561,7 +561,7 @@ mod tests {
},
EventRecord {
phase: Phase::ApplyExtrinsic(2),
event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(1984780231392)),
event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(1984788199392)),
topics: vec![],
},
EventRecord {