diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index f8c03ff5af444b8b24fd65ea52d6e6324ed16e73..4207f56b63b9290bdc3a679067b736178939518a 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -144,13 +144,13 @@ decl_error! {
SignerHasNoClaim,
/// Account ID sending tx has no claim.
SenderHasNoClaim,
- /// The destination is already vesting and cannot be the target of a further claim.
- DestinationVesting,
/// There's not enough in the pot to pay out some unvested amount. Generally implies a logic
/// error.
PotUnderflow,
/// A needed statement was not included.
InvalidStatement,
+ /// The account already has a vested balance.
+ VestedBalanceExists,
}
}
@@ -438,15 +438,22 @@ impl<T: Trait> Module<T> {
let new_total = Self::total().checked_sub(&balance_due).ok_or(Error::<T>::PotUnderflow)?;
+ let vesting = Vesting::<T>::get(&signer);
+ if vesting.is_some() && T::VestingSchedule::vesting_balance(&dest).is_some() {
+ return Err(Error::<T>::VestedBalanceExists.into())
+ }
+
+ // We first need to deposit the balance to ensure that the account exists.
+ CurrencyOf::<T>::deposit_creating(&dest, balance_due);
+
// Check if this claim should have a vesting schedule.
- if let Some(vs) = <Vesting<T>>::get(&signer) {
- // If this fails, destination account already has a vesting schedule
- // applied to it, and this claim should not be processed.
+ if let Some(vs) = vesting {
+ // This can only fail if the account already has a vesting schedule,
+ // but this is checked above.
T::VestingSchedule::add_vesting_schedule(&dest, vs.0, vs.1, vs.2)
- .map_err(|_| Error::<T>::DestinationVesting)?;
+ .expect("No other vesting schedule exists, as checked above; qed");
}
- CurrencyOf::<T>::deposit_creating(&dest, balance_due);
<Total<T>>::put(new_total);
<Claims<T>>::remove(&signer);
<Vesting<T>>::remove(&signer);
@@ -611,7 +618,7 @@ mod tests {
use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, Identity}, testing::Header};
use frame_support::{
impl_outer_origin, impl_outer_dispatch, assert_ok, assert_err, assert_noop, parameter_types,
- weights::{Pays, GetDispatchInfo},
+ weights::{Pays, GetDispatchInfo}, traits::ExistenceRequirement,
};
use balances;
use super::Call as ClaimsCall;
@@ -902,12 +909,18 @@ mod tests {
assert_eq!(Balances::free_balance(42), 0);
assert_noop!(
Claims::claim(Origin::NONE, 69, sig::<Test>(&bob(), &69u64.encode(), &[][..])),
- Error::<Test>::SignerHasNoClaim
+ Error::<Test>::SignerHasNoClaim,
);
assert_ok!(Claims::mint_claim(Origin::ROOT, eth(&bob()), 200, Some((50, 10, 1)), None));
assert_ok!(Claims::claim(Origin::NONE, 69, sig::<Test>(&bob(), &69u64.encode(), &[][..])));
assert_eq!(Balances::free_balance(&69), 200);
assert_eq!(Vesting::vesting_balance(&69), Some(50));
+
+ // Make sure we can not transfer the vested balance.
+ assert_err!(
+ <Balances as Currency<_>>::transfer(&69, &80, 180, ExistenceRequirement::AllowDeath),
+ balances::Error::<Test, _>::LiquidityRestrictions,
+ );
});
}
@@ -979,7 +992,7 @@ mod tests {
// They should not be able to claim
assert_noop!(
Claims::claim(Origin::NONE, 69, sig::<Test>(&bob(), &69u64.encode(), &[][..])),
- Error::<Test>::DestinationVesting
+ Error::<Test>::VestedBalanceExists,
);
});
}
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 28be46c111e5e135c72b4cfccf02412c310c3773..be040fe8420a3f6428ed88d37ce31eb6527eabb2 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -84,8 +84,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
- spec_version: 1064,
- impl_version: 1,
+ spec_version: 1065,
+ impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
};
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
index 32b0ece09efe6a965fb7575ea5bffb622ebc8ab2..ea496e55b23db975a71540566aaf6e692a92be9f 100644
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ b/polkadot/runtime/polkadot/Cargo.toml
@@ -136,6 +136,7 @@ std = [
"runtime-common/std",
"sudo/std",
"vesting/std",
+ "utility/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index adc189d1492f6ba2f99a984d82708b63bd0a9bfd..8c0f84314c9c599f955546703bee3df6caa55705 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -88,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0,
- spec_version: 0,
+ spec_version: 1,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 0,
diff --git a/polkadot/runtime/polkadot/tests/weights.rs b/polkadot/runtime/polkadot/tests/weights.rs
index 6bfe1dced4e7f43d04b18adfb6075cc986cbd090..533783a4e4917b9a92a40c6c5550b528c299e78f 100644
--- a/polkadot/runtime/polkadot/tests/weights.rs
+++ b/polkadot/runtime/polkadot/tests/weights.rs
@@ -219,7 +219,7 @@ fn weight_of_democracy_enact_proposal_is_correct() {
#[test]
fn weight_of_phragmen_vote_is_correct() {
// #[weight = 100_000_000]
- let expected_weight = 100_000_000;
+ let expected_weight = 350_000_000;
let weight = PhragmenCall::vote::<Runtime>(Default::default(), Default::default()).get_dispatch_info().weight;
assert_eq!(weight, expected_weight);
@@ -227,18 +227,17 @@ fn weight_of_phragmen_vote_is_correct() {
#[test]
fn weight_of_phragmen_submit_candidacy_is_correct() {
- // #[weight = 500_000_000]
- let expected_weight = 500_000_000;
- let weight = PhragmenCall::submit_candidacy::<Runtime>().get_dispatch_info().weight;
+ let expected_weight = WEIGHT_PER_MICROS * 35 + 1 * 375 * WEIGHT_PER_NANOS + DbWeight::get().reads_writes(4, 1);
+ let weight = PhragmenCall::submit_candidacy::<Runtime>(1).get_dispatch_info().weight;
assert_eq!(weight, expected_weight);
}
#[test]
fn weight_of_phragmen_renounce_candidacy_is_correct() {
- // #[weight = (2_000_000_000, DispatchClass::Operational)]
- let expected_weight = 2_000_000_000;
- let weight = PhragmenCall::renounce_candidacy::<Runtime>().get_dispatch_info().weight;
+ let expected_weight = 46 * WEIGHT_PER_MICROS + DbWeight::get().reads_writes(2, 2);
+ let weight = PhragmenCall::renounce_candidacy::<Runtime>(elections_phragmen::Renouncing::Member)
+ .get_dispatch_info().weight;
assert_eq!(weight, expected_weight);
}
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index c78bce274271ead7b1fa21445fa056b714b2c0c3..cb766cf52695530b3137b441ca5be683457f2d18 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -82,7 +82,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2,
- spec_version: 10,
+ spec_version: 11,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,