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/proposal multiple #NTRN-311 #17

Merged
merged 3 commits into from
Jan 13, 2023
Merged

Conversation

NeverHappened
Copy link
Contributor

@NeverHappened NeverHappened commented Dec 22, 2022

Implements this task

https://github.com/neutron-org/neutron-tests/actions/runs/3873343559

Adds cwd-pre-propose-multiple and cwd-proposal-multiple contracts to handle multi choice proposals.

Originally is a copypaste from 48d9629 commit from https://github.com/DA0-DA0/dao-contracts

Only changes are:

  • in cargo.toml (deps paths changed)
  • types are simplified - Empty generics was removed (analogous to proposal-single contracts:
pub type InstantiateMsg = InstantiateBase<Empty>;
pub type ExecuteMsg = ExecuteBase<ProposeMessage, Empty>;
pub type QueryMsg = QueryBase<Empty>;
type PrePropose = PreProposeContract<Empty, Empty, Empty, ProposeMessageInternal>; 

@NeverHappened NeverHappened self-assigned this Dec 22, 2022
@foxpy
Copy link
Contributor

foxpy commented Dec 24, 2022

There is quite a lot of code (more than 1000 LoC) to review, could you please describe what deserves the most of our attention?

@quasisamurai
Copy link
Contributor

it would be a nice idea to have a pr to neutron which will include this contact in genesis. as well as have some simple tests, at least sh script

@NeverHappened
Copy link
Contributor Author

NeverHappened commented Dec 26, 2022

@foxpy The most attention is required by contracts code. There are two of them - cwd_pre_propose_multiple and cwd_proposal_multiple.
But it's copypaste so I don't know how seriously to review it.

You can test it by:
1.

  • copying builded contracts into neutron/contracts folder (need to checkout branch in neutron feat/proposal-multiple)
  • make build && make init
  • and running the ./test_proposals_multiple.sh from neutron_dao repo
  • checkout integration tests and neutron to branch feat/proposal-multiple
  • run yarn test:governance

@pr0n00gler
Copy link
Collaborator

@foxpy The most attention is required by contracts code. There are two of them - cwd_pre_propose_multiple and cwd_proposal_multiple. But it's copypaste so I don't know how seriously to review it.

You can test it by:

  • copying builded contracts into neutron/contracts folder (need to checkout branch in neutron TODO)
  • make build && make init
  • and running the ./test_proposals.sh from neutron_dao repo (will add code for multiple proposal check today)

Any updates on the this?

@NeverHappened NeverHappened force-pushed the feat/proposal-multiple branch from 832354e to 3aefb4b Compare January 9, 2023 07:13
@NeverHappened NeverHappened force-pushed the feat/proposal-multiple branch from 731d5a6 to 34a7da8 Compare January 13, 2023 03:03


# PROPOSAL 2 (to pick "none of the above" option)
#propose proposal we're going to pass

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#propose proposal we're not going to pass

@NeverHappened NeverHappened changed the base branch from feat/subdao-timelocks to main January 13, 2023 13:15
@zavgorodnii zavgorodnii merged commit f3344a0 into main Jan 13, 2023
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.

6 participants