Commit 39a75e4
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 support182 files changed
Lines changed: 62195 additions & 951 deletions
File tree
- .github/workflows
- app
- backend
- src/onchain
- test
- mobile/src/services
- onchain
- contracts/aid_escrow
- src
- test_snapshots
- claim_start_boundaries
- claim
- combined_boundaries
- create_package
- delegate/tests
- edge_cases
- expiry_boundaries
- late_claim_behavior
- tests
- token_decimal_normalization
- token_interactions
- tests
- scripts
- docs/onchain
- tools/merkle-allowlist
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
89 | 93 | | |
90 | 94 | | |
91 | 95 | | |
92 | 96 | | |
93 | 97 | | |
94 | | - | |
95 | | - | |
| 98 | + | |
| 99 | + | |
0 commit comments