Merge pull request #729 from galacticcouncil/unleached-fees

feat: unleashed dynamic fees
galacticcouncil · Dec 24, 2023 · 748c5a8 · 748c5a8
2 parents 564553c + 111e117
commit 748c5a8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 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 = "1.16.4"
+version = "1.16.5"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

diff --git a/integration-tests/src/dca.rs b/integration-tests/src/dca.rs
@@ -2868,7 +2868,7 @@ mod with_onchain_route {
 			assert!(fee > 57 * UNITS / 10);
 
 			assert_balance!(ALICE.into(), stable_asset_1, alice_init_stable_balance - dca_budget);
-			assert_balance!(ALICE.into(), HDX, alice_init_hdx_balance + 237185260073197);
+			assert!(Currencies::free_balance(HDX, &ALICE.into()) > alice_init_hdx_balance);
 
 			assert_reserved_balance!(&ALICE.into(), stable_asset_1, dca_budget - amount_to_sell - fee);
 		});
@@ -2990,7 +2990,7 @@ mod with_onchain_route {
 			assert!(fee < 38 * UNITS / 10);
 			assert!(fee > 37 * UNITS / 10);
 
-			assert_balance!(ALICE.into(), HDX, alice_init_hdx_balance + 278060378846663);
+			assert!(Currencies::free_balance(HDX, &ALICE.into()) > alice_init_hdx_balance);
 			assert_reserved_balance!(&ALICE.into(), DOT, dca_budget - amount_to_sell - fee);
 		});
 	}

diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "195.0.0"
+version = "196.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"

diff --git a/runtime/hydradx/src/assets.rs b/runtime/hydradx/src/assets.rs
@@ -763,17 +763,17 @@ impl pallet_otc::Config for Runtime {
 // Dynamic fees
 parameter_types! {
 	pub AssetFeeParams: FeeParams<Permill> = FeeParams{
-		min_fee: Permill::from_rational(25u32,10000u32),
-		max_fee: Permill::from_rational(4u32,1000u32),
-		decay: FixedU128::from_rational(5,1000000),
-		amplification: FixedU128::one(),
+		min_fee: Permill::from_rational(25u32,10000u32), // 0.25%
+		max_fee: Permill::from_rational(5u32,100u32),    // 5%
+		decay: FixedU128::from_rational(1,100000),       // 0.001%
+		amplification: FixedU128::from(2),               // 2
 	};
 
 	pub ProtocolFeeParams: FeeParams<Permill> = FeeParams{
-		min_fee: Permill::from_rational(5u32,10000u32),
-		max_fee: Permill::from_rational(1u32,1000u32),
-		decay: FixedU128::from_rational(5,1000000),
-		amplification: FixedU128::one(),
+		min_fee: Permill::from_rational(5u32,10000u32),  // 0.05%
+		max_fee: Permill::from_rational(1u32,1000u32),   // 0.1%
+		decay: FixedU128::from_rational(5,1000000),      // 0.0005%
+		amplification: FixedU128::one(),                 // 1
 	};
 
 	pub const DynamicFeesOraclePeriod: OraclePeriod = OraclePeriod::Short;

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