mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 08:11:03 +00:00
Reduce base proof size weight component to zero (#7081)
* Reduce base proof size weight component to 1KiB * Create TempFixedXcmWeight and set PoV weight to 0 * Set DEFAULT_PROOF_SIZE to 0 * Fix comment * Update test expectations * Fix comment
This commit is contained in:
@@ -441,5 +441,5 @@ fn karura_liquid_staking_xcm_has_sane_weight_upper_limt() {
|
||||
let weight = <XcmConfig as xcm_executor::Config>::Weigher::weight(&mut xcm)
|
||||
.expect("weighing XCM failed");
|
||||
|
||||
assert_eq!(weight, Weight::from_parts(20_313_281_000, 65536));
|
||||
assert_eq!(weight, Weight::from_parts(20_313_281_000, 0));
|
||||
}
|
||||
|
||||
@@ -108,7 +108,10 @@ type LocalOriginConverter = (
|
||||
|
||||
parameter_types! {
|
||||
/// The amount of weight an XCM operation takes. This is a safe overestimate.
|
||||
pub const BaseXcmWeight: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
|
||||
pub const BaseXcmWeight: Weight = Weight::from_parts(1_000_000_000, 1024);
|
||||
/// A temporary weight value for each XCM instruction.
|
||||
/// NOTE: This should be removed after we account for PoV weights.
|
||||
pub const TempFixedXcmWeight: Weight = Weight::from_parts(1_000_000_000, 0);
|
||||
/// Maximum number of instructions in a single XCM fragment. A sanity check against weight
|
||||
/// calculations getting too crazy.
|
||||
pub const MaxInstructions: u32 = 100;
|
||||
@@ -323,7 +326,7 @@ impl xcm_executor::Config for XcmConfig {
|
||||
type IsTeleporter = TrustedTeleporters;
|
||||
type UniversalLocation = UniversalLocation;
|
||||
type Barrier = Barrier;
|
||||
type Weigher = FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
|
||||
type Weigher = FixedWeightBounds<TempFixedXcmWeight, RuntimeCall, MaxInstructions>;
|
||||
// The weight trader piggybacks on the existing transaction-fee conversion logic.
|
||||
type Trader =
|
||||
UsingComponents<WeightToFee, TokenLocation, AccountId, Balances, ToAuthor<Runtime>>;
|
||||
|
||||
@@ -1191,8 +1191,9 @@ impl<Call> TryFrom<OldXcm<Call>> for Xcm<Call> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Default value for the proof size weight component. Set at 64 KB.
|
||||
const DEFAULT_PROOF_SIZE: u64 = 64 * 1024;
|
||||
/// Default value for the proof size weight component. Set at 0 KB.
|
||||
/// NOTE: Make sure this is removed after we properly account for PoV weights.
|
||||
const DEFAULT_PROOF_SIZE: u64 = 0;
|
||||
|
||||
// Convert from a v2 instruction to a v3 instruction.
|
||||
impl<Call> TryFrom<OldInstruction<Call>> for Instruction<Call> {
|
||||
|
||||
Reference in New Issue
Block a user