Merge pull request #591 from galacticcouncil/chore/use-latest-warehouse

chore: use latest warehouse

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "0.8.5"
+version = "0.8.6"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -10,13 +10,13 @@ repository = "https://github.com/galacticcouncil/Basilisk-node"
 
 [dependencies]
 # Warehouse dependencies
-pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
-pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
-pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-route-executor = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
+pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
+pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+pallet-route-executor = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 pallet-xyk = { path = "../pallets/xyk",default-features = false}
 pallet-duster= { path = "../pallets/duster",default-features = false}
@@ -108,7 +108,7 @@ parachain-runtime-mock = { path = "parachain-runtime-mock", default-features = f
 [dev-dependencies]
 xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "0460d04c798028e7bef82c907082e11753ed173b" }
 hex-literal = "0.3.1"
-pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af" }
+pallet-relaychain-info = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b" }
 pretty_assertions = "1.2.1"
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
 test-case = "2.2.1"

integration-tests/parachain-runtime-mock/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parachain-runtime-mock"
-version = "0.1.4"
+version = "0.1.5"
 description = "A mock runtime for a parachain"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -14,14 +14,14 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.1", default-features = false, features = ["derive"] }
 
 # Warehouse dependencies
-pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
-pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
-pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-route-executor = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
+pallet-price-oracle = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
+pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+pallet-route-executor = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-hydradx-adapters = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+hydradx-adapters = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 pallet-xyk = { path = "../../pallets/xyk",default-features = false}
 pallet-duster= { path = "../../pallets/duster",default-features = false}

integration-tests/src/nft.rs

@@ -2,20 +2,19 @@
 
 use crate::kusama_test_net::*;
 use basilisk_runtime::NFT;
+use frame_support::assert_ok;
 use frame_support::traits::tokens::nonfungibles::*;
 use frame_support::traits::ReservableCurrency;
-use frame_support::{assert_noop, assert_ok};
 use hydradx_traits::nft::CreateTypedCollection;
-use pallet_nft::CollectionType;
 use pallet_nft::NftPermission;
+use pallet_nft::{BoundedVecOfUnq, CollectionType};
 use primitives::{CollectionId, ItemId};
 use test_case::test_case;
 use xcm_emulator::TestExt;
 
 const ALLOW: bool = true;
 const NOT_ALLOW: bool = false;
 const RESERVED_COLLECTION_ID: CollectionId = 0;
-const NON_RESERVED_COLLECTION_ID: CollectionId = 1_000_000;
 const RESTRICTED_COLLECTION_TYPE: CollectionType = CollectionType::HydraHeads;
 
 fn create_nft_collection(account_id: AccountId, collection_id: CollectionId, collection_type: CollectionType) {
@@ -24,7 +23,10 @@ fn create_nft_collection(account_id: AccountId, collection_id: CollectionId, col
 			AccountId,
 			CollectionId,
 			CollectionType,
-		>>::create_typed_collection(account_id, collection_id, collection_type,));
+			BoundedVecOfUnq<basilisk_runtime::Runtime>,
+		>>::create_typed_collection(
+			account_id, collection_id, collection_type, None
+		));
 	});
 }
 
@@ -126,10 +128,12 @@ fn deposit_for_create_typed_collection_should_be_zero(collection_type: Collectio
 			AccountId,
 			CollectionId,
 			CollectionType,
+			BoundedVecOfUnq<basilisk_runtime::Runtime>,
 		>>::create_typed_collection(
 			AccountId::from(ALICE),
 			RESERVED_COLLECTION_ID,
 			collection_type,
+			None,
 		));
 
 		assert_eq!(
@@ -139,42 +143,6 @@ fn deposit_for_create_typed_collection_should_be_zero(collection_type: Collectio
 	});
 }
 
