Merge branch 'master' into liq_mining/test_class_id

Cargo.toml

@@ -202,5 +202,4 @@ cumulus-relay-chain-local = { git = "https://github.com/paritytech//cumulus", re
 pallet-price-oracle = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"}
 pallet-relaychain-info = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"}
 pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"}
-pallet-faucet= { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"}
 hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76"}

Makefile

@@ -25,7 +25,7 @@ coverage:
 
 .PHONY: clippy
 clippy:
-	cargo clippy --release --all-targets --all-features -- -D warnings
+	cargo clippy --release --locked --all-targets --all-features -- -D warnings
 
 .PHONY: format
 format:

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "basilisk"
-version = "6.0.1"
+version = "6.1.0"
 description = "Basilisk node"
 authors = ["GalacticCouncil"]
 edition = "2021"

node/src/testing_chain_spec.rs

@@ -29,7 +29,7 @@ use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 use testing_basilisk_runtime::{
 	AccountId, AssetRegistryConfig, AuraId, Balance, BalancesConfig, CollatorSelectionConfig, CouncilConfig,
-	DusterConfig, ElectionsConfig, FaucetConfig, GenesisConfig, MultiTransactionPaymentConfig, ParachainInfoConfig,
+	DusterConfig, ElectionsConfig, GenesisConfig, MultiTransactionPaymentConfig, ParachainInfoConfig,
 	SessionConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig, VestingConfig,
 	NATIVE_EXISTENTIAL_DEPOSIT, UNITS, WASM_BINARY,
 };
@@ -264,13 +264,15 @@ pub fn k8s_testnet_parachain_config() -> Result<ChainSpec, String> {
 				// Pre-funded accounts
 				vec![
 					hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into(),
+					hex!["2e004ce52dd68ec64093d887dbbcc69c7a5333673a7acec6109b08056e89f538"].into(),
 					hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(), //acc from ../res/basilisk-vesting-lbp-test.json
 					hex!["8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"].into(), //acc from ../res/basilisk-vesting-lbp-test.json
 				],
 				true,
 				PARA_ID.into(),
 				//technical committee
-				vec![hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into()], // TREASURY - Fallback for multi tx payment
+				vec![hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into()], 
+				// TREASURY - Fallback for multi tx payment
 				vec![],
 				hex!["a62f1daf8e490a1c0514c7d9f3a700999100f2aeb1d67a2ca68b241d3d6b3547"].into(),
 				get_vesting_config_for_test(),
@@ -454,11 +456,6 @@ fn testnet_parachain_genesis(
 					.collect()
 			},
 		},
-		faucet: FaucetConfig {
-			rampage: true,
-			mint_limit: 5,
-			mintable_currencies: vec![0, 1, 2],
-		},
 		treasury: Default::default(),
 		elections: ElectionsConfig {
 			members: elections

runtime/basilisk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "basilisk-runtime"
-version = "43.0.0"
+version = "44.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"

runtime/testing-basilisk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "testing-basilisk-runtime"
-version = "43.0.0"
+version = "44.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"
@@ -52,7 +52,6 @@ pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polka
 hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false }
 pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false }
 pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false }
-pallet-faucet = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false }
 pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "d0c99033c5d1f686a31cc311b8d96af2a3de9d76", default-features = false}
 
 # collator support
@@ -203,7 +202,6 @@ std = [
     "pallet-price-oracle/std",
     "pallet-utility/std",
     "hydradx-traits/std",
-    "pallet-faucet/std",
     "sp-api/std",
     "sp-block-builder/std",
     "sp-consensus-aura/std",

runtime/testing-basilisk/src/lib.rs

@@ -113,7 +113,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("testing-basilisk"),
 	impl_name: create_runtime_str!("testing-basilisk"),
 	authoring_version: 1,
-	spec_version: 43,
+	spec_version: 44,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -794,11 +794,6 @@ impl pallet_liquidity_mining::Config for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_faucet::Config for Runtime {
-	type Event = Event;
-	type Currency = Currencies;
-}
-
 parameter_types! {
 	pub const PreimageMaxSize: u32 = 4096 * 1024;
 	pub PreimageBaseDeposit: Balance = deposit(2, 64);
@@ -878,9 +873,6 @@ construct_runtime!(
 		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>} = 154,
 		UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 155,
 
-		// Pallets used only in testing runtime - starts at index 200
-		Faucet: pallet_faucet::{Pallet, Call, Storage, Config, Event<T>} = 200,
-
 		// TEMPORARY - always last. Sudo will be removed at some point.
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 255,
 	}