Merge branch 'feature/role-base-access-control' into feature/collator

Author: amatsonkali

.devcontainer/devcontainer.json

@@ -6,10 +6,11 @@
     "lldb.executable": "/usr/bin/lldb"
   },
   "extensions": [
-    "rust-lang.rust",
-    "bungcip.better-toml",
-    "vadimcn.vscode-lldb"
-  ],
+	"rust-lang.rust",
+	"bungcip.better-toml",
+	"vadimcn.vscode-lldb",
+	"rust-lang.rust-analyzer"
+],
   "forwardPorts": [
     3000,
     9944

node/src/chain_spec.rs

@@ -1,6 +1,6 @@
 use hashed_runtime::{
 	AccountId, AuraConfig, BalancesConfig, CouncilConfig, GenesisConfig, GrandpaConfig, Signature,
-	SudoConfig, SystemConfig, NodeAuthorizationConfig, BitcoinVaultsConfig ,WASM_BINARY,
+	SudoConfig, SystemConfig, NodeAuthorizationConfig, BitcoinVaultsConfig, WASM_BINARY,
 };
 use sc_chain_spec::Properties;
 use sc_service::ChainType;
@@ -279,6 +279,6 @@ fn testnet_genesis(
 		transaction_payment: Default::default(),
 		bitcoin_vaults : BitcoinVaultsConfig{
 			bdk_services_url : BDK_SERVICES_MAINNET_URL.as_bytes().to_vec(),
-		}
+		},
 	}
 }

pallets/gated-marketplace/Cargo.toml

@@ -25,6 +25,12 @@ frame-benchmarking = { default-features = false, git = "https://github.com/parit
 sp-runtime = { default-features = false, version = "6.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 
 
+pallet-balances = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
+pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
+pallet-timestamp = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
+pallet-fruniques = {path = "../fruniques", default-features = false, version = "0.1.0-dev"}
+pallet-rbac = { default-features = false, version = "4.0.0-dev", path="../rbac/"}
+
 [dev-dependencies]
 sp-core = { default-features = false, version = "6.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
@@ -39,6 +45,11 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
+	"pallet-balances/std",
+	"pallet-uniques/std",
+	"pallet-fruniques/std",
+	"pallet-timestamp/std",
+	"pallet-rbac/std"
 ]
 
 runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]