build(deps): update to cosmwasm v1.1 (#7)

Cargo.toml

@@ -9,3 +9,14 @@ overflow-checks = true
 opt-level = 3
 debug = false
 debug-assertions = false
+
+[workspace.dependencies]
+cosmwasm-schema = "1.1.9"
+cosmwasm-std = { version = "1.1.9", features = ["stargate"] }
+cosmwasm-storage = "1.1.9"
+cw-storage-plus = "1.0.1"
+cw-utils = "1.0.1"
+cw2 = "1.0.1"
+schemars = "0.8.11"
+serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.37" }

contracts/increment/Cargo.toml

@@ -40,16 +40,16 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = "=1.0.0"
-cosmwasm-storage = "=1.0.0"
 archway-bindings = { version = "0.1.0", path = "../../packages/bindings" }
-cw-storage-plus = "0.14"
-cw-utils = "0.14"
-cw2 = "0.14"
-schemars = "0.8"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw-utils = { workspace = true }
+cw2 = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
 serde-json-wasm = "0.5"
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-schema = "=1.0.0"

contracts/increment/src/msg.rs

@@ -1,39 +1,42 @@
-use archway_bindings::Coins;
+use archway_bindings::{
+    types::{gov, rewards},
+    Coins,
+};
+use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::Addr;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[cw_serde]
 pub struct InstantiateMsg {
     pub count: i32,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub enum ExecuteMsg {
     Increment {},
     Reset { count: i32 },
     UpdateRewardsAddress { rewards_address: Option<Addr> },
     WithdrawRewards {},
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
+#[derive(QueryResponses)]
 pub enum QueryMsg {
-    // GetCount returns the current count as a json-encoded number
+    #[returns(CountResponse)]
     GetCount {},
+    #[returns(rewards::ContractMetadataResponse)]
     Metadata { contract_address: Option<Addr> },
+    #[returns(OutstandingRewardsResponse)]
     OutstandingRewards {},
+    #[returns(gov::VoteResponse)]
     GovVote { proposal_id: u64, voter: Addr },
 }
 
-// We define a custom struct for each query response
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[cw_serde]
 pub struct CountResponse {
     pub count: i32,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[cw_serde]
 pub struct OutstandingRewardsResponse {
     pub rewards_balance: Coins,
     pub total_records: u64,

packages/bindings/Cargo.toml

@@ -12,7 +12,8 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = { version = "=1.0.0", features = ["stargate"] }
-schemars = "0.8.11"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.37" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }

packages/bindings/src/msg.rs

@@ -1,10 +1,7 @@
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{CosmosMsg, CustomMsg};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
-#[non_exhaustive]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub enum ArchwayMsg {
     UpdateContractMetadata {
         owner_address: Option<String>,

packages/bindings/src/pagination.rs

@@ -1,8 +1,7 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use cosmwasm_schema::cw_serde;
 
-#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
+#[derive(Default)]
 pub struct PageRequest {
     key: Option<String>,
     offset: Option<u64>,
@@ -42,8 +41,7 @@ impl PageRequest {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct PageResponse {
     pub next_key: Option<String>,
     pub total: Option<u64>,

packages/bindings/src/query.rs

@@ -1,24 +1,21 @@
+use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::CustomQuery;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
 use crate::pagination::PageRequest;
+use crate::types::{gov, rewards};
 
-#[non_exhaustive]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
+#[derive(QueryResponses)]
 pub enum ArchwayQuery {
-    ContractMetadata {
-        contract_address: String,
-    },
+    #[returns(rewards::ContractMetadataResponse)]
+    ContractMetadata { contract_address: String },
+    #[returns(rewards::RewardsRecordsResponse)]
     RewardsRecords {
         rewards_address: String,
         pagination: Option<PageRequest>,
     },
-    GovVote {
-        proposal_id: u64,
-        voter: String,
-    },
+    #[returns(gov::VoteResponse)]
+    GovVote { proposal_id: u64, voter: String },
 }
 
 impl CustomQuery for ArchwayQuery {}

packages/bindings/src/types/gov.rs

@@ -1,23 +1,19 @@
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::VoteOption;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct VoteResponse {
     pub vote: Vote,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct Vote {
     pub proposal_id: u64,
     pub voter: String,
     pub options: Vec<WeightedVoteOption>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct WeightedVoteOption {
     pub option: VoteOption,
     pub weight: String,

packages/bindings/src/types/rewards.rs

@@ -1,31 +1,26 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use cosmwasm_schema::cw_serde;
 
 use crate::{Coins, PageResponse};
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct WithdrawRewardsResponse {
     pub records_num: u64,
     pub total_rewards: Coins,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct ContractMetadataResponse {
     pub owner_address: String,
     pub rewards_address: String,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct RewardsRecordsResponse {
     pub records: Vec<RewardsRecord>,
     pub pagination: Option<PageResponse>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub struct RewardsRecord {
     pub id: u64,
     pub rewards_address: String,