diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs index 6d1f3df90f23e..664504d207f3a 100644 --- a/frame/contracts/src/chain_extension.rs +++ b/frame/contracts/src/chain_extension.rs @@ -79,7 +79,7 @@ use frame_support::weights::Weight; use sp_runtime::DispatchError; use sp_std::{marker::PhantomData, vec::Vec}; -pub use crate::{exec::Ext, gas::ChargedAmount, Config}; +pub use crate::{exec::Ext, gas::ChargedAmount, storage::meter::Diff, Config}; pub use frame_system::Config as SysConfig; pub use pallet_contracts_primitives::ReturnFlags; diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs index 6203b31f67a5b..a0c3050e34353 100644 --- a/frame/contracts/src/exec.rs +++ b/frame/contracts/src/exec.rs @@ -17,7 +17,7 @@ use crate::{ gas::GasMeter, - storage::{self, DepositAccount, WriteOutcome}, + storage::{self, meter::Diff, DepositAccount, WriteOutcome}, BalanceOf, CodeHash, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf, DebugBufferVec, Determinism, Error, Event, Nonce, Origin, Pallet as Contracts, Schedule, System, WasmBlob, LOG_TARGET, @@ -272,6 +272,9 @@ pub trait Ext: sealing::Sealed { /// Get a mutable reference to the nested gas meter. fn gas_meter_mut(&mut self) -> &mut GasMeter; + /// Charges `diff` from the meter. + fn charge_storage(&mut self, diff: &Diff); + /// Append a string to the debug buffer. /// /// It is added as-is without any additional new line. @@ -1429,6 +1432,10 @@ where &mut self.top_frame_mut().nested_gas } + fn charge_storage(&mut self, diff: &Diff) { + self.top_frame_mut().nested_storage.charge(diff) + } + fn append_debug_buffer(&mut self, msg: &str) -> bool { if let Some(buffer) = &mut self.debug_message { buffer diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs index 551bfba3fbe6f..291f39f7fa797 100644 --- a/frame/contracts/src/wasm/mod.rs +++ b/frame/contracts/src/wasm/mod.rs @@ -701,6 +701,7 @@ mod tests { fn gas_meter_mut(&mut self) -> &mut GasMeter { &mut self.gas_meter } + fn charge_storage(&mut self, _diff: &crate::storage::meter::Diff) {} fn append_debug_buffer(&mut self, msg: &str) -> bool { self.debug_buffer.extend(msg.as_bytes()); true