Skip to content

Commit d4d6c74

Browse files
authored
Merge branch 'main' into add-allowlist
2 parents 8f311b8 + 4270c2c commit d4d6c74

52 files changed

Lines changed: 5583 additions & 4808 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
COMPOSE_FILE := local-env.yml
2+
LOGS_DIR := logs
3+
SERVICES := proof-server indexer node
4+
5+
.PHONY: env-up env-down env-logs env-logs-clean env-status
6+
7+
## Start local environment and stream logs to logs/
8+
env-up: env-down
9+
docker compose -f $(COMPOSE_FILE) up -d --wait
10+
@mkdir -p $(LOGS_DIR)
11+
@for svc in $(SERVICES); do \
12+
docker compose -f $(COMPOSE_FILE) logs -f --no-log-prefix $$svc > $(LOGS_DIR)/$$svc.log 2>&1 & \
13+
done
14+
@echo "Logs streaming to $(LOGS_DIR)/"
15+
16+
## Stop local environment
17+
env-down:
18+
@-pkill -f "docker compose -f $(COMPOSE_FILE) logs" 2>/dev/null || true
19+
docker compose -f $(COMPOSE_FILE) down
20+
21+
## Tail all logs
22+
env-logs:
23+
tail -f $(LOGS_DIR)/*.log
24+
25+
## Clear log files
26+
env-logs-clean:
27+
rm -rf $(LOGS_DIR)/*.log
28+
29+
## Show container status
30+
env-status:
31+
docker compose -f $(COMPOSE_FILE) ps

contracts/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"build": "compact-builder --hierarchical --out dist --clean-dist --exclude '*/archive/*' --exclude 'Mock*' --exclude '*.mock.compact' --copy package.json --copy ../README.md && find dist -type d -empty -delete",
3535
"test": "SKIP_ZK=true yarn run compact && vitest run",
3636
"test:coverage": "SKIP_ZK=true yarn run compact && vitest run --coverage",
37+
"test:live": "yarn run compact && MIDNIGHT_BACKEND=live vitest run --config vitest.live.config.ts",
3738
"compact:integration": "SKIP_ZK=true compact compile test/integration/_mocks/SharedInitCollision.compact artifacts/SharedInitCollision && SKIP_ZK=true compact compile test/integration/_mocks/ComposedTokens.compact artifacts/ComposedTokens",
3839
"test:integration": "yarn run compact:integration && vitest run --config vitest.integration.config.ts",
3940
"types": "tsc -p tsconfig.json --noEmit",
@@ -46,7 +47,7 @@
4647
"@openzeppelin/compact-cli": "^0.0.2"
4748
},
4849
"devDependencies": {
49-
"@openzeppelin/compact-simulator": "^0.1.0",
50+
"@openzeppelin/compact-simulator": "^0.2.0",
5051
"@tsconfig/node24": "^24.0.4",
5152
"@types/node": "25.9.3",
5253
"@vitest/coverage-v8": "^4.1.9",

0 commit comments

Comments
 (0)