Storagemap optimizations

and adds initial setup in RBAC readme

Author: amatsonkali

pallets/gated-marketplace/README.md

@@ -9,6 +9,7 @@ Create marketplaces that require previous authorization before placing sell and
     - [Getters](#getters)
   - [Usage](#usage)
     - [Polkadot-js CLI](#polkadot-js-cli)
+      - [Submit initial role setup (needs sudo](#submit-initial-role-setup-needs-sudo)
       - [Create a marketplace](#create-a-marketplace)
       - [Get a marketplace](#get-a-marketplace)
       - [Get what roles does an account have on a marketplace](#get-what-roles-does-an-account-have-on-a-marketplace)
@@ -34,6 +35,7 @@ Create marketplaces that require previous authorization before placing sell and
       - [Take sell offer - direct purchase](#take-sell-offer---direct-purchase)
       - [Take buy offer](#take-buy-offer)
     - [Polkadot-js api (javascript library)](#polkadot-js-api-javascript-library)
+      - [Submit initial role setup (needs sudo)](#submit-initial-role-setup-needs-sudo-1)
       - [Create a marketplace](#create-a-marketplace-1)
       - [Get a marketplace](#get-a-marketplace-1)
       - [Get what roles does an account have on a marketplace](#get-what-roles-does-an-account-have-on-a-marketplace-1)
@@ -87,8 +89,10 @@ This module allows to:
 ## Interface
 
 ### Dispachable functions
+
+- `initial_setup` enables all the permission related functionality using the `RBAC` pallet, it can only be called by the sudo account or a majority of the Council (60%). It is essential to call this extrinsic before using other extrinsics.
 - `create_marketplace` creates an on-chain marketplace record, it takes a `label` and an account that will fulfill the role of `administrator`, the extrinsic origin will be set up automatically as the marketplace owner.
-- `apply` starts the process to enter the specidied `marketplace`.
+- `apply` starts the process to enter the specified `marketplace`.
 - `reapply` allows the applicant to apply again for the selected marketplace.
 - `enroll` is only callable by the marketplace owner or administrator, as it finishes the application process. It takes a `marketplace` identification, and `account` or `application` identification to enroll or reject, and an `approved` boolean flag which approves the application if set to `true`. Owner/admin can add a feedback regarding the user's application.
 - `add_authority` is only callable by the marketplace owner or administrator. As it name implies, adds a new user that will have special permission within the marketplace. It takes the `account` which will have the permissions, the type of `authority` it will have, and the `marketplace` identification in which the permissions will be enforced.
@@ -145,6 +149,11 @@ The following examples will be using these prefunded accounts and testing data:
 
 ### Polkadot-js CLI
 
+#### Submit initial role setup (needs sudo
+```bash
+polkadot-js-api tx.gatedMarketplace.initialSetup --sudo --seed "//Alice"
+```
+
 #### Create a marketplace
 ```bash
 # Administrator account and marketplace label
@@ -401,7 +410,13 @@ polkadot-js-api tx.gatedMarketplace.takeBuyOffer "0x66fcfadc174a596d8f8dc1b06703
 ```
 
 ### Polkadot-js api (javascript library)
-While most of the data flow is almost identical to its CLI counter part, the javascript library is much more versatile regarding queries. The API setup will be ommited.
+While most of the data flow is almost identical to its CLI counter part, the javascript library is much more versatile regarding queries.
+
+
+#### Submit initial role setup (needs sudo)
+```js
+const initial_set_up = await api.tx.sudo.sudo(api.tx.gatedMarketplace.initialSetup()).signAndSend(alice);
+```
 
 #### Create a marketplace
 ```js

pallets/rbac/src/lib.rs

@@ -55,7 +55,7 @@ pub mod pallet {
 	#[pallet::getter(fn scopes)]
 	pub(super) type Scopes<T: Config> = StorageMap<
 		_, 
-		Blake2_128Concat, 
+		Identity, 
 		PalletId, // pallet_id
 		BoundedVec<ScopeId, T::MaxScopesPerPallet>,  // scopes_id
 		ValueQuery,
@@ -75,7 +75,7 @@ pub mod pallet {
 	#[pallet::getter(fn pallet_roles)]
 	pub(super) type PalletRoles<T: Config> = StorageMap<
 		_,
-		Blake2_128Concat, 
+		Identity, 
 		PalletId, // pallet_id
 		BoundedVec<RoleId, T::MaxRolesPerPallet >, // role_id
 		ValueQuery,
@@ -85,9 +85,9 @@ pub mod pallet {
 	#[pallet::getter(fn permissions)]
 	pub(super) type Permissions<T: Config> = StorageDoubleMap<
 		_,
-		Blake2_128Concat, 
+		Identity, 
 		PalletId, 			// pallet_id
-		Blake2_128Concat, 
+		Identity, 
 		PermissionId,		// permission_id
 		BoundedVec<u8, T::PermissionMaxLen >,	// permission str
 		ValueQuery,
@@ -97,9 +97,9 @@ pub mod pallet {
 	#[pallet::getter(fn permissions_by_role)]
 	pub(super) type PermissionsByRole<T: Config> = StorageDoubleMap<
 		_,
-		Blake2_128Concat, 
+		Identity, 
 		PalletId, 			// pallet_id
-		Blake2_128Concat, 
+		Identity, 
 		RoleId,		// role_id
 		BoundedVec<PermissionId, T::MaxPermissionsPerRole >,	// permission_ids
 		ValueQuery,
@@ -112,8 +112,8 @@ pub mod pallet {
 		(
 			NMapKey<Blake2_128Concat, T::AccountId>,// user
 			// getting "the trait bound `usize: scale_info::TypeInfo` is not satisfied" errors
-			NMapKey<Blake2_128Concat, PalletId>,			// pallet_id
-			NMapKey<Twox64Concat, ScopeId>,		// scope_id
+			NMapKey<Identity, PalletId>,			// pallet_id
+			NMapKey<Identity, ScopeId>,		// scope_id
 		),
 		BoundedVec<RoleId, T::MaxRolesPerUser>,	// roles (ids)
 		ValueQuery,
@@ -126,9 +126,9 @@ pub mod pallet {
 		(
 			// getting "the trait bound `usize: scale_info::TypeInfo` is not satisfied" errors
 			//  on a 32 bit target, this is 4 bytes and on a 64 bit target, this is 8 bytes.
-			NMapKey<Blake2_128Concat, PalletId>,		// pallet_id
-			NMapKey<Twox64Concat, ScopeId>,		// scope_id
-			NMapKey<Blake2_128Concat, RoleId>,	// role_id
+			NMapKey<Identity, PalletId>,		// pallet_id
+			NMapKey<Identity, ScopeId>,		// scope_id
+			NMapKey<Identity, RoleId>,	// role_id
 		),
 		BoundedVec<T::AccountId, T::MaxUsersPerRole>,	// users
 		ValueQuery,
@@ -199,19 +199,5 @@ pub mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-
-		#[transactional]
-		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn get_pallet_id(
-			origin: OriginFor<T>, 
-		) -> DispatchResult {
-			let who = ensure_signed(origin.clone())?;
-			let a = Self::index();
-			log::info!("henlo {:?}", a);
-			log::warn!("Name: {:?}  Module Name: {:?}",Self::name(), Self::module_name());
-			Self::deposit_event(Event::SomethingStored(a.try_into().unwrap(), who));
-
-			Ok(())
-		}
 	}
 }

pallets/rbac/src/tests.rs

@@ -1,7 +1,5 @@
 use crate::{mock::*, Error, types::{RoleBasedAccessControl, RoleId, ScopeId, PermissionId, IdOrVec}, Config, PermissionsByRole, Permissions};
-use codec::Encode;
 use frame_support::{assert_noop, assert_ok, assert_err, BoundedVec, pallet_prelude::DispatchResult};
-use sp_io::hashing::blake2_256;
 
 type AccountId = <Test as frame_system::Config>::AccountId;