Skip to content
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
2 changes: 1 addition & 1 deletion frame/dynamic-fee/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub mod pallet {
#[pallet::storage]
pub type TargetMinGasPrice<T: Config> = StorageValue<_, U256>;

#[derive(Encode, Decode, RuntimeDebug, PartialEq)]
#[derive(Encode, Decode, DecodeWithMemTracking, RuntimeDebug, PartialEq)]
pub enum InherentError {
/// The target gas price is too high compared to the current gas price.
TargetGasPriceTooHigh,
Expand Down
3 changes: 2 additions & 1 deletion frame/evm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub use evm::{
};
use hash_db::Hasher;
use impl_trait_for_tuples::impl_for_tuples;
use scale_codec::{Decode, Encode, MaxEncodedLen};
use scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
// Substrate
use frame_support::{
Expand Down Expand Up @@ -705,6 +705,7 @@ type NegativeImbalanceOf<C, T> = <C as Currency<AccountIdOf<T>>>::NegativeImbala
PartialEq,
Encode,
Decode,
DecodeWithMemTracking,
TypeInfo,
MaxEncodedLen
)]
Expand Down
2 changes: 2 additions & 0 deletions precompiles/src/testing/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ impl sp_runtime::traits::Convert<H160, MockAccount> for MockAccount {
Clone,
Encode,
Decode,
DecodeWithMemTracking,
sp_core::RuntimeDebug,
TypeInfo,
Serialize,
Expand Down Expand Up @@ -168,6 +169,7 @@ impl sp_runtime::traits::Verify for MockSignature {
Clone,
Encode,
Decode,
DecodeWithMemTracking,
sp_core::RuntimeDebug,
TypeInfo
)]
Expand Down
4 changes: 2 additions & 2 deletions primitives/consensus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
extern crate alloc;

use alloc::vec::Vec;
use scale_codec::{Decode, Encode};
use scale_codec::{Decode, DecodeWithMemTracking, Encode};
use sp_core::H256;
use sp_runtime::{
generic::{Digest, OpaqueDigestItemId},
Expand Down Expand Up @@ -56,7 +56,7 @@ pub enum PostLog {
BlockHash(H256),
}

#[derive(Decode, Encode, Clone, PartialEq, Eq)]
#[derive(Decode, DecodeWithMemTracking, Encode, Clone, PartialEq, Eq)]
pub struct Hashes {
/// Ethereum block hash.
pub block_hash: H256,
Expand Down
15 changes: 13 additions & 2 deletions primitives/evm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mod validation;

use alloc::{collections::BTreeMap, vec::Vec};
use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight};
use scale_codec::{Decode, Encode};
use scale_codec::{Decode, DecodeWithMemTracking, Encode};
use scale_info::TypeInfo;
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -81,7 +81,18 @@ pub enum AccessedStorage {
AccountStorages((H160, H256)),
}

#[derive(Clone, Copy, Eq, PartialEq, Debug, Encode, Decode, Default, TypeInfo)]
#[derive(
Clone,
Copy,
Eq,
PartialEq,
Debug,
Encode,
Decode,
DecodeWithMemTracking,
Default,
TypeInfo
)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct WeightInfo {
pub ref_time_limit: Option<u64>,
Expand Down
14 changes: 12 additions & 2 deletions primitives/rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern crate alloc;
use alloc::vec::Vec;
use ethereum::{AuthorizationList, Log};
use ethereum_types::{Address, Bloom};
use scale_codec::{Decode, Encode};
use scale_codec::{Decode, DecodeWithMemTracking, Encode};
use scale_info::TypeInfo;
// Substrate
use sp_core::{H256, U256};
Expand All @@ -34,7 +34,17 @@ use sp_runtime::{
};
use sp_state_machine::OverlayedChanges;

#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
#[derive(
Clone,
Eq,
PartialEq,
Default,
RuntimeDebug,
Encode,
Decode,
DecodeWithMemTracking,
TypeInfo
)]
pub struct TransactionStatus {
pub transaction_hash: H256,
pub transaction_index: u32,
Expand Down
Loading