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.

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

To polkadot-v0.9.40 #1153

Merged
merged 28 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
408af7b
Remove `account`
aurexav May 22, 2023
b382acd
Update and companions
aurexav May 22, 2023
8530448
Companion of paritytech/cumulus#2164
aurexav May 22, 2023
bee6fcd
Companion of paritytech/substrate#13159
aurexav May 22, 2023
6ac22ff
Companion of paritytech/cumulus#1909
aurexav May 22, 2023
83d4820
Fmt
aurexav May 22, 2023
a3fa551
Companion of paritytech/polkadot#6744
aurexav May 22, 2023
2386d87
Companion of paritytech/cumulus#2245
aurexav May 22, 2023
e45bca6
Companion of paritytech/substrate#12828
aurexav May 22, 2023
0511f10
Companion of paritytech/cumulus#2287
aurexav May 22, 2023
e2e2900
Companion of paritytech/substrate#13592
aurexav May 22, 2023
3a75b26
Companion of paritytech/cumulus#2308
aurexav May 22, 2023
fc6da85
Companion of paritytech/substrate#13410
aurexav May 22, 2023
608913a
Companion of paritytech/substrate#13305
aurexav May 22, 2023
25695dd
Companion of paritytech/frontier#1050
aurexav May 22, 2023
d437742
TODO weight
aurexav May 22, 2023
637a580
TODO weight
aurexav May 22, 2023
6caab1f
Companion of paritytech/frontier#1040
aurexav May 22, 2023
75f01d5
Remove unused dep
aurexav May 22, 2023
d07016f
Merge branch 'main' into xavier/u
aurexav May 22, 2023
f80e7b9
Try fix dev node paritytech/substrate#12828
jiguantong May 23, 2023
c27fcdf
Fix the frontier part (#1154)
boundless-forest May 23, 2023
bf775ff
Fix dev node
jiguantong May 23, 2023
10e4206
Fmt
aurexav May 23, 2023
b967680
Bump moonbeam
aurexav May 23, 2023
f634f40
Bump moonbeam
aurexav May 23, 2023
d919bc7
Remove unnecessary clone
aurexav May 23, 2023
cf9f1fb
Fix tests
aurexav May 23, 2023
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
Prev Previous commit
Next Next commit
  • Loading branch information
aurexav committed May 22, 2023
commit fc6da8566167fef0da01c4c5da69f5fb74e3e511
3 changes: 0 additions & 3 deletions runtime/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ where
mut fees_then_tips: impl Iterator<Item = pallet_balances::NegativeImbalance<R>>,
) {
if let Some(fees) = fees_then_tips.next() {
// substrate
use frame_support::traits::Imbalance;

// Balances pallet automatically burns dropped Negative Imbalances by decreasing
// total_supply accordingly
<pallet_treasury::Pallet<R> as frame_support::traits::OnUnbalanced<_>>::on_unbalanced(
Expand Down
1 change: 1 addition & 0 deletions runtime/crab/src/pallets/democracy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ impl pallet_democracy::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Scheduler = Scheduler;
type Slash = Treasury;
type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down
1 change: 1 addition & 0 deletions runtime/darwinia/src/pallets/democracy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ impl pallet_democracy::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Scheduler = Scheduler;
type Slash = Treasury;
type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down
1 change: 1 addition & 0 deletions runtime/pangolin/src/pallets/democracy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ impl pallet_democracy::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Scheduler = Scheduler;
type Slash = Treasury;
type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down
1 change: 1 addition & 0 deletions runtime/pangoro/src/pallets/democracy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ impl pallet_democracy::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Scheduler = Scheduler;
type Slash = Treasury;
type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down