Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vtoken voting #1540

Merged
merged 4 commits into from
Dec 4, 2024
Merged

Fix vtoken voting #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
427ec1a
Separate the logic for retrieving the current block for different tok…
SunTiebing Dec 3, 2024
3e386b6
change ReferendumTimeout max number to 100
SunTiebing Dec 4, 2024
7256a77
change RelaychainBlockNumber to agent block number
SunTiebing Dec 4, 2024
57407f4
Merge branch 'v0.15.2' into fix-vtoken-voting
ark930 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pallets/vtoken-voting/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,8 @@ pub mod pallet {
.ok_or(Error::<T>::NoData)?
.saturating_mul(lock_periods.into()),
);
let now = T::RelaychainBlockNumberProvider::current_block_number();

let now = Self::get_agent_block_number(&vtoken)?;
if now < unlock_at {
ensure!(
matches!(scope, UnvoteScope::Any),
Expand All @@ -1174,8 +1175,9 @@ pub mod pallet {
/// Rejig the lock on an account. It will never get more stringent (since that would
/// indicate a security hole) but may be reduced from what they are currently.
pub(crate) fn update_lock(who: &AccountIdOf<T>, vtoken: CurrencyIdOf<T>) -> DispatchResult {
let current_block = Self::get_agent_block_number(&vtoken)?;
let lock_needed = VotingFor::<T>::mutate(who, |voting| {
voting.rejig(T::RelaychainBlockNumberProvider::current_block_number());
voting.rejig(current_block);
voting.locked_balance()
});

Expand Down Expand Up @@ -1278,8 +1280,10 @@ pub mod pallet {
(Some(ReferendumInfo::Completed(moment)), Some((lock_periods, _balance))) => {
let locking_period =
VoteLockingPeriod::<T>::get(vtoken).ok_or(Error::<T>::NoData)?;

let current_block = Self::get_agent_block_number(&vtoken)?;
ensure!(
T::RelaychainBlockNumberProvider::current_block_number() >=
current_block >=
moment.saturating_add(
locking_period.saturating_mul(lock_periods.into())
),
Expand All @@ -1288,10 +1292,8 @@ pub mod pallet {
Ok(())
},
(Some(ReferendumInfo::Completed(moment)), None) => {
ensure!(
T::RelaychainBlockNumberProvider::current_block_number() >= moment,
Error::<T>::NotExpired
);
let current_block = Self::get_agent_block_number(&vtoken)?;
ensure!(current_block >= moment, Error::<T>::NotExpired);
Ok(())
},
_ => Err(Error::<T>::NotExpired.into()),
Expand Down
18 changes: 9 additions & 9 deletions pallets/vtoken-voting/src/tests/vbnc_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ fn successful_but_zero_conviction_vote_balance_can_be_unlocked() {
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(BOB), vtoken, poll_index));
assert_eq!(usable_balance(vtoken, &BOB), 20);

RelaychainDataProvider::set_block_number(13);
System::set_block_number(13);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, poll_index));
assert_eq!(usable_balance(vtoken, &ALICE), 10);
});
Expand Down Expand Up @@ -181,7 +181,7 @@ fn unsuccessful_conviction_vote_balance_can_be_unlocked() {
poll_index,
ReferendumInfoOf::<Runtime>::Completed(3),
));
RelaychainDataProvider::set_block_number(13);
System::set_block_number(13);
assert_ok!(VtokenVoting::try_remove_vote(&ALICE, vtoken, poll_index, UnvoteScope::Any));
assert_ok!(VtokenVoting::update_lock(&ALICE, vtoken));
assert_eq!(usable_balance(vtoken, &ALICE), 10);
Expand Down Expand Up @@ -221,7 +221,7 @@ fn ensure_balance_after_unlock() {
poll_index,
ReferendumInfoOf::<Runtime>::Completed(3),
));
RelaychainDataProvider::set_block_number(13);
System::set_block_number(13);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, poll_index));
assert_eq!(usable_balance(vtoken, &ALICE), 0);
assert_eq!(Tokens::accounts(&ALICE, vtoken).frozen, 10);
Expand Down Expand Up @@ -269,7 +269,7 @@ fn ensure_comprehensive_balance_after_unlock() {
poll_index,
ReferendumInfoOf::<Runtime>::Completed(3),
));
RelaychainDataProvider::set_block_number(13);
System::set_block_number(13);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, poll_index));
assert_eq!(usable_balance(vtoken, &ALICE), 8);
assert_eq!(Tokens::accounts(&ALICE, vtoken).frozen, 2);
Expand Down Expand Up @@ -314,7 +314,7 @@ fn successful_conviction_vote_balance_stays_locked_for_correct_time() {
poll_index,
ReferendumInfoOf::<Runtime>::Completed(3),
));
RelaychainDataProvider::set_block_number(163);
System::set_block_number(163);
for i in 1..=5 {
assert_ok!(VtokenVoting::try_remove_vote(&i, vtoken, poll_index, UnvoteScope::Any));
}
Expand Down Expand Up @@ -392,15 +392,15 @@ fn lock_amalgamation_valid_with_multiple_removed_votes() {
.unwrap()
);

RelaychainDataProvider::set_block_number(10);
System::set_block_number(10);
assert_noop!(
VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, 0),
Error::<Runtime>::NoPermissionYet
);
assert_eq!(VotingFor::<Runtime>::get(&ALICE).locked_balance(), 10);
assert_eq!(usable_balance(vtoken, &ALICE), 0);

RelaychainDataProvider::set_block_number(11);
System::set_block_number(11);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, 0));
assert_eq!(VotingFor::<Runtime>::get(&ALICE).locked_balance(), 10);
assert_eq!(usable_balance(vtoken, &ALICE), 0);
Expand All @@ -410,7 +410,7 @@ fn lock_amalgamation_valid_with_multiple_removed_votes() {
.unwrap()
);

RelaychainDataProvider::set_block_number(11);
System::set_block_number(11);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, 1));
assert_eq!(usable_balance(vtoken, &ALICE), 0);
assert_eq!(
Expand All @@ -419,7 +419,7 @@ fn lock_amalgamation_valid_with_multiple_removed_votes() {
.unwrap()
);

RelaychainDataProvider::set_block_number(21);
System::set_block_number(21);
assert_ok!(VtokenVoting::unlock(RuntimeOrigin::signed(ALICE), vtoken, 2));
assert_eq!(usable_balance(vtoken, &ALICE), 10);
assert_eq!(
Expand Down