From 809f707f13ce293f7e054ab74848c440b537caa5 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 9 Feb 2024 23:04:20 -0600
Subject: [PATCH] put template contract back to standalone project and fix
 cosmwasm-std version

---
 Cargo.lock                                    | 125 ++++++------------
 Cargo.toml                                    |  28 ++--
 contracts/attrs/src/contract.rs               |  26 ++--
 contracts/attrs/src/helpers.rs                |   8 +-
 contracts/ibc/local/src/contract.rs           |  10 +-
 contracts/ibc/local/src/ibc.rs                |  14 +-
 contracts/ibc/remote/src/contract.rs          |   6 +-
 contracts/marker/src/contract.rs              |  12 +-
 contracts/name/src/contract.rs                |  16 +--
 contracts/nft/src/query/all_nft_info.rs       |   4 +-
 contracts/nft/src/query/all_operators.rs      |   4 +-
 contracts/nft/src/query/all_tokens.rs         |   4 +-
 contracts/nft/src/query/approval.rs           |   6 +-
 contracts/nft/src/query/approvals.rs          |   4 +-
 contracts/nft/src/query/contract_info.rs      |   4 +-
 contracts/nft/src/query/contract_owner.rs     |   4 +-
 contracts/nft/src/query/contract_version.rs   |   4 +-
 contracts/nft/src/query/minter.rs             |   4 +-
 contracts/nft/src/query/nft_info.rs           |   4 +-
 contracts/nft/src/query/num_tokens.rs         |   4 +-
 contracts/nft/src/query/operator.rs           |   4 +-
 contracts/nft/src/query/owner_of.rs           |   4 +-
 contracts/nft/src/query/tokens.rs             |   4 +-
 contracts/scope/src/contract.rs               |  22 +--
 contracts/template/Cargo.lock                 |   4 +-
 contracts/template/Cargo.toml                 |  34 +++--
 contracts/template/src/query/query_owner.rs   |   8 +-
 contracts/template/src/query/query_version.rs |   8 +-
 contracts/template/src/query/router.rs        |   6 +-
 contracts/trigger/src/contract.rs             |   6 +-
 contracts/tutorial/src/contract.rs            |   8 +-
 packages/provwasm-mocks/src/querier.rs        |   6 +-
 32 files changed, 185 insertions(+), 220 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f23e284..d5d975d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -61,6 +61,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -112,12 +118,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "bnum"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9008b6bb9fc80b5277f2fe481c09e828743d9151203e804583eb4c9e15b31d"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.5.3"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e3a2136e2a60e8b6582f5dffca5d1a683ed77bf38537d330bc1dfccd69010"
