chore: sync with remove meta wasm

fix: typo

examples/big-data-section/proptest-regressions/lib.txt

@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 434c860d37beed8bc731d0f33e2cb225bf1807036c20b9ca50bf90962fef0d12 # shrinks to payload = [0, 0]

examples/big-data-section/src/lib.rs

@@ -53,10 +53,7 @@ mod tests {
             let sys = System::new();
             sys.init_logger();
 
-            let prog = Program::from_file(
-                &sys,
-                "../../target/wasm32-unknown-unknown/debug/demo_big_data_section.opt.wasm",
-            );
+            let prog = Program::current_opt(&sys);
             sys.mint_to(gtest::constants::DEFAULT_USER_ALICE, 100000000000);
 
             let expected_value = DataAccess::from_payload(&payload).expect("").constant();

utils/wasm-builder/Cargo.toml

@@ -26,7 +26,4 @@ gear-core.workspace = true
 gear-wasm-instrument.workspace = true
 gear-wasm-optimizer.workspace = true
 rustc_version.workspace = true
-itertools.workspace = true
-
-[features]
-wasm-opt = ["gear-wasm-optimizer/wasm-opt"]
+itertools.workspace = true

utils/wasm-optimizer/Cargo.toml

@@ -14,7 +14,6 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
 gear-wasm-instrument.workspace = true
-wasm-opt = { workspace = true, optional = true }
 regex.workspace = true
 log.workspace = true
 wasmparser.workspace = true

utils/wasm-optimizer/src/optimize.rs

@@ -16,13 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[cfg(not(feature = "wasm-opt"))]
 use colored::Colorize;
-#[cfg(not(feature = "wasm-opt"))]
-use std::process::Command;
-
-#[cfg(feature = "wasm-opt")]
-use wasm_opt::{OptimizationOptions, Pass};
 
 use crate::stack_end;
 use anyhow::{anyhow, Context, Result};
@@ -188,6 +182,8 @@ pub fn do_optimization<P: AsRef<Path>>(
         .arg("-mvp")
         .arg("--enable-sign-ext")
         .arg("--enable-mutable-globals")
+        .arg("--limit-segments")
+        .arg("--pass-arg=limit-segments@1024")
         // the memory in our module is imported, `wasm-opt` needs to be told that
         // the memory is initialized to zeroes, otherwise it won't run the
         // memory-packing pre-pass.
@@ -211,47 +207,3 @@ pub fn do_optimization<P: AsRef<Path>>(
     }
     Ok(())
 }
-
-#[cfg(feature = "wasm-opt")]
-/// Optimizes the Wasm supplied as `crate_metadata.dest_wasm` using
-/// `wasm-opt`.
-///
-/// The supplied `optimization_level` denotes the number of optimization passes,
-/// resulting in potentially a lot of time spent optimizing.
-///
-/// If successful, the optimized Wasm is written to `dest_optimized`.
-pub fn do_optimization<P: AsRef<Path>>(
-    dest_wasm: P,
-    dest_optimized: P,
-    optimization_level: &str,
-    keep_debug_symbols: bool,
-) -> Result<()> {
-    log::info!(
-        "Optimization level passed to wasm-opt: {}",
-        optimization_level
-    );
-    match optimization_level {
-        "0" => OptimizationOptions::new_opt_level_0(),
-        "1" => OptimizationOptions::new_opt_level_1(),
-        "2" => OptimizationOptions::new_opt_level_2(),
-        "3" => OptimizationOptions::new_opt_level_3(),
-        "4" => OptimizationOptions::new_opt_level_4(),
-        "s" => OptimizationOptions::new_optimize_for_size(),
-        "z" => OptimizationOptions::new_optimize_for_size_aggressively(),
-        _ => panic!("Invalid optimization level {}", optimization_level),
-    }
-    .mvp_features_only()
-    .enable_feature(wasm_opt::Feature::SignExt)
-    .enable_feature(wasm_opt::Feature::MutableGlobals)
-    .shrink_level(wasm_opt::ShrinkLevel::Level2)
-    .add_pass(Pass::Dae)
-    .add_pass(Pass::Vacuum)
-    // the memory in our module is imported, `wasm-opt` needs to be told that
-    // the memory is initialized to zeroes, otherwise it won't run the
-    // memory-packing pre-pass.
-    .zero_filled_memory(true)
-    .debug_info(keep_debug_symbols)
-    .run(dest_wasm, dest_optimized)?;
-
-    Ok(())
-}

utils/wasm-proc/Cargo.toml

@@ -17,8 +17,4 @@ clap = { workspace = true, features = ["derive"] }
 log.workspace = true
 env_logger.workspace = true
 gear-wasm-builder.workspace = true
-gear-wasm-instrument = { workspace = true, features = ["std"] }
-
-[features]
-default = ["wasm-opt"]
-wasm-opt = ["gear-wasm-builder/wasm-opt"]
+gear-wasm-instrument = { workspace = true, features = ["std"] }