Skip to content

set_validation_data register weight manually, do not use refund when the pre dispatch is zero. #7327

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
gui1117 merged 8 commits into from
Jan 25, 2025
Merged

set_validation_data register weight manually, do not use refund when the pre dispatch is zero. #7327

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5a9dab
comment
gui1117 Jan 24, 2025
360d7f5
do not use refund when not in pre dispatch info
gui1117 Jan 24, 2025
a4d8a01
fix
gui1117 Jan 24, 2025
26abf9a
prdoc
gui1117 Jan 24, 2025
46827d4
Merge branch 'master' into gui-do-not-use-refund-when-not-benchmarked
gui1117 Jan 24, 2025
e988d2b
use dispatch result without post info
gui1117 Jan 25, 2025
15d6c29
remove unused import
gui1117 Jan 25, 2025
a9e8ed8
remove unused
gui1117 Jan 25, 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
7 changes: 6 additions & 1 deletion cumulus/pallets/parachain-system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,12 @@ pub mod pallet {
vfp.relay_parent_number,
));

Ok(PostDispatchInfo { actual_weight: Some(total_weight), pays_fee: Pays::No })
frame_system::Pallet::<T>::register_extra_weight_unchecked(
total_weight,
Copy link
Copy Markdown
Member

@athei athei Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume we don't know an upper bound for this value pre-dispatch because it is calculated ad-hoc?

Copy link
Copy Markdown
Contributor

@georgepisaltu georgepisaltu Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but it's once per block and we register the weight, meaning it will be correctly accounted for in the following transactions.

If we go with the worst case weight here before dispatching, we might greatly underestimate the block space we have since those stuctures in ParachainInherentData can grow a lot as far as I'm aware. This model works best IMO.

DispatchClass::Mandatory,
);

Ok(Pays::No.into())
Copy link
Copy Markdown
Member

@athei athei Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: You can change the return type of the dispatchable to just DispatchResult.

Copy link
Copy Markdown
Contributor Author

@gui1117 gui1117 Jan 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in e988d2b

Copy link
Copy Markdown
Member

@ggwpez ggwpez Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make a difference here if we just return this vs Ok(PostDispatchInfo { actual_weight: Some(total_weight), pays_fee: Pays::No })? It would look more correct to me

Copy link
Copy Markdown
Member

@athei athei Jan 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what we were doing before (this PR removes this line) and it was incorrect. This is because you cant (or should not) return a post dispatch weight that is higher than the pre dispatch weight. It will not be charged. Hence the error that was emitted by try runtime.

}

#[pallet::call_index(1)]
Expand Down
11 changes: 11 additions & 0 deletions prdoc/pr_7327.prdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title: Correctly register the weight n `set_validation_data` in `cumulus-pallet-parachain-system`

doc:
- audience: Runtime Dev
description: |
The actual weight of the call was register as a refund, but the pre-dispatch weight is 0,
and we can't refund from 0. Now the actual weight is registered manually instead of ignored.

crates:
- name: cumulus-pallet-parachain-system
bump: patch