Initial dao actions on instantiate (#903)

DA0-DA0 · Feb 25, 2025 · a522e33 · a522e33
1 parent 1249388
commit a522e33
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 6 deletions.
diff --git a/ci/bootstrap-env/src/main.rs b/ci/bootstrap-env/src/main.rs
@@ -122,6 +122,7 @@ fn main() -> Result<()> {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Init dao dao dao with an initial treasury of 9000000 tokens

diff --git a/ci/integration-tests/src/helpers/helper.rs b/ci/integration-tests/src/helpers/helper.rs
@@ -105,6 +105,7 @@ pub fn create_dao(
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     chain

diff --git a/contracts/dao-dao-core/src/contract.rs b/contracts/dao-dao-core/src/contract.rs
@@ -21,11 +21,11 @@ use dao_interface::{
     voting,
 };
 
-use crate::error::ContractError;
 use crate::state::{
     ACTIVE_PROPOSAL_MODULE_COUNT, ADMIN, CONFIG, CW20_LIST, CW721_LIST, ITEMS, NOMINATED_ADMIN,
     PAUSED, PROPOSAL_MODULES, SUBDAO_LIST, TOTAL_PROPOSAL_MODULE_COUNT, VOTING_MODULE,
 };
+use crate::{error::ContractError, state::INITIAL_DAO_ACTIONS};
 
 pub(crate) const CONTRACT_NAME: &str = "crates.io:dao-dao-core";
 pub(crate) const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -92,11 +92,18 @@ pub fn instantiate(
     TOTAL_PROPOSAL_MODULE_COUNT.save(deps.storage, &0)?;
     ACTIVE_PROPOSAL_MODULE_COUNT.save(deps.storage, &0)?;
 
-    Ok(Response::new()
+    let res = Response::new()
         .add_attribute("action", "instantiate")
         .add_attribute("sender", info.sender)
         .add_submessage(vote_module_msg)
-        .add_submessages(proposal_module_msgs))
+        .add_submessages(proposal_module_msgs);
+
+    if let Some(initial_dao_actions) = msg.initial_dao_actions {
+        INITIAL_DAO_ACTIONS.save(deps.storage, &initial_dao_actions)?;
+
+        return Ok(res.add_messages(initial_dao_actions));
+    }
+    Ok(res)
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
@@ -595,6 +602,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
             query_list_sub_daos(deps, start_after, limit)
         }
         QueryMsg::DaoURI {} => query_dao_uri(deps),
+        QueryMsg::InitialDaoActions {} => query_initial_dao_actions(deps),
     }
 }
 
@@ -868,6 +876,12 @@ pub fn query_proposal_module_count(deps: Deps) -> StdResult<Binary> {
     })
 }
 
+pub fn query_initial_dao_actions(deps: Deps) -> StdResult<Binary> {
+    let actions = INITIAL_DAO_ACTIONS.may_load(deps.storage)?;
+
+    to_json_binary(&actions)
+}
+
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
     let ContractVersion { version, .. } = get_contract_version(deps.storage)?;

diff --git a/contracts/dao-dao-core/src/state.rs b/contracts/dao-dao-core/src/state.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{Addr, Empty};
+use cosmwasm_std::{Addr, CosmosMsg, Empty};
 use cw_storage_plus::{Item, Map};
 use cw_utils::Expiration;
 use dao_interface::state::{Config, ProposalModule};
@@ -53,3 +53,6 @@ pub const CW721_LIST: Map<Addr, Empty> = Map::new("cw721s");
 
 /// List of SubDAOs associated to this DAO. Each SubDAO has an optional charter.
 pub const SUBDAO_LIST: Map<&Addr, Option<String>> = Map::new("sub_daos");
+
+/// List of initial dao actions.
+pub const INITIAL_DAO_ACTIONS: Item<Vec<CosmosMsg>> = Item::new("initial_dao_actions");
diff --git a/contracts/dao-dao-core/src/tests.rs b/contracts/dao-dao-core/src/tests.rs
@@ -80,6 +80,7 @@ fn test_instantiate_with_n_gov_modules(n: usize) {
             })
             .collect(),
         initial_items: None,
+        initial_dao_actions: None,
     };
     let gov_addr = instantiate_gov(&mut app, gov_id, instantiate);
 
@@ -180,6 +181,7 @@ makes wickedness."
         },
         proposal_modules_instantiate_info: governance_modules,
         initial_items: None,
+        initial_dao_actions: None,
     };
     instantiate_gov(&mut app, gov_id, instantiate);
 }
@@ -217,6 +219,7 @@ fn test_update_config() {
             label: "voting module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -316,6 +319,7 @@ fn test_swap_governance(swaps: Vec<(u32, u32)>) {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -495,6 +499,7 @@ fn test_removed_modules_can_not_execute() {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -658,6 +663,7 @@ fn test_module_already_disabled() {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -760,6 +766,7 @@ fn test_swap_voting_module() {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -866,6 +873,7 @@ fn test_permissions() {
         initial_items: None,
         automatically_add_cw20s: true,
         automatically_add_cw721s: true,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -966,6 +974,7 @@ fn do_standard_instantiate(auto_add: bool, admin: Option<String>) -> (Addr, App)
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -1683,6 +1692,7 @@ fn test_list_items() {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app
@@ -1817,6 +1827,7 @@ fn test_instantiate_with_items() {
             label: "governance module".to_string(),
         }],
         initial_items: Some(initial_items.clone()),
+        initial_dao_actions: None,
     };
 
     // Ensure duplicates are dissallowed.
