Progress on leagues and cw-orch

also start using a justfile single eliminations getting tested double elims will need a rework
Arena-DAO · May 30, 2024 · b93d4d3 · b93d4d3
1 parent 0897f7a
commit b93d4d3
Show file tree

Hide file tree

Showing 31 changed files with 2,729 additions and 278 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,8 @@
 [workspace]
 members = [
 	"contracts/*",
-	"packages/*",
+	"packages/*", 
+	"scripts"
 	]
 resolver = "2"
 
@@ -45,19 +46,23 @@ bnum = "0.11.0"
 cw-paginate = "0.2.1"
 cw-ownable = "0.5.1"
 cw-address-like = "1.0.4"
-itertools = "0.12.1"
+itertools = "0.13.0"
+cw-orch = "0.22.2"
+semver = "1.0.23"
 
 #arena_dao dependencies
 cw-competition-base = { path = "./packages/cw-competition-base", features = ["library"] }
 cw-balance = { path = "./packages/cw-balance", features = ["library"] }
 arena-testing = { path = "./packages/arena-testing" }
 cw-competition = { path = "./packages/cw-competition" }
 arena-core-interface = { path = "./packages/arena-core-interface" }
+interface = { path = "./packages/interface" }
 
 arena-core = { path = "./contracts/arena-core" }
 arena-escrow = { path = "./contracts/arena-escrow" }
 arena-wager-module = { path = "./contracts/arena-wager-module" }
 arena-league-module = { path = "./contracts/arena-league-module" }
+arena-tournament-module = { path = "./contracts/arena-tournament-module" }
 
 #dao dependencies
 dao-interface = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main" }
@@ -68,4 +73,4 @@ dao-voting = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main"
 dao-voting-cw4 = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main", features = ["library"]}
 dao-proposal-sudo = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main", features = ["library"]}
 dao-pre-propose-base = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main", features = ["library"] }
-dao-dao-core = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main", features = ["library"] }
+dao-dao-core = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "main", features = ["library"] }
diff --git a/contracts/arena-escrow/Cargo.toml b/contracts/arena-escrow/Cargo.toml
@@ -29,6 +29,7 @@ cw-competition = { workspace = true }
 cw-paginate = { workspace = true }
 cw-ownable = { workspace = true }
 arena-core-interface = { workspace = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }

diff --git a/contracts/arena-escrow/src/msg.rs b/contracts/arena-escrow/src/msg.rs
@@ -18,6 +18,7 @@ pub struct InstantiateMsg {
 
 #[cw_ownable_execute]
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     Withdraw {
         cw20_msg: Option<Binary>,
@@ -37,7 +38,7 @@ pub enum ExecuteMsg {
 
 #[cw_ownable_query]
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(Vec<MemberBalanceChecked>)]
     Balances {

diff --git a/contracts/arena-tournament-module/Cargo.toml b/contracts/arena-tournament-module/Cargo.toml
@@ -28,4 +28,5 @@ dao-interface = { workspace = true }
 cw-ownable = { workspace = true }
 itertools = { workspace = true }
 cw-balance = { workspace = true }
-cw-paginate = { workspace = true }
+cw-paginate = { workspace = true }
+cw-orch = { workspace = true }