diff --git a/client/coretime/bulk/src/lib.rs b/client/coretime/bulk/src/lib.rs index 76acf33..cac6112 100644 --- a/client/coretime/bulk/src/lib.rs +++ b/client/coretime/bulk/src/lib.rs @@ -198,12 +198,13 @@ where let constant_query = subxt::dynamic::constant("Broker", "TimeslicePeriod"); - let time_slice = - api.constants() - .at(&constant_query)? - .to_value()? - .as_u128() - .expect("coretime parachain time slice none") as u32; + let time_slice = api + .constants() + .at(&constant_query)? + .to_value()? + .as_u128() + .expect("coretime parachain time slice none") + as u32; item.end_relaychain_height = ev.when + item.duration * time_slice; diff --git a/pallets/liquidation/src/lib.rs b/pallets/liquidation/src/lib.rs index 53fc3dc..a55fcfd 100644 --- a/pallets/liquidation/src/lib.rs +++ b/pallets/liquidation/src/lib.rs @@ -288,7 +288,10 @@ pub mod pallet { let (collator, real_gas_cost) = match T::OrderGasCost::gas_cost(n) { Ok(cost) => match cost { - Some((collator, real_gas_cost)) => (collator, real_gas_cost), + Some((collator, real_gas_cost)) => { + let adjusted_gas_cost = real_gas_cost * PARACHAIN_TO_RELAYCHAIN_UNIT; + (collator, adjusted_gas_cost) + }, None => return, }, Err(_) => { @@ -670,7 +673,8 @@ pub mod pallet { let total_existing_operation_ratio: u32 = OperationRatios::::iter().map(|(_, r)| r).sum(); let total_ratio = system_ratio - + treasury_ratio + collator_ratio + + treasury_ratio + + collator_ratio + total_existing_operation_ratio + ratio; log::info!("3 -+-+-+-+-+ set operation ratio, total ratio:{:?}, system_ratio:{:?}, treasury_ratio:{:?}, collator_ratio:{:?}, operation account:{:?}, op_ratio:{:?}", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6c68881..cccb52c 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1418,6 +1418,7 @@ impl_runtime_apis! { fn account_basic(address: H160) -> EVMAccount { let account_id = ::AddressMapping::into_account_id(address); + let nonce = frame_system::Pallet::::account_nonce(&account_id); let balance_free = ::Currency::free_balance(account_id.clone()); diff --git a/runtime/src/xcms/xcm_weight.rs b/runtime/src/xcms/xcm_weight.rs index 12a2b7f..0977a19 100644 --- a/runtime/src/xcms/xcm_weight.rs +++ b/runtime/src/xcms/xcm_weight.rs @@ -285,7 +285,8 @@ impl< AccountId, Currency: CurrencyT, OnUnbalanced: OnUnbalancedT, - > WeightTrader for UsingComponentsEx + > WeightTrader + for UsingComponentsEx { fn new() -> Self { Self(Weight::zero(), Zero::zero(), PhantomData)