Fix WASM build

contracts/voting/dao-voting-token-staked/src/contract.rs

@@ -15,9 +15,10 @@ use cw_utils::{
     maybe_addr, must_pay, parse_reply_execute_data, parse_reply_instantiate_data, Duration,
 };
 use dao_hooks::stake::{stake_hook_msgs, unstake_hook_msgs};
-use dao_interface::state::ModuleInstantiateCallback;
-use dao_interface::voting::{
-    IsActiveResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
+use dao_interface::{
+    state::ModuleInstantiateCallback,
+    token::{FactoryCallback, InitialBalance, NewTokenInfo},
+    voting::{IsActiveResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse},
 };
 use dao_voting::{
     duration::validate_duration,
@@ -29,8 +30,8 @@ use dao_voting::{
 
 use crate::error::ContractError;
 use crate::msg::{
-    DenomResponse, ExecuteMsg, FactoryCallback, GetHooksResponse, InitialBalance, InstantiateMsg,
-    ListStakersResponse, MigrateMsg, NewTokenInfo, QueryMsg, StakerBalanceResponse, TokenInfo,
+    DenomResponse, ExecuteMsg, GetHooksResponse, InstantiateMsg, ListStakersResponse, MigrateMsg,
+    QueryMsg, StakerBalanceResponse, TokenInfo,
 };
 use crate::state::{
     Config, ACTIVE_THRESHOLD, CLAIMS, CONFIG, DAO, DENOM, HOOKS, MAX_CLAIMS, STAKED_BALANCES,

contracts/voting/dao-voting-token-staked/src/msg.rs

@@ -1,47 +1,10 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{Binary, Uint128};
-use cw_tokenfactory_issuer::msg::DenomUnit;
 use cw_utils::Duration;
 use dao_dao_macros::{active_query, token_query, voting_module_query};
+use dao_interface::token::NewTokenInfo;
 use dao_voting::threshold::{ActiveThreshold, ActiveThresholdResponse};
 
-#[cw_serde]
-pub struct InitialBalance {
-    pub amount: Uint128,
-    pub address: String,
-}
-
-#[cw_serde]
-pub struct NewDenomMetadata {
-    /// The name of the token (e.g. "Cat Coin")
-    pub name: String,
-    /// The description of the token
-    pub description: String,
-    /// The ticker symbol of the token (e.g. "CAT")
-    pub symbol: String,
-    /// The unit commonly used in communication (e.g. "cat")
-    pub display: String,
-    /// Used define additional units of the token (e.g. "tiger")
-    /// These must have an exponent larger than 0.
-    pub additional_denom_units: Option<Vec<DenomUnit>>,
-}
-
-#[cw_serde]
-pub struct NewTokenInfo {
-    /// The code id of the cw-tokenfactory-issuer contract
-    pub token_issuer_code_id: u64,
-    /// The subdenom of the token to create, will also be used as an alias
-    /// for the denom. The Token Factory denom will have the format of
-    /// factory/{contract_address}/{subdenom}
-    pub subdenom: String,
-    /// Optional metadata for the token, this can additionally be set later.
-    pub metadata: Option<NewDenomMetadata>,
-    /// The initial balances to set for the token, cannot be empty.
-    pub initial_balances: Vec<InitialBalance>,
-    /// Optional balance to mint for the DAO.
-    pub initial_dao_balance: Option<Uint128>,
-}
-
 #[cw_serde]
 pub enum TokenInfo {
     /// Uses an existing Token Factory token and creates a new issuer contract.
@@ -138,9 +101,3 @@ pub struct DenomResponse {
 pub struct GetHooksResponse {
     pub hooks: Vec<String>,
 }
-
-#[cw_serde]
-pub struct FactoryCallback {
-    pub denom: String,
-    pub token_contract: Option<String>,
-}

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

@@ -1,7 +1,10 @@
 use cosmwasm_std::{to_binary, Addr, Coin, Decimal, Uint128, WasmMsg};
 use cw_tokenfactory_issuer::msg::DenomUnit;
 use cw_utils::Duration;
-use dao_interface::state::{Admin, ModuleInstantiateInfo};
+use dao_interface::{
+    state::{Admin, ModuleInstantiateInfo},
+    token::{InitialBalance, NewDenomMetadata, NewTokenInfo},
+};
 use dao_testing::test_tube::dao_dao_core::DaoCore;
 use dao_voting::{
     pre_propose::PreProposeInfo,
@@ -11,7 +14,7 @@ use osmosis_std::types::cosmos::bank::v1beta1::QueryBalanceRequest;
 use osmosis_test_tube::{Account, OsmosisTestApp};
 
 use crate::{
-    msg::{ExecuteMsg, InitialBalance, InstantiateMsg, NewDenomMetadata, NewTokenInfo, TokenInfo},
+    msg::{ExecuteMsg, InstantiateMsg, TokenInfo},
     tests::test_tube::test_env::TokenVotingContract,
     ContractError,
 };
@@ -349,16 +352,14 @@ fn test_factory() {
                         contract_addr: custom_factory.unwrap().contract_addr.to_string(),
                         msg: to_binary(
                             &dao_test_custom_factory::msg::ExecuteMsg::TokenFactoryFactory(
-                                dao_test_custom_factory::NewTokenInfo {
+                                NewTokenInfo {
                                     token_issuer_code_id: tf_issuer.code_id,
                                     subdenom: DENOM.to_string(),
                                     metadata: None,
-                                    initial_balances: vec![
-                                        dao_test_custom_factory::InitialBalance {
-                                            address: accounts[0].address(),
-                                            amount: Uint128::new(100),
-                                        },
-                                    ],
+                                    initial_balances: vec![InitialBalance {
+                                        address: accounts[0].address(),
+                                        amount: Uint128::new(100),
+                                    }],
                                     initial_dao_balance: None,
                                 },
                             ),

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

@@ -3,7 +3,7 @@
 #![allow(dead_code)]
 
 use crate::{
-    msg::{ExecuteMsg, InitialBalance, InstantiateMsg, NewTokenInfo, QueryMsg, TokenInfo},
+    msg::{ExecuteMsg, InstantiateMsg, QueryMsg, TokenInfo},
     ContractError,
 };
 
@@ -13,6 +13,7 @@ use cw_utils::Duration;
 use dao_interface::{
     msg::QueryMsg as DaoQueryMsg,
     state::{Admin, ModuleInstantiateInfo, ProposalModule},
+    token::{InitialBalance, NewDenomMetadata, NewTokenInfo},
     voting::{IsActiveResponse, VotingPowerAtHeightResponse},
 };
 use dao_voting::{
@@ -136,7 +137,7 @@ impl TestEnvBuilder {
                 token_info: TokenInfo::New(NewTokenInfo {
                     token_issuer_code_id: issuer_id,
                     subdenom: DENOM.to_string(),
-                    metadata: Some(crate::msg::NewDenomMetadata {
+                    metadata: Some(NewDenomMetadata {
                         description: "Awesome token, get it meow!".to_string(),
                         additional_denom_units: Some(vec![DenomUnit {
                             denom: "cat".to_string(),
@@ -208,7 +209,7 @@ impl TestEnvBuilder {
                     token_info: TokenInfo::New(NewTokenInfo {
                         token_issuer_code_id: issuer_id,
                         subdenom: DENOM.to_string(),
-                        metadata: Some(crate::msg::NewDenomMetadata {
+                        metadata: Some(NewDenomMetadata {
                             description: "Awesome token, get it meow!".to_string(),
                             additional_denom_units: Some(vec![DenomUnit {
                                 denom: "cat".to_string(),

justfile

@@ -59,14 +59,14 @@ 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/workspace-optimizer-arm64:0.13.0; \
+            cosmwasm/workspace-optimizer-arm64:0.14.0; \
     elif [[ $(uname -m) == 'aarch64' ]]; 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/arm64 \
-            cosmwasm/workspace-optimizer-arm64:0.13.0; \
+            cosmwasm/workspace-optimizer-arm64:0.14.0; \
     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/workspace-optimizer:0.13.0; fi
+            cosmwasm/workspace-optimizer:0.14.0; fi

packages/dao-interface/Cargo.toml

@@ -15,6 +15,7 @@ cw20 = { workspace = true }
 cw721 = { workspace = true }
 cw-hooks = { workspace = true }
 cw-utils = { workspace = true }
+osmosis-std = { workspace = true }
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }

packages/dao-interface/src/lib.rs

@@ -5,4 +5,5 @@ pub mod msg;
 pub mod proposal;
 pub mod query;
 pub mod state;
+pub mod token;
 pub mod voting;

packages/dao-interface/src/token.rs

@@ -0,0 +1,49 @@
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Uint128;
+
+// These are Cosmos Proto types used for Denom Metadata.
+// We re-export them here for convenience.
+pub use osmosis_std::types::cosmos::bank::v1beta1::{DenomUnit, Metadata};
+
+#[cw_serde]
+pub struct InitialBalance {
+    pub amount: Uint128,
+    pub address: String,
+}
+
+#[cw_serde]
+pub struct NewDenomMetadata {
+    /// The name of the token (e.g. "Cat Coin")
+    pub name: String,
+    /// The description of the token
+    pub description: String,
+    /// The ticker symbol of the token (e.g. "CAT")
+    pub symbol: String,
+    /// The unit commonly used in communication (e.g. "cat")
+    pub display: String,
+    /// Used define additional units of the token (e.g. "tiger")
+    /// These must have an exponent larger than 0.
+    pub additional_denom_units: Option<Vec<DenomUnit>>,
+}
+
+#[cw_serde]
+pub struct NewTokenInfo {
+    /// The code id of the cw-tokenfactory-issuer contract
+    pub token_issuer_code_id: u64,
+    /// The subdenom of the token to create, will also be used as an alias
+    /// for the denom. The Token Factory denom will have the format of
+    /// factory/{contract_address}/{subdenom}
+    pub subdenom: String,
+    /// Optional metadata for the token, this can additionally be set later.
+    pub metadata: Option<NewDenomMetadata>,
+    /// The initial balances to set for the token, cannot be empty.
+    pub initial_balances: Vec<InitialBalance>,
+    /// Optional balance to mint for the DAO.
+    pub initial_dao_balance: Option<Uint128>,
+}
+
+#[cw_serde]
+pub struct FactoryCallback {
+    pub denom: String,
+    pub token_contract: Option<String>,
+}

test-contracts/dao-proposal-hook-counter/src/contract.rs

@@ -66,12 +66,12 @@ pub fn execute_proposal_hook(
     match proposal_hook {
         ProposalHookMsg::NewProposal { .. } => {
             let mut count = PROPOSAL_COUNTER.load(deps.storage)?;
-            count += 1;
+            count = count.checked_add(1).unwrap_or_default();
             PROPOSAL_COUNTER.save(deps.storage, &count)?;
         }
         ProposalHookMsg::ProposalStatusChanged { .. } => {
             let mut count = STATUS_CHANGED_COUNTER.load(deps.storage)?;
-            count += 1;
+            count = count.checked_add(1).unwrap_or_default();
             STATUS_CHANGED_COUNTER.save(deps.storage, &count)?;
         }
     }
@@ -88,12 +88,12 @@ pub fn execute_stake_hook(
     match stake_hook {
         StakeChangedHookMsg::Stake { .. } => {
             let mut count = STAKE_COUNTER.load(deps.storage)?;
-            count += Uint128::new(1);
+            count = count.checked_add(Uint128::new(1))?;
             STAKE_COUNTER.save(deps.storage, &count)?;
         }
         StakeChangedHookMsg::Unstake { .. } => {
             let mut count = STAKE_COUNTER.load(deps.storage)?;
-            count += Uint128::new(1);
+            count = count.checked_add(Uint128::new(1))?;
             STAKE_COUNTER.save(deps.storage, &count)?;
         }
     }
@@ -110,7 +110,7 @@ pub fn execute_vote_hook(
     match vote_hook {
         VoteHookMsg::NewVote { .. } => {
             let mut count = VOTE_COUNTER.load(deps.storage)?;
-            count += 1;
+            count = count.checked_add(1).unwrap_or_default();
             VOTE_COUNTER.save(deps.storage, &count)?;
         }
     }

test-contracts/dao-proposal-hook-counter/src/error.rs

@@ -1,11 +1,14 @@
-use cosmwasm_std::StdError;
+use cosmwasm_std::{OverflowError, StdError};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum ContractError {
     #[error("{0}")]
     Std(#[from] StdError),
 
+    #[error(transparent)]
+    OverflowError(#[from] OverflowError),
+
     #[error("Unauthorized")]
     Unauthorized {},
 }

test-contracts/dao-test-custom-factory/Cargo.toml

@@ -27,12 +27,10 @@ cw-utils = { workspace = true }
 thiserror = { workspace = true }
 dao-dao-macros = { workspace = true }
 dao-interface = { workspace = true }
-dao-voting-cw721-staked = { workspace = true, features = ["library"] }
-dao-voting-token-staked = { workspace = true, features = ["library"] }
-vending-factory = { workspace = true, features = ["library"] }
-vending-minter = { workspace = true, features = ["library"] }
+# vending-factory = { workspace = true, features = ["library"] }
+# vending-minter = { workspace = true, features = ["library"] }
 cw-tokenfactory-issuer = { workspace = true, features = ["library"] }
-sg721-base = { workspace = true, features = ["library"] }
+# sg721-base = { workspace = true, features = ["library"] }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }

test-contracts/dao-test-custom-factory/src/contract.rs

@@ -10,8 +10,9 @@ use cw_tokenfactory_issuer::msg::{
     ExecuteMsg as IssuerExecuteMsg, InstantiateMsg as IssuerInstantiateMsg,
 };
 use cw_utils::parse_reply_instantiate_data;
-use dao_voting_token_staked::msg::{
-    FactoryCallback, InitialBalance, NewTokenInfo, QueryMsg as TokenVotingQueryMsg,
+use dao_interface::{
+    token::{FactoryCallback, InitialBalance, NewTokenInfo},
+    voting::Query as VotingModuleQueryMsg,
 };
 
 use crate::{
@@ -32,8 +33,8 @@ const TOKEN_INFO: Item<NewTokenInfo> = Item::new("token_info");
 pub fn instantiate(
     deps: DepsMut,
     _env: Env,
-    info: MessageInfo,
-    msg: InstantiateMsg,
+    _info: MessageInfo,
+    _msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
@@ -69,7 +70,7 @@ pub fn execute_token_factory_factory(
     // Query for DAO
     let dao: Addr = deps
         .querier
-        .query_wasm_smart(info.sender, &TokenVotingQueryMsg::Dao {})?;
+        .query_wasm_smart(info.sender, &VotingModuleQueryMsg::Dao {})?;
 
     // Save DAO and TOKEN_INFO for use in replies
     DAO.save(deps.storage, &dao)?;

test-contracts/dao-test-custom-factory/src/lib.rs

@@ -3,4 +3,3 @@ mod error;
 pub mod msg;
 
 pub use crate::error::ContractError;
-pub use dao_voting_token_staked::msg::{InitialBalance, NewTokenInfo};

test-contracts/dao-test-custom-factory/src/msg.rs

@@ -1,6 +1,6 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::WasmMsg;
-use dao_voting_token_staked::msg::NewTokenInfo;
+use dao_interface::token::NewTokenInfo;
 
 #[cw_serde]
 pub struct InstantiateMsg {}