feat(launchpad): Add DAO Proposal Single contract address in nft-launchpad contract config

Author: WaDadidou

packages/networks/features.ts

@@ -58,6 +58,7 @@ const zodCosmWasmNFTLaunchpad = z.object({
   launchpadEndpoint: z.string(),
   codeId: z.number(),
   nftTr721CodeId: z.number(),
+  daoProposalSingleContractAddress: z.string(),
 });
 
 export type CosmWasmNFTLaunchpad = z.infer<typeof zodCosmWasmNFTLaunchpad>;

packages/networks/teritori-testnet/index.ts

@@ -39,6 +39,7 @@ const cosmwasmNftLaunchpadFeature: CosmWasmNFTLaunchpad = {
   nftTr721CodeId: 60,
   codeId: 71,
   defaultMintDenom: "utori",
+  daoProposalSingleContractAddress: "",
 };
 
 const rakkiFeature: CosmWasmRakki = {

packages/scripts/network-setup/deployNftLaunchpad.ts

@@ -82,18 +82,35 @@ const instantiateNftLaunchpad = async (
   }
   let nftCodeId = featureObject.nftTr721CodeId;
   if (!nftCodeId) {
+    console.error("No NFT TR721 code ID found. Deploying NFT TR721 ...");
     nftCodeId = await deployNftTr721({
       opts,
       networkId: network.id,
       deployerWallet,
     });
   }
+
+  let daoProposalSingleContractAddress =
+    featureObject.daoProposalSingleContractAddress;
+  if (!daoProposalSingleContractAddress) {
+    console.error(
+      "No DAO Proposal Single contract address found. Instantiating DAO Proposal Single...",
+    );
+    daoProposalSingleContractAddress = await instantiateDaoProposalSingle(
+      opts,
+      deployerWallet,
+      launchpadAdmin,
+      network,
+    );
+  }
+
   const instantiateMsg: NftLaunchpadInstantiateMsg = {
     config: {
       name: "Teritori NFT Launchpad",
       owner: deployerAddr,
       admin: launchpadAdmin,
       nft_code_id: nftCodeId,
+      dao_proposal_single_contract_addr: daoProposalSingleContractAddress,
     },
   };
   return await instantiateContract(
@@ -107,6 +124,68 @@ const instantiateNftLaunchpad = async (
   );
 };
 
+const instantiateDaoProposalSingle = async (
+  opts: DeployOpts,
+  deployerWallet: string,
+  adminAddr: string,
+  network: CosmosNetworkInfo,
+) => {
+  let codeId = network.daoProposalSingleCodeId;
+  if (!codeId) {
+    console.error(
+      "No DAO Proposal Single code ID. Deploying DAO Proposal Single...",
+    );
+    codeId = deployDaoProposalSingle({
+      opts,
+      networkId: network.id,
+      deployerWallet,
+    });
+  }
+  return await instantiateContract(
+    opts,
+    deployerWallet,
+    network,
+    codeId,
+    adminAddr,
+    "Teritori DAO Proposal Single",
+    {},
+  );
+};
+
+const deployDaoProposalSingle = async ({
+  opts,
+  networkId,
+  deployerWallet,
+}: {
+  networkId: string;
+  deployerWallet: string;
+  opts: DeployOpts;
+}) => {
+  const { network } = await initDeploy({
+    opts,
+    networkId,
+    wallet: deployerWallet,
+  });
+  const cosmwasmLaunchpadFeature = cloneDeep(
+    getNetworkFeature(networkId, NetworkFeature.CosmWasmNFTLaunchpad),
+  );
+  if (!cosmwasmLaunchpadFeature) {
+    console.error(`Cosmwasm Launchpad feature not found on ${networkId}`);
+    process.exit(1);
+  }
+  const daoProposalSingleFilePath = path.join(
+    __dirname,
+    "dao_proposal_single.wasm",
+  );
+  const daoProposalSingleCodeId = await storeWASM(
+    opts,
+    deployerWallet,
+    network,
+    daoProposalSingleFilePath,
+  );
+  return daoProposalSingleCodeId;
+};
+
 const deployNftTr721 = async ({
   opts,
   networkId,

rust/cw-contracts/nft-launchpad/config-mainnet.json

@@ -4,6 +4,7 @@
     "supported_networks": ["teritori"],
     "owner": "",
     "deployer": "",
-    "nft_code_id": 0
+    "nft_code_id": 0,
+    "dao_proposal_single_contract_addr": ""
   } 
 }

rust/cw-contracts/nft-launchpad/config.json

@@ -4,6 +4,7 @@
     "supported_networks": ["teritori-testnet"],
     "owner": "tori1llmym9upcpwnz7qte856ghlp5437ezz2gg7z0q",
     "admin": "tori1kjvyqf4mttwrhfuq5gfj9xgxx9jdt92xnxzf770x853567ymx8cscrnw05",
-    "nft_code_id": 60
+    "nft_code_id": 60,
+    "dao_proposal_single_contract_addr": ""
   } 
 }