-#[test]
-fn deposit_for_create_collection_should_be_zero() {
-	// Arrange
-	TestNet::reset();
-	Basilisk::execute_with(|| {
-		// Act & Assert
-		assert_ok!(<NFT as Create<AccountId>>::create_collection(
-			&NON_RESERVED_COLLECTION_ID,
-			&AccountId::from(ALICE),
-			&AccountId::from(ALICE),
-		));
-
-		assert_eq!(
-			<basilisk_runtime::Runtime as pallet_uniques::Config>::Currency::reserved_balance(&AccountId::from(ALICE)),
-			0
-		);
-	});
-}
-
-#[test]
-fn create_collection_should_fail_when_collection_id_is_reserved() {
-	// Arrange
-	TestNet::reset();
-	Basilisk::execute_with(|| {
-		// Act & Assert
-		assert_noop!(
-			<NFT as Create<AccountId>>::create_collection(
-				&RESERVED_COLLECTION_ID,
-				&AccountId::from(ALICE),
-				&AccountId::from(ALICE),
-			),
-			pallet_nft::Error::<basilisk_runtime::Runtime>::IdReserved
-		);
-	});
-}
-
 #[test]
 fn destroy_collection_should_ignore_permissions() {
 	// Arrange
@@ -270,10 +238,12 @@ fn create_typed_collection_should_ignore_permissions_and_reserved_ids(collection
 			AccountId,
 			CollectionId,
 			CollectionType,
+			BoundedVecOfUnq<basilisk_runtime::Runtime>,
 		>>::create_typed_collection(
 			AccountId::from(ALICE),
 			RESERVED_COLLECTION_ID,
 			collection_type,
+			None,
 		));
 	});
 }

node/Cargo.toml

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

node/src/chain_spec.rs

@@ -69,7 +69,7 @@ pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-	TPublic::Pair::from_string(&format!("//{}", seed), None)
+	TPublic::Pair::from_string(&format!("//{seed}"), None)
 		.expect("static values are valid; qed")
 		.public()
 }

node/src/cli.rs

@@ -10,7 +10,7 @@ pub struct RuntimeInstanceError(String);
 impl fmt::Display for RuntimeInstanceError {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		let RuntimeInstanceError(message) = self;
-		write!(f, "RuntimeInstanceError: {}", message)
+		write!(f, "RuntimeInstanceError: {message}")
 	}
 }
 

node/src/command.rs

@@ -229,7 +229,7 @@ pub fn run() -> sc_cli::Result<()> {
 
 				let polkadot_config =
 					SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, config.tokio_handle.clone())
-						.map_err(|err| format!("Relay chain argument error: {}", err))?;
+						.map_err(|err| format!("Relay chain argument error: {err}"))?;
 
 				cmd.run(config, polkadot_config)
 			})
@@ -381,12 +381,12 @@ pub fn run() -> sc_cli::Result<()> {
 				let state_version = Cli::native_runtime_version(&config.chain_spec).state_version();
 
 				let block: Block =
-					generate_genesis_block(&*config.chain_spec, state_version).map_err(|e| format!("{:?}", e))?;
+					generate_genesis_block(&*config.chain_spec, state_version).map_err(|e| format!("{e:?}"))?;
 				let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
 
 				let task_executor = config.tokio_handle.clone();
 				let polkadot_config = SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
-					.map_err(|err| format!("Relay chain argument error: {}", err))?;
+					.map_err(|err| format!("Relay chain argument error: {err}"))?;
 
 				let collator_options = cli.run.base.collator_options();
 

node/src/testing_chain_spec.rs

@@ -50,7 +50,7 @@ pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-	TPublic::Pair::from_string(&format!("//{}", seed), None)
+	TPublic::Pair::from_string(&format!("//{seed}"), None)
 		.expect("static values are valid; qed")
 		.public()
 }

pallets/duster/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-duster"
-version = "3.1.8"
+version = "3.1.9"
 description = "Account duster"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -19,7 +19,7 @@ codec = { default-features = false, features = ["derive"], package = "parity-sca
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { features = ["derive"], optional = true, version = "1.0.136" }
 
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 # ORML dependencies
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false }
@@ -40,7 +40,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }
-pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-currencies = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false }
 
 [features]

pallets/duster/src/lib.rs

