Skip to content

Commit 39a75e4

Browse files
committed
merge: resolve conflicts with main for v2 merkle leaf binding
- Integrate main's zero-dependency merkle-allowlist architecture - Keep v2 leaf format (address + amount binding) from PR #442 - Update sample_allowlist.json with amount fields for v2 support
2 parents 79a5e9e + baf4ade commit 39a75e4

182 files changed

Lines changed: 62195 additions & 951 deletions

File tree

Some content is hidden

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

.github/workflows/backend-ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,14 @@ jobs:
8686
NODE_ENV: development
8787
run: npm run spec:export
8888

89+
- name: Regenerate frontend client types
90+
working-directory: app/frontend
91+
run: pnpm generate:api
92+
8993
- name: Check for Prisma schema without migration
9094
run: chmod +x app/backend/scripts/check-prisma-migration.sh && app/backend/scripts/check-prisma-migration.sh
9195

9296
- name: Check for OpenAPI spec drift
9397
run: |
94-
git diff --exit-code app/frontend/openapi.json || \
95-
(echo "ERROR: openapi.json is out of date. Run 'npm run spec:export' in app/backend and commit app/frontend/openapi.json." && exit 1)
98+
git diff --exit-code app/frontend/openapi.json app/frontend/src/lib/generated/api.ts || \
99+
(echo "ERROR: openapi.json or api.ts is out of date. Run 'npm run spec:export' in app/backend, then 'pnpm generate:api' in app/frontend, and commit both files." && exit 1)

0 commit comments

Comments
 (0)