Merge pull request #535 from galacticcouncil/feat/exchange-fee-bump

feat: XYK fee adjusted
galacticcouncil · Jul 26, 2022 · 04c2900 · 04c2900
2 parents f645aca + b29e866
commit 04c2900
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "0.7.0"
+version = "0.7.1"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

diff --git a/integration-tests/src/non_native_fee.rs b/integration-tests/src/non_native_fee.rs
@@ -33,7 +33,7 @@ pub fn basilisk_run_to_block(to: BlockNumber) {
 }
 
 #[test]
-fn non_native_fee_payment_works() {
+fn non_native_fee_payment_works_with_xyk_spot_price() {
 	use pallet_transaction_multi_payment::TransactionMultiPaymentDataProvider;
 
 	TestNet::reset();
@@ -108,14 +108,14 @@ fn non_native_fee_payment_works() {
 		));
 
 		let dave_balance = basilisk_runtime::Tokens::free_balance(1, &AccountId::from(DAVE));
-		assert_eq!(dave_balance, 968_048_559_011_998);
+		assert_eq!(dave_balance, 968_046_450_495_217);
 
 		expect_basilisk_events(vec![
 			pallet_transaction_multi_payment::Event::FeeWithdrawn {
 				account_id: DAVE.into(),
 				asset_id: 1,
 				native_fee_amount: 55_738_705_000_000,
-				non_native_fee_amount: 31_951_440_988_002,
+				non_native_fee_amount: 31_953_549_504_783,
 				destination_account_id: basilisk_runtime::MultiTransactionPayment::get_fee_receiver(),
 			}
 			.into(),

diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "basilisk-runtime"
-version = "68.0.0"
+version = "69.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"

diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs
@@ -107,7 +107,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("basilisk"),
 	impl_name: create_runtime_str!("basilisk"),
 	authoring_version: 1,
-	spec_version: 68,
+	spec_version: 69,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common-runtime"
-version = "1.12.0"
+version = "2.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -162,7 +162,7 @@ parameter_types! {
 
 // pallet xyk
 parameter_types! {
-	pub ExchangeFee: (u32, u32) = (2, 1_000);
+	pub ExchangeFee: (u32, u32) = (3, 1_000);
 	pub const MinTradingLimit: Balance = MIN_TRADING_LIMIT;
 	pub const MinPoolLiquidity: Balance = MIN_POOL_LIQUIDITY;
 	pub const MaxInRatio: u128 = MAX_IN_RATIO;

diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "testing-basilisk-runtime"
-version = "68.0.0"
+version = "69.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"

diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs
@@ -115,7 +115,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: 68,
+	spec_version: 69,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,