Merge branch 'brent/improve-wasm-build' (#2795)

* origin/brent/improve-wasm-build:
  changelog: add #2795
  script/release: update wasm_for_tests path
  improve wasm build

Author: tzemanovic

.changelog/unreleased/improvements/2795-improve-wasm-build.md

@@ -0,0 +1,2 @@
+- Split up WASM transaction and validity-predicates into individual crates to
+  improve build time. ([\#2795](https://github.com/anoma/namada/pull/2795))

Cargo.lock

@@ -133,7 +133,7 @@ paste = "1.0.9"
 pretty_assertions = "1.4.0"
 primitive-types = "0.12.1"
 proptest = "1.4.0"
-proptest-state-machine = "0.1.0"
+proptest-state-machine = "0.3.0"
 prost = "0.12.0"
 prost-types = "0.12.0"
 rand = {version = "0.8", default-features = false}

Cargo.toml

@@ -17,10 +17,8 @@ debug-cargo := $(env) $(debug-env) cargo
 nightly := $(shell cat rust-nightly-version)
 
 # Path to the wasm source for the provided txs and VPs
-wasms := wasm/wasm_source
-wasms_for_tests := wasm_for_tests/wasm_source
-# Paths for all the wasm templates
-wasm_templates := wasm/tx_template wasm/vp_template
+wasms := wasm
+wasms_for_tests := wasm_for_tests
 
 ifdef JOBS
 jobs := -j $(JOBS)
@@ -93,16 +91,17 @@ check-wasm = $(cargo) check --target wasm32-unknown-unknown --manifest-path $(wa
 check:
 	$(cargo) check --workspace && \
 	make -C $(wasms) check && \
-	make -C $(wasms_for_tests) check && \
-	$(foreach wasm,$(wasm_templates),$(check-wasm) && ) true
+	make -C $(wasms_for_tests) check
 
 check-mainnet:
 	$(cargo) check --workspace --features "mainnet"
 
 # Check that every crate can be built with default features and that namada crate
 # can be built for wasm
 check-crates:
+	rustup target add --toolchain $(nightly) wasm32-unknown-unknown
 	$(foreach p,$(crates), echo "Checking $(p)" && cargo +$(nightly) check -Z unstable-options --tests -p $(p) && ) \
+		make -C $(wasms) check && \
 		make -C $(wasms_for_tests) check && \
 		cargo check --package namada --target wasm32-unknown-unknown --no-default-features --features "namada-sdk" && \
 		cargo check --package namada_sdk --all-features
@@ -114,8 +113,7 @@ clippy:
 	$(cargo) +$(nightly) clippy $(jobs) --all-targets --workspace --exclude namada_benchmarks -- -D warnings && \
 	$(cargo) +$(nightly) clippy $(jobs) --all-targets --package namada_benchmarks -- -D warnings && \
 	make -C $(wasms) clippy && \
-	make -C $(wasms_for_tests) clippy && \
-	$(foreach wasm,$(wasm_templates),$(clippy-wasm) && ) true
+	make -C $(wasms_for_tests) clippy
 
 clippy-mainnet:
 	$(cargo) +$(nightly) clippy --all-targets --features "mainnet" -- -D warnings
@@ -255,15 +253,11 @@ test-pos-sm:
 
 fmt-wasm = $(cargo) +$(nightly) fmt --manifest-path $(wasm)/Cargo.toml
 fmt:
-	$(cargo) +$(nightly) fmt --all && \
-	make -C $(wasms) fmt && \
-	$(foreach wasm,$(wasm_templates),$(fmt-wasm) && ) true
+	$(cargo) +$(nightly) fmt --all && make -C $(wasms) fmt
 
 fmt-check-wasm = $(cargo) +$(nightly) fmt --manifest-path $(wasm)/Cargo.toml -- --check
 fmt-check:
-	$(cargo) +$(nightly) fmt --all -- --check && \
-	make -C $(wasms) fmt-check && \
-	$(foreach wasm,$(wasm_templates),$(fmt-check-wasm) && ) true
+	$(cargo) +$(nightly) fmt --all -- --check && make -C $(wasms) fmt-check
 
 watch:
 	$(cargo) watch
@@ -292,7 +286,7 @@ debug-wasm-scripts-docker: build-wasm-image-docker
 
 # Build the validity predicate and transactions wasm
 build-wasm-scripts:
-	rm wasm/*.wasm || true
+	rm $(wasms)/*.wasm || true
 	make -C $(wasms)
 	make opt-wasm
 	make checksum-wasm
@@ -304,6 +298,18 @@ debug-wasm-scripts:
 	make opt-wasm
 	make checksum-wasm
 
+# Build the validity predicate and transactions wasm for tests
+build-wasm-tests-scripts:
+	rm $(wasms_for_tests)/*.wasm || true
+	make -C $(wasms_for_tests)
+	make opt-wasm-tests
+
+# Debug build the validity predicate and transactions wasm for tests
+debug-wasm-tests-scripts:
+	rm $(wasms_for_tests)/*.wasm || true
+	make -C $(wasms_for_tests) debug
+	make opt-wasm-tests
+
 # need python
 checksum-wasm:
 	python3 wasm/checksums.py
@@ -312,6 +318,9 @@ checksum-wasm:
 opt-wasm:
 	@for file in $(shell ls wasm/*.wasm); do wasm-opt -Oz -o $${file} $${file}; done
 
+opt-wasm-tests:
+	@for file in $(shell ls wasm_for_tests/*.wasm); do wasm-opt -Oz -o $${file} $${file}; done
+
 clean-wasm-scripts:
 	make -C $(wasms) clean
 

Makefile

@@ -45,7 +45,6 @@
 //!     - `all`: the hashes included up to the last block
 //!     - `last`: the hashes included in the last block
 
-use std::collections::HashSet;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::Path;
@@ -56,6 +55,7 @@ use borsh::BorshDeserialize;
 use borsh_ext::BorshSerializeExt;
 use data_encoding::HEXLOWER;
 use itertools::Either;
+use namada::core::collections::HashSet;
 use namada::core::storage::{
     BlockHeight, BlockResults, Epoch, EthEventsQueue, Header, Key, KeySeg,
     KEY_SEGMENT_SEPARATOR,
@@ -2105,9 +2105,7 @@ mod imp {
 
 #[cfg(test)]
 mod test {
-    use namada::core::address::{
-        gen_established_address, EstablishedAddressGen,
-    };
+    use namada::core::address::EstablishedAddressGen;
     use namada::core::hash::Hash;
     use namada::core::storage::{BlockHash, Epochs};
     use namada::state::{MerkleTree, Sha256Hasher};

crates/apps/src/lib/node/ledger/storage/rocksdb.rs

@@ -25,15 +25,15 @@ HASH_BEFORE=$(git rev-parse HEAD)
 cargo release --execute $VERSION
 HASH_AFTER=$(git rev-parse HEAD)
 
-# update the wasm crate versions (2 fixups)
+# update the wasm workspace crate versions (2 fixups)
 cd $REPO_ROOT/wasm
 cargo update -w
 git add Cargo.lock
 git commit --fixup=$HASH_AFTER
 cargo release --execute $VERSION
 
-# update the wasm_for_tests crate version, and rebuild them (3 fixups)
-cd $REPO_ROOT/wasm_for_tests/wasm_source
+# update the wasm_for_tests workspace crate version, and rebuild them (3 fixups)
+cd $REPO_ROOT/wasm_for_tests
 cargo update -w
 git add Cargo.lock
 git commit --fixup=$HASH_AFTER