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.

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

[1.14] Backport PoV-reclaim fixes (#5273, #5281) #5371

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
144 changes: 137 additions & 7 deletions cumulus/primitives/storage-weight-reclaim/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,17 @@ where
);
return Ok(())
};
let benchmarked_weight = info.weight.proof_size();
let consumed_weight = post_dispatch_proof_size.saturating_sub(pre_dispatch_proof_size);

// Unspent weight according to the `actual_weight` from `PostDispatchInfo`
// This unspent weight will be refunded by the `CheckWeight` extension, so we need to
// account for that.
let unspent = post_info.calc_unspent(info).proof_size();
let storage_size_diff =
benchmarked_weight.saturating_sub(unspent).abs_diff(consumed_weight as u64);
let benchmarked_weight = info.weight.proof_size().saturating_sub(unspent);
let consumed_weight = post_dispatch_proof_size.saturating_sub(pre_dispatch_proof_size);

let storage_size_diff = benchmarked_weight.abs_diff(consumed_weight as u64);

let extrinsic_len = frame_system::AllExtrinsicsLen::<T>::get().unwrap_or(0);
let node_side_pov_size = post_dispatch_proof_size.saturating_add(extrinsic_len.into());

// This value will be reclaimed by [`frame_system::CheckWeight`], so we need to calculate
// that in.
Expand All @@ -191,6 +193,19 @@ where
);
current.reduce(Weight::from_parts(0, storage_size_diff), info.class)
}

// If we encounter a situation where the node-side proof size is already higher than
// what we have in the runtime bookkeeping, we add the difference to the `BlockWeight`.
// This prevents that the proof size grows faster than the runtime proof size.
let block_weight_proof_size = current.total().proof_size();
let missing_from_node = node_side_pov_size.saturating_sub(block_weight_proof_size);
if missing_from_node > 0 {
log::warn!(
target: LOG_TARGET,
"Node-side PoV size higher than runtime proof size weight. node-side: {node_side_pov_size} extrinsic_len: {extrinsic_len} runtime: {block_weight_proof_size}, missing: {missing_from_node}. Setting to node-side proof size."
);
current.accrue(Weight::from_parts(0, missing_from_node), info.class);
}
});
Ok(())
}
Expand Down Expand Up @@ -294,6 +309,121 @@ mod tests {
})
}

#[test]
fn underestimating_refund() {
// We fixed a bug where `pre dispatch info weight > consumed weight > post info weight`
// resulted in error.

// The real cost will be 100 bytes of storage size
let mut test_ext = setup_test_externalities(&[0, 100]);

test_ext.execute_with(|| {
set_current_storage_weight(1000);

// Benchmarked storage weight: 500
let info = DispatchInfo { weight: Weight::from_parts(0, 101), ..Default::default() };
let post_info = PostDispatchInfo {
actual_weight: Some(Weight::from_parts(0, 99)),
pays_fee: Default::default(),
};

assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&info, LEN));

let pre = StorageWeightReclaim::<Test>(PhantomData)
.pre_dispatch(&ALICE, CALL, &info, LEN)
.unwrap();
assert_eq!(pre, Some(0));

assert_ok!(CheckWeight::<Test>::post_dispatch(None, &info, &post_info, 0, &Ok(())));
// We expect an accrue of 1
assert_ok!(StorageWeightReclaim::<Test>::post_dispatch(
Some(pre),
&info,
&post_info,
LEN,
&Ok(())
));

assert_eq!(get_storage_weight().total().proof_size(), 1250);
})
}

#[test]
fn sets_to_node_storage_proof_if_higher() {
// The storage proof reported by the proof recorder is higher than what is stored on
// the runtime side.
{
let mut test_ext = setup_test_externalities(&[1000, 1005]);

test_ext.execute_with(|| {
// Stored in BlockWeight is 5
set_current_storage_weight(5);

// Benchmarked storage weight: 10
let info = DispatchInfo { weight: Weight::from_parts(0, 10), ..Default::default() };
let post_info = PostDispatchInfo::default();

assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&info, LEN));

let pre = StorageWeightReclaim::<Test>(PhantomData)
.pre_dispatch(&ALICE, CALL, &info, LEN)
.unwrap();
assert_eq!(pre, Some(1000));

assert_ok!(CheckWeight::<Test>::post_dispatch(None, &info, &post_info, 0, &Ok(())));
assert_ok!(StorageWeightReclaim::<Test>::post_dispatch(
Some(pre),
&info,
&post_info,
LEN,
&Ok(())
));

// We expect that the storage weight was set to the node-side proof size (1005) +
// extrinsics length (150)
assert_eq!(get_storage_weight().total().proof_size(), 1155);
})
}

