Unverified Commit d9f2cbe0 authored by Albrecht's avatar Albrecht Committed by GitHub
Browse files

Companion for #6912 (#1784)

* adjustments for substrate PR

https://github.com/paritytech/substrate/pull/6912



* Update runtime/kusama/src/lib.rs
Co-authored-by: thiolliere's avatarGuillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply suggestions from code review
Co-authored-by: thiolliere's avatarGuillaume Thiolliere <gui.thiolliere@gmail.com>

* update substrate
Co-authored-by: thiolliere's avatarGuillaume Thiolliere <gui.thiolliere@gmail.com>
parent 60b9e368
Pipeline #112778 passed with stages
in 22 minutes and 28 seconds
This diff is collapsed.
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "256"] #![recursion_limit = "256"]
use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_core::u32_trait::{_1, _2, _3, _5}; use sp_core::u32_trait::{_1, _2, _3, _5};
use codec::{Encode, Decode}; use codec::{Encode, Decode};
...@@ -229,8 +230,7 @@ parameter_types! { ...@@ -229,8 +230,7 @@ parameter_types! {
} }
impl pallet_transaction_payment::Trait for Runtime { impl pallet_transaction_payment::Trait for Runtime {
type Currency = Balances; type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees<Self>>;
type OnTransactionPayment = DealWithFees<Self>;
type TransactionByteFee = TransactionByteFee; type TransactionByteFee = TransactionByteFee;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "256"] #![recursion_limit = "256"]
use pallet_transaction_payment::CurrencyAdapter;
use runtime_common::{ use runtime_common::{
claims, SlowAdjustingFeeUpdate, CurrencyToVote, claims, SlowAdjustingFeeUpdate, CurrencyToVote,
impls::DealWithFees, impls::DealWithFees,
...@@ -242,8 +243,7 @@ parameter_types! { ...@@ -242,8 +243,7 @@ parameter_types! {
} }
impl pallet_transaction_payment::Trait for Runtime { impl pallet_transaction_payment::Trait for Runtime {
type Currency = Balances; type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees<Runtime>>;
type OnTransactionPayment = DealWithFees<Runtime>;
type TransactionByteFee = TransactionByteFee; type TransactionByteFee = TransactionByteFee;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "256"] #![recursion_limit = "256"]
use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use codec::Encode; use codec::Encode;
use primitives::v1::{ use primitives::v1::{
...@@ -652,8 +653,7 @@ parameter_types! { ...@@ -652,8 +653,7 @@ parameter_types! {
} }
impl pallet_transaction_payment::Trait for Runtime { impl pallet_transaction_payment::Trait for Runtime {
type Currency = Balances; type OnChargeTransaction = CurrencyAdapter<Balances, ToAuthor<Runtime>>;
type OnTransactionPayment = ToAuthor<Runtime>;
type TransactionByteFee = TransactionByteFee; type TransactionByteFee = TransactionByteFee;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "256"] #![recursion_limit = "256"]
use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use codec::Encode; use codec::Encode;
use polkadot_runtime_parachains::{ use polkadot_runtime_parachains::{
...@@ -211,8 +212,7 @@ parameter_types! { ...@@ -211,8 +212,7 @@ parameter_types! {
} }
impl pallet_transaction_payment::Trait for Runtime { impl pallet_transaction_payment::Trait for Runtime {
type Currency = Balances; type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
type OnTransactionPayment = ();
type TransactionByteFee = TransactionByteFee; type TransactionByteFee = TransactionByteFee;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "256"] #![recursion_limit = "256"]
use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use codec::{Encode, Decode}; use codec::{Encode, Decode};
use primitives::v1::{ use primitives::v1::{
...@@ -220,8 +221,7 @@ parameter_types! { ...@@ -220,8 +221,7 @@ parameter_types! {
} }
impl pallet_transaction_payment::Trait for Runtime { impl pallet_transaction_payment::Trait for Runtime {
type Currency = Balances; type OnChargeTransaction = CurrencyAdapter<Balances, ToAuthor<Runtime>>;
type OnTransactionPayment = ToAuthor<Runtime>;
type TransactionByteFee = TransactionByteFee; type TransactionByteFee = TransactionByteFee;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment