Removal of execution strategies (#14387)

* Start * More work! * Moar * More changes * More fixes * More worrk * More fixes * More fixes to make it compile * Adds `NoOffchainStorage` * Pass the extensions * Small basti making small progress * Fix merge errors and remove `ExecutionContext` * Move registration of `ReadRuntimeVersionExt` to `ExecutionExtension` Instead of registering `ReadRuntimeVersionExt` in `sp-state-machine` it is moved to `ExecutionExtension` which provides the default extensions. * Fix compilation * Register the global extensions inside runtime api instance * Fixes * Fix `generate_initial_session_keys` by passing the keystore extension * Fix the grandpa tests * Fix more tests * Fix more tests * Don't set any heap pages if there isn't an override * Fix small fallout * FMT * Fix tests * More tests * Offchain worker custom extensions * More fixes * Make offchain tx pool creation reusable Introduces an `OffchainTransactionPoolFactory` for creating offchain transactions pools that can be registered in the runtime externalities context. This factory will be required for a later pr to make the creation of offchain transaction pools easier. * Fixes * Fixes * Set offchain transaction pool in BABE before using it in the runtime * Add the `offchain_tx_pool` to Grandpa as well * Fix the nodes * Print some error when using the old warnings * Fix merge issues * Fix compilation * Rename `babe_link` * Rename to `offchain_tx_pool_factory` * Cleanup * FMT * Fix benchmark name * Fix `try-runtime` * Remove `--execution` CLI args * Make clippy happy * Forward bls functions * Fix docs * Update UI tests * Update client/api/src/execution_extensions.rs Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Koute <koute@users.noreply.github.com> * Update client/cli/src/params/import_params.rs Co-authored-by: Koute <koute@users.noreply.github.com> * Update client/api/src/execution_extensions.rs Co-authored-by: Koute <koute@users.noreply.github.com> * Pass the offchain storage to the MMR RPC * Update client/api/src/execution_extensions.rs Co-authored-by: Sebastian Kunert <skunert49@gmail.com> * Review comments * Fixes --------- Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Co-authored-by: Koute <koute@users.noreply.github.com> Co-authored-by: Sebastian Kunert <skunert49@gmail.com>
2026-06-14 12:11:09 +00:00 · 2023-07-11 16:21:38 +02:00
parent a2b01c061b
commit 5eb816d7a6
96 changed files with 1175 additions and 1499 deletions
@@ -98,45 +98,6 @@ pub use sp_storage as storage;
 #[doc(hidden)]
 pub use sp_std;

-/// Context for executing a call into the runtime.
-pub enum ExecutionContext {
-	/// Context used for general block import (including locally authored blocks).
-	Importing,
-	/// Context used for importing blocks as part of an initial sync of the blockchain.
-	///
-	/// We distinguish between major sync and import so that validators who are running
-	/// their initial sync (or catching up after some time offline) can use the faster
-	/// native runtime (since we can reasonably assume the network as a whole has already
-	/// come to a broad consensus on the block and it probably hasn't been crafted
-	/// specifically to attack this node), but when importing blocks at the head of the
-	/// chain in normal operation they can use the safer Wasm version.
-	Syncing,
-	/// Context used for block construction.
-	BlockConstruction,
-	/// Context used for offchain calls.
-	///
-	/// This allows passing offchain extension and customizing available capabilities.
-	OffchainCall(Option<(Box<dyn offchain::Externalities>, offchain::Capabilities)>),
-}
-
-impl ExecutionContext {
-	/// Returns the capabilities of particular context.
-	pub fn capabilities(&self) -> offchain::Capabilities {
-		use ExecutionContext::*;
-
-		match self {
-			Importing | Syncing | BlockConstruction => offchain::Capabilities::empty(),
-			// Enable keystore, transaction pool and Offchain DB reads by default for offchain
-			// calls.
-			OffchainCall(None) =>
-				offchain::Capabilities::KEYSTORE |
-					offchain::Capabilities::OFFCHAIN_DB_READ |
-					offchain::Capabilities::TRANSACTION_POOL,
-			OffchainCall(Some((_, capabilities))) => *capabilities,
-		}
-	}
-}
-
 /// Hex-serialized shim for `Vec<u8>`.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize, Hash, PartialOrd, Ord))]
@@ -260,26 +260,22 @@ impl Timestamp {
 bitflags::bitflags! {
 	/// Execution context extra capabilities.
 	pub struct Capabilities: u32 {
-		/// Access to transaction pool.
-		const TRANSACTION_POOL = 0b0000_0000_0001;
 		/// External http calls.
-		const HTTP = 0b0000_0000_0010;
+		const HTTP = 1 << 0;
 		/// Keystore access.
-		const KEYSTORE = 0b0000_0000_0100;
+		const KEYSTORE = 1 << 2;
 		/// Randomness source.
-		const RANDOMNESS = 0b0000_0000_1000;
+		const RANDOMNESS = 1 << 3;
 		/// Access to opaque network state.
-		const NETWORK_STATE = 0b0000_0001_0000;
+		const NETWORK_STATE = 1 << 4;
 		/// Access to offchain worker DB (read only).
-		const OFFCHAIN_DB_READ = 0b0000_0010_0000;
+		const OFFCHAIN_DB_READ = 1 << 5;
 		/// Access to offchain worker DB (writes).
-		const OFFCHAIN_DB_WRITE = 0b0000_0100_0000;
+		const OFFCHAIN_DB_WRITE = 1 << 6;
 		/// Manage the authorized nodes
-		const NODE_AUTHORIZATION = 0b0000_1000_0000;
+		const NODE_AUTHORIZATION = 1 << 7;
 		/// Access time related functionality
-		const TIME = 0b0001_0000_0000;
-		/// Access the statement store.
-		const STATEMENT_STORE = 0b0010_0000_0000;
+		const TIME = 1 << 8;
 	}
 }

@@ -785,8 +781,8 @@ mod tests {
 		assert!(!none.contains(Capabilities::KEYSTORE));
 		assert!(all.contains(Capabilities::KEYSTORE));
 		assert!(some.contains(Capabilities::KEYSTORE));
-		assert!(!none.contains(Capabilities::TRANSACTION_POOL));
-		assert!(all.contains(Capabilities::TRANSACTION_POOL));
-		assert!(!some.contains(Capabilities::TRANSACTION_POOL));
+		assert!(!none.contains(Capabilities::RANDOMNESS));
+		assert!(all.contains(Capabilities::RANDOMNESS));
+		assert!(!some.contains(Capabilities::TIME));
 	}
 }
@@ -17,12 +17,14 @@

 //! In-memory implementation of offchain workers database.

-use crate::offchain::OffchainStorage;
+use crate::offchain::{DbExternalities, OffchainStorage, StorageKind, STORAGE_PREFIX};
 use std::{
 	collections::hash_map::{Entry, HashMap},
 	iter::Iterator,
 };

+const LOG_TARGET: &str = "offchain-worker::storage";
+
 /// In-memory storage for offchain workers.
 #[derive(Debug, Clone, Default)]
 pub struct InMemOffchainStorage {
@@ -88,3 +90,95 @@ impl OffchainStorage for InMemOffchainStorage {
 		}
 	}
 }
