feat: Add --release flag to wasm_builder

crates/iroha_wasm_builder/src/lib.rs

@@ -45,6 +45,7 @@ pub struct Builder<'path, 'out_dir> {
     out_dir: Option<&'out_dir Path>,
     /// Flag controlling whether to show output of the build process
     show_output: bool,
+    release: bool,
 }
 
 impl<'path, 'out_dir> Builder<'path, 'out_dir> {
@@ -59,6 +60,7 @@ impl<'path, 'out_dir> Builder<'path, 'out_dir> {
             path: relative_path.as_ref(),
             out_dir: None,
             show_output: false,
+            release: false,
         }
     }
 
@@ -83,6 +85,14 @@ impl<'path, 'out_dir> Builder<'path, 'out_dir> {
         self
     }
 
+    /// Enable release build optimizations.
+    ///
+    /// Disabled by default.
+    pub fn release(mut self) -> Self {
+        self.release = true;
+        self
+    }
+
     /// Apply `cargo check` to the smartcontract.
     ///
     /// # Errors
@@ -114,6 +124,7 @@ impl<'path, 'out_dir> Builder<'path, 'out_dir> {
                 |out_dir| Ok(Cow::Borrowed(out_dir)),
             )?,
             show_output: self.show_output,
+            release: self.release,
         })
     }
 
@@ -167,6 +178,7 @@ mod internal {
         pub absolute_path: PathBuf,
         pub out_dir: Cow<'out_dir, Path>,
         pub show_output: bool,
+        pub release: bool,
     }
 
     impl Builder<'_> {
@@ -189,9 +201,9 @@ mod internal {
             })
         }
 
-        fn build_options() -> impl Iterator<Item = &'static str> {
+        fn build_options(&self) -> impl Iterator<Item = &'static str> {
             [
-                "--release",
+                if self.release { "--release" } else { "" },
                 "-Z",
                 "build-std",
                 "-Z",
@@ -202,6 +214,7 @@ mod internal {
                 "wasm32-unknown-unknown",
             ]
             .into_iter()
+            .filter(|&arg| !arg.is_empty())
         }
 
         fn get_base_command(&self, cmd: &'static str) -> std::process::Command {
@@ -210,7 +223,7 @@ mod internal {
                 .current_dir(&self.absolute_path)
                 .stderr(Stdio::inherit())
                 .arg(cmd)
-                .args(Self::build_options());
+                .args(self.build_options());
 
             command
         }
@@ -226,7 +239,10 @@ mod internal {
                 .retrieve_package_name()
                 .wrap_err("Failed to retrieve package name")?;
 
-            let full_out_dir = self.out_dir.join("wasm32-unknown-unknown/release/");
+            let build_mode_dir = if self.release { "release" } else { "debug" };
+            let full_out_dir = self
+                .out_dir
+                .join(format!("wasm32-unknown-unknown/{build_mode_dir}/"));
             let wasm_file = full_out_dir.join(package_name).with_extension("wasm");
 
             let previous_hash = if wasm_file.exists() {

crates/iroha_wasm_builder/src/main.rs

@@ -21,7 +21,7 @@ enum Cli {
         common: CommonArgs,
         /// Optimize WASM output.
         #[arg(long)]
-        optimize: bool,
+        release: bool,
         /// Where to store the output WASM. If the file exists, it will be overwritten.
         #[arg(long)]
         out_file: PathBuf,
@@ -44,11 +44,13 @@ fn main() -> color_eyre::Result<()> {
         }
         Cli::Build {
             common: CommonArgs { path },
-            optimize,
+            release,
             out_file,
         } => {
             let builder = Builder::new(&path).show_output();
 
+            let builder = if release { builder.release() } else { builder };
+
             let output = {
                 // not showing the spinner here, cargo does a progress bar for us
 
@@ -58,7 +60,7 @@ fn main() -> color_eyre::Result<()> {
                 }
             };
 
-            let output = if optimize {
+            let output = if release {
                 let sp = if std::env::var("CI").is_err() {
                     Some(spinoff::Spinner::new_with_stream(
                         spinoff::spinners::Binary,

scripts/build_wasm.sh

@@ -5,6 +5,46 @@ DEFAULTS_DIR="defaults"
 CRATES_DIR="wasm"
 TARGET_DIR="wasm/target/prebuilt"
 
+# Default options
+DEFAULT_RELEASE_FLAG=""
+DEFAULT_SHOW_HELP=false
+
+# Build options
+RELEASE_FLAG=$DEFAULT_RELEASE_FLAG
+SHOW_HELP=$DEFAULT_SHOW_HELP
+
+main() {
+    # Parse args
+    for arg in "$@"; do
+        case $arg in
+            "--release")
+                RELEASE_FLAG="--release"
+                ;;
+            "--help")
+                SHOW_HELP=true
+        esac
+    done
+
+    if $SHOW_HELP; then
+        print_help
+        exit 0
+    fi
+
+    # Parse target
+    case ${!#} in
+        "libs")
+            command "libs"
+            ;;
+        "samples")
+            command "samples"
+            ;;
+        *)
+            command "libs"
+            command "samples"
+            ;;
+    esac
+}
+
 build() {
     case $1 in
         "libs")
@@ -26,7 +66,7 @@ build() {
     mkdir -p "$TARGET_DIR/$1"
     for name in ${NAMES[@]}; do
         out_file="$TARGET_DIR/$1/$name.wasm"
-        cargo run --bin iroha_wasm_builder -- build "$CRATES_DIR/$1/$name" --optimize --out-file "$out_file"
+        cargo run --bin iroha_wasm_builder -- build "$CRATES_DIR/$1/$name" $RELEASE_FLAG --out-file "$out_file"
     done
     echo "info: WASM $1 build complete"
     echo "artifacts written to $TARGET_DIR/$1/"
@@ -46,18 +86,20 @@ command() {
     esac
 }
 
-case $1 in
-    "")
-        command "libs"
-        command "samples"
-        ;;
-    "libs")
-        command "libs"
-        ;;
-    "samples")
-        command "samples"
-        ;;
-    *)
-        echo "error: arg must be 'libs', 'samples', or empty to build both"
-        exit 1
-esac
+
+print_help() {
+    cat << END
+Usage: build_wasm.sh [OPTIONS] [TARGET]
+
+Options:
+  --help           Show help message.
+  --release        Enable release and size optimizations for the build.
+
+Targets:
+  libs             Specify to build libs.
+  samples          Specify to build samples.
+                   If omitted, both libraries and samples will be built.
+END
+}
+
+main "$@"; exit