rust/cw-contracts/nft-launchpad/src/contract.rs

@@ -133,6 +133,8 @@ impl NftLaunchpad {
         merkle_root: String,
     ) -> Result<Response, ContractError> {
         let storage = ctx.deps.storage;
+        let config = self.config.load(ctx.deps.storage)?;
+
 
         let mut collection = self
             .collections
@@ -155,72 +157,51 @@ impl NftLaunchpad {
         // Update collection
         self.collections.save(storage, collection_id, &collection)?;
 
-        Ok(Response::new()
-            .add_attribute("action", "update_merkle_root")
-            .add_attribute("merkle_root", merkle_root))
-    }
 
-    #[msg(exec)]
-    pub fn deploy_collection(
-        &self,
-        ctx: ExecCtx,
-        collection_id: String,
-    ) -> Result<Response, ContractError> {
-        let sender = ctx.info.sender.to_string();
-        let config = self.config.load(ctx.deps.storage)?;
 
-        // Only allow launchpad_admin to deploy
-        if sender != config.admin {
-            return Err(ContractError::WrongDeployer);
-        }
+        // TODO:
+        // MAKE THE PROPOSAL
 
-        let collection = self
-            .collections
-            .load(ctx.deps.storage, collection_id.to_owned())
-            .map_err(|_| ContractError::CollectionNotFound)?;
 
-        // Do not allow to deploy collection if merkle root is not set
-        if collection.metadatas_merkle_root.is_none() {
-            return Err(ContractError::MerkleRootMissing);
-        }
+        
+        // verify proposal_id exists using DA0 contract
+
+        // vote yes to this proposal
 
-        let nft_code_id = config.nft_code_id;
-
-        // NOTE: cannot use wasm_instantiate because we need to specify admin
-        let instantiate_msg = WasmMsg::Instantiate {
-            admin: Some(sender.clone()),
-            code_id: nft_code_id,
-            msg: to_json_binary(&Tr721InstantiateMsg {
-                admin: sender.clone(),
-                name: collection.name.clone(),
-                symbol: collection.symbol.clone(),
-                minter: sender,
-                launchpad_contract: "launchpad_contract".to_string(),
-                mint_info: Tr721MintInfo {
-                    metadatas_merkle_root: collection.metadatas_merkle_root.unwrap(),
-                    tokens_count: collection.tokens_count,
-                    royalty_address: collection.royalty_address,
-                    royalty_percentage: collection.royalty_percentage,
-                },
-                mint_periods: collection.mint_periods,
+        // emit "project_id"
+
+        // with indexer, listen to vote_approve_project and trigger UpdateApprovedProject
+
+        let proposal_contract_addr = config.dao_proposal_single_contract_addr;
+
+        let proposal_msg = WasmMsg::Execute {
+            contract_addr: proposal_contract_addr.to_string(),
+            msg: to_json_binary(&dao_contracts::msg::ExecuteMsg::Propose {
+                title: format!("Approve Merkle Root Update for {}", collection_id),
+                description: format!(
+                    "Update the Merkle root for collection {} to {}.",
+                    collection_id, merkle_root
+                ),
+                msgs: vec![cosmwasm_std::CosmosMsg::Wasm(WasmMsg::Execute {
+                    contract_addr: ctx.env.contract.address.to_string(),
+                    msg: to_json_binary(&Self::msg().approve_merkle_root_update {
+                        collection_id: collection_id.clone(),
+                    })?,
+                    funds: vec![],
+                })],
             })?,
             funds: vec![],
-            label: format!(
-                "TR721 codeId:{} collectionId:{} symbol:{}",
-                nft_code_id, collection_id, collection.symbol
-            ),
         };
 
-        // Update instantiating collection id
-        self.instantiating_collection_id
-            .save(ctx.deps.storage, &collection_id)?;
 
-        let submessage = SubMsg::reply_on_success(instantiate_msg, INSTANTIATE_REPLY_ID);
 
         Ok(Response::new()
-            .add_submessage(submessage)
-            .add_attribute("action", "collection_deployed")
-            .add_attribute("collection_id", collection_id))
+        // TODO:
+        // .add_message(makeProposalMsg)
+            .add_attribute("action", "update_merkle_root")
+            .add_attribute("merkle_root", merkle_root))
+        // TODO:
+        // .add_attribute("proposal_id", proposal_id))
     }
 
     #[msg(query)]
@@ -274,6 +255,7 @@ pub struct Config {
     pub nft_code_id: u64,
     pub admin: Addr,
     pub owner: Addr,
+    pub dao_proposal_single_contract_addr: Addr,
 }
 
 #[cw_serde]
@@ -282,6 +264,7 @@ pub struct ConfigChanges {
     pub nft_code_id: Option<u64>,
     pub admin: Option<String>,
     pub owner: Option<String>,
+    pub dao_proposal_single_contract_addr: Option<Addr>,
 }
 
 #[cw_serde]