chore(wasm-instrument): replace wasm-instrument with gwasm-instrument (…

…#3054)

Cargo.toml

@@ -183,6 +183,18 @@ which = "4.4.0"
 winapi = "0.3.9"
 paste = "1.0"
 
+# Published deps
+#
+# fork of `parity-wasm` with sign-ext enabled by default.
+#
+# https://github.com/gear-tech/parity-wasm/tree/v0.45.0-sign-ext
+# gear-wasm = "0.45.0"
+#
+# fork of `wasm-instrument`
+#
+# https://github.com/gear-tech/wasm-instrument/tree/v0.2.1-sign-ext
+gwasm-instrument = { version = "0.2.1", default-features = false }
+
 # Internal deps
 authorship = { package = "gear-authorship", path = "node/authorship" }
 common = { package = "gear-common", path = "common", default-features = false }
@@ -240,8 +252,6 @@ service = { package = "gear-service", path = "node/service", default-features =
 testing = { package = "gear-node-testing", path = "node/testing" }
 vara-runtime = { path = "runtime/vara" }
 wasm-smith = { version = "0.11.4", git = "https://github.com/gear-tech/wasm-tools.git", branch = "gear-stable" }
-wasm-instrument = { version = "0.2.1", git = "https://github.com/gear-tech/wasm-instrument.git", branch = "gear-stable", default-features = false }
-
 validator-set = { package = 'substrate-validator-set', git = 'https://github.com/gear-tech/substrate-validator-set.git', branch = 'gear-polkadot-v0.9.41-canary-no-sandbox', default-features = false }
 
 # Substrate deps

utils/wasm-instrument/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-wasm-instrument = { workspace = true, features = ["sign_ext"] }
+gwasm-instrument = { workspace = true, features = ["sign_ext"] }
 enum-iterator.workspace = true
 
 [dev-dependencies]
@@ -20,6 +20,6 @@ gear-core.workspace = true
 default = ["std"]
 std = [
     "gear-backend-wasmi/std",
-    "wasm-instrument/std",
     "gear-backend-wasmi/std",
+    "gwasm-instrument/std",
 ]

utils/wasm-instrument/src/lib.rs

@@ -23,7 +23,7 @@ extern crate alloc;
 
 use alloc::vec;
 
-use wasm_instrument::{
+use gwasm_instrument::{
     gas_metering::{self, Rules},
     parity_wasm::{
         builder,
@@ -32,7 +32,7 @@ use wasm_instrument::{
 };
 
 use crate::syscalls::SysCallName;
-pub use wasm_instrument::{self, parity_wasm};
+pub use gwasm_instrument::{self as wasm_instrument, parity_wasm};
 
 #[cfg(test)]
 mod tests;

utils/wasm-instrument/src/rules.rs

@@ -1,5 +1,5 @@
 use core::num::NonZeroU32;
-use wasm_instrument::{
+use gwasm_instrument::{
     gas_metering::{MemoryGrowCost, Rules},
     parity_wasm::elements::{self, Instruction},
 };