+
+fn unavailable_yet<R: Default>(name: &str) -> R {
+	tracing::error!(
+		target: LOG_TARGET,
+		"The {:?} API is not available for offchain workers yet. Follow \
+		https://github.com/paritytech/substrate/issues/1458 for details",
+		name
+	);
+	Default::default()
+}
+
+const LOCAL_DB: &str = "LOCAL (fork-aware) DB";
+
+/// Offchain DB that implements [`DbExternalities`] for [`OffchainStorage`].
+#[derive(Debug, Clone)]
+pub struct OffchainDb<Storage> {
+	/// Persistent storage database.
+	persistent: Storage,
+}
+
+impl<Storage> OffchainDb<Storage> {
+	/// Create new instance of Offchain DB.
+	pub fn new(persistent: Storage) -> Self {
+		Self { persistent }
+	}
+}
+
+impl<Storage: OffchainStorage> DbExternalities for OffchainDb<Storage> {
+	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
+		tracing::debug!(
+			target: LOG_TARGET,
+			?kind,
+			key = ?array_bytes::bytes2hex("", key),
+			value = ?array_bytes::bytes2hex("", value),
+			"Write",
+		);
+		match kind {
+			StorageKind::PERSISTENT => self.persistent.set(STORAGE_PREFIX, key, value),
+			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
+		}
+	}
+
+	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
+		tracing::debug!(
+			target: LOG_TARGET,
+			?kind,
+			key = ?array_bytes::bytes2hex("", key),
+			"Clear",
+		);
+		match kind {
+			StorageKind::PERSISTENT => self.persistent.remove(STORAGE_PREFIX, key),
+			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
+		}
+	}
+
+	fn local_storage_compare_and_set(
+		&mut self,
+		kind: StorageKind,
+		key: &[u8],
+		old_value: Option<&[u8]>,
+		new_value: &[u8],
+	) -> bool {
+		tracing::debug!(
+			target: LOG_TARGET,
+			?kind,
+			key = ?array_bytes::bytes2hex("", key),
+			new_value = ?array_bytes::bytes2hex("", new_value),
+			old_value = ?old_value.as_ref().map(|s| array_bytes::bytes2hex("", s)),
+			"CAS",
+		);
+		match kind {
+			StorageKind::PERSISTENT =>
+				self.persistent.compare_and_set(STORAGE_PREFIX, key, old_value, new_value),
+			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
+		}
+	}
+
+	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
+		let result = match kind {
+			StorageKind::PERSISTENT => self.persistent.get(STORAGE_PREFIX, key),
+			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
+		};
+		tracing::debug!(
+			target: LOG_TARGET,
+			?kind,
+			key = ?array_bytes::bytes2hex("", key),
+			result = ?result.as_ref().map(|s| array_bytes::bytes2hex("", s)),
+			"Read",
+		);
+		result
+	}
+}