Bump parity-wasm and pwasm-utils to the newest versions everywhere (#8928)

substrate/client/executor/common/Cargo.toml

@@ -15,10 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-parity-wasm = "0.41.0"
-pwasm-utils = "0.14.0"
+pwasm-utils = "0.18.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-wasmi = "0.6.2"
+wasmi = "0.9.0"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }

substrate/client/executor/common/src/runtime_blob/data_segments_snapshot.rs

@@ -19,7 +19,7 @@
 use crate::error::{self, Error};
 use super::RuntimeBlob;
 use std::mem;
-use parity_wasm::elements::Instruction;
+use pwasm_utils::parity_wasm::elements::Instruction;
 
 /// This is a snapshot of data segments specialzied for a particular instantiation.
 ///

substrate/client/executor/common/src/runtime_blob/runtime_blob.rs

@@ -16,14 +16,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use parity_wasm::elements::{DataSegment, Module as RawModule, deserialize_buffer, serialize};
-
+use pwasm_utils::{
+	parity_wasm::elements::{
+		DataSegment, Module, deserialize_buffer, serialize, Internal,
+	},
+	export_mutable_globals,
+};
 use crate::error::WasmError;
 
 /// A bunch of information collected from a WebAssembly module.
 #[derive(Clone)]
 pub struct RuntimeBlob {
-	raw_module: RawModule,
+	raw_module: Module,
 }
 
 impl RuntimeBlob {
@@ -42,7 +46,7 @@ impl RuntimeBlob {
 	///
 	/// Returns `Err` if the wasm code cannot be deserialized.
 	pub fn new(wasm_code: &[u8]) -> Result<Self, WasmError> {
-		let raw_module: RawModule = deserialize_buffer(wasm_code)
+		let raw_module: Module = deserialize_buffer(wasm_code)
 			.map_err(|e| WasmError::Other(format!("cannot deserialize module: {:?}", e)))?;
 		Ok(Self { raw_module })
 	}
@@ -74,7 +78,7 @@ impl RuntimeBlob {
 
 	/// Perform an instrumentation that makes sure that the mutable globals are exported.
 	pub fn expose_mutable_globals(&mut self) {
-		pwasm_utils::export_mutable_globals(&mut self.raw_module, "exported_internal_global");
+		export_mutable_globals(&mut self.raw_module, "exported_internal_global");
 	}
 
 	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
@@ -87,7 +91,7 @@ impl RuntimeBlob {
 			.map(|es| es.entries())
 			.unwrap_or(&[]);
 		exports.iter().filter_map(|export| match export.internal() {
-			parity_wasm::elements::Internal::Global(_)
+			Internal::Global(_)
 				if export.field().starts_with("exported_internal_global") =>
 			{
 				Some(export.field())
@@ -112,7 +116,7 @@ impl RuntimeBlob {
 	}
 
 	/// Destructure this structure into the underlying parity-wasm Module.
-	pub fn into_inner(self) -> RawModule {
+	pub fn into_inner(self) -> Module {
 		self.raw_module
 	}
 }