mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-28 16:47:57 +00:00
Allow Non Intersecting Bids in Para Auction (#2741)
* Update auctions.rs * Add integration test * check that bid to another para requires new funds
This commit is contained in:
Shawn Tabrizi
@@ -18,7 +18,7 @@
|
||||
//! auctioning mechanism and for reserving balance as part of the "payment". Unreserving the balance
|
||||
//! happens elsewhere.
|
||||
|
||||
use sp_std::{prelude::*, mem::swap, convert::TryInto};
|
||||
use sp_std::{prelude::*, mem::swap};
|
||||
use sp_runtime::traits::{CheckedSub, Zero, One, Saturating};
|
||||
use frame_support::{
|
||||
decl_module, decl_storage, decl_event, decl_error, ensure, dispatch::DispatchResult,
|
||||
@@ -173,8 +173,6 @@ decl_error! {
|
||||
InvalidCode,
|
||||
/// Deployment data has not been set for this parachain.
|
||||
UnsetDeployData,
|
||||
/// The bid must overlap all intersecting ranges.
|
||||
NonIntersectingRange,
|
||||
/// Not a current auction.
|
||||
NotCurrentAuction,
|
||||
/// Not an auction.
|
||||
@@ -413,17 +411,6 @@ impl<T: Config> Module<T> {
|
||||
|
||||
// If this bid beat the previous winner of our range.
|
||||
if current_winning[range_index].as_ref().map_or(true, |last| amount > last.2) {
|
||||
// This must overlap with all existing ranges that we're winning on or it's invalid.
|
||||
ensure!(current_winning.iter()
|
||||
.enumerate()
|
||||
.all(|(i, x)| x.as_ref().map_or(true, |(w, _, _)|
|
||||
w != &bidder || range.intersects(i.try_into()
|
||||
.expect("array has SLOT_RANGE_COUNT items; index never reaches that value; qed")
|
||||
)
|
||||
)),
|
||||
Error::<T>::NonIntersectingRange,
|
||||
);
|
||||
|
||||
// Ok; we are the new winner of this range - reserve the additional amount and record.
|
||||
|
||||
// Get the amount already held on deposit if this is a renewal bid (i.e. there's
|
||||
@@ -1043,17 +1030,38 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn independent_bids_should_fail() {
|
||||
fn gap_bid_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
run_to_block(1);
|
||||
assert_ok!(Auctions::new_auction(Origin::signed(6), 1, 1));
|
||||
assert_ok!(Auctions::bid(Origin::signed(1), 0.into(), 1, 1, 2, 1));
|
||||
assert_ok!(Auctions::bid(Origin::signed(1), 0.into(), 1, 2, 4, 1));
|
||||
assert_ok!(Auctions::bid(Origin::signed(1), 0.into(), 1, 2, 2, 1));
|
||||
assert_noop!(
|
||||
Auctions::bid(Origin::signed(1), 0.into(), 1, 3, 3, 1),
|
||||
Error::<Test>::NonIntersectingRange
|
||||
);
|
||||
assert_ok!(Auctions::new_auction(Origin::signed(6), 5, 1));
|
||||
|
||||
// User 1 will make a bid for period 1 and 4 for the same Para 0
|
||||
assert_ok!(Auctions::bid(Origin::signed(1), 0.into(), 1, 1, 1, 1));
|
||||
assert_ok!(Auctions::bid(Origin::signed(1), 0.into(), 1, 4, 4, 4));
|
||||
|
||||
// User 2 and 3 will make a bid for para 1 on period 2 and 3 respectively
|
||||
assert_ok!(Auctions::bid(Origin::signed(2), 1.into(), 1, 2, 2, 2));
|
||||
assert_ok!(Auctions::bid(Origin::signed(3), 1.into(), 1, 3, 3, 3));
|
||||
|
||||
// Total reserved should be the max of the two
|
||||
assert_eq!(Balances::reserved_balance(1), 4);
|
||||
|
||||
// Other people are reserved correctly too
|
||||
assert_eq!(Balances::reserved_balance(2), 2);
|
||||
assert_eq!(Balances::reserved_balance(3), 3);
|
||||
|
||||
// End the auction.
|
||||
run_to_block(9);
|
||||
|
||||
assert_eq!(leases(), vec![
|
||||
((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
|
||||
((0.into(), 4), LeaseData { leaser: 1, amount: 4 }),
|
||||
((1.into(), 2), LeaseData { leaser: 2, amount: 2 }),
|
||||
((1.into(), 3), LeaseData { leaser: 3, amount: 3 }),
|
||||
]);
|
||||
assert_eq!(TestLeaser::deposit_held(0.into(), &1), 4);
|
||||
assert_eq!(TestLeaser::deposit_held(1.into(), &2), 2);
|
||||
assert_eq!(TestLeaser::deposit_held(1.into(), &3), 3);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -944,3 +944,149 @@ fn auction_bid_requires_registered_para() {
|
||||
));
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gap_bids_work() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert!(System::block_number().is_one()); // So events are emitted
|
||||
|
||||
// Start a new auction in the future
|
||||
let duration = 99u32;
|
||||
let lease_period_index_start = 4u32;
|
||||
assert_ok!(Auctions::new_auction(Origin::root(), duration, lease_period_index_start));
|
||||
Balances::make_free_balance_be(&1, 1_000);
|
||||
Balances::make_free_balance_be(&2, 1_000);
|
||||
|
||||
// Now register 2 paras
|
||||
assert_ok!(Registrar::register(
|
||||
Origin::signed(1),
|
||||
ParaId::from(1),
|
||||
test_genesis_head(10),
|
||||
test_validation_code(10),
|
||||
));
|
||||
assert_ok!(Registrar::register(
|
||||
Origin::signed(2),
|
||||
ParaId::from(2),
|
||||
test_genesis_head(10),
|
||||
test_validation_code(10),
|
||||
));
|
||||
|
||||
// Onboarded on Session 2
|
||||
run_to_session(2);
|
||||
|
||||
// Make bids
|
||||
Balances::make_free_balance_be(&10, 1_000);
|
||||
Balances::make_free_balance_be(&20, 1_000);
|
||||
// Slot 1 for 100 from 10
|
||||
assert_ok!(Auctions::bid(
|
||||
Origin::signed(10),
|
||||
ParaId::from(1),
|
||||
1, // Auction Index
|
||||
lease_period_index_start + 0, // First Slot
|
||||
lease_period_index_start + 0, // Last slot
|
||||
100, // Amount
|
||||
));
|
||||
// Slot 4 for 400 from 10
|
||||
assert_ok!(Auctions::bid(
|
||||
Origin::signed(10),
|
||||
ParaId::from(1),
|
||||
1, // Auction Index
|
||||
lease_period_index_start + 3, // First Slot
|
||||
lease_period_index_start + 3, // Last slot
|
||||
400, // Amount
|
||||
));
|
||||
|
||||
// A bid for another para is counted separately.
|
||||
assert_ok!(Auctions::bid(
|
||||
Origin::signed(10),
|
||||
ParaId::from(2),
|
||||
1, // Auction Index
|
||||
lease_period_index_start + 1, // First Slot
|
||||
lease_period_index_start + 1, // Last slot
|
||||
555, // Amount
|
||||
));
|
||||
assert_eq!(Balances::reserved_balance(&10), 400 + 555);
|
||||
|
||||
// Slot 2 for 800 from 20, overtaking 10's bid
|
||||
assert_ok!(Auctions::bid(
|
||||
Origin::signed(20),
|
||||
ParaId::from(1),
|
||||
1, // Auction Index
|
||||
lease_period_index_start + 1, // First Slot
|
||||
lease_period_index_start + 1, // Last slot
|
||||
800, // Amount
|
||||
));
|
||||
// Slot 3 for 200 from 20
|
||||
assert_ok!(Auctions::bid(
|
||||
Origin::signed(20),
|
||||
ParaId::from(1),
|
||||
1, // Auction Index
|
||||
lease_period_index_start + 2, // First Slot
|
||||
lease_period_index_start + 2, // Last slot
|
||||
200, // Amount
|
||||
));
|
||||
|
||||
// Finish the auction
|
||||
run_to_block(110);
|
||||
|
||||
// Should have won the lease periods
|
||||
assert_eq!(
|
||||
slots::Leases::<Test>::get(ParaId::from(1)),
|
||||
// -- 1 --- 2 --- 3 ---------- 4 -------------- 5 -------------- 6 -------------- 7 -------
|
||||
vec![None, None, None, Some((10, 100)), Some((20, 800)), Some((20, 200)), Some((10, 400))],
|
||||
);
|
||||
// Appropriate amount is reserved (largest of the values)
|
||||
assert_eq!(Balances::reserved_balance(&10), 400);
|
||||
// Appropriate amount is reserved (largest of the values)
|
||||
assert_eq!(Balances::reserved_balance(&20), 800);
|
||||
|
||||
// Progress through the leases and note the correct amount of balance is reserved.
|
||||
|
||||
run_to_block(400);
|
||||
assert_eq!(
|
||||
slots::Leases::<Test>::get(ParaId::from(1)),
|
||||
// --------- 4 -------------- 5 -------------- 6 -------------- 7 -------
|
||||
vec![Some((10, 100)), Some((20, 800)), Some((20, 200)), Some((10, 400))],
|
||||
);
|
||||
// Nothing changed.
|
||||
assert_eq!(Balances::reserved_balance(&10), 400);
|
||||
assert_eq!(Balances::reserved_balance(&20), 800);
|
||||
|
||||
// Lease period 4 is done, but nothing is unreserved since user 1 has a debt on lease 7
|
||||
run_to_block(500);
|
||||
assert_eq!(
|
||||
slots::Leases::<Test>::get(ParaId::from(1)),
|
||||
// --------- 5 -------------- 6 -------------- 7 -------
|
||||
vec![Some((20, 800)), Some((20, 200)), Some((10, 400))],
|
||||
);
|
||||
// Nothing changed.
|
||||
assert_eq!(Balances::reserved_balance(&10), 400);
|
||||
assert_eq!(Balances::reserved_balance(&20), 800);
|
||||
|
||||
// Lease period 5 is done, and 20 will unreserve down to 200.
|
||||
run_to_block(600);
|
||||
assert_eq!(
|
||||
slots::Leases::<Test>::get(ParaId::from(1)),
|
||||
// --------- 6 -------------- 7 -------
|
||||
vec![Some((20, 200)), Some((10, 400))],
|
||||
);
|
||||
assert_eq!(Balances::reserved_balance(&10), 400);
|
||||
assert_eq!(Balances::reserved_balance(&20), 200);
|
||||
|
||||
// Lease period 6 is done, and 20 will unreserve everything.
|
||||
run_to_block(700);
|
||||
assert_eq!(
|
||||
slots::Leases::<Test>::get(ParaId::from(1)),
|
||||
// --------- 7 -------
|
||||
vec![Some((10, 400))],
|
||||
);
|
||||
assert_eq!(Balances::reserved_balance(&10), 400);
|
||||
assert_eq!(Balances::reserved_balance(&20), 0);
|
||||
|
||||
// All leases are done. Everything is unreserved.
|
||||
run_to_block(800);
|
||||
assert_eq!(slots::Leases::<Test>::get(ParaId::from(1)), vec![]);
|
||||
assert_eq!(Balances::reserved_balance(&10), 0);
|
||||
assert_eq!(Balances::reserved_balance(&20), 0);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user