Reintroduce extension

Cargo.toml

@@ -397,6 +397,7 @@ members = [
 	"substrate/primitives/genesis-builder",
 	"substrate/primitives/inherents",
 	"substrate/primitives/io",
+	"substrate/primitives/proof-size-ext",
 	"substrate/primitives/keyring",
 	"substrate/primitives/keystore",
 	"substrate/primitives/maybe-compressed-blob",

cumulus/primitives/pov-reclaim/Cargo.toml

@@ -6,9 +6,13 @@ edition.workspace = true
 
 [dependencies]
 sp-runtime-interface = { path = "../../../substrate/primitives/runtime-interface", default-features = false }
+sp-externalities = { path = "../../../substrate/primitives/externalities", default-features = false }
+sp-proof-size-ext = { path = "../../../substrate/primitives/proof-size-ext", default-features = false }
 
 [features]
 default = ["std"]
 std = [
 	"sp-runtime-interface/std",
+	"sp-proof-size-ext/std",
+	"sp-externalities/std",
 ]

cumulus/primitives/pov-reclaim/src/lib.rs

@@ -16,11 +16,18 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use sp_externalities::ExternalitiesExt;
+
+#[cfg(feature = "std")]
+use sp_proof_size_ext::ProofSizeExt;
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
 pub trait PovReclaimHostFunctions {
 	fn current_storage_proof_size(&mut self) -> u32 {
-		self.proof_size().unwrap_or_default()
+		match self.extension::<ProofSizeExt>() {
+			Some(ext) => ext.current_storage_proof_size(),
+			None => 0,
+		}
 	}
 }

substrate/client/block-builder/Cargo.toml

@@ -20,6 +20,7 @@ sc-client-api = { path = "../api" }
 sp-api = { path = "../../primitives/api" }
 sp-block-builder = { path = "../../primitives/block-builder" }
 sp-blockchain = { path = "../../primitives/blockchain" }
+sp-proof-size-ext = { path = "../../primitives/proof-size-ext" }
 sp-core = { path = "../../primitives/core" }
 sp-inherents = { path = "../../primitives/inherents" }
 sp-runtime = { path = "../../primitives/runtime" }

substrate/client/block-builder/src/lib.rs

@@ -173,6 +173,9 @@ where
 
 		if record_proof.yes() {
 			api.record_proof();
+			let recorder =
+				api.proof_recorder().expect("We enable proof recording hte line before; qed");
+			api.register_extension(sp_proof_size_ext::ProofSizeExt::new(recorder));
 		}
 
 		api.set_call_context(CallContext::Onchain);

substrate/client/service/Cargo.toml

@@ -47,6 +47,7 @@ sp-core = { path = "../../primitives/core" }
 sp-keystore = { path = "../../primitives/keystore" }
 sp-session = { path = "../../primitives/session" }
 sp-state-machine = { path = "../../primitives/state-machine" }
+sp-proof-size-ext = { path = "../../primitives/proof-size-ext" }
 sp-consensus = { path = "../../primitives/consensus/common" }
 sc-consensus = { path = "../consensus/common" }
 sp-storage = { path = "../../primitives/storage" }

substrate/client/service/src/client/client.rs

@@ -867,6 +867,10 @@ where
 
 				if self.config.enable_import_proof_recording {
 					runtime_api.record_proof();
+					let recorder = runtime_api
+						.proof_recorder()
+						.expect("We enable proof recording hte line before; qed");
+					runtime_api.register_extension(sp_proof_size_ext::ProofSizeExt::new(recorder));
 				}
 
 				runtime_api.execute_block(

substrate/primitives/proof-size-ext/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "sp-proof-size-ext"
+version = "4.0.0-dev"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+homepage = "https://substrate.io"
+repository.workspace = true
+description = "A crate which contains an externalities extension to fetch the proof size."
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+sp-externalities = { path = "../externalities", default-features = false}
+sp-trie = { path = "../trie", default-features = false}
+sp-runtime = { path = "../runtime", default-features = false}
+
+[features]
+default = ["std"]
+std = [
+	"sp-externalities/std",
+	"sp-trie/std",
+	"sp-runtime/std",
+]

substrate/primitives/proof-size-ext/src/lib.rs

@@ -0,0 +1,35 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_trie::ProofSizeProvider;
+
+#[cfg(feature = "std")]
+sp_externalities::decl_extension! {
+	/// The proof size extension to fetch the current storage proof size
+	/// in externalities.
+	pub struct ProofSizeExt(Box<dyn ProofSizeProvider + 'static + Sync + Send>);
+}
+
+#[cfg(feature = "std")]
+impl ProofSizeExt {
+	pub fn new<T: ProofSizeProvider + Sync + Send + 'static>(recorder: T) -> Self {
+		ProofSizeExt(Box::new(recorder))
+	}
+
+	pub fn current_storage_proof_size(&self) -> u32 {
+		self.0.estimate_encoded_size() as u32
+	}
+}

substrate/primitives/trie/src/lib.rs

@@ -156,6 +156,11 @@ pub trait TrieRecorderProvider<H: Hasher> {
 	fn estimate_encoded_size(&self) -> usize;
 }
 
+pub trait ProofSizeProvider {
+	fn estimate_encoded_size(&self) -> usize;
+}
+
+
 /// TrieDB error over `TrieConfiguration` trait.
 pub type TrieError<L> = trie_db::TrieError<TrieHash<L>, CError<L>>;
 /// Reexport from `hash_db`, with genericity set for `Hasher` trait.

substrate/primitives/trie/src/recorder.rs

@@ -228,6 +228,12 @@ impl<H: Hasher> Recorder<H> {
 	}
 }
 
+impl<H: Hasher> crate::ProofSizeProvider for Recorder<H> {
+	fn estimate_encoded_size(&self) -> usize {
+		self.estimate_encoded_size()
+	}
+}
+
 /// The [`TrieRecorder`](trie_db::TrieRecorder) implementation.
 pub struct TrieRecorder<'a, H: Hasher> {
 	inner: MutexGuard<'a, RecorderInner<H::Out>>,