Skip to content

Merge development into main#28

Open
xavikh wants to merge 8 commits intomainfrom
development
Open

Merge development into main#28
xavikh wants to merge 8 commits intomainfrom
development

Conversation

@xavikh
Copy link
Contributor

@xavikh xavikh commented Jan 28, 2026

Summary

  • Fix permissions and deploymentIds (ownerOrDao pattern)
  • Add deployment JSON output
  • Add fee params to deploy script
  • Create scripts for testing claims (ClaimMerkleCampaign, CreateMerkleCampaign)
  • Add Makefile for build automation
  • Fix typos

Changes

  • 28 files changed, +1,465 / -148 lines
  • New ownerOrDao modifier allowing both owner AND DAO to manage strategies/encoders
  • Factory deployment ID now includes plugin address to prevent collisions
  • New deployStrategy() and deployActionEncoder() functions on plugin

Test plan

  • All existing tests pass
  • New OwnerOrDaoTest.t.sol covers permission patterns

Main Changes:

Added ownership/DAO authorization pattern (authOrOwner)
- Introduced ownerOrDao modifier
- Both AllocatorStrategyBase and PayoutActionEncoderBase now support dual authorization (owner OR DAO)
Added deployment helper methods to the plugin
- deployStrategy() and deployActionEncoder() methods in CapitalDistributorPlugin
Refactored factory deployment logic
- Factories now use the plugin address to compute deployment IDs
* Forbid endtime in the past
* Remove unused error
* Add max_batch size check
* Check factory caller is a CapDistPlugin
* Use ERC165Checker
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant