Add initial_dao_actions to dao_core

ci/bootstrap-env/src/main.rs

@@ -121,6 +121,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

ci/integration-tests/src/helpers/helper.rs

@@ -104,6 +104,7 @@ pub fn create_dao(
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     chain

contracts/dao-dao-core/src/contract.rs

@@ -92,11 +92,16 @@ 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 {
+        return Ok(res.add_messages(initial_dao_actions));
+    }
+    Ok(res)
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]

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

contracts/external/btsg-ft-factory/src/testing/tests.rs

@@ -90,6 +90,7 @@ fn test_issue_fantoken() -> anyhow::Result<()> {
             label: "DAO DAO governance module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     let dao = app
@@ -192,6 +193,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
@@ -299,6 +301,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
@@ -456,6 +459,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

contracts/external/cw-admin-factory/src/integration_tests.rs

@@ -98,6 +98,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());

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.

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

contracts/proposal/dao-proposal-multiple/src/testing/instantiate.rs

@@ -178,6 +178,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,
     };
 
@@ -297,6 +298,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,
     };
 
@@ -414,6 +416,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,
     };
 
@@ -500,6 +503,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,
     };
 
@@ -639,6 +643,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,
     };
 
@@ -754,6 +759,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,
     };
 
@@ -833,6 +839,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,
     };
 

contracts/proposal/dao-proposal-single/src/testing/instantiate.rs

@@ -179,6 +179,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
@@ -298,6 +299,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
@@ -419,6 +421,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
@@ -534,6 +537,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(
@@ -613,6 +617,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

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)

contracts/voting/dao-voting-cw721-staked/src/testing/integration_tests.rs

@@ -120,6 +120,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

contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs

@@ -144,6 +144,7 @@ impl TestEnvBuilder {
                 label: "DAO DAO Proposal Module".to_string(),
             }],
             initial_items: None,
+            initial_dao_actions: None,
         };
 
         // Instantiate DAO

contracts/voting/dao-voting-token-staked/src/tests/test_tube/integration_tests.rs

@@ -404,6 +404,7 @@ fn test_factory() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Instantiate DAO succeeds
@@ -514,6 +515,7 @@ fn test_factory_funds_pass_through() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Instantiate DAO fails because no funds to create the token were sent
@@ -640,6 +642,7 @@ fn test_factory_no_callback() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Instantiate DAO fails because no callback
@@ -721,6 +724,7 @@ fn test_factory_wrong_callback() {
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,
+        initial_dao_actions: None,
     };
 
     // Instantiate DAO fails because of wrong callback

contracts/voting/dao-voting-token-staked/src/tests/test_tube/test_env.rs

@@ -255,6 +255,7 @@ impl TestEnvBuilder {
                 label: "DAO DAO Proposal Module".to_string(),
             }],
             initial_items: None,
+            initial_dao_actions: None,
         };
 
         // Instantiate DAO

justfile

@@ -59,9 +59,9 @@ workspace-optimize:
             --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
             --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
             --platform linux/arm64 \
-            cosmwasm/optimizer-arm64:0.16.0; \
+            cosmwasm/optimizer-arm64:0.16.1; \
     elif [[ $(uname -m) == 'x86_64' ]]; then docker run --rm -v "$(pwd)":/code \
             --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
             --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
             --platform linux/amd64 \
-            cosmwasm/optimizer:0.16.0; fi
+            cosmwasm/optimizer:0.16.1; fi

packages/dao-interface/src/msg.rs

@@ -50,6 +50,8 @@ pub struct InstantiateMsg {
     pub initial_items: Option<Vec<InitialItem>>,
     /// Implements the DAO Star standard: <https://daostar.one/EIP>
     pub dao_uri: Option<String>,
+    /// Optional initial actions for the DAO
+    pub initial_dao_actions: Option<Vec<CosmosMsg>>,
 }
 
 #[cw_serde]