Merge pull request #188 from docknetwork/allow-root-to-fast-track

Allow system root origin to create external proposals
docknetwork · Sep 2, 2024 · 52df523 · 52df523
2 parents 80fbf9e + ca182c5
commit 52df523
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -514,7 +514,7 @@ branch = "polkadot-v0.9.29"
 
 [dependencies.pallet-elections-phragmen]
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.dock-staking-rewards]
 path = "../pallets/staking-rewards"
@@ -528,7 +528,7 @@ rev = "dc50c3d973d1f53434c7a03e426faa9c20062f60"
 
 [dependencies.dock-price-feed-rpc]
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.dock-staking-rewards-rpc]
 path = "../pallets/staking-rewards/rpc"
@@ -538,7 +538,7 @@ path = "../pallets/core/rpc"
 
 [dependencies.pallet-staking]
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.fp-consensus]
 git = "https://github.com/docknetwork/frontier.git"

diff --git a/pallets/core/Cargo.toml b/pallets/core/Cargo.toml
@@ -22,7 +22,7 @@ default-features = false
 
 [dependencies.utils]
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 default-features = false
 
 [dependencies.scale-info]

diff --git a/pallets/staking-rewards/Cargo.toml b/pallets/staking-rewards/Cargo.toml
@@ -8,7 +8,9 @@ license = "Apache-2.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = [
+    "derive",
+] }
 
 [dependencies.codec]
 default-features = false
@@ -49,7 +51,7 @@ branch = "polkadot-v0.9.29"
 [dependencies.pallet-staking]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.pallet-staking-reward-curve]
 default-features = false
@@ -100,4 +102,4 @@ std = [
     "dock-poa/std",
     "sp-io/std",
     "scale-info/std",
-]
+]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -49,7 +49,7 @@ hex = { version = "0.4", default-features = false }
 
 [dependencies.utils]
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 default-features = false
 
 [dependencies.pallet-babe]
@@ -292,7 +292,7 @@ branch = "polkadot-v0.9.29"
 [dependencies.pallet-collective]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.pallet-membership]
 default-features = false
@@ -332,7 +332,7 @@ branch = "polkadot-v0.9.29"
 [dependencies.pallet-staking]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.pallet-staking-reward-curve]
 default-features = false
@@ -367,12 +367,12 @@ branch = "polkadot-v0.9.29"
 [dependencies.pallet-democracy]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.pallet-elections-phragmen]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.hex-literal]
 version = "0.3.4"
@@ -463,7 +463,7 @@ path = "../pallets/agreement"
 [dependencies.dock-price-feed]
 default-features = false
 git = "https://github.com/docknetwork/dock-substrate-common.git"
-branch = "identity-provider"
+commit = "49c162eb87c85631376fb95dc04e48dde845ba1c"
 
 [dependencies.libsecp256k1]
 version = "0.7"

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -200,7 +200,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("dock-pos-dev-runtime"),
     impl_name: create_runtime_str!("Dock"),
     authoring_version: 1,
-    spec_version: 61,
+    spec_version: 62,
     impl_version: 2,
     transaction_version: 2,
     apis: RUNTIME_API_VERSIONS,
@@ -1233,20 +1233,26 @@ impl pallet_democracy::Config for Runtime {
     type CooloffPeriod = CooloffPeriod;
     type MinimumDeposit = MinimumDeposit;
     /// A straight majority of the council can decide what their next motion is.
-    type ExternalOrigin =
-        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>;
+    type ExternalOrigin = EitherOfDiverse<
+        EnsureRoot<AccountId>,
+        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>,
+    >;
     /// A super-majority can have the next scheduled referendum be a straight majority-carries vote.
-    type ExternalMajorityOrigin =
-        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 4>;
+    type ExternalMajorityOrigin = EitherOfDiverse<
+        EnsureRoot<AccountId>,
+        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 4>,
+    >;
     /// A unanimous council can have the next scheduled referendum be a straight default-carries
     /// (NTB) vote.
-    type ExternalDefaultOrigin =
-        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 1>;
+    type ExternalDefaultOrigin = EitherOfDiverse<
+        EnsureRoot<AccountId>,
+        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 1>,
+    >;
     /// Two thirds of the technical committee can have an ExternalMajority/ExternalDefault vote
     /// be tabled immediately and with a shorter voting/enactment period.
     type FastTrackOrigin = EitherOfDiverse<
-        pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 2, 3>,
         EnsureRoot<AccountId>,
+        pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 2, 3>,
     >;
     /// Root or the Technical committee unanimously agreeing can make a Council proposal a referendum instantly.
     type InstantOrigin = EitherOfDiverse<