Skip to content

Allow crowdloan finalize/refund before end #2115

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

Merged
sam0x17 merged 5 commits into from
Oct 9, 2025
Merged

Allow crowdloan finalize/refund before end #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4d802f
make crowdloan finalizable when cap is reached but before end
l0r1s Oct 8, 2025
cef1fcc
make crowdloan refund before the end possible
l0r1s Oct 8, 2025
0736b0b
fix comment
l0r1s Oct 8, 2025
7ccea37
bump spec version
l0r1s Oct 8, 2025
9cf797f
auto-update benchmark weights
github-actions[bot] Oct 8, 2025
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
2 changes: 1 addition & 1 deletion pallets/admin-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ pub mod pallet {
/// It is only callable by the root account.
/// The extrinsic will call the Subtensor pallet to set the target registrations per interval.
#[pallet::call_index(21)]
#[pallet::weight(Weight::from_parts(44_320_000, 0)
#[pallet::weight(Weight::from_parts(25_980_000, 0)
.saturating_add(<T as frame_system::Config>::DbWeight::get().reads(3_u64))
.saturating_add(<T as frame_system::Config>::DbWeight::get().writes(1_u64)))]
pub fn sudo_set_target_registrations_per_interval(
Expand Down
14 changes: 5 additions & 9 deletions pallets/crowdloan/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ pub mod pallet {
Ok(())
}

/// Finalize a successful crowdloan.
/// Finalize crowdloan that has reached the cap.
///
/// The call will transfer the raised amount to the target address if it was provided when the crowdloan was created
/// and dispatch the call that was provided using the creator origin. The CurrentCrowdloanId will be set to the
Expand All @@ -565,14 +565,12 @@ pub mod pallet {
#[pallet::compact] crowdloan_id: CrowdloanId,
) -> DispatchResult {
let who = ensure_signed(origin)?;
let now = frame_system::Pallet::<T>::block_number();

let mut crowdloan = Self::ensure_crowdloan_exists(crowdloan_id)?;

// Ensure the origin is the creator of the crowdloan and the crowdloan has ended,
// raised the cap and is not finalized.
// Ensure the origin is the creator of the crowdloan and the crowdloan has raised the cap
// and is not finalized.
ensure!(who == crowdloan.creator, Error::<T>::InvalidOrigin);
ensure!(now >= crowdloan.end, Error::<T>::ContributionPeriodNotEnded);
ensure!(crowdloan.raised == crowdloan.cap, Error::<T>::CapNotRaised);
ensure!(!crowdloan.finalized, Error::<T>::AlreadyFinalized);

Expand Down Expand Up @@ -621,7 +619,7 @@ pub mod pallet {
Ok(())
}

/// Refund a failed crowdloan.
/// Refund contributors of a non-finalized crowdloan.
///
/// The call will try to refund all contributors (excluding the creator) up to the limit defined by the `RefundContributorsLimit`.
/// If the limit is reached, the call will stop and the crowdloan will be marked as partially refunded.
Expand All @@ -637,13 +635,11 @@ pub mod pallet {
origin: OriginFor<T>,
#[pallet::compact] crowdloan_id: CrowdloanId,
) -> DispatchResultWithPostInfo {
let now = frame_system::Pallet::<T>::block_number();
ensure_signed(origin)?;

let mut crowdloan = Self::ensure_crowdloan_exists(crowdloan_id)?;

// Ensure the crowdloan has ended and is not finalized
ensure!(now >= crowdloan.end, Error::<T>::ContributionPeriodNotEnded);
// Ensure the crowdloan is not finalized
ensure!(!crowdloan.finalized, Error::<T>::AlreadyFinalized);

let mut refunded_contributors: Vec<T::AccountId> = vec![];
Expand Down
90 changes: 3 additions & 87 deletions pallets/crowdloan/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,6 @@ fn test_finalize_succeeds() {
amount
));

// run some more blocks past the end of the contribution period
run_to_block(60);

// finalize the crowdloan
assert_ok!(Crowdloan::finalize(
RuntimeOrigin::signed(creator),
Expand Down Expand Up @@ -1340,54 +1337,6 @@ fn test_finalize_fails_if_not_creator_origin() {
});
}

#[test]
fn test_finalize_fails_if_crowdloan_has_not_ended() {
TestState::default()
.with_balance(U256::from(1), 100)
.with_balance(U256::from(2), 100)
.build_and_execute(|| {
// create a crowdloan
let creator: AccountOf<Test> = U256::from(1);
let deposit: BalanceOf<Test> = 50;
let min_contribution: BalanceOf<Test> = 10;
let cap: BalanceOf<Test> = 100;
let end: BlockNumberFor<Test> = 50;

assert_ok!(Crowdloan::create(
RuntimeOrigin::signed(creator),
deposit,
min_contribution,
cap,
end,
Some(noop_call()),
None,
));

// run some blocks
run_to_block(10);

// some contribution
let crowdloan_id: CrowdloanId = 0;
let contributor: AccountOf<Test> = U256::from(2);
let amount: BalanceOf<Test> = 50;

assert_ok!(Crowdloan::contribute(
RuntimeOrigin::signed(contributor),
crowdloan_id,
amount
));

// run some more blocks before end of contribution period
run_to_block(10);

// try to finalize
assert_err!(
Crowdloan::finalize(RuntimeOrigin::signed(creator), crowdloan_id),
pallet_crowdloan::Error::<Test>::ContributionPeriodNotEnded
);
});
}

#[test]
fn test_finalize_fails_if_crowdloan_cap_is_not_raised() {
TestState::default()
Expand Down Expand Up @@ -1585,8 +1534,8 @@ fn test_refund_succeeds() {
.is_some_and(|c| c.contributors_count == 7)
);

// run some more blocks past the end of the contribution period
run_to_block(60);
// run some more blocks before the end of the contribution period
run_to_block(20);

// first round of refund
assert_ok!(Crowdloan::refund(
Expand Down Expand Up @@ -1614,7 +1563,7 @@ fn test_refund_succeeds() {
pallet_crowdloan::Event::<Test>::PartiallyRefunded { crowdloan_id }.into()
);

// run some more blocks
// run some more blocks past the end of the contribution period
run_to_block(70);

// second round of refund
Expand Down Expand Up @@ -1700,39 +1649,6 @@ fn test_refund_fails_if_crowdloan_does_not_exist() {
});
}

#[test]
fn test_refund_fails_if_crowdloan_has_not_ended() {
TestState::default()
.with_balance(U256::from(1), 100)
.build_and_execute(|| {
// create a crowdloan
let creator: AccountOf<Test> = U256::from(1);
let initial_deposit: BalanceOf<Test> = 50;
let min_contribution: BalanceOf<Test> = 10;
let cap: BalanceOf<Test> = 300;
let end: BlockNumberFor<Test> = 50;
assert_ok!(Crowdloan::create(
RuntimeOrigin::signed(creator),
initial_deposit,
min_contribution,
cap,
end,
Some(noop_call()),
None,
));

// run some blocks
run_to_block(10);

// try to refund
let crowdloan_id: CrowdloanId = 0;
assert_err!(
Crowdloan::refund(RuntimeOrigin::signed(creator), crowdloan_id),
pallet_crowdloan::Error::<Test>::ContributionPeriodNotEnded
);
});
}

#[test]
fn test_dissolve_succeeds() {
TestState::default()
Expand Down
6 changes: 3 additions & 3 deletions pallets/subtensor/src/macros/dispatches.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ mod dispatches {
/// The extrinsic for user to change its hotkey in subnet or all subnets.
#[pallet::call_index(70)]
#[pallet::weight((Weight::from_parts(275_300_000, 0)
.saturating_add(T::DbWeight::get().reads(47))
.saturating_add(T::DbWeight::get().reads(49_u64))
.saturating_add(T::DbWeight::get().writes(37)), DispatchClass::Normal, Pays::No))]
pub fn swap_hotkey(
origin: OriginFor<T>,
Expand Down Expand Up @@ -2293,8 +2293,8 @@ mod dispatches {
/// - The hotkey account to designate as the autostake destination.
#[pallet::call_index(114)]
#[pallet::weight((Weight::from_parts(29_930_000, 0)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1)), DispatchClass::Normal, Pays::No))]
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64)), DispatchClass::Normal, Pays::No))]
pub fn set_coldkey_auto_stake_hotkey(
origin: T::RuntimeOrigin,
netuid: NetUid,
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// `spec_version`, and `authoring_version` are the same between Wasm and native.
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
// the compatible custom types.
spec_version: 326,
spec_version: 328,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down