fix(kreivo-runtime): allow signed requests from dispatch as (communit…

…y) account for kreivo collective referenda
virto-network · Apr 9, 2024 · ba18406 · ba18406
1 parent a9ca1ca
commit ba18406
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Build node
-    runs-on: self-hosted
+    runs-on: [self-hosted, builder]
     steps:
       - uses: actions/checkout@v4
 
@@ -18,7 +18,7 @@ jobs:
   release:
     name: Create GH Release
     needs: build
-    runs-on: self-hosted
+    runs-on: [self-hosted, builder]
     steps:
       - name: Build collator artifacts
         run: just release-artifacts
@@ -35,7 +35,7 @@ jobs:
   container:
     name: Containerize & Publish
     needs: build
-    runs-on: self-hosted
+    runs-on: [self-hosted, builder]
     steps:
       - name: Login to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | podman login ghcr.io -u ${{ github.actor }} --password-stdin

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "virto-node"
-version = "0.9.0"
+version = "0.9.1"
 authors = ['Virto Team <[email protected]>']
 license = "GPL-3.0-only"
 homepage = 'https://github.com/virto-network/virto-node'

diff --git a/runtime/kreivo/Cargo.toml b/runtime/kreivo/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "kreivo-runtime"
 description = "Kreivo Runtime"
-version = "0.9.0"
+version = "0.9.1"
 authors = ['Virto Team <[email protected]>']
 license = "GPL-3.0-only"
 homepage = 'https://github.com/virto-network/virto-node'

diff --git a/runtime/kreivo/src/collective/governance.rs b/runtime/kreivo/src/collective/governance.rs
@@ -1,6 +1,7 @@
 use super::*;
 
 use pallet_communities::origin::AsSignedByCommunity;
+use pallet_ranked_collective::{EnsureMember, TallyOf, Votes};
 use parachains_common::kusama::currency::QUID;
 use sp_core::ConstU128;
 
@@ -20,12 +21,13 @@ impl pallet_referenda::Config<KreivoReferendaInstance> for Runtime {
 	type Scheduler = Scheduler;
 	type Currency = Balances;
 	// Communities can submit proposals.
-	type SubmitOrigin = AsEnsureOriginWithArg<AsSignedByCommunity<Self>>;
+	type SubmitOrigin =
+		AsEnsureOriginWithArg<EitherOf<EnsureMember<Runtime, KreivoCollectiveInstance, 1>, AsSignedByCommunity<Self>>>;
 	type CancelOrigin = EnsureRoot<AccountId>;
 	type KillOrigin = EnsureRoot<AccountId>;
 	type Slash = ();
-	type Votes = pallet_ranked_collective::Votes;
-	type Tally = pallet_ranked_collective::TallyOf<Runtime, KreivoCollectiveInstance>;
+	type Votes = Votes;
+	type Tally = TallyOf<Runtime, KreivoCollectiveInstance>;
 	type SubmissionDeposit = ConstU128<0>;
 	type MaxQueued = ConstU32<10>;
 	type UndecidingTimeout = ConstU32<{ 2 * DAYS }>;

diff --git a/runtime/kreivo/src/lib.rs b/runtime/kreivo/src/lib.rs
@@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kreivo-parachain"),
 	impl_name: create_runtime_str!("kreivo-parachain"),
 	authoring_version: 1,
-	spec_version: 103,
+	spec_version: 104,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 4,