Skip to content

Commit

Permalink
Improve pre-propose proposal creation permission granularity (and bum…
Browse files Browse the repository at this point in the history 
…p versions to v2.5.0) (DA0-DA0#843)
  • Loading branch information
@NoahSaso
NoahSaso committed Jul 7, 2024
1 parent 8be18d1 commit ac249f4
Show file tree
Hide file tree
Showing 46 changed files with 4,470 additions and 323 deletions.
158 changes: 79 additions & 79 deletions Cargo.lock
View file

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resolver = "2"
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/DA0-DA0/dao-contracts"
version = "2.4.2"
version = "2.5.0"

[profile.release]
codegen-units = 1
Expand Down Expand Up @@ -81,45 +81,45 @@ wynd-utils = "0.4"
# optional owner.
cw-ownable = "0.5"

cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.4.2" }
cw-denom = { path = "./packages/cw-denom", version = "2.4.2" }
cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.4.2" }
cw-hooks = { path = "./packages/cw-hooks", version = "2.4.2" }
cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.4.2" }
cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.4.2" }
cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.4.2" }
cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.4.2", default-features = false }
cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.4.2", default-features = false }
cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.4.2" }
cw-wormhole = { path = "./packages/cw-wormhole", version = "2.4.2" }
cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.4.2" }
cw721-controllers = { path = "./packages/cw721-controllers", version = "2.4.2" }
cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.4.2" }
dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.4.2" }
dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.4.2" }
dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.4.2" }
dao-hooks = { path = "./packages/dao-hooks", version = "2.4.2" }
dao-interface = { path = "./packages/dao-interface", version = "2.4.2" }
dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.4.2" }
dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.4.2" }
dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.4.2" }
dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.4.2" }
dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.4.2" }
dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.4.2" }
dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.4.2" }
dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.4.2" }
dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.4.2" }
dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.4.2" }
dao-rewards-distributor = { path = "./contracts/distribution/dao-rewards-distributor", version = "2.4.2" }
dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.4.2" }
dao-testing = { path = "./packages/dao-testing", version = "2.4.2" }
dao-voting = { path = "./packages/dao-voting", version = "2.4.2" }
dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.4.2" }
dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.4.2" }
dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.4.2" }
dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.4.2" }
dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.4.2" }
dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.4.2" }
cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.5.0" }
cw-denom = { path = "./packages/cw-denom", version = "2.5.0" }
cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.5.0" }
cw-hooks = { path = "./packages/cw-hooks", version = "2.5.0" }
cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.5.0" }
cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.5.0" }
cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.5.0" }
cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.5.0", default-features = false }
cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.5.0", default-features = false }
cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.5.0" }
cw-wormhole = { path = "./packages/cw-wormhole", version = "2.5.0" }
cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.5.0" }
cw721-controllers = { path = "./packages/cw721-controllers", version = "2.5.0" }
cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.5.0" }
dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.5.0" }
dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.5.0" }
dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.5.0" }
dao-hooks = { path = "./packages/dao-hooks", version = "2.5.0" }
dao-interface = { path = "./packages/dao-interface", version = "2.5.0" }
dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.5.0" }
dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.5.0" }
dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.5.0" }
dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.5.0" }
dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.5.0" }
dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.5.0" }
dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.5.0" }
dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.5.0" }
dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.5.0" }
dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.5.0" }
dao-rewards-distributor = { path = "./contracts/distribution/dao-rewards-distributor", version = "2.5.0" }
dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.5.0" }
dao-testing = { path = "./packages/dao-testing", version = "2.5.0" }
dao-voting = { path = "./packages/dao-voting", version = "2.5.0" }
dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.5.0" }
dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.5.0" }
dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.5.0" }
dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.5.0" }
dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.5.0" }
dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.5.0" }

# v1 dependencies. used for state migrations.
cw-core-v1 = { package = "cw-core", version = "0.1.0" }
Expand Down
7 changes: 6 additions & 1 deletion ci/bootstrap-env/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use cosm_orc::{config::cfg::Config, orchestrator::cosm_orc::CosmOrc};
use cosmwasm_std::{to_json_binary, Decimal, Empty, Uint128};
use cw20::Cw20Coin;
use dao_interface::state::{Admin, ModuleInstantiateInfo};
use dao_voting::pre_propose::PreProposeSubmissionPolicy;
use dao_voting::{
deposit::{DepositRefundPolicy, DepositToken, UncheckedDepositInfo, VotingModuleTokenType},
pre_propose::PreProposeInfo,
Expand Down Expand Up @@ -99,7 +100,11 @@ fn main() -> Result<()> {
amount: Uint128::new(1000000000),
refund_policy: DepositRefundPolicy::OnlyPassed,
}),
open_proposal_submission: false,
submission_policy: PreProposeSubmissionPolicy::Specific {
dao_members: true,
allowlist: None,
denylist: None,
},
extension: Empty::default(),
})
.unwrap(),
Expand Down
8 changes: 6 additions & 2 deletions ci/integration-tests/src/helpers/helper.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use dao_interface::query::DumpStateResponse;
use dao_interface::state::{Admin, ModuleInstantiateInfo};
use dao_voting::{
deposit::{DepositRefundPolicy, DepositToken, UncheckedDepositInfo, VotingModuleTokenType},
pre_propose::{PreProposeInfo, ProposalCreationPolicy},
pre_propose::{PreProposeInfo, PreProposeSubmissionPolicy, ProposalCreationPolicy},
threshold::PercentageThreshold,
threshold::Threshold,
voting::Vote,
Expand Down Expand Up @@ -84,7 +84,11 @@ pub fn create_dao(
amount: DEPOSIT_AMOUNT,
refund_policy: DepositRefundPolicy::OnlyPassed,
}),
open_proposal_submission: false,
submission_policy: PreProposeSubmissionPolicy::Specific {
dao_members: true,
allowlist: None,
denylist: None,
},
extension: Empty::default(),
})
.unwrap(),
Expand Down
2 changes: 1 addition & 1 deletion contracts/dao-dao-core/schema/dao-dao-core.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "dao-dao-core",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/distribution/cw-fund-distributor/schema/cw-fund-distributor.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-fund-distributor",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/distribution/dao-rewards-distributor/schema/dao-rewards-distributor.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "dao-rewards-distributor",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-admin-factory/schema/cw-admin-factory.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-admin-factory",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-payroll-factory/schema/cw-payroll-factory.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-payroll-factory",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-token-swap/schema/cw-token-swap.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-token-swap",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-tokenfactory-issuer",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-vesting/schema/cw-vesting.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-vesting",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw721-roles/schema/cw721-roles.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw721-roles",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/dao-migrator/schema/dao-migrator.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "dao-migrator",
"contract_version": "2.4.2",
"contract_version": "2.5.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
Loading

0 comments on commit ac249f4

Please sign in to comment.