Prepare for v2.0.2 release. (#637)

codecov.yml

@@ -0,0 +1,5 @@
+ignore:
+ - "ci"
+ - "packages/dao-macros"
+ - "packages/dao-testing"
+ - "test-contracts"

contracts/dao-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-core"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/dao-core/schema/dao-core.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "dao-core",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",
@@ -965,6 +965,7 @@
  "type": "object"
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",

contracts/external/cw-admin-factory/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name ="cw-admin-factory"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["Jake Hartnell", "blue-note", "ekez <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/external/cw-admin-factory/schema/cw-admin-factory.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "cw-admin-factory",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-payroll-factory/src/msg.rs

@@ -3,8 +3,6 @@ use cw20::Cw20ReceiveMsg;
 use cw_ownable::cw_ownable;
 use cw_vesting::msg::InstantiateMsg as PayrollInstantiateMsg;
 
-use crate::state::VestingContract;
-
 #[cw_serde]
 pub struct InstantiateMsg {
  pub owner: Option<String>,
@@ -41,40 +39,40 @@ pub enum ReceiveMsg {
 #[derive(QueryResponses)]
 pub enum QueryMsg {
  /// Returns list of all vesting payment contracts
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContracts {
  start_after: Option<String>,
  limit: Option<u32>,
  },
  /// Returns list of all vesting payment contracts in reverse
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContractsReverse {
  start_before: Option<String>,
  limit: Option<u32>,
  },
  /// Returns list of all vesting payment contracts by who instantiated them
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContractsByInstantiator {
  instantiator: String,
  start_after: Option<String>,
  limit: Option<u32>,
  },
  /// Returns list of all vesting payment contracts by who instantiated them in reverse
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContractsByInstantiatorReverse {
  instantiator: String,
  start_before: Option<String>,
  limit: Option<u32>,
  },
  /// Returns list of all vesting payment contracts by recipient
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContractsByRecipient {
  recipient: String,
  start_after: Option<String>,
  limit: Option<u32>,
  },
  /// Returns list of all vesting payment contracts by recipient in reverse
- #[returns(Vec<VestingContract>)]
+ #[returns(Vec<crate::state::VestingContract>)]
  ListVestingContractsByRecipientReverse {
  recipient: String,
  start_before: Option<String>,

contracts/external/cw-token-swap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cw-token-swap"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/external/cw-token-swap/schema/cw-token-swap.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "cw-token-swap",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-vesting/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cw-vesting"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["Jake Hartnell", "ekez <[email protected]>", "blue-note"]
 edition = "2021"
 

contracts/external/cw-vesting/schema/cw-vesting.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "cw-vesting",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/dao-migrator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-migrator"
-version = "2.0.0-beta"
+version = "2.0.2"
 authors = ["Art3mix <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/external/dao-migrator/schema/dao-migrator.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "dao-migrator",
- "contract_version": "2.0.0-beta",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",
@@ -981,6 +981,7 @@
  "type": "object"
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",
@@ -2834,6 +2835,7 @@
  ]
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",
@@ -4014,6 +4016,7 @@
  ]
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",
@@ -5139,6 +5142,7 @@
  ]
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",

contracts/pre-propose/dao-pre-propose-approval-single/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-pre-propose-approval-single"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/pre-propose/dao-pre-propose-approval-single/schema/dao-pre-propose-approval-single.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "dao-pre-propose-approval-single",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",
@@ -752,6 +752,7 @@
  ]
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",

contracts/pre-propose/dao-pre-propose-approver/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-pre-propose-approver"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/pre-propose/dao-pre-propose-approver/schema/dao-pre-propose-approver.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "dao-pre-propose-approver",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",

contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-pre-propose-multiple"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>", "blue-note"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"

contracts/pre-propose/dao-pre-propose-multiple/schema/dao-pre-propose-multiple.json

@@ -1,6 +1,6 @@
 {
  "contract_name": "dao-pre-propose-multiple",
- "contract_version": "2.0.1",
+ "contract_version": "2.0.2",
  "idl_version": "1.0.0",
  "instantiate": {
  "$schema": "http://json-schema.org/draft-07/schema#",
@@ -670,6 +670,7 @@
  "type": "object"
  },
  "GovMsg": {
+ "description": "This message type allows the contract interact with the [x/gov] module in order to cast votes.\n\n[x/gov]: https://github.com/cosmos/cosmos-sdk/tree/v0.45.12/x/gov\n\n## Examples\n\nCast a simple vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); use cosmwasm_std::{GovMsg, VoteOption};\n\n#[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::Vote { proposal_id: 4, vote: VoteOption::Yes, })) } ```\n\nCast a weighted vote:\n\n``` # use cosmwasm_std::{ # HexBinary, # Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo, # Response, QueryResponse, # }; # type ExecuteMsg = (); # #[cfg(feature = \"cosmwasm_1_2\")] use cosmwasm_std::{Decimal, GovMsg, VoteOption, WeightedVoteOption};\n\n# #[cfg(feature = \"cosmwasm_1_2\")] #[entry_point] pub fn execute( deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg, ) -> Result<Response, StdError> { // ... Ok(Response::new().add_message(GovMsg::VoteWeighted { proposal_id: 4, options: vec![ WeightedVoteOption { option: VoteOption::Yes, weight: Decimal::percent(65), }, WeightedVoteOption { option: VoteOption::Abstain, weight: Decimal::percent(35), }, ], })) } ```",
  "oneOf": [
  {
  "description": "This maps directly to [MsgVote](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/proto/cosmos/gov/v1beta1/tx.proto#L46-L56) in the Cosmos SDK with voter set to the contract address.",

contracts/pre-propose/dao-pre-propose-single/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dao-pre-propose-single"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["ekez <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/DA0-DA0/dao-contracts"