diff --git a/.gitignore b/.gitignore index 24762eae6..b1e3e1fcb 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,8 @@ coverage.txt sftp-config.json *~ +# AI skills +**/experience + target zkvm-prover/config.json \ No newline at end of file diff --git a/coordinator/Makefile b/coordinator/Makefile index e25df0db0..65369bb27 100644 --- a/coordinator/Makefile +++ b/coordinator/Makefile @@ -34,7 +34,7 @@ coordinator_cron: coordinator_tool: go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator_tool ./cmd/tool -localsetup: coordinator_api ## Local setup: build coordinator_api, copy config, and setup releases +localsetup: libzkp coordinator_api ## Local setup: build coordinator_api, copy config, and setup releases mkdir -p build/bin/conf @echo "Copying configuration files..." @if [ -f "$(PWD)/conf/config.template.json" ]; then \ diff --git a/tests/prover-e2e/.gitignore b/tests/prover-e2e/.gitignore index f3722d067..822b20d15 100644 --- a/tests/prover-e2e/.gitignore +++ b/tests/prover-e2e/.gitignore @@ -1,3 +1,5 @@ build/* testset.json -conf \ No newline at end of file +conf +*.log +*.txt \ No newline at end of file diff --git a/tests/prover-e2e/README.md b/tests/prover-e2e/README.md index a6bb0444b..4bf35a81b 100644 --- a/tests/prover-e2e/README.md +++ b/tests/prover-e2e/README.md @@ -1,16 +1,21 @@ -## A new e2e test tool to setup a local environment for testing coordinator and prover. +# ProverE2E: A new e2e test tool to setup a local environment for testing coordinator and prover. It contains data from some blocks in a specified testnet, and helps to generate a series of chunks/batches/bundles from these blocks, filling the DB for the coordinator, so an e2e test (from chunk to bundle) can be run completely local -Prepare: +## Prepare link the staff dir as "conf" from one of the dir with staff set, currently we have following staff sets: + sepolia: with blocks from scroll sepolia + cloak-xen: with blocks from xen sepolia, which is a cloak network -Steps: +## Test 1. run `make all` under `tests/prover-e2e`, it would launch a postgreSql db in local docker container, which is ready to be used by coordinator (include some chunks/batches/bundles waiting to be proven) 2. setup assets by run `make coordinator_setup` -3. in `coordinator/build/bin/conf`, update necessary items in `config.template.json` and rename it as `config.json` -4. build and launch `coordinator_api` service locally -5. setup the `config.json` for zkvm prover to connect with the locally launched coordinator api -6. in `zkvm-prover`, launch `make test_e2e_run`, which would specific prover run locally, connect to the local coordinator api service according to the `config.json`, and prove all tasks being injected to db in step 1. \ No newline at end of file +3. come into `coordinator/build/bin` for following steps: + + rename `conf/config.template.json` as `conf/config.json` + + if the `l2.validium_mode` is set to true in `config.json`, the `sequencer.decryption_key` must be set + + launch `coordinator_api` service by executing the file +4. come into `zkvm-prover` for following steps: + + copy `config.template.json` to `config.json`, + + set the `sdk_config.coordinator.base_url` field in `config.json`, so zkvm prover would connect with the locally launched coordinator api, + for common case the url is `http://localhost:8390` (the default listening port of coordinator api) + + launch `make test_e2e_run`, which would specific prover run locally, connect to the local coordinator api service according to the `config.json`, and prove all tasks being injected to db in step 1. \ No newline at end of file diff --git a/zkvm-prover/.work/.gitignore b/zkvm-prover/.work/.gitignore index ca77ed9a9..d5246e093 100644 --- a/zkvm-prover/.work/.gitignore +++ b/zkvm-prover/.work/.gitignore @@ -1,4 +1,5 @@ *.vmexe +*.elf openvm.toml *.bin *.sol