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.

Sign up for GitHub

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

Jump to bottom

[dao] Implement DAOSpace #32

Merged
merged 35 commits into from
Jul 29, 2022
Merged

[dao] Implement DAOSpace #32

merged 35 commits into from
Jul 29, 2022

Commits on Jun 24, 2022

  1. [genesis_dao] Implement GenesisDao

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    03106a4 View commit details
    Browse the repository at this point in the history

  2. Implement Proposal

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    5d13575 View commit details
    Browse the repository at this point in the history

  3. Init MemberJoinPlugin

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    e34ccee View commit details
    Browse the repository at this point in the history

  4. implement InstallPluginProposalPlugin

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    e94b12e View commit details
    Browse the repository at this point in the history

  5. update build

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    d52b8c7 View commit details
    Browse the repository at this point in the history

  6. update build

    @jolestar
    jolestar committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    7d013e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. Merge branch 'main' into genesis_dao

    @jolestar
    jolestar committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    4c3cd3b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. Implement DaoAccount and GenesisDao module (#46) 

    * Implement DaoAccount and GenesisDao module
    @jolestar
    jolestar committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    d0b5690 View commit details
    Browse the repository at this point in the history

  2. Update BuildInfo.yaml

    @jolestar
    jolestar committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    131c121 View commit details
    Browse the repository at this point in the history

  3. merge Dao proposal and dao config into genesis dao base code (#47) 

    Co-authored-by: jolestar <jolestar@gmail.com>
    @baichuan3 @jolestar
    baichuan3 and jolestar committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    b4870d9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into genesis_dao

    @jolestar
    jolestar committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    36242c8 View commit details
    Browse the repository at this point in the history

  5. Update BuildInfo.yaml

    @jolestar
    jolestar committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    72173ab View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Genesis dao plugin (#49) 

    * add salary governance

* add salary governance

* Salary governance plugin

* add script tag for plugin functions
    @welbon
    welbon committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    e3306a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Dao account test (#53) 

    * Update DaoAccount and write integration test

* update build

* update CI for genesis_dao branch
    @jolestar
    jolestar committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    fdddff4 View commit details
    Browse the repository at this point in the history

  2. Add member event (#55)

    @WGB5445
    WGB5445 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    6856141 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into genesis_dao

    @jolestar
    jolestar committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    5bd7b61 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Dao proposal implement (#57) 

    * dao proposal implementation

* update build files

* fixed merge genesis_dao conflicts
    @baichuan3
    baichuan3 committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    f081d2e View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Genesis dao test (#59) 

    * [test] Add dao integration test

* fixup

* update build file

* remove XDao module
    @jolestar
    jolestar committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    8b60212 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. checkpoints temp Test (#62)

    @WGB5445
    WGB5445 committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    2737469 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Grant plugin (#61) 

    * add GrantProposalPlugin

* add event struct

* add grant in GenesisDao

* add grant cap

* fix grant plugin

* Rename DaoGrantWithdrawTokenCap
    @WGB5445
    WGB5445 committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    5f3df4a View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Add the plugin code that to convert token to SBT amount (#64)

    @welbon
    welbon committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    e1317dc View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. Dao proposal test (#66) 

    * add proposal create and member join test case

* upgrade proof params via rpc raw proofs api

* generate struct tag for dao resource

* add bcs option tuple test case

* add queue proposal action script

* add script signer

* add cast vote scripts

* unify daoT ablity

* fix dao propsosal abort test case

* fix prove (#67)

Co-authored-by: WGB5445 <919603023@qq.com>
    @baichuan3 @WGB5445
    baichuan3 and WGB5445 committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    5cd8c0a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Dao event and get vote info api (#69) 

    * add dao event and get vote info api

* fix get vote info option when has not vote yet

* no_with_veto counts as no but also adds a veto vote
    @baichuan3
    baichuan3 committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    af63eff View commit details
    Browse the repository at this point in the history

  2. event associate with dao id (#71)

    @baichuan3
    baichuan3 committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    38c8d65 View commit details
    Browse the repository at this point in the history

  3. Change some functions into Script methods and fix part of the logic (#65 

    )
    @WGB5445
    WGB5445 committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    7ba5d10 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. [ Other ] Rename DaoSpace (#72) 

    * rename DaoSpace

* Fix dir name

* add AnyMemberPlugin Accept

* Rename : DAOSpace

* Rename

Co-authored-by: WGB5445 <WGB98512@163.com>
    @WGB5445
    WGB5445 and WGB5445 committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    cd1002d View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. Add Grant view and Grant refund (#73) 

    * add query_grant

* add refund grant function

* add query_grant_can_withdraw

* add GrantInfo
    @WGB5445
    WGB5445 committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    ea66229 View commit details
    Browse the repository at this point in the history

  2. [lib] Refactor include source dir

    @jolestar
    jolestar committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    322f919 View commit details
    Browse the repository at this point in the history

  3. Fix stake SBT plugin from one stake to multiple stake

    @welbon
    welbon committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    e17525c View commit details
    Browse the repository at this point in the history

  4. DAOSpace error code (#74) 

    * [dao] Refactor DAOSpace's error codes

* [refactor] Move VoteStrategy to test dir
    @jolestar
    jolestar committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    4bc5d65 View commit details
    Browse the repository at this point in the history

  5. [Feature and test]Add dao_grant test and query_grant_info_total (#76)

    @WGB5445
    WGB5445 committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    2e9928a View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Fixed the problems in PR that relationship between SBT and the staked… 

    … token
    @welbon
    welbon committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    0d7b1f4 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Add some integration test for StakeToSBTPlugin

    @welbon
    welbon committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    5ca37d6 View commit details
    Browse the repository at this point in the history

  2. Add some integration test for StakeToSBTPlugin

    @welbon
    welbon committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    7e798f5 View commit details
    Browse the repository at this point in the history

  3. Rename Dao to DAO (#79) 

    * [daospace] rename Dao to DAO

* update struct tag testcase after change Dao to DAO

* fix test exp

* fix prove and remove Debug print

Co-authored-by: BaiChuan <muzixinly@gmail.com>
Co-authored-by: WGB5445 <919603023@qq.com>
    @jolestar @baichuan3 @WGB5445
    3 people committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    4116929 View commit details
    Browse the repository at this point in the history