From f6e2c594a47fdacf9e35c805c177b990b6fdafce Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 12:50:02 +0200 Subject: [PATCH 1/6] lower support threshold for whitelisted caller --- runtime/basilisk/src/governance/tracks.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/basilisk/src/governance/tracks.rs b/runtime/basilisk/src/governance/tracks.rs index f557818f6d..87c41dd577 100644 --- a/runtime/basilisk/src/governance/tracks.rs +++ b/runtime/basilisk/src/governance/tracks.rs @@ -33,7 +33,7 @@ const APP_RECIP: Curve = Curve::make_reciprocal(1, 7, percent(80), percent(50), const SUP_LINEAR: Curve = Curve::make_linear(7, 7, percent(0), percent(50)); const SUP_RECIP: Curve = Curve::make_reciprocal(5, 7, percent(1), percent(0), percent(50)); const SUP_FAST_RECIP: Curve = Curve::make_reciprocal(3, 7, percent(1), percent(0), percent(50)); -const SUP_WHITELISTED_CALLER: Curve = Curve::make_reciprocal(1, 28, percent(20), percent(1), percent(50)); +const SUP_WHITELISTED_CALLER: Curve = Curve::make_linear(1, 7, percent(0), percent(1)); const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 8] = [ ( @@ -57,8 +57,8 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 8] max_deciding: 10, decision_deposit: 1_000_000 * UNITS, prepare_period: 10 * MINUTES, - decision_period: 7 * DAYS, - confirm_period: 10 * MINUTES, + decision_period: DAYS, + confirm_period: 4 * HOURS, min_enactment_period: 10 * MINUTES, min_approval: APP_RECIP, min_support: SUP_WHITELISTED_CALLER, From a579fd531219d48261167ddadb4d7685a30b202c Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 12:51:39 +0200 Subject: [PATCH 2/6] Shorter periods for ref canceller and ref killer --- runtime/basilisk/src/governance/tracks.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/basilisk/src/governance/tracks.rs b/runtime/basilisk/src/governance/tracks.rs index 87c41dd577..552efffe37 100644 --- a/runtime/basilisk/src/governance/tracks.rs +++ b/runtime/basilisk/src/governance/tracks.rs @@ -71,8 +71,8 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 8] max_deciding: 10, decision_deposit: 10_000_000 * UNITS, prepare_period: 60 * MINUTES, - decision_period: 7 * DAYS, - confirm_period: 24 * HOURS, + decision_period: 3 * DAYS, + confirm_period: 12 * HOURS, min_enactment_period: 10 * MINUTES, min_approval: APP_LINEAR_FLAT, min_support: SUP_FAST_RECIP, @@ -85,7 +85,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 8] max_deciding: 10, decision_deposit: 50_000_000 * UNITS, prepare_period: 60 * MINUTES, - decision_period: 7 * DAYS, + decision_period: 3 * DAYS, confirm_period: 3 * HOURS, min_enactment_period: 10 * MINUTES, min_approval: APP_LINEAR_FLAT, From 51520ccf4dcc2f754aaf05762d7869ad996ca00c Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 12:57:00 +0200 Subject: [PATCH 3/6] fix governance proxy --- runtime/basilisk/src/system.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/runtime/basilisk/src/system.rs b/runtime/basilisk/src/system.rs index 0916f61c24..411cd63e14 100644 --- a/runtime/basilisk/src/system.rs +++ b/runtime/basilisk/src/system.rs @@ -300,12 +300,10 @@ impl InstanceFilter for ProxyType { ProxyType::CancelProxy => matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })), ProxyType::Governance => matches!( c, - RuntimeCall::Democracy(..) - | RuntimeCall::Council(..) + RuntimeCall::ConvictionVoting(..) + | RuntimeCall::Referenda(..) | RuntimeCall::TechnicalCommittee(..) - | RuntimeCall::Elections(..) | RuntimeCall::Treasury(..) - | RuntimeCall::Tips(..) | RuntimeCall::Utility(..) ), ProxyType::Exchange => matches!(c, RuntimeCall::XYK(..) | RuntimeCall::LBP(..) | RuntimeCall::NFT(..)), From 4861c0ae0c3ccd6967a7bf7a82a4864be89bd785 Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 12:57:59 +0200 Subject: [PATCH 4/6] Exclude OpenGov from CallFilter --- runtime/basilisk/src/system.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/runtime/basilisk/src/system.rs b/runtime/basilisk/src/system.rs index 411cd63e14..2869bec15f 100644 --- a/runtime/basilisk/src/system.rs +++ b/runtime/basilisk/src/system.rs @@ -60,7 +60,14 @@ impl Contains for BaseFilter { fn contains(call: &RuntimeCall) -> bool { if matches!( call, - RuntimeCall::System(_) | RuntimeCall::Timestamp(_) | RuntimeCall::ParachainSystem(_) + RuntimeCall::System(_) + | RuntimeCall::ConvictionVoting(_) + | RuntimeCall::Timestamp(_) + | RuntimeCall::ParachainSystem(_) + | RuntimeCall::Preimage(_) + | RuntimeCall::Referenda(_) + | RuntimeCall::TransactionPause(_) + | RuntimeCall::Whitelist(_) ) { // always allow // Note: this is done to avoid unnecessary check of paused storage. From 375cc46f121a5c3215e58b91f346d2bf02809ce8 Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 13:02:23 +0200 Subject: [PATCH 5/6] bump runtime version --- Cargo.lock | 2 +- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b97857c073..ed1ea3f4f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "119.0.0" +version = "120.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index c4b45f20e0..5a85ecfdb0 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "119.0.0" +version = "120.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index 463d65fb19..ec848b5acf 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 119, + spec_version: 120, impl_version: 0, apis: apis::RUNTIME_API_VERSIONS, transaction_version: 1, From 8f148ca371d52d7023e73883af573a940eaed118 Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 18 Sep 2024 14:27:12 +0200 Subject: [PATCH 6/6] versions --- Cargo.lock | 2 +- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83ad56e56f..6d60998b10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "120.0.0" +version = "121.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 5a85ecfdb0..f61203f628 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "120.0.0" +version = "121.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index 5d6e70d80c..a4ced91ca9 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -100,7 +100,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 120, + spec_version: 121, impl_version: 0, apis: apis::RUNTIME_API_VERSIONS, transaction_version: 1,