Skip to content

Commit 08c4d5a

Browse files
committed
update build stuffs
1 parent 94dbf57 commit 08c4d5a

6 files changed

Lines changed: 175 additions & 86 deletions

File tree

coordinator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ coordinator_tool:
3737
localsetup: coordinator_api ## Local setup: build coordinator_api, copy config, and setup releases
3838
mkdir -p build/bin/conf
3939
@echo "Copying configuration files..."
40-
cp -r $(PWD)/conf/config.json $(PWD)/build/bin/conf/config.template.json
40+
cp -fL $(CURDIR)/conf/config.json $(CURDIR)/build/bin/conf/config.template.json
4141
@echo "Setting up releases..."
42-
cd $(PWD)/build && bash setup_releases.sh
42+
cd $(CURDIR)/build && bash setup_releases.sh
4343

4444

4545
#coordinator_api_skip_libzkp:

coordinator/conf/config.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

coordinator/conf/config.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"prover_manager": {
3+
"provers_per_session": 1,
4+
"session_attempts": 5,
5+
"external_prover_threshold": 32,
6+
"bundle_collection_time_sec": 180,
7+
"batch_collection_time_sec": 180,
8+
"chunk_collection_time_sec": 180,
9+
"verifier": {
10+
"min_prover_version": "v4.4.45",
11+
"verifiers": [
12+
{
13+
"assets_path": "assets",
14+
"fork_name": "euclidV2"
15+
},
16+
{
17+
"assets_path": "assets",
18+
"fork_name": "feynman"
19+
}
20+
]
21+
}
22+
},
23+
"db": {
24+
"driver_name": "postgres",
25+
"dsn": "postgres://localhost/scroll?sslmode=disable",
26+
"maxOpenNum": 200,
27+
"maxIdleNum": 20
28+
},
29+
"l2": {
30+
"chain_id": 111,
31+
"l2geth": {
32+
"endpoint": "not need to specified for mocking"
33+
}
34+
},
35+
"auth": {
36+
"secret": "prover secret key",
37+
"challenge_expire_duration_sec": 3600,
38+
"login_expire_duration_sec": 3600
39+
}
40+
}

coordinator/conf/config_cloak_template.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

coordinator/conf/config_sepolia_template.json

Lines changed: 0 additions & 41 deletions
This file was deleted.

tests/prover-e2e/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ all: setup_db test_tool import_data
1414
clean:
1515
docker compose down
1616

17-
check_vars:
17+
conf:
18+
@echo "Please link sepolia or cloak-xen as conf"
19+
exit 1
20+
21+
check_vars: | conf
1822
@if [ -z "$(BEGIN_BLOCK)" ] || [ -z "$(END_BLOCK)" ]; then \
1923
echo "Error: BEGIN_BLOCK and END_BLOCK must be defined"; \
2024
echo "Usage: make import_data BEGIN_BLOCK=<start_block> END_BLOCK=<end_block>"; \
@@ -49,4 +53,8 @@ import_data_euclid: build/bin/e2e_tool check_vars
4953
build/bin/e2e_tool --config conf/config.json --codec 7 ${BEGIN_BLOCK} ${END_BLOCK}
5054

5155
import_data: build/bin/e2e_tool check_vars
52-
build/bin/e2e_tool --config conf/config.json --codec 8 ${BEGIN_BLOCK} ${END_BLOCK}
56+
build/bin/e2e_tool --config conf/config.json --codec 8 ${BEGIN_BLOCK} ${END_BLOCK}
57+
58+
coordinator_setup:
59+
$(MAKE) -C ../../coordinator localsetup
60+
cp -f conf/genesis.json ../../coordinator/build/bin/conf

0 commit comments

Comments
 (0)