@@ -148,11 +148,11 @@ pub mod pallet {
 				AccountBlacklist::<T>::insert(account_id, ());
 			});
 
-			if self.reward_account == None {
+			if self.reward_account.is_none() {
 				panic!("Reward account is not set in genesis config");
 			}
 
-			if self.dust_account == None {
+			if self.dust_account.is_none() {
 				panic!("Dust account is not set in genesis config");
 			}
 
@@ -336,7 +336,7 @@ impl<T: Config> DustRemovalAccountWhitelist<T::AccountId> for Pallet<T> {
 	}
 
 	fn remove_account(account: &T::AccountId) -> Result<(), Self::Error> {
-		AccountBlacklist::<T>::mutate(&account, |maybe_account| -> Result<(), DispatchError> {
+		AccountBlacklist::<T>::mutate(account, |maybe_account| -> Result<(), DispatchError> {
 			ensure!(!maybe_account.is_none(), Error::<T>::AccountNotBlacklisted);
 
 			*maybe_account = None;

pallets/lbp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-lbp"
-version = "4.6.3"
+version = "4.6.4"
 description = "HydraDX Liquidity Bootstrapping Pool Pallet"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -22,7 +22,7 @@ serde = { features = ["derive"], optional = true, version = "1.0.136" }
 
 # Warehouse dependencies
 hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "7b95ae58e6a8a24c56da3511cef24d8c394801bf", default-features = false }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 ## Local dependencies
 primitives = { default-features = false, path = "../../primitives" }
@@ -44,7 +44,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
 
 [dev-dependencies]
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }
-test-utils = {git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
+test-utils = {git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
 
 [features]
 default = ["std"]

pallets/marketplace/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-marketplace"
-version = "5.0.5"
+version = "5.0.6"
 authors = ["GalacticCoucil"]
 description = "The marketplace for trading NFTs"
 edition = "2018"
@@ -26,7 +26,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
 pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }
 
 # Warehouse dependency
-pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev = "d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 # local dependency
 primitives = { default-features = false, path = "../../primitives" }

pallets/xyk-liquidity-mining/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-xyk-liquidity-mining"
-version = "1.0.6"
+version = "1.1.0"
 description = "Liquidity mining"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -21,9 +21,9 @@ log = { version = "0.4.17", default-features = false }
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false }
 
 # HydraDX dependencies
-pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 primitives = { path = "../../primitives", default-features = false }
 

pallets/xyk-liquidity-mining/benchmarking/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-xyk-liquidity-mining-benchmarking"
-version = "1.0.4"
+version = "1.0.5"
 description = "Liquidity Mining Benchmarking Module"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -26,10 +26,10 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false }
 
 # HydraDX dependencies
-pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false}
+pallet-nft = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false}
 pallet-asset-registry = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="fcebd285141ce9ed15136f6102fa6396605d96af", default-features = false }
+pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="d5b8001d90f974f165cf1bfcea0775cfe4340f6b", default-features = false }
 
 # Substrate dependencies
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false }

pallets/xyk-liquidity-mining/benchmarking/src/lib.rs

@@ -113,7 +113,7 @@ fn lm_create_global_farm<T: Config>(
 		BSX,
 		owner,
 		yield_per_period,
-		1,
+		1_000,
 		One::one(),
 	)
 }
@@ -156,7 +156,7 @@ benchmarks! {
 		let yield_per_period = Perquintill::from_percent(20);
 		let blocks_per_period = T::BlockNumber::from(1_u32);
 	}: {
-		XYKLiquidityMining::<T>::create_global_farm(RawOrigin::Root.into(), total_rewards, planned_yielding_periods, blocks_per_period, BSX, BSX, caller.clone(), yield_per_period, 1, One::one())?
+		XYKLiquidityMining::<T>::create_global_farm(RawOrigin::Root.into(), total_rewards, planned_yielding_periods, blocks_per_period, BSX, BSX, caller.clone(), yield_per_period, 1_000, One::one())?
 	}
 
 	update_global_farm {