Skip to content

Commit

Permalink
Roles & NFT Voting Module cleanup (#692)
Browse files Browse the repository at this point in the history
* Initial contract commits

* Clean up

* Start building out the contracts more

* Untested first version of roles NFT contract

* Move ActiveThreshold to dao-voting package

* Fix up many bugs in cw721-roles

* Refactor into multiple files

* Rename contracts

* Clean up helpers

* More ActiveThreshold fixups

* Clean up dao-voting-cw721-roles tests

* Bug fixes and starting tests for cw721-roles

* MVP roles voting contract

* MVP voting-cw721-roles contract and tests

* Fix transfer / send and clean up

* Create NFT contract on instantiation dao-voting-cw721-staked

* Add ActiveThreshold support to dao-voting-cw721-staked

* More dao-voting-cw721-roles tests, clippy cleanup

* Update schemas

* Update readmes, clean up msg exports

* Add basic test for instantiate NFT contract with dao-voting-cw721-roles

* Fix WASM build

* Update cw721 and cw721-base to 0.17

* Update contracts/external/cw721-roles/src/contract.rs

Co-authored-by: Art3miX <[email protected]>

* Address code review comments, more comments

* Add active threshold tests, fix math

* Clean up

* Implement Art3Mix suggested change

* Add optional on-chain role

* Fix WASM build

* Add ext methods to update role NFTs

* Add more info to README.md

* Update contract description

* Ignore doc test

* Make clippy happy

* Update schemas

* Fixups, tests for NFT sending to increase test coverage

* Add ListMembers query and test

* Add test coverage for hooks

* More test coverage for dao-voting-cw721-staked

* Remove unused hooks code from roles voting module

* Update schema, make clippy happy

* Try and fix integration tests -Z option not available in stable

* Try running integration tests with stable rust

* Use older nightly version

* Another attempt to fix integration tests

* Fix dao-voting-cw721-staked

* Minor cleanup

* More cleanup, bump workspace-optimizer version

* More cleanup

* Introduce dao-cw721-extensions package, fix wasm build

---------

Co-authored-by: Art3miX <[email protected]>
  • Loading branch information
JakeHartnell and Art3miX authored Jul 3, 2023
1 parent 0513941 commit 6a4e747
Show file tree
Hide file tree
Showing 67 changed files with 6,344 additions and 553 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3

- name: Install latest stable toolchain
- name: Install latest nightly toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
toolchain: nightly-2023-02-02
target: wasm32-unknown-unknown
override: true

Expand Down
Loading

0 comments on commit 6a4e747

Please sign in to comment.