Skip to content

feat: vote delegation#4

Open
mijoco-btc wants to merge 9 commits intomainfrom
feat/vote-delegation
Open

feat: vote delegation#4
mijoco-btc wants to merge 9 commits intomainfrom
feat/vote-delegation

Conversation

@mijoco-btc
Copy link
Copy Markdown

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
@mijoco-btc
Copy link
Copy Markdown
Author

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

@mijoco-btc mijoco-btc 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