Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: vote delegation #4

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat: vote delegation #4

wants to merge 9 commits into from

Conversation

radicleart
Copy link

Work in progress.

MarvinJanssen and others added 8 commits May 29, 2022 14:54
* main:
  test fix for the update to dev fund to include start height per developer
  tidy up before merging pull request
  NFT Escrow tests
  1. Cont test for dev fund 2. Refactored some boilerplate methods (setup) into a common utils class 3. Begun nft escrow
  1. Added test for dev fund 2. Refactored some boilerplate methods (setup) into a common utils class
  Moved test proposal clarity contracts to the test folder
  Moved test proposal clarity contracts to the test folder
  Unit tests for governance token, executive proposals and emergency executive extensions
  Unit tests for governance token, executive proposals and emergency executive extensions
  Proposal voting tests
  Unit tests for executor dao NB this branch will likely undergo a lot of refactoring.
* main:
  Chore: changed is/set whitelisted to is/set allowed
* main:
  Change is/set allowed to is/set allowlisted
  Chore: changed is/set whitelisted to is/set allowed

# Conflicts:
#	Clarinet.toml
#	README.md
#	contracts/external/nft-escrow.clar
#	contracts/proposals/edp003-allowlist-escrow-nft.clar
#	contracts/proposals/edp003-manage-escrow-nft.clar
#	contracts/proposals/edp003-whitelist-escrow-nft.clar
#	tests/nft-escrow_test.ts
#	tests/proposals/edp008-1-allowlist-nft-escrow.clar
#	tests/src/nft-escrow-client.ts
#	tests/src/utils.ts
* main:
  Change is/set allowed to is/set allowlisted
  Chore: changed is/set whitelisted to is/set allowed

# Conflicts:
#	Clarinet.toml
#	README.md
#	contracts/external/nft-escrow.clar
#	contracts/proposals/edp003-allowlist-escrow-nft.clar
#	contracts/proposals/edp003-manage-escrow-nft.clar
#	contracts/proposals/edp003-whitelist-escrow-nft.clar
#	tests/nft-escrow_test.ts
#	tests/proposals/edp008-1-allowlist-nft-escrow.clar
#	tests/src/nft-escrow-client.ts
#	tests/src/utils.ts
@radicleart
Copy link
Author

This was raised originally by Marvin in the reference executor DAO and is now applicable here for the EcosystemDAO

@radicleart radicleart changed the title Treasury and token sale extensions feat: vote delegation Jun 29, 2022
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.

2 participants