Merge pull request #256 from galacticcouncil/feat/xyk-can-create

feat: expose possibility to control pool creation
galacticcouncil · Nov 23, 2021 · d7eee2b · d7eee2b
2 parents 7fbd10a + cebf9b1
commit d7eee2b
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml
@@ -35,7 +35,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Optionals
 frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, optional = true }

diff --git a/pallets/exchange/Cargo.toml b/pallets/exchange/Cargo.toml
@@ -30,7 +30,7 @@ orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Substrate dependencies
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/pallets/exchange/benchmarking/Cargo.toml b/pallets/exchange/benchmarking/Cargo.toml
@@ -30,7 +30,7 @@ orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Substrate dependencies
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/pallets/exchange/benchmarking/src/mock.rs b/pallets/exchange/benchmarking/src/mock.rs
@@ -161,6 +161,7 @@ impl pallet_xyk::Config for Test {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 impl pallet_exchange::Config for Test {

diff --git a/pallets/exchange/src/mock.rs b/pallets/exchange/src/mock.rs
@@ -168,6 +168,7 @@ impl xyk::Config for Test {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 impl Config for Test {

diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml
@@ -22,7 +22,7 @@ serde = { features = ["derive"], optional = true, version = "1.0.101" }
 
 # HydraDX dependencies
 hydra-dx-math = { default-features = false, version = "4.0.0" }
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 ## Local dependencies
 primitives = { default-features = false, path = "../../primitives" }

diff --git a/pallets/transaction-multi-payment/Cargo.toml b/pallets/transaction-multi-payment/Cargo.toml
@@ -29,7 +29,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Substrate dependencies
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/pallets/transaction-multi-payment/benchmarking/Cargo.toml b/pallets/transaction-multi-payment/benchmarking/Cargo.toml
@@ -32,7 +32,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Substrate dependencies
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/pallets/transaction-multi-payment/benchmarking/src/mock.rs b/pallets/transaction-multi-payment/benchmarking/src/mock.rs
@@ -191,6 +191,7 @@ impl pallet_xyk::Config for Test {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 parameter_type_with_key! {

diff --git a/pallets/transaction-multi-payment/src/mock.rs b/pallets/transaction-multi-payment/src/mock.rs
@@ -221,6 +221,7 @@ impl pallet_xyk::Config for Test {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 parameter_type_with_key! {

diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-xyk'
-version = '2.1.0'
+version = '3.0.0'
 description = 'XYK automated market maker'
 authors = ['GalacticCouncil']
 edition = '2018'
@@ -31,7 +31,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # Substrate dependencies
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, optional = true }

diff --git a/pallets/xyk/src/lib.rs b/pallets/xyk/src/lib.rs
@@ -31,7 +31,7 @@
 use frame_support::sp_runtime::{traits::Zero, DispatchError};
 use frame_support::{dispatch::DispatchResult, ensure, traits::Get, transactional};
 use frame_system::ensure_signed;
-use hydradx_traits::{AMMTransfer, AssetPairAccountIdFor, AMM};
+use hydradx_traits::{AMMTransfer, AssetPairAccountIdFor, CanCreatePool, AMM};
 use primitives::{asset::AssetPair, constants::chain::MIN_POOL_LIQUIDITY, fee, AssetId, Balance, Price};
 use sp_std::{vec, vec::Vec};
 
@@ -107,6 +107,9 @@ pub mod pallet {
 		/// Max fraction of pool to buy in single transaction
 		#[pallet::constant]
 		type MaxOutRatio: Get<u128>;
+
+		/// Called to ensure that pool can be created
+		type CanCreatePool: CanCreatePool<AssetId>;
 	}
 
 	#[pallet::error]
@@ -178,6 +181,9 @@ pub mod pallet {
 
 		/// Overflow
 		Overflow,
+
+		/// Pool cannot be created due to outside factors.
+		CannotCreatePool,
 	}
 
 	#[pallet::event]
@@ -257,6 +263,11 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
+			ensure!(
+				T::CanCreatePool::can_create(asset_a, asset_b),
+				Error::<T>::CannotCreatePool
+			);
+
 			ensure!(amount >= T::MinPoolLiquidity::get(), Error::<T>::InsufficientLiquidity);
 
 			ensure!(!(initial_price == Price::zero()), Error::<T>::ZeroInitialPrice);
@@ -917,3 +928,11 @@ impl<T: Config> AMM<T::AccountId, AssetId, AssetPair, Balance> for Pallet<T> {
 		T::MaxOutRatio::get()
 	}
 }
+
+pub struct AllowAllPools();
+
+impl CanCreatePool<AssetId> for AllowAllPools {
+	fn can_create(_asset_a: AssetId, _asset_b: AssetId) -> bool {
+		true
+	}
+}
diff --git a/pallets/xyk/src/mock.rs b/pallets/xyk/src/mock.rs
@@ -27,12 +27,11 @@ use sp_runtime::{
 };
 
 use frame_support::traits::{Everything, GenesisBuild, Get};
+use hydradx_traits::{AssetPairAccountIdFor, CanCreatePool};
 use primitives::{
 	constants::chain::{MAX_IN_RATIO, MAX_OUT_RATIO, MIN_POOL_LIQUIDITY, MIN_TRADING_LIMIT},
-	fee,
-	AssetId, Balance,
+	fee, AssetId, Balance,
 };
-use hydradx_traits::AssetPairAccountIdFor;
 
 use frame_system::EnsureSigned;
 use std::cell::RefCell;
@@ -158,6 +157,14 @@ parameter_types! {
 	pub const MaxOutRatio: u128 = MAX_OUT_RATIO;
 }
 
+pub struct Disallow10_10Pool();
+
+impl CanCreatePool<AssetId> for Disallow10_10Pool {
+	fn can_create(asset_a: AssetId, asset_b: AssetId) -> bool {
+		!matches!((asset_a, asset_b), (10u32,10u32))
+	}
+}
+
 impl Config for Test {
 	type Event = Event;
 	type AssetRegistry = AssetRegistry;
@@ -170,6 +177,7 @@ impl Config for Test {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = Disallow10_10Pool;
 }
 
 pub struct ExtBuilder {

diff --git a/pallets/xyk/src/tests.rs b/pallets/xyk/src/tests.rs
@@ -31,7 +31,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 fn expect_events(e: Vec<TestEvent>) {
-	e.into_iter().for_each( frame_system::Pallet::<Test>::assert_has_event);
+	e.into_iter().for_each(frame_system::Pallet::<Test>::assert_has_event);
 }
 
 #[test]
@@ -1873,3 +1873,21 @@ fn fee_calculation() {
 			assert_noop!(XYK::calculate_fee(100000), Error::<Test>::FeeAmountInvalid);
 		});
 }
+
+#[test]
+fn can_create_pool_should_work() {
+	new_test_ext().execute_with(|| {
+		let asset_a = 10u32;
+		let asset_b = 10u32;
+		assert_noop!(
+			XYK::create_pool(
+				Origin::signed(ALICE),
+				asset_a,
+				asset_b,
+				100_000_000_000_000,
+				Price::from(10)
+			),
+			Error::<Test>::CannotCreatePool
+		);
+	});
+}
diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml
@@ -49,7 +49,7 @@ pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", b
 pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # collator support
 pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs
@@ -410,6 +410,7 @@ impl pallet_xyk::Config for Runtime {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 impl pallet_exchange::Config for Runtime {

diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml
@@ -51,7 +51,7 @@ pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", b
 pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 
 # HydraDX dependencies
-hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="32f3a9ab84b86b200d3ad702db762ac7de06b20c", default-features = false }
+hydradx-traits = { git = "https://github.com/galacticcouncil/warehouse", rev="a5cb40ae5313bb158f8b28e0a78479148be3b9f5", default-features = false }
 
 # collator support
 pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12", default-features = false }

diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs
@@ -373,6 +373,7 @@ impl pallet_xyk::Config for Runtime {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
 	type MaxOutRatio = MaxOutRatio;
+	type CanCreatePool = pallet_xyk::AllowAllPools;
 }
 
 impl pallet_exchange::Config for Runtime {