better makefiles

Author: noel2004

tests/prover-e2e/Makefile

@@ -1,14 +1,20 @@
-.PHONY: clean setup_db test_tool all
+.PHONY: clean setup_db test_tool all check_vars
 
 GOOSE_CMD?=goose
-BEGIN_BLOCK?=10405848
-END_BLOCK?=10405858
+
 
 all: setup_db test_tool import_data
 
 clean:
 	docker compose down
 
+check_vars:
+	@if [ -z "$(BEGIN_BLOCK)" ] || [ -z "$(END_BLOCK)" ]; then \
+        echo "Error: BEGIN_BLOCK and END_BLOCK must be defined"; \
+        echo "Usage: make import_data BEGIN_BLOCK=<start_block> END_BLOCK=<end_block>"; \
+        exit 1; \
+    fi
+
 setup_db: clean
 	docker compose up --detach
 	@echo "Waiting for PostgreSQL to be ready..."
@@ -31,5 +37,10 @@ setup_db: clean
 test_tool:
 	go build -o $(PWD)/build/bin/e2e_tool ../../rollup/tests/integration_tool
 
-import_data: test_tool
-	build/bin/e2e_tool --config ./config.json --codec 7 ${BEGIN_BLOCK} ${END_BLOCK}
+build/bin/e2e_tool: test_tool
+
+import_data_euclid: build/bin/e2e_tool check_vars
+	build/bin/e2e_tool --config ./config.json --codec 7 ${BEGIN_BLOCK} ${END_BLOCK}
+
+import_data: build/bin/e2e_tool check_vars
+	build/bin/e2e_tool --config ./config.json --codec 8 ${BEGIN_BLOCK} ${END_BLOCK}    

zkvm-prover/Makefile

@@ -3,7 +3,7 @@
 RUST_MIN_STACK ?= 16777216
 export RUST_MIN_STACK
 
-CIRCUIT_STUFF = .work/chunk/app.vmexe .work/batch/app.vmexe .work/bundle/app.vmexe
+CIRCUIT_STUFF = .work/euclid/chunk/app.vmexe .work/feynman/chunk/app.vmexe
 
 ifeq (4.3,$(firstword $(sort $(MAKE_VERSION) 4.3)))
     PLONKY3_VERSION=$(shell grep -m 1 "Plonky3.git" ../Cargo.lock | cut -d "#" -f2 | cut -c-7)
@@ -41,6 +41,8 @@ ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_VERSION}
 #    ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_GPU_VERSION}
 #endif
 
+E2E_HANDLE_SET = ../tests/prover-e2e/testset.json
+
 prover_gpu:
 	cd ../crates/gpu_override && cargo tree >/dev/null
 	$(eval PLONKY3_GPU_VERSION:=$(shell ./print_plonky3gpu_version.sh | sed -n '2p'))
@@ -64,7 +66,11 @@ lint:
 	cargo fmt --all
 
 $(CIRCUIT_STUFF):
-	bash .work/download-release.sh
+	@echo "Download stuff with download-release.sh, and put them into correct directory";
+	@exit 1;
 
 test_run: $(CIRCUIT_STUFF)
-	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cargo run --release -p prover -- --config ./config.json
+	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cargo run --release -p prover -- --config ./config.json
+
+test_e2e_run: $(CIRCUIT_STUFF) ${E2E_HANDLE_SET}
+	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cargo run --release -p prover -- --config ./config.json handle ${E2E_HANDLE_SET}