From 462b5fc15c943eb2e17bf710e28ed271df21b3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20P=C3=A1nik?= Date: Mon, 25 Jul 2022 20:00:20 +0200 Subject: [PATCH 1/4] feat/exchange-fee-bump --- runtime/common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 36501819131..196115d6b0a 100644 --- 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; From 57ee44bddc480764dd8930bea80343ebf854efa8 Mon Sep 17 00:00:00 2001 From: Jakub Panik Date: Mon, 25 Jul 2022 20:06:52 +0200 Subject: [PATCH 2/4] 69 --- Cargo.lock | 4 ++-- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 2 +- runtime/testing-basilisk/Cargo.toml | 2 +- runtime/testing-basilisk/src/lib.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56f8f4132f5..33cb3640ba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -486,7 +486,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "68.0.0" +version = "69.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", @@ -11283,7 +11283,7 @@ dependencies = [ [[package]] name = "testing-basilisk-runtime" -version = "68.0.0" +version = "69.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index aaa10ec4c0e..42080021aa5 100644 --- 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 index 68d0133a721..dd1c2f562fa 100644 --- 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/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index ab02b7308ad..3e5b67bebda 100644 --- 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 index b843ab2216b..ef9c772b7cf 100644 --- 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, From 376756684984f5476ed54530b081d1c006291f6d Mon Sep 17 00:00:00 2001 From: Jakub Panik Date: Mon, 25 Jul 2022 20:11:08 +0200 Subject: [PATCH 3/4] 2 --- Cargo.lock | 2 +- runtime/common/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33cb3640ba2..7f16c0363ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1289,7 +1289,7 @@ dependencies = [ [[package]] name = "common-runtime" -version = "1.12.0" +version = "2.0.0" dependencies = [ "frame-support", "frame-system", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 2b00150b5de..89ca3b2d643 100644 --- 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" From b29e8661c509b4ac8b8275b437b8c3467d4d2958 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Mon, 25 Jul 2022 22:51:16 +0200 Subject: [PATCH 4/4] updated integration test --- Cargo.lock | 2 +- integration-tests/Cargo.toml | 2 +- integration-tests/src/non_native_fee.rs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f16c0363ac..d56090a1bb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8746,7 +8746,7 @@ dependencies = [ [[package]] name = "runtime-integration-tests" -version = "0.7.0" +version = "0.7.1" dependencies = [ "basilisk-runtime", "cumulus-pallet-aura-ext", diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 6f07b22a9d1..4da711ee343 100644 --- 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 index 00d24f8d42a..b5b4bb11f98 100644 --- 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(),