Merge pull request #272 from galacticcouncil/vesting-disable

fix: restricted vesting calls
galacticcouncil · Dec 3, 2021 · 24fd7e2 · 24fd7e2
2 parents dd0e434 + 884e911
commit 24fd7e2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "basilisk-runtime"
-version = "22.0.0"
+version = "24.0.0"
 authors = ["GalacticCouncil"]
 edition = "2018"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"

diff --git a/runtime/basilisk/src/benchmarking/vesting.rs b/runtime/basilisk/src/benchmarking/vesting.rs
@@ -1,5 +1,5 @@
 use crate::{AccountId, AssetId, Balance, NativeAssetId, Runtime};
-use crate::{BlockNumber, Currencies, MaxVestingSchedules, MinVestedTransfer, System, Vesting};
+use crate::{BlockNumber, Currencies, MaxVestingSchedules, System, Vesting};
 
 use super::BSX;
 
@@ -17,6 +17,8 @@ use orml_traits::MultiCurrency;
 use orml_traits::MultiCurrencyExtended;
 use orml_vesting::VestingSchedule;
 
+use primitives::constants::currency::NATIVE_EXISTENTIAL_DEPOSIT;
+
 use sp_runtime::traits::{SaturatedConversion, StaticLookup};
 
 pub type Schedule = VestingSchedule<BlockNumber, Balance>;
@@ -49,7 +51,7 @@ runtime_benchmarks! {
 			start: 0,
 			period: 2,
 			period_count: 3,
-			per_period: MinVestedTransfer::get(),
+			per_period: NATIVE_EXISTENTIAL_DEPOSIT,
 		};
 
 		let from: AccountId = get_vesting_account();
@@ -72,7 +74,7 @@ runtime_benchmarks! {
 			start: 0,
 			period: 2,
 			period_count: 3,
-			per_period: MinVestedTransfer::get(),
+			per_period: NATIVE_EXISTENTIAL_DEPOSIT,
 		};
 
 		let from: AccountId = get_vesting_account();
@@ -101,7 +103,7 @@ runtime_benchmarks! {
 			start: 0,
 			period: 2,
 			period_count: 3,
-			per_period: MinVestedTransfer::get(),
+			per_period: NATIVE_EXISTENTIAL_DEPOSIT,
 		};
 
 		let to: AccountId = account("to", 0, SEED);

diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs
@@ -106,7 +106,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("basilisk"),
 	impl_name: create_runtime_str!("basilisk"),
 	authoring_version: 1,
-	spec_version: 23,
+	spec_version: 24,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -129,6 +129,7 @@ impl Contains<Call> for BaseFilter {
 			Call::XYK(_) => false,
 			Call::NFT(_) => false,
 			Call::Exchange(_) => false,
+			Call::Vesting(_) => false,
 			_ => true,
 		}
 	}

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -225,6 +225,6 @@ parameter_types! {
 
 // pallet vesting
 parameter_types! {
-	pub MinVestedTransfer: Balance = 100_000 * UNITS;
-	pub const MaxVestingSchedules: u32 = 100;
+	pub MinVestedTransfer: Balance = 100_000;
+	pub const MaxVestingSchedules: u32 = 15;
 }