Remove zkvm feature and compile it directly with crypto feature.

Cargo.toml

@@ -223,12 +223,6 @@ zkas = [
     "util",
 ]
 
-zkvm = [
-    "crypto",
-    "zkas",
-]
-
-
 [[example]]
 name = "net"
 path = "example/net.rs"
@@ -252,9 +246,9 @@ required-features = ["crypto"]
 [[example]]
 name = "mint"
 path = "proof/mint.rs"
-required-features = ["cli", "zkvm"]
+required-features = ["cli", "crypto", "zkas"]
 
 [[example]]
 name = "burn"
 path = "proof/burn.rs"
-required-features = ["cli", "zkvm"]
+required-features = ["cli", "crypto", "zkas"]

Makefile

@@ -39,11 +39,15 @@ test: test-vm test-tx
 test-tx:
 	$(CARGO) run --release --features=node --example tx
 
-test-vm: zkas
-	./zkas proof/mint.zk
-	$(CARGO) run --release --features=cli,zkvm --example mint
-	./zkas proof/burn.zk
-	$(CARGO) run --release --features=cli,zkvm --example burn
+VM_SRC = proof/mint.zk proof/burn.zk
+VM_BIN = $(VM_SRC:=.bin)
+
+$(VM_BIN): $(VM_SRC)
+	./zkas $(basename $@) -o $@
+
+test-vm:
+	$(CARGO) run --release --features=cli,crypto,zkas --example mint
+	$(CARGO) run --release --features=cli,crypto,zkas --example burn
 
 clean:
 	rm -f $(BINS)

src/zk/mod.rs

@@ -1,7 +1,4 @@
 pub mod circuit;
-
-#[cfg(feature = "zkvm")]
+/// Halo2 zkas virtual machine
 pub mod vm;
-
-#[cfg(feature = "zkvm")]
 mod vm_stack;

src/zk/vm_stack.rs

@@ -1,4 +1,4 @@
-//! Stack type abstractions
+//! VM stack type abstractions
 use halo2_gadgets::{
     ecc::{chip::EccChip, FixedPoint, Point},
     utilities::CellValue,