Optional team size requirement for enrollments

Arena-DAO · Dec 26, 2024 · 67008b5 · 67008b5
1 parent d38ce70
commit 67008b5
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/arena-competition-enrollment/Cargo.toml b/contracts/arena-competition-enrollment/Cargo.toml
@@ -34,3 +34,5 @@ cw-ownable = { workspace = true }
 cw-orch = { workspace = true }
 cw-balance = { workspace = true }
 itertools = { workspace = true }
+dao-voting-cw4 = { workspace = true }
+cw4 = { workspace = true }
diff --git a/contracts/arena-competition-enrollment/schema/arena-competition-enrollment.json b/contracts/arena-competition-enrollment/schema/arena-competition-enrollment.json
@@ -82,6 +82,14 @@
                     "type": "null"
                   }
                 ]
+              },
+              "require_team_size": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
               }
             },
             "additionalProperties": false
@@ -1163,6 +1171,14 @@
                 "type": "null"
               }
             ]
+          },
+          "require_team_size": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "uint32",
+            "minimum": 0.0
           }
         },
         "additionalProperties": false
@@ -1349,6 +1365,14 @@
               "type": "null"
             }
           ]
+        },
+        "require_team_size": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint32",
+          "minimum": 0.0
         }
       },
       "additionalProperties": false,
@@ -1950,6 +1974,14 @@
                   "type": "null"
                 }
               ]
+            },
+            "require_team_size": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
             }
           },
           "additionalProperties": false

diff --git a/contracts/arena-competition-enrollment/src/contract.rs b/contracts/arena-competition-enrollment/src/contract.rs
@@ -59,6 +59,7 @@ pub fn execute(
             competition_info,
             competition_type,
             group_contract_info,
+            require_team_size,
         } => execute::create_enrollment(
             deps,
             env,
@@ -71,6 +72,7 @@ pub fn execute(
             competition_info,
             competition_type,
             group_contract_info,
+            require_team_size,
         ),
         ExecuteMsg::TriggerExpiration { id, escrow_id } => {
             execute::trigger_expiration(deps, env, info, id, escrow_id)

diff --git a/contracts/arena-competition-enrollment/src/error.rs b/contracts/arena-competition-enrollment/src/error.rs
@@ -59,4 +59,7 @@ pub enum ContractError {
 
     #[error("Enrollment is at max members already")]
     EnrollmentMaxMembers {},
+
+    #[error("Only teams of size {required_team_size} can enroll")]
+    TeamSizeMismatch { required_team_size: u32 },
 }
diff --git a/contracts/arena-competition-enrollment/src/execute.rs b/contracts/arena-competition-enrollment/src/execute.rs
@@ -26,6 +26,8 @@ use crate::{
 };
 
 pub const TRIGGER_COMPETITION_REPLY_ID: u64 = 1;
+/// Team size is limited to cw4-group's max size limit
+const TEAM_SIZE_LIMIT: u32 = 30;
 
 #[allow(clippy::too_many_arguments)]
 pub fn create_enrollment(
@@ -40,6 +42,7 @@ pub fn create_enrollment(
     competition_info: CompetitionInfoMsg,
     competition_type: CompetitionType,
     group_contract_info: ModuleInstantiateInfo,
+    require_team_size: Option<u32>,
 ) -> Result<Response, ContractError> {
     ensure!(
         !expiration.is_expired(&env.block),
@@ -186,6 +189,7 @@ pub fn create_enrollment(
             category_id,
             competition_module,
             group_contract,
+            required_team_size: require_team_size,
         },
     )?;
 
@@ -424,6 +428,30 @@ pub fn enroll(
         ContractError::EnrollmentMaxMembers {}
     );
 
+    // Ensure team size requirement is handled
+    if let Some(required_team_size) = entry.required_team_size {
+        let dao_voting_module: Addr = deps.querier.query_wasm_smart(
+            info.sender.to_string(),
+            &dao_interface::msg::QueryMsg::VotingModule {},
+        )?;
+        let group_contract: Addr = deps.querier.query_wasm_smart(
+            dao_voting_module,
+            &dao_voting_cw4::msg::QueryMsg::GroupContract {},
+        )?;
+        let member_list_response: cw4::MemberListResponse = deps.querier.query_wasm_smart(
+            group_contract,
+            &cw4::Cw4QueryMsg::ListMembers {
+                start_after: None,
+                limit: Some(TEAM_SIZE_LIMIT),
+            },
+        )?;
+
+        ensure!(
+            member_list_response.members.len() as u32 == required_team_size,
+            ContractError::TeamSizeMismatch { required_team_size }
+        );
+    }
+
     let msg = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: entry.group_contract.to_string(),
         msg: to_json_binary(&group::ExecuteMsg::UpdateMembers {

diff --git a/contracts/arena-competition-enrollment/src/migrate.rs b/contracts/arena-competition-enrollment/src/migrate.rs
@@ -57,6 +57,7 @@ pub fn from_v2_to_v2_1(deps: DepsMut, env: &Env, group_id: u64) -> StdResult<Vec
             category_id: enrollment.category_id,
             competition_module: enrollment.competition_module,
             group_contract,
+            required_team_size: None,
         };
 
         enrollment_entries().replace(

diff --git a/contracts/arena-competition-enrollment/src/msg.rs b/contracts/arena-competition-enrollment/src/msg.rs
@@ -28,6 +28,7 @@ pub enum ExecuteMsg {
         competition_info: CompetitionInfoMsg,
         competition_type: CompetitionType,
         group_contract_info: ModuleInstantiateInfo,
+        require_team_size: Option<u32>,
     },
     TriggerExpiration {
         id: Uint128,

diff --git a/contracts/arena-competition-enrollment/src/state.rs b/contracts/arena-competition-enrollment/src/state.rs
@@ -20,6 +20,7 @@ pub struct EnrollmentEntry {
     pub category_id: Option<Uint128>,
     pub competition_module: Addr,
     pub group_contract: Addr,
+    pub required_team_size: Option<u32>,
 }
 
 #[cw_serde]
@@ -52,6 +53,7 @@ pub struct EnrollmentEntryResponse {
     pub is_expired: bool,
     pub competition_module: Addr,
     pub group_contract: Addr,
+    pub require_team_size: Option<u32>,
 }
 
 #[cw_serde]
@@ -96,6 +98,7 @@ impl EnrollmentEntry {
             is_expired,
             competition_module: self.competition_module,
             group_contract: self.group_contract,
+            require_team_size: self.required_team_size,
         })
     }
 }

diff --git a/scripts/src/tests/arena_competition_enrollment.rs b/scripts/src/tests/arena_competition_enrollment.rs
@@ -76,6 +76,7 @@ fn test_competition_enrollment() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     let res = arena
@@ -195,6 +196,7 @@ fn test_invalid_enrollment() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     let result = arena
@@ -263,6 +265,7 @@ fn test_enrollment_capacity() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -345,6 +348,7 @@ fn test_successful_tournament_creation() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -428,6 +432,7 @@ fn test_successful_wager_creation() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -524,6 +529,7 @@ fn test_successful_league_creation() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -603,6 +609,7 @@ fn test_trigger_expiration_without_escrow() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -692,6 +699,7 @@ fn test_trigger_expiration_before_min_members() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -775,6 +783,7 @@ fn test_unregistered_competition_enrollment() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena
@@ -880,6 +889,7 @@ fn test_huge_tournament() -> anyhow::Result<()> {
             funds: vec![],
             label: "Arena Group".to_string(),
         },
+        require_team_size: None,
     };
 
     arena