Robin/add rpc calls

rpc/runtime-api/Cargo.toml

@@ -7,15 +7,15 @@ license = "Apache-2.0"
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [
+codec = { package = "parity-scale-codec", version = "3.0", features = [
 	"derive",
 ], default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = [
 	"derive",
 ] }
 
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" , version = "4.0.0-dev"}
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" , version = "4.0.0-dev"}
 
 [features]
 default = ["std"]

rpc/runtime-api/src/lib.rs

@@ -1,7 +1,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Codec;
-use sp_std::vec::Vec;
+#[cfg(not(feature = "std"))]
+use sp_std::prelude::Vec;
 
 sp_api::decl_runtime_apis! {
 	pub trait SuperSigApi<AccountId>

src/lib.rs

@@ -250,7 +250,7 @@ pub mod pallet {
 			// A supersig should at least have one member
 			let member_length = members.len();
 			if member_length < 1 {
-				return Err(Error::<T>::InvalidNumberOfMembers.into());
+				return Err(Error::<T>::InvalidNumberOfMembers.into())
 			}
 
 			// Get it id and associated account
@@ -352,10 +352,10 @@ pub mod pallet {
 			let supersig_id = Self::get_supersig_id_from_account(&supersig_account)?;
 
 			if Self::calls(supersig_id, call_id).is_none() {
-				return Err(Error::<T>::CallNotFound.into());
+				return Err(Error::<T>::CallNotFound.into())
 			}
 			if Self::members_votes((supersig_id, call_id, who.clone())) {
-				return Err(Error::<T>::AlreadyVoted.into());
+				return Err(Error::<T>::AlreadyVoted.into())
 			}
 
 			// Different roles have different voting weight
@@ -427,7 +427,7 @@ pub mod pallet {
 
 			// Either the supersig or the user that created the vote can remove a call
 			if who != supersig_account && who != preimage.provider {
-				return Err(Error::<T>::NotAllowed.into());
+				return Err(Error::<T>::NotAllowed.into())
 			}
 
 			// Clean up storage and release reserved funds
@@ -569,7 +569,7 @@ pub mod pallet {
 			let supersig_id = Self::get_supersig_id_from_account(&supersig_account)?;
 
 			if Self::members(supersig_id, &who) == Role::NotMember {
-				return Err(Error::<T>::NotMember.into());
+				return Err(Error::<T>::NotMember.into())
 			}
 
 			// Remeber the storage state before we remove the members from it
@@ -586,7 +586,7 @@ pub mod pallet {
 			// A supersig should at least have one member
 			TotalMembers::<T>::try_mutate(supersig_id, |nb| {
 				if *nb == 1 {
-					return Err(Error::<T>::InvalidNumberOfMembers);
+					return Err(Error::<T>::InvalidNumberOfMembers)
 				};
 				*nb -= 1;
 				Ok(())
@@ -610,7 +610,7 @@ pub mod pallet {
 		) -> Result<SupersigId, pallet::Error<T>> {
 			if let Some((account, supersig_id)) = PalletId::try_from_sub_account(supersig_account) {
 				if account != T::PalletId::get() || Self::total_members(supersig_id) == 0 {
-					return Err(Error::<T>::NotSupersig);
+					return Err(Error::<T>::NotSupersig)
 				}
 				Ok(supersig_id)
 			} else {
@@ -679,7 +679,7 @@ pub mod pallet {
 				let new_total_members =
 					n.saturating_sub(removed.len().try_into().map_err(|_| Error::<T>::Conversion)?);
 				if new_total_members < 1 {
-					return Err(Error::<T>::InvalidNumberOfMembers);
+					return Err(Error::<T>::InvalidNumberOfMembers)
 				}
 
 				*n = new_total_members;
@@ -767,7 +767,60 @@ impl<T: Config> Pallet<T> {
 			.collect()
 	}
 
-	pub fn get_members_connected_to_supersig(which: SupersigId) -> Vec<(T::AccountId, Role)> {
+	pub fn get_members_connected(which: SupersigId) -> Vec<(T::AccountId, Role)> {
 		Members::<T>::iter_prefix(which).collect()
 	}
+
+	// Return :
+	// Tuple :
+	// Vec<((Vec<u8>, T::AccountId, BalanceOf<T>), Vec<T::AccountId>)> :
+	// The tuple inside the vec is just a Call that is unwrap.
+	// The vec inside the vec is all the account id that have voted.
+	// The second parameter of the tuple is the total amount of members into the supersig.
+	pub fn get_proposals(
+		which: SupersigId,
+	) -> (
+		Vec<((Vec<u8>, T::AccountId, BalanceOf<T>), Vec<T::AccountId>)>,
+		u32,
+	) {
+		let member_count = Self::total_members(which);
+		let proposal_state = Calls::<T>::iter_prefix(which)
+			.map(|(call_id, call)| {
+				(
+					(call.data, call.provider, call.deposit),
+					MembersVotes::<T>::iter_prefix((which, call_id))
+						.filter_map(
+							|(account_id, vote)| {
+								if vote { Some(account_id) } else { None }
+							},
+						)
+						.collect(),
+				)
+			})
+			.collect();
+		(proposal_state, member_count)
+	}
+
+	// Return :
+	// Tuple :
+	// The bool is to define if the Call that is asked for state still exists.
+	// The vec is all the account id that have voted.
+	// The first u32 is the total amount of members in the supersig
+	// The second u32 is the total number of votes (not necessary because == members_votes.len())
+	pub fn get_proposal_state(
+		which: SupersigId,
+		call_id: CallId,
+	) -> (bool, Vec<T::AccountId>, u32, u32) {
+		let member_count = Self::total_members(which);
+		let votes = Self::votes(which, call_id);
+		let exists = !Self::calls(which, call_id).is_none();
+		let member_votes = MembersVotes::<T>::iter_prefix((which, call_id))
+			.filter_map(
+				|(account_id, vote)| {
+					if vote { Some(account_id) } else { None }
+				},
+			)
+			.collect();
+		(exists, member_votes, member_count, votes)
+	}
 }

src/tests/mod.rs

@@ -5,8 +5,8 @@ mod delete_supersig;
 mod leave_supersig;
 mod remove_call;
 mod remove_members;
-mod submit_call;
 mod rpc_calls;
+mod submit_call;
 
 pub mod helper;
 pub mod mock;