BREAKING Overlay transaction support.

.gitlab-ci.yml

@@ -168,9 +168,12 @@ cargo-check-benches:
   <<:                              *docker-env
   script:
     - BUILD_DUMMY_WASM_BINARY=1 time cargo +nightly check --benches --all
+    - cd ./primitives/state-machine/fuzz
+    - time cargo check
     - sccache -s
 
 
+
 cargo-check-subkey:
   stage:                           test
   <<:                              *docker-env

client/src/client.rs

@@ -953,7 +953,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				.trigger(
 					&notify_import.hash,
 					storage_changes.0.into_iter(),
-					storage_changes.1.into_iter().map(|(sk, v)| (sk, v.into_iter())),
+					storage_changes.1.into_iter().map(|(storage_key, v)| (storage_key, v.into_iter())),
 				);
 		}
 

frame/support/src/storage/mod.rs

@@ -27,6 +27,21 @@ pub mod child;
 pub mod generator;
 pub mod migration;
 
+/// Execute under a new transactional layer.
+///
+/// If the result of execution is an error,
+/// the transactional layer get reverted; otherwise
+/// it is committed.
+pub fn with_transaction<R, E>(f: impl FnOnce() -> Result<R, E>) -> Result<R, E> {
+	sp_io::storage_transaction::start_transaction();
+	let result = f();
+	match result {
+		Ok(_) => sp_io::storage_transaction::commit_transaction(),
+		Err(_) => sp_io::storage_transaction::discard_transaction(),
+	}
+	result
+}
+
 /// A trait for working with macro-generated storage values under the substrate storage API.
 ///
 /// Details on implementation can be found at

primitives/api/test/tests/runtime_calls.rs

@@ -105,7 +105,6 @@ fn calling_with_both_strategy_and_fail_on_native_should_work() {
 	assert_eq!(runtime_api.fail_on_native(&block_id).unwrap(), 1);
 }
 
-
 #[test]
 fn calling_with_native_else_wasm_and_fail_on_wasm_should_work() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeElseWasm).build();

primitives/externalities/src/lib.rs

@@ -37,20 +37,20 @@ mod scope_limited;
 /// Provides access to the storage and to other registered extensions.
 pub trait Externalities: ExtensionStore {
 	/// Read runtime storage.
-	fn storage(&self, key: &[u8]) -> Option<Vec<u8>>;
+	fn storage(&mut self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Get storage value hash.
 	///
 	/// This may be optimized for large values.
-	fn storage_hash(&self, key: &[u8]) -> Option<Vec<u8>>;
+	fn storage_hash(&mut self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Get child storage value hash.
 	///
 	/// This may be optimized for large values.
 	///
 	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn child_storage_hash(
-		&self,
+		&mut self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
@@ -60,7 +60,7 @@ pub trait Externalities: ExtensionStore {
 	///
 	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn child_storage(
-		&self,
+		&mut self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
@@ -98,13 +98,13 @@ pub trait Externalities: ExtensionStore {
 	}
 
 	/// Whether a storage entry exists.
-	fn exists_storage(&self, key: &[u8]) -> bool {
+	fn exists_storage(&mut self, key: &[u8]) -> bool {
 		self.storage(key).is_some()
 	}
 
 	/// Whether a child storage entry exists.
 	fn exists_child_storage(
-		&self,
+		&mut self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
@@ -113,11 +113,11 @@ pub trait Externalities: ExtensionStore {
 	}
 
 	/// Returns the key immediately following the given key, if it exists.
-	fn next_storage_key(&self, key: &[u8]) -> Option<Vec<u8>>;
+	fn next_storage_key(&mut self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Returns the key immediately following the given key, if it exists, in child storage.
 	fn next_child_storage_key(
-		&self,
+		&mut self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
@@ -177,6 +177,19 @@ pub trait Externalities: ExtensionStore {
 	/// The returned hash is defined by the `Block` and is SCALE encoded.
 	fn storage_changes_root(&mut self, parent: &[u8]) -> Result<Option<Vec<u8>>, ()>;
 
+	/// Start a new transactional layer.
+	fn storage_start_transaction(&mut self);
+
+	/// Discard current transactional layer, pending changes of this transaction layer are
+	/// dropped.
+	/// The transactional layer is closed, a new one is started if this was the last layer.
+	fn storage_discard_transaction(&mut self);
+
+	/// Commit current transactional layer.
+	/// The changes stay attached to parent transaction layer and could still be discarded.
+	/// The transactional layer is closed, a new one is started if this was the last layer.
+	fn storage_commit_transaction(&mut self);
+
 	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	/// Benchmarking related functionality and shouldn't be used anywhere else!
 	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!