Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for substrate#11690 #1377

Merged
merged 6 commits into from
Jul 29, 2022
Merged

Companion for substrate#11690 #1377

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e5810e
Companion for substrate#11690
hzy1919 Jun 16, 2022
273d1d9
Merge branch 'master' into companion-Add-Event-to-Pallet-Asset-Tx-Pay…
hzy1919 Jul 29, 2022
673c388
Fix
hzy1919 Jul 29, 2022
820ad4a
Fix
hzy1919 Jul 29, 2022
9f82720
Merge branch 'paritytech:master' into companion-Add-Event-to-Pallet-A…
hzy1919 Jul 29, 2022
fe2a2d2
update lockfile for {"substrate", "polkadot"}
Jul 29, 2022
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
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/statemine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ impl pallet_collator_selection::Config for Runtime {
}

impl pallet_asset_tx_payment::Config for Runtime {
ggwpez marked this conversation as resolved.
Show resolved Hide resolved
type Event = Event;
type Fungibles = Assets;
type OnChargeAssetTransaction = pallet_asset_tx_payment::FungiblesAdapter<
pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto>,
Expand Down Expand Up @@ -560,7 +561,7 @@ construct_runtime!(
// Monetary stuff.
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
AssetTxPayment: pallet_asset_tx_payment::{Pallet, Event<T>} = 12,

// Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
Expand Down
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/statemint/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ impl pallet_collator_selection::Config for Runtime {
}

impl pallet_asset_tx_payment::Config for Runtime {
type Event = Event;
type Fungibles = Assets;
type OnChargeAssetTransaction = pallet_asset_tx_payment::FungiblesAdapter<
pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto>,
Expand Down Expand Up @@ -590,7 +591,7 @@ construct_runtime!(
// Monetary stuff.
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
AssetTxPayment: pallet_asset_tx_payment::{Pallet, Event<T>} = 12,

// Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
Expand Down
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/westmint/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ impl pallet_collator_selection::Config for Runtime {
}

impl pallet_asset_tx_payment::Config for Runtime {
type Event = Event;
type Fungibles = Assets;
type OnChargeAssetTransaction = pallet_asset_tx_payment::FungiblesAdapter<
pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto>,
Expand Down Expand Up @@ -550,7 +551,7 @@ construct_runtime!(
// Monetary stuff.
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
AssetTxPayment: pallet_asset_tx_payment::{Pallet, Event<T>} = 12,

// Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
Expand Down