// In this second scenario the proof size on the node side is only lower
// after reclaim happened.
{
let mut test_ext = setup_test_externalities(&[175, 180]);
test_ext.execute_with(|| {
set_current_storage_weight(85);

// Benchmarked storage weight: 100
let info =
DispatchInfo { weight: Weight::from_parts(0, 100), ..Default::default() };
let post_info = PostDispatchInfo::default();

// After this pre_dispatch, the BlockWeight proof size will be
// 85 (initial) + 100 (benched) + 150 (tx length) = 335
assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&info, LEN));

let pre = StorageWeightReclaim::<Test>(PhantomData)
.pre_dispatch(&ALICE, CALL, &info, LEN)
.unwrap();
assert_eq!(pre, Some(175));

assert_ok!(CheckWeight::<Test>::post_dispatch(None, &info, &post_info, 0, &Ok(())));

// First we will reclaim 95, which leaves us with 240 BlockWeight. This is lower
// than 180 (proof size hf) + 150 (length), so we expect it to be set to 330.
assert_ok!(StorageWeightReclaim::<Test>::post_dispatch(
Some(pre),
&info,
&post_info,
LEN,
&Ok(())
));

// We expect that the storage weight was set to the node-side proof weight
assert_eq!(get_storage_weight().total().proof_size(), 330);
})
}
}

#[test]
fn does_nothing_without_extension() {
let mut test_ext = new_test_ext();
Expand Down Expand Up @@ -507,7 +637,7 @@ mod tests {

#[test]
fn test_nothing_relcaimed() {
let mut test_ext = setup_test_externalities(&[100, 200]);
let mut test_ext = setup_test_externalities(&[0, 100]);

test_ext.execute_with(|| {
set_current_storage_weight(0);
Expand All @@ -530,7 +660,7 @@ mod tests {
.pre_dispatch(&ALICE, CALL, &info, LEN)
.unwrap();
// Should return `setup_test_externalities` proof recorder value: 100.
assert_eq!(pre, Some(100));
assert_eq!(pre, Some(0));

// The `CheckWeight` extension will refund `actual_weight` from `PostDispatchInfo`
// we always need to call `post_dispatch` to verify that they interoperate correctly.
Expand Down
10 changes: 10 additions & 0 deletions prdoc/pr_5273.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title: Fix storage weight reclaim bug.

doc:
- audience: Runtime Dev
description: |
A bug in storage weight reclaim signed extension is fixed. The bug was causing an underestimate of the proof size when the post dispatch info was underestimating the proof size and the pre dispatch info was overestimating the proof size at the same time.

crates:
- name: cumulus-primitives-storage-weight-reclaim
bump: patch
17 changes: 17 additions & 0 deletions prdoc/pr_5281.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json

title: PoV-Reclaim - Set `BlockWeight` to node-side PoV size if mismatch is detected

doc:
- audience: Runtime Dev
description: |
After this change, the `StorageWeightReclaim` `SignedExtension` will check the node-side PoV size after every
extrinsic. If we detect a case where the returned proof size is higher than the `BlockWeight` value of the
runtime, we set `BlockWeight` to the size returned from the node.

crates:
- name: cumulus-primitives-storage-weight-reclaim
bump: patch
- name: frame-system
bump: minor
2 changes: 1 addition & 1 deletion substrate/frame/system/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ pub mod pallet {

/// Total length (in bytes) for all extrinsics put together, for the current block.
#[pallet::storage]
pub(super) type AllExtrinsicsLen<T: Config> = StorageValue<_, u32>;
pub type AllExtrinsicsLen<T: Config> = StorageValue<_, u32>;

/// Map of block numbers to block hashes.
#[pallet::storage]
Expand Down
Loading