+checksum = "e0864db0a1e0ba2abd35d1105d0487e779538f616daa0338697315cc1601bf24"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.5.3"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d803bea6bd9ed61bd1ee0b4a2eb09ee20dbb539cc6e0b8795614d20952ebb1"
+checksum = "2cd0f686ff907612ed63fdff97906b3eafe169d560ebd428e92ef400fb56479f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -207,13 +207,11 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.5.2"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad011ae7447188e26e4a7dbca2fcd0fc186aa21ae5c86df0503ea44c78f9e469"
+checksum = "197ed654c41885e2d76b23bff8db11b0f9745bfdede0909de9daa564edb19187"
 dependencies = [
- "base64",
- "bech32",
- "bnum",
+ "base64 0.13.1",
  "cosmwasm-crypto",
  "cosmwasm-derive",
  "derivative",
@@ -223,8 +221,8 @@ dependencies = [
  "serde",
  "serde-json-wasm",
  "sha2 0.10.8",
- "static_assertions",
  "thiserror",
+ "uint",
 ]
 
 [[package]]
@@ -236,6 +234,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-bigint"
 version = "0.4.9"
@@ -311,25 +315,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-multi-test"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d818f5323c80ed4890db7f89d65eda3f0261fe21878e628c27ea2d8de4b7ba4"
-dependencies = [
- "anyhow",
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "derivative",
- "itertools 0.11.0",
- "prost 0.12.3",
- "schemars",
- "serde",
- "sha2 0.10.8",
- "thiserror",
-]
-
 [[package]]
 name = "cw-ownable"
 version = "0.5.1"
@@ -358,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "cw-storage-plus"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c"
+checksum = "3f0e92a069d62067f3472c62e30adedb4cab1754725c0f2a682b3128d2bf3c79"
 dependencies = [
  "cosmwasm-std",
  "schemars",
@@ -369,9 +354,9 @@ dependencies = [
 
 [[package]]
 name = "cw-utils"
-version = "1.0.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c"
+checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -384,15 +369,14 @@ dependencies = [
 
 [[package]]
 name = "cw2"
-version = "1.1.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa"
+checksum = "29ac2dc7a55ad64173ca1e0a46697c31b7a5c51342f55a1e84a724da4eb99908"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-storage-plus",
  "schemars",
- "semver",
  "serde",
  "thiserror",
 ]
@@ -939,7 +923,7 @@ dependencies = [
  "bech32",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-multi-test 0.16.5",
+ "cw-multi-test",
  "cw-ownable",
  "cw-storage-plus",
  "cw-utils",
@@ -1077,16 +1061,6 @@ dependencies = [
  "prost-derive 0.11.9",
 ]
 
-[[package]]
-name = "prost"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
-dependencies = [
- "bytes",
- "prost-derive 0.12.3",
-]
-
 [[package]]
 name = "prost-build"
 version = "0.11.9"
@@ -1135,19 +1109,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "prost-derive"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
-dependencies = [
- "anyhow",
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "prost-types"
 version = "0.11.9"
@@ -1214,7 +1175,7 @@ dependencies = [
 name = "provwasm-std"
 version = "2.2.0"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "chrono",
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1604,24 +1565,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "template"
-version = "2.2.0"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-multi-test 0.17.0",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "provwasm-mocks",
- "provwasm-std",
- "schemars",
- "semver",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -1688,6 +1631,18 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.8"
diff --git a/Cargo.toml b/Cargo.toml
index 4b0221d7..4977f4ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,10 +14,12 @@ members = [
     "contracts/name",
     "contracts/nft",
     "contracts/scope",
-    "contracts/template",
     "contracts/trigger",
     "contracts/tutorial"
 ]
+exclude = [
+    "contracts/template"
+]
 
 [workspace.package]
 version = "2.2.0"
@@ -27,9 +29,9 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 ### CosmWasm
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", default-features = false }
-cw-storage-plus = { version = "1.2.0" }
+cosmwasm-schema = { version = "=1.2.8" }
+cosmwasm-std = { version = "=1.2.8", default-features = false }
+cw-storage-plus = { version = "=1.1.0" }
 
 ### ProvWasm
 provwasm-proto-build = { version = "0.1.0", path = "packages/proto-build" }
@@ -38,15 +40,15 @@ provwasm-mocks = { version = "2.2.0", path = "packages/provwasm-mocks" }
 provwasm-proc-macro = { version = "0.1.0", path = "packages/provwasm-proc-macro" }
 provwasm-std = { version = "2.2.0", path = "packages/provwasm-std" }
 
-base64 = "0.21.7"
-chrono = { version = "0.4.33", default-features = false }
-prost = { version = "0.11.9", default-features = false, features = ["prost-derive"] }
-prost-types = { version = "0.11.9", default-features = false }
-prost-build = "0.11.9"
-schemars = "0.8.16"
-serde = { version = "1.0.196", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.113", features = ["std"] }
-thiserror = { version = "1.0.56" }
+base64 = "=0.21.7"
+chrono = { version = "=0.4.33", default-features = false }
+prost = { version = "=0.11.9", default-features = false, features = ["prost-derive"] }
+prost-types = { version = "=0.11.9", default-features = false }
+prost-build = "=0.11.9"
+schemars = "=0.8.16"
+serde = { version = "=1.0.196", default-features = false, features = ["derive"] }
+serde_json = { version = "=1.0.113", features = ["std"] }
+thiserror = { version = "=1.0.56" }
 
 [profile.release]
 opt-level = 3
diff --git a/contracts/attrs/src/contract.rs b/contracts/attrs/src/contract.rs
index 9d39f17e..a61e848d 100644
--- a/contracts/attrs/src/contract.rs
+++ b/contracts/attrs/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 
 use provwasm_std::types::provenance::attribute::v1::{AttributeQuerier, AttributeType};
@@ -139,7 +139,7 @@ fn try_delete_distinct_label(
         env.contract.address.clone(),
         env.contract.address,
         &attr_name,
-        to_json_binary(&Label { text: value })?,
+        to_binary(&Label { text: value })?,
     )?;
     let res = Response::new()
         .add_message(msg)
@@ -163,11 +163,11 @@ fn try_update_label(
         env.contract.address.clone(),
         env.contract.address,
         &attr_name,
-        to_json_binary(&Label {
+        to_binary(&Label {
             text: original_text,
         })?,
         AttributeType::Json,
-        to_json_binary(&Label { text: update_text })?,
+        to_binary(&Label { text: update_text })?,
         AttributeType::Json,
     )?;
     let res = Response::new()
@@ -184,12 +184,12 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<QueryResponse, StdEr
     let state = CONFIG.load(deps.storage)?;
     let attr_name = format!("{}.{}", "label", state.contract_name);
     match msg {
-        QueryMsg::GetLabelName {} => to_json_binary(&LabelNameResponse { name: attr_name }),
+        QueryMsg::GetLabelName {} => to_binary(&LabelNameResponse { name: attr_name }),
         QueryMsg::GetLabels {} => {
             let querier = AttributeQuerier::new(&deps.querier);
             let labels: Vec<Label> =
                 get_json_attributes(querier, env.contract.address, &attr_name)?;
-            to_json_binary(&LabelsResponse { labels })
+            to_binary(&LabelsResponse { labels })
         }
     }
 }
@@ -203,7 +203,7 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response,
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
-    use cosmwasm_std::{from_json, Binary, CosmosMsg};
+    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
 
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::attribute::v1::{
@@ -374,7 +374,7 @@ mod tests {
             CosmosMsg::Stargate { type_url, value } => {
                 let expected: Binary = MsgAddAttributeRequest {
                     name: "label.contract.pb".to_string(),
-                    value: to_json_binary(&Label {
+                    value: to_binary(&Label {
                         text: "text".to_string(),
                     })
                     .unwrap()
@@ -541,12 +541,12 @@ mod tests {
         match &res.messages[0].msg {
             CosmosMsg::Stargate { type_url, value } => {
                 let expected: Binary = MsgUpdateAttributeRequest {
-                    original_value: to_json_binary(&Label {
+                    original_value: to_binary(&Label {
                         text: "original_text".to_string(),
                     })
                     .unwrap()
                     .0,
-                    update_value: to_json_binary(&Label {
+                    update_value: to_binary(&Label {
                         text: "update_text".to_string(),
                     })
                     .unwrap()
@@ -590,7 +590,7 @@ mod tests {
         let bin = query(deps.as_ref(), mock_env(), QueryMsg::GetLabelName {}).unwrap();
 
         // Ensure that we got the expected response
-        let rep: LabelNameResponse = from_json(&bin).unwrap();
+        let rep: LabelNameResponse = from_binary(&bin).unwrap();
         assert_eq!(
             rep,
             LabelNameResponse {
@@ -610,7 +610,7 @@ mod tests {
                 account: MOCK_CONTRACT_ADDR.to_string(),
                 attributes: vec![Attribute {
                     name: "label.contract.pb".to_string(),
-                    value: to_json_binary(&Label {
+                    value: to_binary(&Label {
                         text: "text".to_string(),
                     })
                     .unwrap()
@@ -638,7 +638,7 @@ mod tests {
         let bin = query(deps.as_ref(), mock_env(), QueryMsg::GetLabels {}).unwrap();
 
         // Ensure that we got the expected response
-        let rep: LabelsResponse = from_json(&bin).unwrap();
+        let rep: LabelsResponse = from_binary(&bin).unwrap();
         assert_eq!(rep.labels.len(), 1);
         assert_eq!(
             rep.labels[0],
diff --git a/contracts/attrs/src/helpers.rs b/contracts/attrs/src/helpers.rs
index ec5eab97..a5d273cd 100644
--- a/contracts/attrs/src/helpers.rs
+++ b/contracts/attrs/src/helpers.rs
@@ -1,6 +1,4 @@
-use cosmwasm_std::{
-    from_json, to_json_binary, Addr, Binary, CosmosMsg, Empty, StdError, StdResult,
-};
+use cosmwasm_std::{from_binary, to_binary, Addr, Binary, CosmosMsg, Empty, StdError, StdResult};
 use provwasm_std::types::provenance::attribute::v1::{
     AttributeQuerier, AttributeType, MsgAddAttributeRequest, MsgDeleteAttributeRequest,
     MsgDeleteDistinctAttributeRequest, MsgUpdateAttributeRequest,
@@ -69,7 +67,7 @@ pub fn add_json_attribute<H: Into<Addr>, S: Into<String>, T: Serialize + ?Sized>
         address,
         contract_address,
         name,
-        to_json_binary(data)?,
+        to_binary(data)?,
         AttributeType::Json,
     )
 }
@@ -151,7 +149,7 @@ pub fn get_json_attributes<H: Into<Addr>, S: Into<String>, T: DeserializeOwned>(
     resp.attributes
         .iter()
         .filter(|a| a.attribute_type == AttributeType::Json as i32)
-        .map(|a| from_json(&Binary::from(a.value.clone())))
+        .map(|a| from_binary(&Binary::from(a.value.clone())))
         .collect()
 }
 
diff --git a/contracts/ibc/local/src/contract.rs b/contracts/ibc/local/src/contract.rs
index 875d886c..c6fa1b01 100644
--- a/contracts/ibc/local/src/contract.rs
+++ b/contracts/ibc/local/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, IbcMsg, MessageInfo, Order, QueryResponse,
+    entry_point, to_binary, Deps, DepsMut, Env, IbcMsg, MessageInfo, Order, QueryResponse,
     Response, StdError, StdResult,
 };
 
@@ -69,7 +69,7 @@ pub fn handle_who_am_i(
     let packet = PacketMsg::WhoAmI {};
     let msg = IbcMsg::SendPacket {
         channel_id,
-        data: to_json_binary(&packet)?,
+        data: to_binary(&packet)?,
         timeout: env.block.time.plus_seconds(PACKET_LIFETIME).into(),
     };
 
@@ -82,9 +82,9 @@ pub fn handle_who_am_i(
 #[entry_point]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
     match msg {
-        QueryMsg::Admin {} => to_json_binary(&query_admin(deps)?),
-        QueryMsg::Account { channel_id } => to_json_binary(&query_account(deps, channel_id)?),
-        QueryMsg::ListAccounts {} => to_json_binary(&query_list_accounts(deps)?),
+        QueryMsg::Admin {} => to_binary(&query_admin(deps)?),
+        QueryMsg::Account { channel_id } => to_binary(&query_account(deps, channel_id)?),
+        QueryMsg::ListAccounts {} => to_binary(&query_list_accounts(deps)?),
     }
 }
 
diff --git a/contracts/ibc/local/src/ibc.rs b/contracts/ibc/local/src/ibc.rs
index aadd01e3..13b79a3b 100644
--- a/contracts/ibc/local/src/ibc.rs
+++ b/contracts/ibc/local/src/ibc.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, from_json, to_json_binary, DepsMut, Env, IbcBasicResponse, IbcChannelCloseMsg,
+    entry_point, from_binary, to_binary, DepsMut, Env, IbcBasicResponse, IbcChannelCloseMsg,
     IbcChannelConnectMsg, IbcChannelOpenMsg, IbcMsg, IbcOrder, IbcPacketAckMsg,
     IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, StdError, StdResult,
 };
@@ -54,7 +54,7 @@ pub fn ibc_channel_connect(
     let packet = PacketMsg::WhoAmI {};
     let msg = IbcMsg::SendPacket {
         channel_id: channel_id.clone(),
-        data: to_json_binary(&packet)?,
+        data: to_binary(&packet)?,
         timeout: env.block.time.plus_seconds(PACKET_LIFETIME).into(),
     };
 
@@ -102,10 +102,10 @@ pub fn ibc_packet_ack(
     // which local channel was this packet send from
     let caller = msg.original_packet.src.channel_id;
     // we need to parse the ack based on our request
-    let packet: PacketMsg = from_json(&msg.original_packet.data)?;
+    let packet: PacketMsg = from_binary(&msg.original_packet.data)?;
     match packet {
         PacketMsg::WhoAmI {} => {
-            let res: AcknowledgementMsg<WhoAmIResponse> = from_json(&msg.acknowledgement.data)?;
+            let res: AcknowledgementMsg<WhoAmIResponse> = from_binary(&msg.acknowledgement.data)?;
             acknowledge_who_am_i(deps, caller, res)
         }
     }
@@ -127,7 +127,7 @@ fn acknowledge_who_am_i(
         AcknowledgementMsg::Err(e) => {
             return Ok(IbcBasicResponse::new()
                 .add_attribute("action", "acknowledge_who_am_i")
-                .add_attribute("error", e))
+                .add_attribute("error", e));
         }
     };
 
@@ -251,7 +251,7 @@ mod tests {
             channel_id: channel_id.into(),
         };
         let r = query(deps.as_ref(), mock_env(), q).unwrap();
-        let acct: AccountResponse = from_json(r).unwrap();
+        let acct: AccountResponse = from_binary(&r).unwrap();
         assert!(acct.remote_addr.is_none());
         assert!(acct.remote_balance.is_empty());
         assert_eq!(0, acct.last_update_time.nanos());
@@ -265,7 +265,7 @@ mod tests {
             channel_id: channel_id.into(),
         };
         let r = query(deps.as_ref(), mock_env(), q).unwrap();
-        let acct: AccountResponse = from_json(r).unwrap();
+        let acct: AccountResponse = from_binary(&r).unwrap();
         assert_eq!(acct.remote_addr.unwrap(), remote_addr);
         assert!(acct.remote_balance.is_empty());
         assert_eq!(0, acct.last_update_time.nanos());
diff --git a/contracts/ibc/remote/src/contract.rs b/contracts/ibc/remote/src/contract.rs
index 054b7375..9a9b10fd 100644
--- a/contracts/ibc/remote/src/contract.rs
+++ b/contracts/ibc/remote/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, from_json, to_json_binary, DepsMut, Empty, Env, Event, Ibc3ChannelOpenResponse,
+    entry_point, from_binary, to_binary, DepsMut, Empty, Env, Event, Ibc3ChannelOpenResponse,
     IbcBasicResponse, IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg,
     IbcChannelOpenResponse, IbcOrder, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg,
     IbcReceiveResponse, MessageInfo, Response, StdError, StdResult,
@@ -93,7 +93,7 @@ pub fn ibc_packet_receive(
     let packet = msg.packet;
     // which local channel did this packet come on
     let caller = packet.dest.channel_id;
-    let msg: PacketMsg = from_json(&packet.data)?;
+    let msg: PacketMsg = from_binary(&packet.data)?;
     match msg {
         PacketMsg::WhoAmI {} => receive_who_am_i(deps, env, caller),
     }
@@ -105,7 +105,7 @@ fn receive_who_am_i(_deps: DepsMut, env: Env, _caller: String) -> StdResult<IbcR
         account: env.contract.address.into(),
         block_info: env.block,
     };
-    let acknowledgement = to_json_binary(&AcknowledgementMsg::Ok(response))?;
+    let acknowledgement = to_binary(&AcknowledgementMsg::Ok(response))?;
     // and we are golden
     Ok(IbcReceiveResponse::new()
         .set_ack(acknowledgement)
diff --git a/contracts/marker/src/contract.rs b/contracts/marker/src/contract.rs
index 3fabfd2e..b8b9aabb 100644
--- a/contracts/marker/src/contract.rs
+++ b/contracts/marker/src/contract.rs
@@ -1,6 +1,6 @@
 use cosmwasm_std::{
-    attr, entry_point, to_json_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse,
-    Response, StdError, StdResult, Uint128,
+    attr, entry_point, to_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
+    StdError, StdResult, Uint128,
 };
 
 use provwasm_std::types::provenance::marker::v1::{MarkerQuerier, MarkerType};
@@ -255,14 +255,14 @@ fn try_get_marker_by_address(deps: Deps, address: String) -> Result<QueryRespons
     let address = deps.api.addr_validate(&address)?;
     let querier = MarkerQuerier::new(&deps.querier);
     let marker = get_marker_by_address(address, &querier)?;
-    to_json_binary(&marker)
+    to_binary(&marker)
 }
 
 // Query a marker by denom.
 fn try_get_marker_by_denom(deps: Deps, denom: String) -> Result<QueryResponse, StdError> {
     let querier = MarkerQuerier::new(&deps.querier);
     let marker = get_marker_by_denom(denom, &querier)?;
-    to_json_binary(&marker)
+    to_binary(&marker)
 }
 
 #[cfg(test)]
@@ -270,7 +270,7 @@ mod tests {
     use super::*;
     use crate::types::Marker;
     use cosmwasm_std::testing::{mock_env, mock_info};
-    use cosmwasm_std::{from_json, Binary, CosmosMsg};
+    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
     use prost::Message;
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::shim::Any;
@@ -779,7 +779,7 @@ mod tests {
 
         let bin = query(deps.as_ref(), mock_env(), req).unwrap();
 
-        let marker: Marker = from_json(&bin).unwrap();
+        let marker: Marker = from_binary(&bin).unwrap();
         assert_eq!(marker.marker_account, expected_marker);
         assert_eq!(
             marker.marker_account.base_account.unwrap().address,
diff --git a/contracts/name/src/contract.rs b/contracts/name/src/contract.rs
index dfafcdc0..77545f7f 100644
--- a/contracts/name/src/contract.rs
+++ b/contracts/name/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 use provwasm_std::types::provenance::name::v1::{
     MsgBindNameRequest, MsgDeleteNameRequest, NameQuerier, NameRecord,
@@ -168,14 +168,14 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, StdE
 fn try_resolve(deps: Deps, name: String) -> Result<QueryResponse, StdError> {
     let querier = NameQuerier::new(&deps.querier);
     let name = querier.resolve(name)?;
-    to_json_binary(&name)
+    to_binary(&name)
 }
 
 // Use a ProvenanceQuerier to resolve the address for a name.
 fn try_params(deps: Deps) -> Result<QueryResponse, StdError> {
     let querier = NameQuerier::new(&deps.querier);
     let params = querier.params()?;
-    to_json_binary(&params)
+    to_binary(&params)
 }
 
 // Use a ProvenanceQuerier to lookup all names bound to the contract address.
@@ -183,14 +183,14 @@ fn try_lookup(deps: Deps, address: String) -> Result<QueryResponse, StdError> {
     deps.api.addr_validate(&address)?;
     let querier = NameQuerier::new(&deps.querier);
     let names = querier.reverse_lookup(address, None)?;
-    to_json_binary(&names)
+    to_binary(&names)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use cosmwasm_std::testing::{mock_env, mock_info};
-    use cosmwasm_std::{from_json, Binary, CosmosMsg};
+    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::name::v1::{
         QueryResolveRequest, QueryResolveResponse, QueryReverseLookupRequest,
@@ -406,7 +406,7 @@ mod tests {
         .unwrap();
 
         // Ensure that we got the expected address.
-        let rep: QueryResolveResponse = from_json(&bin).unwrap();
+        let rep: QueryResolveResponse = from_binary(&bin).unwrap();
         assert_eq!(rep.address, "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync")
     }
 
@@ -433,7 +433,7 @@ mod tests {
         .unwrap();
 
         // Ensure that we got the expected number of records.
-        let rep: QueryReverseLookupResponse = from_json(&bin).unwrap();
+        let rep: QueryReverseLookupResponse = from_binary(&bin).unwrap();
         assert_eq!(rep, mock_response);
     }
 
@@ -459,7 +459,7 @@ mod tests {
         .unwrap();
 
         // Ensure that we got zero records.
-        let rep: QueryReverseLookupResponse = from_json(&bin).unwrap();
+        let rep: QueryReverseLookupResponse = from_binary(&bin).unwrap();
         assert_eq!(rep, mock_response);
     }
 }
diff --git a/contracts/nft/src/query/all_nft_info.rs b/contracts/nft/src/query/all_nft_info.rs
index 08b835ac..022831ea 100644
--- a/contracts/nft/src/query/all_nft_info.rs
+++ b/contracts/nft/src/query/all_nft_info.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_binary, Binary, Deps, Env};
 use cw721::{AllNftInfoResponse, NftInfoResponse, OwnerOfResponse};
 
 use crate::core::error::ContractError;
@@ -14,7 +14,7 @@ pub fn handle(
     include_expired: bool,
 ) -> Result<Binary, ContractError> {
     let info = TOKENS.load(deps.storage, &token_id)?;
-    Ok(to_json_binary(&AllNftInfoResponse {
+    Ok(to_binary(&AllNftInfoResponse {
         access: OwnerOfResponse {
             owner: info.owner.to_string(),
             approvals: humanize_approvals(&env.block, &info, include_expired),
diff --git a/contracts/nft/src/query/all_operators.rs b/contracts/nft/src/query/all_operators.rs
index 201330e9..30ecb38f 100644
--- a/contracts/nft/src/query/all_operators.rs
+++ b/contracts/nft/src/query/all_operators.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env, Order, StdResult};
+use cosmwasm_std::{to_binary, Binary, Deps, Env, Order, StdResult};
 use cw721::OperatorsResponse;
 use cw_storage_plus::Bound;
 use cw_utils::maybe_addr;
@@ -28,5 +28,5 @@ pub fn handle(
         .take(limit)
         .map(parse_approval)
         .collect();
-    Ok(to_json_binary(&OperatorsResponse { operators: res? })?)
+    Ok(to_binary(&OperatorsResponse { operators: res? })?)
 }
diff --git a/contracts/nft/src/query/all_tokens.rs b/contracts/nft/src/query/all_tokens.rs
index e2e9dc8a..2140bbb8 100644
--- a/contracts/nft/src/query/all_tokens.rs
+++ b/contracts/nft/src/query/all_tokens.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Order, StdResult};
+use cosmwasm_std::{to_binary, Binary, Deps, Order, StdResult};
 use cw721::TokensResponse;
 use cw_storage_plus::Bound;
 
@@ -20,5 +20,5 @@ pub fn handle(
         .map(|item| item.map(|(k, _)| k))
         .collect();
 
-    Ok(to_json_binary(&TokensResponse { tokens: tokens? })?)
+    Ok(to_binary(&TokensResponse { tokens: tokens? })?)
 }
diff --git a/contracts/nft/src/query/approval.rs b/contracts/nft/src/query/approval.rs
index 608ab1d7..2263f2e1 100644
--- a/contracts/nft/src/query/approval.rs
+++ b/contracts/nft/src/query/approval.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env, StdError};
+use cosmwasm_std::{to_binary, Binary, Deps, Env, StdError};
 use cw721::ApprovalResponse;
 use cw_utils::Expiration;
 
@@ -20,7 +20,7 @@ pub fn handle(
             spender: token.owner.to_string(),
             expires: Expiration::Never {},
         };
-        return Ok(to_json_binary(&ApprovalResponse { approval })?);
+        return Ok(to_binary(&ApprovalResponse { approval })?);
     }
 
     let filtered: Vec<_> = token
@@ -42,5 +42,5 @@ pub fn handle(
     // we expect only one item
     let approval = filtered[0].clone();
 
-    Ok(to_json_binary(&ApprovalResponse { approval })?)
+    Ok(to_binary(&ApprovalResponse { approval })?)
 }
diff --git a/contracts/nft/src/query/approvals.rs b/contracts/nft/src/query/approvals.rs
index 373e2a40..80815bdc 100644
--- a/contracts/nft/src/query/approvals.rs
+++ b/contracts/nft/src/query/approvals.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_binary, Binary, Deps, Env};
 use cw721::ApprovalsResponse;
 
 use crate::core::error::ContractError;
@@ -21,5 +21,5 @@ pub fn handle(
         })
         .collect();
 
-    Ok(to_json_binary(&ApprovalsResponse { approvals })?)
+    Ok(to_binary(&ApprovalsResponse { approvals })?)
 }
diff --git a/contracts/nft/src/query/contract_info.rs b/contracts/nft/src/query/contract_info.rs
index 47a2548c..4f6079fe 100644
--- a/contracts/nft/src/query/contract_info.rs
+++ b/contracts/nft/src/query/contract_info.rs
@@ -1,8 +1,8 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps};
+use cosmwasm_std::{to_binary, Binary, Deps};
 
 use crate::core::error::ContractError;
 use crate::storage::contract_info::CONTRACT_INFO;
 
 pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
-    Ok(to_json_binary(&CONTRACT_INFO.load(deps.storage)?)?)
+    Ok(to_binary(&CONTRACT_INFO.load(deps.storage)?)?)
 }
diff --git a/contracts/nft/src/query/contract_owner.rs b/contracts/nft/src/query/contract_owner.rs
index 8a42d1e2..22676908 100644
--- a/contracts/nft/src/query/contract_owner.rs
+++ b/contracts/nft/src/query/contract_owner.rs
@@ -1,7 +1,7 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps};
+use cosmwasm_std::{to_binary, Binary, Deps};
 
 use crate::core::error::ContractError;
 
 pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
-    Ok(to_json_binary(&cw_ownable::get_ownership(deps.storage)?)?)
+    Ok(to_binary(&cw_ownable::get_ownership(deps.storage)?)?)
 }
diff --git a/contracts/nft/src/query/contract_version.rs b/contracts/nft/src/query/contract_version.rs
index 15476e06..40b596d4 100644
--- a/contracts/nft/src/query/contract_version.rs
+++ b/contracts/nft/src/query/contract_version.rs
@@ -1,5 +1,5 @@
 use crate::core::error::ContractError;
-use cosmwasm_std::{to_json_binary, Binary, Deps};
+use cosmwasm_std::{to_binary, Binary, Deps};
 use cw2::get_contract_version;
 
 use crate::core::msg::ContractVersionResponse;
@@ -14,5 +14,5 @@ pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
     let res = ContractVersionResponse {
         contract_version: get_contract_version(deps.storage)?,
     };
-    Ok(to_json_binary(&res)?)
+    Ok(to_binary(&res)?)
 }
diff --git a/contracts/nft/src/query/minter.rs b/contracts/nft/src/query/minter.rs
index 7aaf8dfb..24169ba0 100644
--- a/contracts/nft/src/query/minter.rs
+++ b/contracts/nft/src/query/minter.rs
@@ -1,11 +1,11 @@
 use crate::core::error::ContractError;
 use crate::core::msg::MinterResponse;
-use cosmwasm_std::{to_json_binary, Binary, Deps};
+use cosmwasm_std::{to_binary, Binary, Deps};
 
 pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
     let minter = cw_ownable::get_ownership(deps.storage)?
         .owner
         .map(|a| a.into_string());
 
-    Ok(to_json_binary(&MinterResponse { minter })?)
+    Ok(to_binary(&MinterResponse { minter })?)
 }
diff --git a/contracts/nft/src/query/nft_info.rs b/contracts/nft/src/query/nft_info.rs
index 08c5945f..11cb7455 100644
--- a/contracts/nft/src/query/nft_info.rs
+++ b/contracts/nft/src/query/nft_info.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env, QuerierWrapper, StdError};
+use cosmwasm_std::{to_binary, Binary, Deps, Env, QuerierWrapper, StdError};
 use cw721::NftInfoResponse;
 use provwasm_std::types::provenance::metadata::v1::{MetadataQuerier, ScopeResponse};
 
@@ -9,7 +9,7 @@ use crate::storage::nft::TOKENS;
 pub fn handle(deps: Deps, _env: Env, token_id: String) -> Result<Binary, ContractError> {
     let info = TOKENS.load(deps.storage, &token_id)?;
 
-    Ok(to_json_binary(&NftInfoResponse {
+    Ok(to_binary(&NftInfoResponse {
         token_uri: None,
         extension: &NftData {
             id: info.id,
diff --git a/contracts/nft/src/query/num_tokens.rs b/contracts/nft/src/query/num_tokens.rs
index 159970b3..ffe5910e 100644
--- a/contracts/nft/src/query/num_tokens.rs
+++ b/contracts/nft/src/query/num_tokens.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps};
+use cosmwasm_std::{to_binary, Binary, Deps};
 use cw721::NumTokensResponse;
 
 use crate::core::error::ContractError;
@@ -6,5 +6,5 @@ use crate::storage::nft_count::nft_count;
 
 pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
     let count = nft_count(deps.storage)?;
-    Ok(to_json_binary(&NumTokensResponse { count })?)
+    Ok(to_binary(&NumTokensResponse { count })?)
 }
diff --git a/contracts/nft/src/query/operator.rs b/contracts/nft/src/query/operator.rs
index 831e6161..19f3326d 100644
--- a/contracts/nft/src/query/operator.rs
+++ b/contracts/nft/src/query/operator.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env, StdError};
+use cosmwasm_std::{to_binary, Binary, Deps, Env, StdError};
 use cw721::OperatorResponse;
 
 use crate::core::error::ContractError;
@@ -22,7 +22,7 @@ pub fn handle(
                 "Approval not found",
             )));
         }
-        return Ok(to_json_binary(&OperatorResponse {
+        return Ok(to_binary(&OperatorResponse {
             approval: cw721::Approval {
                 spender: operator,
                 expires,
diff --git a/contracts/nft/src/query/owner_of.rs b/contracts/nft/src/query/owner_of.rs
index 4a21cf3e..cc6f4ae8 100644
--- a/contracts/nft/src/query/owner_of.rs
+++ b/contracts/nft/src/query/owner_of.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_binary, Binary, Deps, Env};
 use cw721::OwnerOfResponse;
 
 use crate::core::error::ContractError;
@@ -12,7 +12,7 @@ pub fn handle(
     include_expired: bool,
 ) -> Result<Binary, ContractError> {
     let info = TOKENS.load(deps.storage, &token_id)?;
-    Ok(to_json_binary(&OwnerOfResponse {
+    Ok(to_binary(&OwnerOfResponse {
         owner: info.owner.to_string(),
         approvals: humanize_approvals(&env.block, &info, include_expired),
     })?)
diff --git a/contracts/nft/src/query/tokens.rs b/contracts/nft/src/query/tokens.rs
index 339f5c79..caa8ce79 100644
--- a/contracts/nft/src/query/tokens.rs
+++ b/contracts/nft/src/query/tokens.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Binary, Deps, Order, StdResult};
+use cosmwasm_std::{to_binary, Binary, Deps, Order, StdResult};
 use cw721::TokensResponse;
 use cw_storage_plus::Bound;
 
@@ -24,5 +24,5 @@ pub fn handle(
         .take(limit)
         .collect::<StdResult<Vec<_>>>()?;
 
-    Ok(to_json_binary(&TokensResponse { tokens })?)
+    Ok(to_binary(&TokensResponse { tokens })?)
 }
diff --git a/contracts/scope/src/contract.rs b/contracts/scope/src/contract.rs
index 55f98631..8bf2e23a 100644
--- a/contracts/scope/src/contract.rs
+++ b/contracts/scope/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 
 use provwasm_std::types::provenance::metadata::v1::{MetadataQuerier, MsgWriteScopeRequest, Scope};
@@ -105,7 +105,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, StdE
 fn try_get_contract_spec(deps: Deps, id: String) -> Result<QueryResponse, StdError> {
     let querier = MetadataQuerier::new(&deps.querier);
     let contract_spec_response = querier.contract_specification(id, true, false, false)?;
-    to_json_binary(&contract_spec_response)
+    to_binary(&contract_spec_response)
 }
 
 // Use a ProvenanceQuerier to get a scope by ID.
@@ -120,7 +120,7 @@ fn try_get_scope(deps: Deps, id: String) -> Result<QueryResponse, StdError> {
         false,
         false,
     )?;
-    to_json_binary(&scope_response)
+    to_binary(&scope_response)
 }
 
 // Use a ProvenanceQuerier to get sessions for a scope.
@@ -136,7 +136,7 @@ fn try_get_sessions(deps: Deps, scope_id: String) -> Result<QueryResponse, StdEr
         false,
         false,
     )?;
-    to_json_binary(&sessions_response)
+    to_binary(&sessions_response)
 }
 
 // Use a ProvenanceQuerier to get records for a scope.
@@ -152,7 +152,7 @@ fn try_get_records(deps: Deps, scope_id: String) -> Result<QueryResponse, StdErr
         false,
         false,
     )?;
-    to_json_binary(&records_response)
+    to_binary(&records_response)
 }
 
 // Use a ProvenanceQuerier to get records for a scope by name
@@ -172,12 +172,12 @@ fn try_get_records_by_name(
         false,
         false,
     )?;
-    to_json_binary(&records_response)
+    to_binary(&records_response)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::from_json;
+    use cosmwasm_std::from_binary;
     use cosmwasm_std::testing::{mock_env, mock_info};
 
     use provwasm_mocks::mock_provenance_dependencies;
@@ -255,7 +255,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected scope.
-        let scope: ScopeResponse = from_json(&bin).unwrap();
+        let scope: ScopeResponse = from_binary(&bin).unwrap();
         assert_eq!(scope, expected)
     }
 
@@ -306,7 +306,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected sessions.
-        let sessions: SessionsResponse = from_json(&bin).unwrap();
+        let sessions: SessionsResponse = from_binary(&bin).unwrap();
         assert_eq!(sessions, expected)
     }
 
@@ -403,7 +403,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected records
-        let records: RecordsResponse = from_json(&bin).unwrap();
+        let records: RecordsResponse = from_binary(&bin).unwrap();
         assert_eq!(records, expected)
     }
 
@@ -467,7 +467,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected record.
-        let record: RecordsResponse = from_json(&bin).unwrap();
+        let record: RecordsResponse = from_binary(&bin).unwrap();
         assert_eq!(record, expected);
     }
 }
diff --git a/contracts/template/Cargo.lock b/contracts/template/Cargo.lock
index b198b8ee..577e830b 100644
--- a/contracts/template/Cargo.lock
+++ b/contracts/template/Cargo.lock
@@ -635,9 +635,9 @@ dependencies = [
 
 [[package]]
 name = "provwasm-std"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d216752a4c37d7bc39ee1d397f6500fa92cf1c191c60b501038aa98cafa07c69"
+checksum = "cc1be9fcaa463174e3bec59a179ed5b3590aa038f0e9c68d5132bc19df212383"
 dependencies = [
  "base64",
  "chrono",
diff --git a/contracts/template/Cargo.toml b/contracts/template/Cargo.toml
index 398cf24a..1332be99 100644
--- a/contracts/template/Cargo.toml
+++ b/contracts/template/Cargo.toml
@@ -1,16 +1,25 @@
 [package]
 name = "template"
-version = { workspace = true }
-repository = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
+version = "2.1.0"
 authors = ["Matthew Witkowski <mwitkowski@provenance.io"]
+edition = "2021"
 
 exclude = ["contract.wasm", "checksums.txt"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
 [features]
 backtraces = []
 
@@ -27,17 +36,18 @@ optimize-arm = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-provwasm-std = { workspace = true }
+provwasm-std = { version = "2.1.0" }
 cw-utils = { version = "1.0.1" }
-cosmwasm-schema = { workspace = true }
-cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
-cw-storage-plus = { workspace = true, features = ["iterator"] }
+cosmwasm-schema = { version = "1.2.5" }
+cosmwasm-std = { version = "1.2.5", features = ["cosmwasm_1_1"] }
+cosmwasm-storage = { version = "1.2.5" }
+cw-storage-plus = { version = "1.0.1", features = ["iterator"] }
 cw2 = "1.0.1"
-schemars = { workspace = true }
-serde = { workspace = true, default-features = false, features = ["derive"] }
-thiserror = { workspace = true }
+schemars = "0.8.10"
+serde = { version = "1.0.145", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.31" }
 semver = "1"
 
 [dev-dependencies]
-provwasm-mocks = { workspace = true }
+provwasm-mocks = { version = "2.0.0" }
 cw-multi-test = "0.17.0"
diff --git a/contracts/template/src/query/query_owner.rs b/contracts/template/src/query/query_owner.rs
index 4875e563..f72e4d37 100644
--- a/contracts/template/src/query/query_owner.rs
+++ b/contracts/template/src/query/query_owner.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Deps};
+use cosmwasm_std::{to_binary, Deps};
 
 use crate::{
     core::{aliases::ProvQueryResponse, msg::QueryOwnerResponse},
@@ -19,12 +19,12 @@ pub fn handle(deps: Deps) -> ProvQueryResponse {
     let res = QueryOwnerResponse {
         owner: storage::state::get_owner(deps.storage)?,
     };
-    Ok(to_json_binary(&res)?)
+    Ok(to_binary(&res)?)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::{from_json, Addr};
+    use cosmwasm_std::{from_binary, Addr};
     use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
@@ -39,7 +39,7 @@ mod tests {
         let mut deps = mock_provenance_dependencies();
         setup::mock_contract(deps.as_mut());
         let bin = handle(deps.as_ref()).unwrap();
-        let response: QueryOwnerResponse = from_json(&bin).unwrap();
+        let response: QueryOwnerResponse = from_binary(&bin).unwrap();
         assert_eq!(Addr::unchecked(OWNER), response.owner);
     }
 }
diff --git a/contracts/template/src/query/query_version.rs b/contracts/template/src/query/query_version.rs
index c67a26a8..9e2e2616 100644
--- a/contracts/template/src/query/query_version.rs
+++ b/contracts/template/src/query/query_version.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Deps};
+use cosmwasm_std::{to_binary, Deps};
 use cw2::get_contract_version;
 
 use crate::core::{aliases::ProvQueryResponse, msg::QueryVersionResponse};
@@ -17,12 +17,12 @@ pub fn handle(deps: Deps) -> ProvQueryResponse {
     let res = QueryVersionResponse {
         contract_version: get_contract_version(deps.storage)?,
     };
-    Ok(to_json_binary(&res)?)
+    Ok(to_binary(&res)?)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::from_json;
+    use cosmwasm_std::from_binary;
     use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
@@ -40,7 +40,7 @@ mod tests {
         let mut deps = mock_provenance_dependencies();
         setup::mock_contract(deps.as_mut());
         let bin = handle(deps.as_ref()).unwrap();
-        let response: QueryVersionResponse = from_json(&bin).unwrap();
+        let response: QueryVersionResponse = from_binary(&bin).unwrap();
         assert_eq!(CONTRACT_NAME, response.contract_version.contract);
         assert_eq!(CONTRACT_VERSION, response.contract_version.version);
     }
diff --git a/contracts/template/src/query/router.rs b/contracts/template/src/query/router.rs
index 93d60faa..94494d59 100644
--- a/contracts/template/src/query/router.rs
+++ b/contracts/template/src/query/router.rs
@@ -26,7 +26,7 @@ pub fn route(deps: Deps, _env: Env, msg: QueryMsg) -> ProvQueryResponse {
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::{from_json, testing::mock_env, Addr};
+    use cosmwasm_std::{from_binary, testing::mock_env, Addr};
     use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
@@ -46,7 +46,7 @@ mod tests {
         let msg = QueryMsg::QueryOwner {};
         setup::mock_contract(deps.as_mut());
         let bin = route(deps.as_ref(), env, msg).unwrap();
-        let response: QueryOwnerResponse = from_json(&bin).unwrap();
+        let response: QueryOwnerResponse = from_binary(&bin).unwrap();
         assert_eq!(Addr::unchecked(OWNER), response.owner);
     }
 
@@ -57,7 +57,7 @@ mod tests {
         let msg = QueryMsg::QueryVersion {};
         setup::mock_contract(deps.as_mut());
         let bin = route(deps.as_ref(), env, msg).unwrap();
-        let response: QueryVersionResponse = from_json(&bin).unwrap();
+        let response: QueryVersionResponse = from_binary(&bin).unwrap();
         assert_eq!(CONTRACT_NAME, response.contract_version.contract);
         assert_eq!(CONTRACT_VERSION, response.contract_version.version);
     }
diff --git a/contracts/trigger/src/contract.rs b/contracts/trigger/src/contract.rs
index 864d153f..0d47ee9e 100644
--- a/contracts/trigger/src/contract.rs
+++ b/contracts/trigger/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, Uint64,
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, Uint64,
 };
 use provwasm_std::shim::{Any, Timestamp};
 use provwasm_std::types::cosmos::bank::v1beta1::MsgSend;
@@ -105,8 +105,8 @@ pub fn get_trigger(deps: Deps, id: Option<Uint64>) -> Result<QueryResponse, Cont
     let trigger_querier = TriggerQuerier::new(&deps.querier);
 
     match id {
-        Some(id) => Ok(to_json_binary(&trigger_querier.trigger_by_id(id.u64())?)?),
-        None => Ok(to_json_binary(&trigger_querier.triggers(None)?)?),
+        Some(id) => Ok(to_binary(&trigger_querier.trigger_by_id(id.u64())?)?),
+        None => Ok(to_binary(&trigger_querier.triggers(None)?)?),
     }
 }
 
diff --git a/contracts/tutorial/src/contract.rs b/contracts/tutorial/src/contract.rs
index 6adecdb9..62271d3e 100644
--- a/contracts/tutorial/src/contract.rs
+++ b/contracts/tutorial/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    coin, entry_point, to_json_binary, BankMsg, Binary, CosmosMsg, Decimal, Deps, DepsMut, Env,
+    coin, entry_point, to_binary, BankMsg, Binary, CosmosMsg, Decimal, Deps, DepsMut, Env,
     MessageInfo, Response, StdError, StdResult,
 };
 use provwasm_std::types::provenance::name::v1::{MsgBindNameRequest, NameRecord};
@@ -93,7 +93,7 @@ pub fn query(
     match msg {
         QueryMsg::QueryRequest {} => {
             let state = CONFIG.load(deps.storage)?;
-            let json = to_json_binary(&state)?;
+            let json = to_binary(&state)?;
             Ok(json)
         }
     }
@@ -180,7 +180,7 @@ fn try_purchase(
 // mod tests {
 //     use super::*;
 //     use cosmwasm_std::testing::{mock_env, mock_info};
-//     use cosmwasm_std::{from_json, Addr};
+//     use cosmwasm_std::{from_binary, Addr};
 //     use provwasm_mocks::mock_dependencies;
 //     use provwasm_std::{NameMsgParams, ProvenanceMsgParams};
 //
@@ -294,7 +294,7 @@ fn try_purchase(
 //
 //         // Call the smart contract query function to get stored state.
 //         let bin = query(deps.as_ref(), mock_env(), QueryMsg::QueryRequest {}).unwrap();
-//         let resp: State = from_json(&bin).unwrap();
+//         let resp: State = from_binary(&bin).unwrap();
 //
 //         // Ensure the expected init fields were properly stored.
 //         assert_eq!(resp.merchant_address, Addr::unchecked("merchant"));
diff --git a/packages/provwasm-mocks/src/querier.rs b/packages/provwasm-mocks/src/querier.rs
index 0322a25b..7967cad6 100644
--- a/packages/provwasm-mocks/src/querier.rs
+++ b/packages/provwasm-mocks/src/querier.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 
 use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage};
 use cosmwasm_std::{
-    from_json, Binary, Coin, Empty, OwnedDeps, Querier, QuerierResult, QueryRequest, SystemError,
+    from_slice, Binary, Coin, Empty, OwnedDeps, Querier, QuerierResult, QueryRequest, SystemError,
     SystemResult,
 };
 use serde::de::DeserializeOwned;
@@ -54,13 +54,13 @@ impl MockableQuerier for MockProvenanceQuerier {
 
 impl Querier for MockProvenanceQuerier {
     fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
-        let request: QueryRequest<Empty> = match from_json(bin_request) {
+        let request: QueryRequest<Empty> = match from_slice(bin_request) {
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
                     error: format!("Parsing query request: {}", e),
                     request: bin_request.into(),
-                })
+                });
             }
         };
         self.handle_query(&request)