@@ -2646,6 +2657,7 @@ fn test_migrate_from_compatible() {
             label: "governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let core_addr = app
@@ -2947,6 +2959,7 @@ fn test_module_prefixes() {
             },
         ],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let gov_addr = app

diff --git a/contracts/external/btsg-ft-factory/src/testing/tests.rs b/contracts/external/btsg-ft-factory/src/testing/tests.rs
@@ -91,6 +91,7 @@ fn test_issue_fantoken() -> anyhow::Result<()> {
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let dao = app
@@ -194,6 +195,7 @@ fn test_initial_fantoken_balances() -> anyhow::Result<()> {
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let dao = app
@@ -302,6 +304,7 @@ fn test_fantoken_minter_and_authority_set_to_dao() -> anyhow::Result<()> {
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let dao = app
@@ -460,6 +463,7 @@ fn test_fantoken_can_be_staked() -> anyhow::Result<()> {
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let dao = app

diff --git a/contracts/external/cw-admin-factory/src/integration_tests.rs b/contracts/external/cw-admin-factory/src/integration_tests.rs
@@ -99,6 +99,7 @@ fn test_set_self_admin_instantiate2() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let salt = Binary::from("salt".as_bytes());

diff --git a/contracts/external/cw-admin-factory/src/tests.rs b/contracts/external/cw-admin-factory/src/tests.rs
@@ -80,6 +80,7 @@ pub fn test_set_self_admin() {
             },
         ],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let res: AppResponse = app
@@ -174,6 +175,7 @@ pub fn test_authorized_set_self_admin() {
             },
         ],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Fails when not the admin.

diff --git a/contracts/proposal/dao-proposal-condorcet/src/testing/suite.rs b/contracts/proposal/dao-proposal-condorcet/src/testing/suite.rs
@@ -108,6 +108,7 @@ impl SuiteBuilder {
                 label: "condorcet module".to_string(),
             }],
             initial_items: None,
+            initial_dao_actions: None,
             dao_uri: None,
         };
         let core = app

diff --git a/contracts/proposal/dao-proposal-multiple/src/testing/instantiate.rs b/contracts/proposal/dao-proposal-multiple/src/testing/instantiate.rs
@@ -180,6 +180,7 @@ pub fn _instantiate_with_staked_cw721_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -299,6 +300,7 @@ pub fn instantiate_with_native_staked_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -416,6 +418,7 @@ pub fn instantiate_with_cw20_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -502,6 +505,7 @@ pub fn instantiate_with_staked_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -641,6 +645,7 @@ pub fn instantiate_with_multiple_staked_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -756,6 +761,7 @@ pub fn instantiate_with_staking_active_threshold(
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 
@@ -835,6 +841,7 @@ pub fn _instantiate_with_cw4_groups_governance(
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
         dao_uri: None,
     };
 

diff --git a/contracts/proposal/dao-proposal-single/src/testing/instantiate.rs b/contracts/proposal/dao-proposal-single/src/testing/instantiate.rs
@@ -181,6 +181,7 @@ pub(crate) fn instantiate_with_staked_cw721_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let core_addr = app
@@ -300,6 +301,7 @@ pub(crate) fn instantiate_with_native_staked_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let core_addr = app
@@ -421,6 +423,7 @@ pub(crate) fn instantiate_with_staked_balances_governance(
             label: "DAO DAO governance module.".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let core_addr = app
@@ -536,6 +539,7 @@ pub(crate) fn instantiate_with_staking_active_threshold(
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     app.instantiate_contract(
@@ -615,6 +619,7 @@ pub(crate) fn instantiate_with_cw4_groups_governance(
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let addr = app

diff --git a/contracts/test/dao-proposal-hook-counter/src/tests.rs b/contracts/test/dao-proposal-hook-counter/src/tests.rs
@@ -87,6 +87,7 @@ fn instantiate_with_default_governance(
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     instantiate_governance(app, governance_id, governance_instantiate)

diff --git a/contracts/voting/dao-voting-cw721-staked/src/testing/integration_tests.rs b/contracts/voting/dao-voting-cw721-staked/src/testing/integration_tests.rs
@@ -121,6 +121,7 @@ fn test_full_integration_with_factory() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Instantiating without funds fails

diff --git a/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs b/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs
@@ -145,6 +145,7 @@ impl TestEnvBuilder {
                 label: "DAO DAO Proposal Module".to_string(),
             }],
             initial_items: None,
+            initial_dao_actions: None,
         };
 
         // Instantiate DAO
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,6 +105,7 @@ pub fn create_dao( @@
                 label: "DAO DAO Proposal Module".to_string(),
             }],
             initial_items: None,
+            initial_dao_actions: None,
         };
         chain
@@ Expand Down @@